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

Check progression instead of Death Knight class (#662)

Browse Source 
death knights can now enter if their progression level is low enough.
This commit is contained in:
Grimfeather
2025-08-21 09:04:37 +02:00
committed by GitHub
parent 17a2657b73
commit efe6513185
4 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/IndividualProgressionPlayer.cpp
View File

@@ -365,7 +365,7 @@ public:
{ {
return true; return true;
} }
if (mapid == MAP_ONYXIAS_LAIR && player->GetLevel() <= IP_LEVEL_TBC && (!player->HasItemCount(ITEM_DRAKEFIRE_AMULET) || player->getClass() == CLASS_DEATH_KNIGHT)) if (mapid == MAP_ONYXIAS_LAIR && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && !player->HasItemCount(ITEM_DRAKEFIRE_AMULET))
{ {
return false; return false;
} }
@@ -435,7 +435,7 @@ public:
{ {
return false; return false;
} }
if (instanceTemplate->Parent == MAP_NORTHREND && mapid == MAP_NAXXRAMAS && player->GetLevel() <= IP_LEVEL_TBC && !isAttuned(player)) if (instanceTemplate->Parent == MAP_NORTHREND && mapid == MAP_NAXXRAMAS && player->GetLevel() <= IP_LEVEL_TBC && (!isAttuned(player) || sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) ))
{ {
return false; return false;
} }

9
src/cs_individualProgression.cpp
View File

@@ -52,7 +52,6 @@ public:
static bool HandleViewIndividualProgressionCommand(ChatHandler* handler, Optional<PlayerIdentifier> player) static bool HandleViewIndividualProgressionCommand(ChatHandler* handler, Optional<PlayerIdentifier> player)
{ {
player = PlayerIdentifier::FromTargetOrSelf(handler); player = PlayerIdentifier::FromTargetOrSelf(handler);
Player* target = player->GetConnectedPlayer(); Player* target = player->GetConnectedPlayer();
uint32 progressionLevel = target->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value; uint32 progressionLevel = target->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
std::string playername = target->GetName(); std::string playername = target->GetName();
@@ -77,24 +76,24 @@ public:
static bool HandleTeleIndividualProgressionCommand(ChatHandler* handler, Optional<PlayerIdentifier> player, std::string location) static bool HandleTeleIndividualProgressionCommand(ChatHandler* handler, Optional<PlayerIdentifier> player, std::string location)
{ {
player = PlayerIdentifier::FromTargetOrSelf(handler);
if (location != "naxx40" && location != "onyxia40") if (location != "naxx40" && location != "onyxia40")
{ {
handler->PSendSysMessage("|cff00ffff{}|r is not a valid teleport location.", location); handler->PSendSysMessage("|cff00ffff{}|r is not a valid teleport location.", location);
return false; return false;
} }
player = PlayerIdentifier::FromTargetOrSelf(handler);
Player* target = player->GetConnectedPlayer(); Player* target = player->GetConnectedPlayer();
uint32 progressionLevel = target->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
std::string playername = target->GetName(); std::string playername = target->GetName();
if ((location == "naxx40") && (target->GetLevel() <= IP_LEVEL_TBC) && (target->getClass() != CLASS_DEATH_KNIGHT) && isAttuned(target)) if (location == "naxx40" && ((progressionLevel < PROGRESSION_TBC_TIER_5 && isAttuned(target)) || target->IsGameMaster()))
{ {
target->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC); target->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC);
target->TeleportTo(533, 3005.51f, -3434.64f, 304.195f, 6.2831f); target->TeleportTo(533, 3005.51f, -3434.64f, 304.195f, 6.2831f);
return true; return true;
} }
else if ((location == "onyxia40" && target->GetLevel() < IP_LEVEL_TBC) && (target->getClass() != CLASS_DEATH_KNIGHT) && target->HasItemCount(ITEM_DRAKEFIRE_AMULET)) else if (location == "onyxia40" && ((progressionLevel < PROGRESSION_TBC_TIER_5 && target->HasItemCount(ITEM_DRAKEFIRE_AMULET)) || target->IsGameMaster()))
{ {
target->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC); target->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC);
target->TeleportTo(249, 29.1607f, -71.3372f, -8.18032f, 4.58f); target->TeleportTo(249, 29.1607f, -71.3372f, -8.18032f, 4.58f);

2
src/naxx40Scripts/custom_gameobjects_40.cpp
View File

@@ -51,7 +51,7 @@ public:
bool OnGossipHello(Player* player, GameObject* /*go*/) override bool OnGossipHello(Player* player, GameObject* /*go*/) override
{ {
if ((isExcludedFromProgression(player) && (player->GetLevel() <= IP_LEVEL_TBC) && (player->getClass() != CLASS_DEATH_KNIGHT)) || if ((isExcludedFromProgression(player) && (player->GetLevel() <= IP_LEVEL_TBC)) ||
((!sIndividualProgression->requireNaxxStrath || player->GetQuestStatus(NAXX40_ENTRANCE_FLAG) == QUEST_STATUS_REWARDED) && (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5)))) ((!sIndividualProgression->requireNaxxStrath || player->GetQuestStatus(NAXX40_ENTRANCE_FLAG) == QUEST_STATUS_REWARDED) && (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5))))
{ {
player->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC); player->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC);

7
src/vanillaScripts/instance_onyxias_lair.cpp
View File

@@ -148,8 +148,9 @@ public:
bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/) override bool OnTrigger(Player* player, AreaTrigger const* /*areaTrigger*/) override
{ {
ChatHandler handler(player->GetSession()); ChatHandler handler(player->GetSession());
uint32 progressionLevel = player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
if ((player->GetLevel() <= IP_LEVEL_TBC) && (player->getClass() != CLASS_DEATH_KNIGHT) && (player->HasItemCount(ITEM_DRAKEFIRE_AMULET) || isExcludedFromProgression(player))) if (player->GetLevel() <= IP_LEVEL_TBC && progressionLevel < PROGRESSION_TBC_TIER_5 && (player->HasItemCount(ITEM_DRAKEFIRE_AMULET) || isExcludedFromProgression(player)))
{ {
player->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC); player->SetRaidDifficulty(RAID_DIFFICULTY_10MAN_HEROIC);
player->TeleportTo(249, 29.1607f, -71.3372f, -8.18032f, 4.58f); player->TeleportTo(249, 29.1607f, -71.3372f, -8.18032f, 4.58f);
@@ -162,9 +163,9 @@ public:
{ {
handler.PSendSysMessage("You must have the Drakefire Amulet in your inventory to enter this version of Onyxia\'s Lair."); handler.PSendSysMessage("You must have the Drakefire Amulet in your inventory to enter this version of Onyxia\'s Lair.");
} }
else if (player->getClass() == CLASS_DEATH_KNIGHT) else if (progressionLevel > PROGRESSION_TBC_TIER_4)
{ {
handler.PSendSysMessage("Death knights are not allowed to enter this version of Onyxia\'s Lair."); handler.PSendSysMessage("Your progression level is too high to enter this version of Onyxia\'s Lair.");
} }
return true; return true;
} }