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

Many little adjustments

Browse Source
This commit is contained in:
valsan-azerty-boi
2025-06-11 18:12:19 +02:00
parent 4e390867b0
commit 8ac367231a
14 changed files with 228 additions and 434 deletions
Download Patch File Download Diff File Expand all files Collapse all files

412
src/IndividualProgressionPlayer.cpp
View File

@@ -201,16 +201,16 @@ public:
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC))
{
if (sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) > 60)
if (sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) > IP_LEVEL_VANILLA)
{
maxPlayerLevel = 60;
maxPlayerLevel = IP_LEVEL_VANILLA;
}
}
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5))
{
if (sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) > 70)
if (sWorld->getIntConfig(CONFIG_MAX_PLAYER_LEVEL) > IP_LEVEL_TBC)
{
maxPlayerLevel = 70;
maxPlayerLevel = IP_LEVEL_TBC;
}
}
}
@@ -242,9 +242,9 @@ public:
return false;
}
// Player is still in Vanilla content - give money at 60 level cap
return ((!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && player->GetLevel() == 60) ||
return ((!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && player->GetLevel() == IP_LEVEL_VANILLA) ||
// Player is in TBC content - give money at 70 level cap
(!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && player->GetLevel() == 70));
(!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && player->GetLevel() == IP_LEVEL_TBC));
}
void OnPlayerAfterUpdateMaxHealth(Player* player, float& value) override
@@ -261,7 +261,7 @@ public:
sIndividualProgression->ComputeGearTuning(player, gearAdjustment, item->GetTemplate());
}
// Player is still in Vanilla content - give Vanilla health adjustment
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() <= IP_LEVEL_VANILLA)))
{
float adjustmentAmount = 1.0f - sIndividualProgression->vanillaHealthAdjustment;
float applyPercent = ((player->GetLevel() - 10.0f) / 50.0f);
@@ -269,7 +269,7 @@ public:
value *= computedAdjustment;
}
// Player is in TBC content - give TBC health adjustment
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() < 71)))
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
value *= (sIndividualProgression->tbcHealthAdjustment - gearAdjustment);
}
@@ -304,7 +304,7 @@ public:
return;
}
// Player is still in Vanilla content - do not give XP past level 60
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && player->GetLevel() >= 60)
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && player->GetLevel() >= IP_LEVEL_VANILLA)
{
// Still award XP to pets - they won't be able to pass the player's level
Pet* pet = player->GetPet();
@@ -313,7 +313,7 @@ public:
amount = 0;
}
// Player is in TBC content - do not give XP past level 70
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && player->GetLevel() >= 70)
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && player->GetLevel() >= IP_LEVEL_TBC)
{
// Still award XP to pets - they won't be able to pass the player's level
Pet* pet = player->GetPet();
@@ -420,7 +420,7 @@ public:
{
return false;
}
if (instanceTemplate->Parent == MAP_NORTHREND && mapid == MAP_NAXXRAMAS && player->GetLevel() < 71 && !isAttuned(player))
if (instanceTemplate->Parent == MAP_NORTHREND && mapid == MAP_NAXXRAMAS && player->GetLevel() <= IP_LEVEL_TBC && !isAttuned(player))
{
return false;
}
@@ -531,29 +531,8 @@ public:
{
switch (newArea) {
case AREA_DARKSHORE:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_GROVE_OF_THE_ANCIENTS:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_WILDBEND_RIVER:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_TWILIGHT_VALE:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
@@ -563,47 +542,8 @@ public:
}
break;
case AREA_SILITHUS:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_HIVE_ASHI:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_HIVE_ZORA:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_HIVE_REGAL:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{
@@ -619,37 +559,9 @@ public:
}
break;
case AREA_BOUGH_SHADOW:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_SERADANE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_DREAM_BOUGH:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_JADEMIR_LAKE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_TWILIGHT_GROVE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{
@@ -659,126 +571,40 @@ public:
}
break;
case AREA_DUROTAR:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_ROCKTUSK_FARM:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_TIRISFAL_GLADES:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_RUINS_OF_LORDAERON:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_MULGORE:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_VALLEY_OF_HEROES:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_ELWYNN_FOREST:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_DUN_MOROGH:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_TELDRASSIL:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_EASTERN_PLAGUELANDS:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_PESTILENT_SCAR:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_THE_MARRIS_STEAD:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_BLASTED_LANDS:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_RISE_OF_THE_DEFILER:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_DREADMAUL_HOLD:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_DREADMAUL_POST:
case AREA_SERPENTS_COIL:
case AREA_TANARIS:
case AREA_GADGETZAN:
case AREA_ABYSSAL_SANDS:
case AREA_BROKEN_PILLAR:
case AREA_WINTERSPRING:
case AREA_TIMBERMAW_POST:
case AREA_FROSTSABER_ROCK:
case AREA_ICE_THISTLE_HILLS:
case AREA_MAZTHORIL:
case AREA_AZSHARA:
case AREA_HALDARR_ENCAMPMENT:
case AREA_THE_SHATTERED_STRAND:
case AREA_SOUTHRIDGE_BEACH:
case AREA_BURNING_STEPPES:
case AREA_DRACO_DAR:
case AREA_BLACKROCK_MOUNTAIN:
case AREA_DREADMAUL_ROCK:
case AREA_RUINS_OF_THAURISSAN:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
@@ -798,158 +624,6 @@ public:
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE_II, false);
}
break;
case AREA_SERPENTS_COIL:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_TANARIS:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_GADGETZAN:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_ABYSSAL_SANDS:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_BROKEN_PILLAR:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_WINTERSPRING:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_TIMBERMAW_POST:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_FROSTSABER_ROCK:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_ICE_THISTLE_HILLS:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_MAZTHORIL:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_AZSHARA:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_HALDARR_ENCAMPMENT:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_THE_SHATTERED_STRAND:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_SOUTHRIDGE_BEACH:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_BURNING_STEPPES:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_DRACO_DAR:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_BLACKROCK_MOUNTAIN:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_DREADMAUL_ROCK:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_RUINS_OF_THAURISSAN:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))
{
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false);
}
break;
case AREA_LIGHTS_HOPE:
@@ -1031,15 +705,15 @@ public:
return;
}
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() <= IP_LEVEL_VANILLA)))
{
rDungeonId = RDF_CLASSIC;
}
else if ((rDungeonId == RDF_WRATH_OF_THE_LICH_KING && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5)) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() < 71)))
else if ((rDungeonId == RDF_WRATH_OF_THE_LICH_KING && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5)) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
rDungeonId = RDF_THE_BURNING_CRUSADE;
}
else if ((rDungeonId == RDF_WRATH_OF_THE_LICH_KING_HEROIC && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5)) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() < 71)))
else if ((rDungeonId == RDF_WRATH_OF_THE_LICH_KING_HEROIC && !sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5)) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
rDungeonId = RDF_THE_BURNING_CRUSADE_HEROIC;
}
@@ -1257,11 +931,11 @@ private:
return;
}
if (!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_PRE_TBC) || ((!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_PRE_TBC)) && (pet->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_PRE_TBC) || ((!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_PRE_TBC)) && (pet->GetLevel() <= IP_LEVEL_VANILLA)))
{
AdjustVanillaStats(pet);
}
else if (!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_TBC_TIER_5) || ((!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_TBC_TIER_5)) && (pet->GetLevel() < 71)))
else if (!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_TBC_TIER_5) || ((!sIndividualProgression->hasPassedProgression(pet->GetOwner(), PROGRESSION_TBC_TIER_5)) && (pet->GetLevel() <= IP_LEVEL_TBC)))
{
AdjustTBCStats(pet);
}
@@ -1357,11 +1031,11 @@ public:
}
Player* player = isPet ? healer->GetOwner()->ToPlayer() : healer->ToPlayer();
float gearAdjustment = computeTotalGearTuning(player);
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() <= IP_LEVEL_VANILLA)))
{
heal *= (sIndividualProgression->ComputeVanillaAdjustment(player->GetLevel(), sIndividualProgression->vanillaHealingAdjustment) - gearAdjustment);
}
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() < 71)))
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
heal *= (sIndividualProgression->tbcHealingAdjustment - gearAdjustment);
}
@@ -1382,11 +1056,11 @@ public:
}
Player* player = isPet ? attacker->GetOwner()->ToPlayer() : attacker->ToPlayer();
float gearAdjustment = computeTotalGearTuning(player);
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() <= IP_LEVEL_VANILLA)))
{
damage *= (sIndividualProgression->ComputeVanillaAdjustment(player->GetLevel(), sIndividualProgression->vanillaPowerAdjustment) - gearAdjustment);
}
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() < 71)))
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
damage *= (sIndividualProgression->tbcPowerAdjustment - gearAdjustment);
}
@@ -1408,11 +1082,11 @@ public:
}
Player* player = isPet ? attacker->GetOwner()->ToPlayer() : attacker->ToPlayer();
float gearAdjustment = computeTotalGearTuning(player);
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() <= IP_LEVEL_VANILLA)))
{
damage *= (sIndividualProgression->ComputeVanillaAdjustment(player->GetLevel(), sIndividualProgression->vanillaPowerAdjustment) - gearAdjustment);
}
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() < 71)))
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
damage *= (sIndividualProgression->tbcPowerAdjustment - gearAdjustment);
}
@@ -1443,11 +1117,11 @@ public:
}
Player* player = isPet ? attacker->GetOwner()->ToPlayer() : attacker->ToPlayer();
float gearAdjustment = computeTotalGearTuning(player);
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() < 61)))
if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_TBC) && (player->GetLevel() <= IP_LEVEL_VANILLA)))
{
damage *= (sIndividualProgression->ComputeVanillaAdjustment(player->GetLevel(), sIndividualProgression->vanillaPowerAdjustment) - gearAdjustment);
}
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() < 71)))
else if (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) || (!sIndividualProgression->hasPassedProgression(player, PROGRESSION_TBC_TIER_5) && (player->GetLevel() <= IP_LEVEL_TBC)))
{
damage *= (sIndividualProgression->tbcPowerAdjustment - gearAdjustment);
}