yolinlin/mod-individual-progression
1
0
Fork 0
mirror of https://github.com/ZhengPeiRu21/mod-individual-progression synced 2025-11-29 23:44:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix IndividualProgression chat commands

Browse Source
This commit is contained in:
郑佩茹
2022-09-17 15:02:46 -06:00
parent a6685b0bcb
commit 770cca9f50
3 changed files with 30 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/IndividualProgression.cpp
View File

@@ -18,7 +18,7 @@ bool IndividualProgression::hasPassedProgression(Player* player, ProgressionStat
return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value >= state; return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value >= state;
} }
bool IndividualProgression::isBeforeProgression(Player* player, ProgressionState state) const bool IndividualProgression::isBeforeProgression(Player* player, ProgressionState state)
{ {
return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value < state; return player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value < state;
} }
@@ -34,6 +34,11 @@ void IndividualProgression::UpdateProgressionState(Player* player, ProgressionSt
} }
} }
void IndividualProgression::ForceUpdateProgressionState(Player* player, ProgressionState newState)
{
player->UpdatePlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE, newState);
}
void IndividualProgression::CheckAdjustments(Player* player) const void IndividualProgression::CheckAdjustments(Player* player) const
{ {
if (!enabled) if (!enabled)
@@ -533,6 +538,25 @@ public:
sIndividualProgression->CheckAdjustments(player); sIndividualProgression->CheckAdjustments(player);
} }
// Waiting for PR: https://github.com/azerothcore/azerothcore-wotlk/pull/13046
// void OnSetMaxLevel(Player* player, uint32& maxPlayerLevel) override
// {
// if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
// {
// if (sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) > 60)
// {
// maxPlayerLevel = 60;
// }
// }
// else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5))
// {
// if (sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) > 70)
// {
// maxPlayerLevel = 70;
// }
// }
// }
void OnMapChanged(Player* player) override void OnMapChanged(Player* player) override
{ {
sIndividualProgression->CheckAdjustments(player); sIndividualProgression->CheckAdjustments(player);

3
src/IndividualProgression.h
View File

@@ -121,8 +121,9 @@ public:
int progressionLimit, startingProgression; int progressionLimit, startingProgression;
bool hasPassedProgression(Player* player, ProgressionState state) const; bool hasPassedProgression(Player* player, ProgressionState state) const;
bool isBeforeProgression(Player* player, ProgressionState state) const; static bool isBeforeProgression(Player* player, ProgressionState state) ;
void UpdateProgressionState(Player* player, ProgressionState newState) const; void UpdateProgressionState(Player* player, ProgressionState newState) const;
static void ForceUpdateProgressionState(Player* player, ProgressionState newState) ;
void CheckAdjustments(Player* player) const; void CheckAdjustments(Player* player) const;
void ApplyGearStatsTuning(Player* player, float& computedAdjustment, ItemTemplate const* item) const; void ApplyGearStatsTuning(Player* player, float& computedAdjustment, ItemTemplate const* item) const;
void ApplyGearHealthTuning(Player* player, float& computedAdjustment, ItemTemplate const* item) const; void ApplyGearHealthTuning(Player* player, float& computedAdjustment, ItemTemplate const* item) const;

6
src/cs_individualProgression.cpp
View File

@@ -33,10 +33,10 @@ public:
handler->SendSysMessage("Invalid progression level."); handler->SendSysMessage("Invalid progression level.");
return false; return false;
} }
Player* target = player->GetConnectedPlayer(); player = PlayerIdentifier::FromTargetOrSelf(handler);
if (target) if (player && player->GetConnectedPlayer())
{ {
sIndividualProgression->UpdateProgressionState(target, static_cast<ProgressionState>(progressionLevel)); sIndividualProgression->ForceUpdateProgressionState(player->GetConnectedPlayer(), static_cast<ProgressionState>(progressionLevel));
handler->SendSysMessage("Progression state updated successfully"); handler->SendSysMessage("Progression state updated successfully");
} }
return true; return true;