Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-12-12 11:08:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: racing meta missions and undefined behavior in mission progression

Browse Source 
Tested that missions can still be completed
Tested that racing meta tasks are now actually possible
TODO: Tested that old characters with incomplete meta missions are brought up to speed with their current progress
This commit is contained in:
David Markowitz
2025-11-19 22:18:57 -08:00
parent a713216540
commit 4a9971d182
7 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
dGame/dComponents/MissionComponent.cpp
View File

@@ -3,6 +3,7 @@
* Copyright 2019
*/
#include <ranges>
#include <sstream>
#include <string>
@@ -71,7 +72,7 @@ eMissionState MissionComponent::GetMissionState(const uint32_t missionId) const
}
const std::unordered_map<uint32_t, Mission*>& MissionComponent::GetMissions() const {
const std::map<uint32_t, Mission*>& MissionComponent::GetMissions() const {
return m_Missions;
}
@@ -149,7 +150,7 @@ void MissionComponent::Progress(eMissionTaskType type, int32_t value, LWOOBJID a
}
for (const auto& [id, mission] : m_Missions) {
if (!mission || std::find(acceptedAchievements.begin(), acceptedAchievements.end(), mission->GetMissionId()) != acceptedAchievements.end()) continue;
if (!mission || std::ranges::find(acceptedAchievements, mission->GetMissionId()) != acceptedAchievements.end()) continue;
if (mission->IsAchievement() && ignoreAchievements) continue;
@@ -747,3 +748,30 @@ bool MissionComponent::OnMissionNeedsLot(GameMessages::GameMsg& msg) {
const auto& needMsg = static_cast<GameMessages::MissionNeedsLot&>(msg);
return RequiresItem(needMsg.item);
}
void MissionComponent::FixRacingMetaMissions() {
for (const auto mission : m_Missions | std::views::values) {
if (!mission || mission->IsComplete()) continue;
for (const auto task : mission->GetTasks()) {
if (!task) continue;
// has to be a racing meta mission and have a taskparam1 of 4
if (task->GetType() != eMissionTaskType::RACING || !task->GetClientInfo().taskParam1.starts_with("4")) continue;
// Each target is racing mission that needs to be completed.
// If its completed, progress the meta task by 1.
uint32_t progress = 0;
for (const auto& target : task->GetAllTargets()) {
if (target == 0) continue;
auto* racingMission = GetMission(target);
if (racingMission && racingMission->IsComplete()) {
progress++;
}
}
task->SetProgress(progress);
}
// in case the mission is actually complete, give them the rewards
mission->CheckCompletion();
}
}

6
dGame/dComponents/MissionComponent.h
View File

@@ -38,7 +38,7 @@ public:
* Returns all the missions for this entity, mapped by mission ID
* @return the missions for this entity, mapped by mission ID
*/
const std::unordered_map<uint32_t, Mission*>& GetMissions() const;
const std::map<uint32_t, Mission*>& GetMissions() const;
/**
* Returns the mission for the given mission ID, if it exists
@@ -170,6 +170,8 @@ public:
bool HasMission(uint32_t missionId);
void ResetMission(const int32_t missionId);
void FixRacingMetaMissions();
private:
bool OnGetObjectReportInfo(GameMessages::GameMsg& msg);
bool OnGetMissionState(GameMessages::GameMsg& msg);
@@ -177,7 +179,7 @@ private:
/**
* All the missions owned by this entity, mapped by mission ID
*/
std::unordered_map<uint32_t, Mission*> m_Missions;
std::map<uint32_t, Mission*> m_Missions;
/**
* All the collectibles currently collected by the entity