From 94f8a99fbaec9105f98e8350867ddd2b2d0aaed1 Mon Sep 17 00:00:00 2001 From: David Markowitz Date: Sun, 8 Oct 2023 23:23:14 -0700 Subject: [PATCH] Revert: Fix wisp lee mission This reverts commit d7e16ab589697fd1a0a270a02c622b8fa752638f. Fixes an issue where the incorrect mission is marked as being offerable and this overwrote the original mission offered by wisp lee and forced him to offer a different, unacceptable mission. Tested that completing the mission twice from a new daily state and a repeatable state both completed the chain correctly. Unsure what the original bug was, but it does not appear to be present. On top of that, there is no pre-requisite for mission 1883 anywhere in the cdclient, so at best, this check was always false, but the correct behavior is exact equivalence for the mission state. --- dGame/dMission/MissionPrerequisites.cpp | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dGame/dMission/MissionPrerequisites.cpp b/dGame/dMission/MissionPrerequisites.cpp index ec4522b9..8dab9a2d 100644 --- a/dGame/dMission/MissionPrerequisites.cpp +++ b/dGame/dMission/MissionPrerequisites.cpp @@ -105,9 +105,7 @@ bool PrerequisiteExpression::Execute(const std::unordered_mapsub != 0) { // Special case for one Wisp Lee repeatable mission. - a = mission->GetClientInfo().id == 1883 ? - mission->GetMissionState() == static_cast(this->sub) : - mission->GetMissionState() >= static_cast(this->sub); + a = mission->GetMissionState() == static_cast(this->sub); } else if (mission->IsComplete()) { a = true; }