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

set RNDbot progression level on invite (#801)

Browse Source 
this sets the progression level for RNDbots to the same level as the party leader.
This commit is contained in:
Grimfeather
2025-10-10 15:31:13 +02:00
committed by GitHub
parent 0aa213ba89
commit 327ac10bc0
1 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/IndividualProgressionPlayer.cpp
View File

@@ -39,6 +39,11 @@ public:
sIndividualProgression->UpdateProgressionQuests(player); sIndividualProgression->UpdateProgressionQuests(player);
} }
if (isExcludedFromProgression(player))
{
sIndividualProgression->UpdateProgressionState(player, static_cast<ProgressionState>(0));
}
sIndividualProgression->CheckAdjustments(player); sIndividualProgression->CheckAdjustments(player);
if (sIndividualProgression->enabled) if (sIndividualProgression->enabled)
@@ -318,13 +323,24 @@ public:
bool OnPlayerCanGroupAccept(Player* player, Group* group) override bool OnPlayerCanGroupAccept(Player* player, Group* group) override
{ {
if (!sIndividualProgression->enabled || !sIndividualProgression->enforceGroupRules || isExcludedFromProgression(player))
{
return true;
}
Player* groupLeader = ObjectAccessor::FindPlayerByLowGUID(group->GetLeaderGUID().GetCounter()); Player* groupLeader = ObjectAccessor::FindPlayerByLowGUID(group->GetLeaderGUID().GetCounter());
uint8 currentState = player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value; uint8 currentState = player->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
uint8 otherPlayerState = groupLeader->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value; uint8 otherPlayerState = groupLeader->GetPlayerSetting("mod-individual-progression", SETTING_PROGRESSION_STATE).value;
if (isExcludedFromProgression(player))
{
if (currentState != otherPlayerState)
{
sIndividualProgression->UpdateProgressionState(player, static_cast<ProgressionState>(otherPlayerState));
}
return true;
}
if (!sIndividualProgression->enabled || !sIndividualProgression->enforceGroupRules)
{
return true;
}
return (currentState == otherPlayerState); return (currentState == otherPlayerState);
} }
@@ -463,7 +479,7 @@ public:
} }
break; break;
case AREA_BOUGH_SHADOW: case AREA_BOUGH_SHADOW:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -472,7 +488,7 @@ public:
} }
break; break;
case AREA_SERADANE: case AREA_SERADANE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -481,7 +497,7 @@ public:
} }
break; break;
case AREA_DREAM_BOUGH: case AREA_DREAM_BOUGH:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -490,7 +506,7 @@ public:
} }
break; break;
case AREA_JADEMIR_LAKE: case AREA_JADEMIR_LAKE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -499,7 +515,7 @@ public:
} }
break; break;
case AREA_TWILIGHT_GROVE: case AREA_TWILIGHT_GROVE:
if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA) || isExcludedFromProgression(player)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_ONYXIA))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);
@@ -864,7 +880,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) || isExcludedFromProgression(player)) if (sIndividualProgression->hasPassedProgression(player, PROGRESSION_WOTLK_TIER_2))
{ {
player->RemoveAura(IPP_PHASE); player->RemoveAura(IPP_PHASE);
player->RemoveAura(IPP_PHASE_II); player->RemoveAura(IPP_PHASE_II);