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

Exclude RNDbots from some phased areas (#729)

Browse Source 
exclude RNDbots from vanilla world dragon areas
This commit is contained in:
Grimfeather
2025-09-10 13:05:41 +02:00
committed by GitHub
parent 06470a0538
commit 8e8632bd6b
1 changed files with 46 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/IndividualProgressionPlayer.cpp
View File

@@ -635,7 +635,7 @@ public:
} }
break; break;
case AREA_BOUGH_SHADOW: case AREA_BOUGH_SHADOW:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -643,7 +643,7 @@ public:
} }
break; break;
case AREA_SERADANE: case AREA_SERADANE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -651,7 +651,7 @@ public:
} }
break; break;
case AREA_DREAM_BOUGH: case AREA_DREAM_BOUGH:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -659,7 +659,7 @@ public:
} }
break; break;
case AREA_JADEMIR_LAKE: case AREA_JADEMIR_LAKE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -667,7 +667,7 @@ public:
} }
break; break;
case AREA_TWILIGHT_GROVE: case AREA_TWILIGHT_GROVE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -992,7 +992,7 @@ public:
case AREA_THE_ALLIANCE_VALIANTS_RING: case AREA_THE_ALLIANCE_VALIANTS_RING:
case AREA_THE_HORDE_VALIANTS_RING: case AREA_THE_HORDE_VALIANTS_RING:
case AREA_ARGENT_PAVILION: case AREA_ARGENT_PAVILION:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_2)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_2) || isExcludedFromProgression(player))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -1003,41 +1003,56 @@ public:
uint32 mapid = player->GetMapId(); uint32 mapid = player->GetMapId();
if (mapid == MAP_SHADOWFANG_KEEP && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))) if (mapid == MAP_SHADOWFANG_KEEP)
{
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ) && sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
break; break;
} }
if (mapid == MAP_RAZORFEN_DOWNS && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))) }
if (mapid == MAP_RAZORFEN_DOWNS)
{
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ) && sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
break; break;
} }
if (mapid == MAP_SCARLET_MONASTERY && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))) }
if (mapid == MAP_SCARLET_MONASTERY)
{
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ) && sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
break; break;
} }
if (mapid == MAP_STRATHOLME && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))) }
if (mapid == MAP_STRATHOLME)
{
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ) && sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
break; break;
} }
if (mapid == MAP_DIRE_MAUL && ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40)))) }
if (mapid == MAP_DIRE_MAUL)
{
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ) && sIndividualProgression->isBeforeProgression(player, PROGRESSION_NAXX40))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
break; break;
} }
}
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);