Fix ProgressionLimit comparison

This commit is contained in:
郑佩茹
2022-09-12 20:04:04 -06:00
parent 97badd82a6
commit fe257e52e3

View File

@@ -234,7 +234,7 @@ class IndividualPlayerProgression_PetScript : public PetScript
private: private:
bool hasPassedProgression(Player* player, ProgressionState state) bool hasPassedProgression(Player* player, ProgressionState state)
{ {
if (progressionLimit && state > progressionLimit) if (progressionLimit && state >= progressionLimit)
return false; return false;
return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value >= state; return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value >= state;
} }
@@ -313,13 +313,13 @@ class IndividualPlayerProgression : public PlayerScript
private: private:
static bool hasPassedProgression(Player* player, ProgressionState state) static bool hasPassedProgression(Player* player, ProgressionState state)
{ {
if (progressionLimit && state > progressionLimit) if (progressionLimit && state >= progressionLimit)
return false; return false;
return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value >= state; return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value >= state;
} }
static void UpdateProgressionState(Player* player, ProgressionState newState) static void UpdateProgressionState(Player* player, ProgressionState newState)
{ {
if (progressionLimit && newState > progressionLimit) if (progressionLimit && newState >= progressionLimit)
return; return;
uint8 currentState = player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value; uint8 currentState = player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
if (newState > currentState) if (newState > currentState)