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

Merge pull request #83 from Grimfeather/fix-redefinition-errors

Browse Source 
Fix redefinition errors
This commit is contained in:
Grimfeather
2025-05-10 19:35:08 +02:00
committed by GitHub
parent dd87812be3 ff4dcd1796
commit c085cc0a4b
2 changed files with 55 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/IndividualProgression.h
View File

@@ -15,6 +15,7 @@
#include "DBCEnums.h"
#include "QuestDef.h"
#include "GameObject.h"
#include "AreaDefines.h"
#include "IWorld.h"
#include <regex>
@@ -58,24 +59,6 @@ enum ProgressionQuestIDs
QUEST_WINTERFALL = 6241
};
enum ProgressionMaps
{
MAP_BLACKWING_LAIR = 469,
MAP_ZUL_GURUB = 309,
MAP_AQ_20 = 509,
MAP_AQ_40 = 531,
MAP_OUTLANDS = 530,
MAP_NAXXRAMAS = 533,
MAP_ZUL_AMAN = 568,
MAP_NORTHREND = 571,
MAP_ULDUAR = 603,
MAP_TRIAL_OF_THE_CRUSADER = 649,
MAP_TRIAL_OF_THE_CHAMPION = 650,
MAP_ICC = 631,
MAP_FORGE_OF_SOULS = 632,
MAP_RUBY_SANCTUM = 724
};
enum ProgressionZones
{
ZONE_AZUREMYST = 3524,
@@ -90,23 +73,15 @@ enum ProgressionZones
enum ProgressionAreas
{
AREA_DARKSHORE = 148,
AREA_GROVE_OF_THE_ANCIENTS = 448,
AREA_WILDBEND_RIVER = 454,
AREA_SILITHUS = 1377,
AREA_TWILIGHT_VALE = 2077,
AREA_LIGHTS_HOPE = 2268,
AREA_HIVE_ASHI = 2742,
AREA_HIVE_ZORA = 2743,
AREA_HIVE_REGAL = 2744,
AREA_ARGENT_TOURNAMENT = 4658,
AREA_ARGENT_SUNREAVER_PAVILION = 4666,
AREA_ARGENT_SILVER_COVENANT_PAVILION = 4667,
AREA_ARGENT_RING_OF_CHAMPIONS = 4669,
AREA_ARGENT_ASPIRANTS_RING = 4670,
AREA_ARGENT_VALIANTS_RING = 4671,
AREA_ARGENT_ALLIANCE_VALIANTS_RING = 4672,
AREA_ARGENT_HORDE_VALIANTS_RING = 4673,
AREA_ARGENT_PAVILION = 4674
};

30
src/IndividualProgressionPlayer.cpp
View File

@@ -185,15 +185,15 @@ public:
{
return false;
}
if (mapid == MAP_AQ_40 && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ))
if (mapid == MAP_AHN_QIRAJ_TEMPLE && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ))
{
return false;
}
if (mapid == MAP_AQ_20 && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ))
if (mapid == MAP_RUINS_OF_AHN_QIRAJ && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ))
{
return false;
}
if (mapid == MAP_OUTLANDS)
if (mapid == MAP_OUTLAND)
{
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
{
@@ -223,11 +223,11 @@ public:
return false;
}
// This will also restrict other Frozen Halls dungeons, because Forge of Souls must be completed first to access them
if ((mapid == MAP_ICC || mapid == MAP_FORGE_OF_SOULS) && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_3))
if ((mapid == MAP_ICECROWN_CITADEL || mapid == MAP_THE_FORGE_OF_SOULS) && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_3))
{
return false;
}
if (mapid == MAP_RUBY_SANCTUM && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_4))
if (mapid == MAP_THE_RUBY_SANCTUM && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_4))
{
return false;
}
@@ -235,7 +235,7 @@ public:
InstanceTemplate const* instanceTemplate = sObjectMgr->GetInstanceTemplate(mapid);
if (instanceTemplate)
{
if (instanceTemplate->Parent == MAP_OUTLANDS && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
if (instanceTemplate->Parent == MAP_OUTLAND && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_NAXX40))
{
return false;
}
@@ -388,20 +388,14 @@ public:
}
break;
case AREA_LIGHTS_HOPE:
// if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ))
// {
// player->RemoveAura(IPP_PHASE);
// player->CastSpell(player, IPP_PHASE, false);
// }
// break;
case AREA_ARGENT_TOURNAMENT:
case AREA_ARGENT_TOURNAMENT_GROUNDS:
case AREA_ARGENT_SUNREAVER_PAVILION:
case AREA_ARGENT_SILVER_COVENANT_PAVILION:
case AREA_ARGENT_RING_OF_CHAMPIONS:
case AREA_ARGENT_ASPIRANTS_RING:
case AREA_ARGENT_VALIANTS_RING:
case AREA_ARGENT_ALLIANCE_VALIANTS_RING:
case AREA_ARGENT_HORDE_VALIANTS_RING:
case AREA_THE_RING_OF_CHAMPIONS:
case AREA_THE_ASPIRANTS_RING:
case AREA_THE_ARGENT_VALIANTS_RING:
case AREA_THE_ALLIANCE_VALIANTS_RING:
case AREA_THE_HORDE_VALIANTS_RING:
case AREA_ARGENT_PAVILION:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_2))
{