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

Code Cleaning - Error Messages - Progression Level Fixes (#820)

Browse Source 
- removing some duplicate code
- adding some error messages
- removing achievements if player decides to go down in progression level.
- on login your progression level will no longer go down, if it's currently higher than the highest kill achievement you got
This commit is contained in:
Grimfeather
2025-10-22 00:57:51 +02:00
committed by GitHub
parent 0476f9c99a
commit 9c0f909b02
6 changed files with 196 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files

103
src/cs_individualProgression.cpp
View File

@@ -16,10 +16,10 @@ public:
{
static ChatCommandTable individualProgressionTable =
{
{ "get", HandleGetIndividualProgressionCommand, SEC_GAMEMASTER, Console::Yes },
{ "set", HandleSetIndividualProgressionCommand, SEC_GAMEMASTER, Console::Yes },
{ "tele", HandleTeleIndividualProgressionCommand, SEC_GAMEMASTER, Console::Yes },
{ "view", HandleViewIndividualProgressionCommand, SEC_GAMEMASTER, Console::Yes },
{ "get", HandleViewIndividualProgressionCommand, SEC_GAMEMASTER, Console::Yes },
{ "view", HandleGetIndividualProgressionCommand, SEC_GAMEMASTER, Console::Yes },
};
static ChatCommandTable commandTable =
@@ -31,6 +31,17 @@ public:
return commandTable;
}
static bool HandleGetIndividualProgressionCommand(ChatHandler* handler, Optional<PlayerIdentifier> player)
{
player = PlayerIdentifier::FromTargetOrSelf(handler);
Player* target = player->GetConnectedPlayer();
uint32 progressionLevel = target->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
std::string playername = target->GetName();
handler->PSendSysMessage("Progression Level for |cff00ffff{}|r = |cff00ffff{}|r", playername, progressionLevel);
return true;
}
static bool HandleSetIndividualProgressionCommand(ChatHandler* handler, Optional<PlayerIdentifier> player, uint32 progressionLevel)
{
if (progressionLevel > PROGRESSION_WOTLK_TIER_5)
@@ -42,6 +53,67 @@ public:
player = PlayerIdentifier::FromTargetOrSelf(handler);
Player* target = player->GetConnectedPlayer();
std::string playername = target->GetName();
uint16 playerGUID = target->GetGUID().GetCounter();
uint8 currentState = target->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
if (progressionLevel < currentState)
{
for (uint8 i = progressionLevel; i < currentState; ++i)
{
if (i == 0 && target->HasAchieved(RAGNAROS_KILL)) // 686
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, RAGNAROS_KILL);
}
else if (i == 1 && target->HasAchieved(ONYXIAS_KILL)) // 684
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, ONYXIAS_KILL);
}
else if (i == 2 && target->HasAchieved(NEFARIAN_KILL)) // 685
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, NEFARIAN_KILL);
}
else if (i == 5 && target->HasAchieved(C_THUN_KILL)) // 687
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, C_THUN_KILL);
}
else if (i == 8 && target->HasAchieved(MALCHEZAAR_KILL)) // 690
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, MALCHEZAAR_KILL);
}
else if (i == 9 && target->HasAchieved(KAEL_THAS_KILL)) // 696
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, KAEL_THAS_KILL);
}
else if (i == 10 && target->HasAchieved(ILLIDAN_KILL)) // 697
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, ILLIDAN_KILL);
}
else if (i == 11 && target->HasAchieved(ZUL_JIN_KILL)) // 691
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, ZUL_JIN_KILL);
}
else if (i == 12 && target->HasAchieved(KIL_JAEDEN_KILL)) // 698
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, KIL_JAEDEN_KILL);
}
else if (i == 13 && target->HasAchieved(KEL_THUZAD_KILL)) // 575
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, KEL_THUZAD_KILL);
}
else if (i == 15 && target->HasAchieved(ANUB_ARAK_KILL)) // 3916
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, ANUB_ARAK_KILL);
}
else if (i == 16 && target->HasAchieved(LICH_KING_KILL)) // 4597
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, LICH_KING_KILL);
}
else if (i == 17 && target->HasAchieved(HALION_KILL)) // 4815
{
sIndividualProgression->RemovePlayerAchievement(playerGUID, HALION_KILL);
}
}
}
sIndividualProgression->ForceUpdateProgressionState(target, static_cast<ProgressionState>(progressionLevel));
sIndividualProgression->UpdateProgressionQuests(target);
@@ -50,31 +122,6 @@ public:
return true;
}
static bool HandleViewIndividualProgressionCommand(ChatHandler* handler, Optional<PlayerIdentifier> player)
{
player = PlayerIdentifier::FromTargetOrSelf(handler);
Player* target = player->GetConnectedPlayer();
uint32 progressionLevel = target->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
std::string playername = target->GetName();
handler->PSendSysMessage("Progression Level for |cff00ffff{}|r = |cff00ffff{}|r", playername, progressionLevel);
return true;
}
static bool isAttuned(Player* player)
{
if ((player->GetQuestStatus(NAXX40_ATTUNEMENT_1) == QUEST_STATUS_REWARDED) ||
(player->GetQuestStatus(NAXX40_ATTUNEMENT_2) == QUEST_STATUS_REWARDED) ||
(player->GetQuestStatus(NAXX40_ATTUNEMENT_3) == QUEST_STATUS_REWARDED))
{
return true;
}
else
{
return false;
}
}
static bool HandleTeleIndividualProgressionCommand(ChatHandler* handler, Optional<PlayerIdentifier> player, std::string location)
{
if (location != "naxx40" && location != "onyxia40" && location != "naxx" && location != "onyxia")
@@ -88,7 +135,7 @@ public:
uint32 progressionLevel = target->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
std::string playername = target->GetName();
if ((location == "naxx" || location == "naxx40" ) && ((progressionLevel < PROGRESSION_TBC_TIER_5 && isAttuned(target)) || target->IsGameMaster()))
if ((location == "naxx" || location == "naxx40" ) && ((progressionLevel < PROGRESSION_TBC_TIER_5 && sIndividualProgression->isAttuned(target)) || target->IsGameMaster()))
{
target->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC);
target->TeleportTo(533, 3005.51f, -3434.64f, 304.195f, 6.2831f);