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 #115 from Grimfeather/AQ-update

Browse Source 
AQ update
This commit is contained in:
Grimfeather
2025-05-21 02:54:04 +02:00
committed by GitHub
parent 2930edcff5 d38e08ac2e
commit 0f1fa92c9e
1 changed files with 18 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/IndividualProgressionPlayer.cpp
View File

@@ -347,6 +347,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -354,6 +355,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -361,6 +363,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -368,6 +371,7 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -375,10 +379,12 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR)) else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{ {
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ); player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE_AQ, false); player->CastSpell(player, IPP_PHASE_AQ, false);
} }
@@ -387,10 +393,12 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR)) else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{ {
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ); player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE_AQ, false); player->CastSpell(player, IPP_PHASE_AQ, false);
} }
@@ -399,10 +407,12 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR)) else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{ {
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ); player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE_AQ, false); player->CastSpell(player, IPP_PHASE_AQ, false);
} }
@@ -411,10 +421,12 @@ public:
if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR))) if ((sIndividualProgression->hasPassedProgression(player, PROGRESSION_PRE_AQ)) && (sIndividualProgression->isBeforeProgression(player, PROGRESSION_AQ_WAR)))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR)) else if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_AQ_WAR))
{ {
player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ); player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE_AQ, false); player->CastSpell(player, IPP_PHASE_AQ, false);
} }
@@ -423,6 +435,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -430,6 +443,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -437,6 +451,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -444,6 +459,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -451,6 +467,7 @@ public:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
player->CastSpell(player, IPP_PHASE, false); player->CastSpell(player, IPP_PHASE, false);
} }
break; break;
@@ -472,6 +489,7 @@ public:
break; break;
default: default:
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_AQ);
} }
} }