Core/Scripts: Fixed build of boss_* scripts
This commit is contained in:
1 parent
6ce0a3107d
commit
a3d8f1d879
88 files changed
+453
-508
No files matched your search
@@ -354,9 +354,10 @@ public:
|
||||
|
||||
_summonDeaths = 0;
|
||||
_preparingPulsesChecker = 0;
|
||||
_arcaneOverloadGUID = 0;
|
||||
_lastHitByArcaneBarrageGUID = 0;
|
||||
memset(_surgeTargetGUID, 0, sizeof(_surgeTargetGUID));
|
||||
_arcaneOverloadGUID.Clear();
|
||||
_lastHitByArcaneBarrageGUID.Clear();
|
||||
for (ObjectGuid& guid : _surgeTargetGUID)
|
||||
guid.Clear();
|
||||
|
||||
_killSpamFilter = false;
|
||||
_canAttack = false;
|
||||
@@ -424,7 +425,7 @@ public:
|
||||
else if (type == DATA_LAST_TARGET_BARRAGE_GUID)
|
||||
return _lastHitByArcaneBarrageGUID;
|
||||
|
||||
return 0;
|
||||
return ObjectGuid::Empty;
|
||||
}
|
||||
|
||||
void SetGUID(ObjectGuid guid, int32 type) override
|
||||
@@ -441,6 +442,7 @@ public:
|
||||
break;
|
||||
case DATA_LAST_TARGET_BARRAGE_GUID:
|
||||
_lastHitByArcaneBarrageGUID = guid;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1030,9 +1032,9 @@ public:
|
||||
uint8 _phase; // Counter for phases used with a getter.
|
||||
uint8 _summonDeaths; // Keeps count of arcane trash.
|
||||
uint8 _preparingPulsesChecker; // In retail they use 2 preparing pulses with 7 sec CD, after they pass 2 seconds.
|
||||
uint64 _arcaneOverloadGUID; // Last Arcane Overload summoned to know to which should visual be cast to (the purple ball, not bubble).
|
||||
uint64 _lastHitByArcaneBarrageGUID; // Last hit player by Arcane Barrage, will be removed if targets > 1.
|
||||
uint64 _surgeTargetGUID[3]; // All these three are used to keep current tagets to which warning should be sent.
|
||||
ObjectGuid _arcaneOverloadGUID; // Last Arcane Overload summoned to know to which should visual be cast to (the purple ball, not bubble).
|
||||
ObjectGuid _lastHitByArcaneBarrageGUID; // Last hit player by Arcane Barrage, will be removed if targets > 1.
|
||||
ObjectGuid _surgeTargetGUID[3]; // All these three are used to keep current tagets to which warning should be sent.
|
||||
|
||||
bool _killSpamFilter; // Prevent text spamming on killed player by helping implement a CD.
|
||||
bool _canAttack; // Used to control attacking (Move Chase not being applied after Stop Attack, only few times should act like this).
|
||||
|
||||
@@ -73,8 +73,8 @@ public:
|
||||
|
||||
InstanceScript* instance;
|
||||
|
||||
std::list<uint64> intenseColdList;
|
||||
uint64 auiContainmentSphereGUIDs[DATA_CONTAINMENT_SPHERES];
|
||||
GuidList intenseColdList;
|
||||
ObjectGuid auiContainmentSphereGUIDs[DATA_CONTAINMENT_SPHERES];
|
||||
uint32 uiCrystalfireBreathTimer;
|
||||
uint32 uiCrystalChainsCrystalizeTimer;
|
||||
uint32 uiTailSweepTimer;
|
||||
@@ -271,9 +271,9 @@ class achievement_intense_cold : public AchievementCriteriaScript
|
||||
if (!target)
|
||||
return false;
|
||||
|
||||
std::list<uint64> intenseColdList = ENSURE_AI(boss_keristrasza::boss_keristraszaAI, target->ToCreature()->AI())->intenseColdList;
|
||||
GuidList intenseColdList = ENSURE_AI(boss_keristrasza::boss_keristraszaAI, target->ToCreature()->AI())->intenseColdList;
|
||||
if (!intenseColdList.empty())
|
||||
for (std::list<uint64>::iterator itr = intenseColdList.begin(); itr != intenseColdList.end(); ++itr)
|
||||
for (GuidList::iterator itr = intenseColdList.begin(); itr != intenseColdList.end(); ++itr)
|
||||
if (player->GetGUID() == *itr)
|
||||
return false;
|
||||
|
||||
|
||||
@@ -77,9 +77,9 @@ public:
|
||||
|
||||
InstanceScript* instance;
|
||||
|
||||
uint64 uiFireMagusGUID;
|
||||
uint64 uiFrostMagusGUID;
|
||||
uint64 uiArcaneMagusGUID;
|
||||
ObjectGuid uiFireMagusGUID;
|
||||
ObjectGuid uiFrostMagusGUID;
|
||||
ObjectGuid uiArcaneMagusGUID;
|
||||
|
||||
bool bFireMagusDead;
|
||||
bool bFrostMagusDead;
|
||||
@@ -105,9 +105,9 @@ public:
|
||||
uiGravityWellTimer = 15*IN_MILLISECONDS;
|
||||
uiCooldown = 0;
|
||||
|
||||
uiFireMagusGUID = 0;
|
||||
uiFrostMagusGUID = 0;
|
||||
uiArcaneMagusGUID = 0;
|
||||
uiFireMagusGUID.Clear();
|
||||
uiFrostMagusGUID.Clear();
|
||||
uiArcaneMagusGUID.Clear();
|
||||
|
||||
for (uint8 n = 0; n < 3; ++n)
|
||||
time[n] = 0;
|
||||
@@ -163,7 +163,7 @@ public:
|
||||
return 0;
|
||||
}
|
||||
|
||||
uint64 SplitPersonality(uint32 entry)
|
||||
ObjectGuid SplitPersonality(uint32 entry)
|
||||
{
|
||||
if (Creature* Summoned = me->SummonCreature(entry, me->GetPositionX(), me->GetPositionY(), me->GetPositionZ(), me->GetOrientation(), TEMPSUMMON_TIMED_DESPAWN_OUT_OF_COMBAT, 1*IN_MILLISECONDS))
|
||||
{
|
||||
@@ -189,7 +189,7 @@ public:
|
||||
Summoned->AI()->AttackStart(target);
|
||||
return Summoned->GetGUID();
|
||||
}
|
||||
return 0;
|
||||
return ObjectGuid::Empty;
|
||||
}
|
||||
|
||||
void SummonedCreatureDespawn(Creature* summon) override
|
||||
@@ -246,9 +246,9 @@ public:
|
||||
Phase = 2;
|
||||
if (Phase == 3)
|
||||
Phase = 4;
|
||||
uiFireMagusGUID = 0;
|
||||
uiFrostMagusGUID = 0;
|
||||
uiArcaneMagusGUID = 0;
|
||||
uiFireMagusGUID.Clear();
|
||||
uiFrostMagusGUID.Clear();
|
||||
uiArcaneMagusGUID.Clear();
|
||||
bIsWaitingToAppear = true;
|
||||
uiIsWaitingToAppearTimer = 4*IN_MILLISECONDS;
|
||||
Talk(SAY_MERGE);
|
||||
|
||||
@@ -175,7 +175,7 @@ class npc_azure_ring_captain : public CreatureScript
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
targetGUID = 0;
|
||||
targetGUID.Clear();
|
||||
|
||||
me->SetWalk(true);
|
||||
//! HACK: Creature's can't have MOVEMENTFLAG_FLYING
|
||||
@@ -232,7 +232,7 @@ class npc_azure_ring_captain : public CreatureScript
|
||||
}
|
||||
|
||||
private:
|
||||
uint64 targetGUID;
|
||||
ObjectGuid targetGUID;
|
||||
InstanceScript* instance;
|
||||
};
|
||||
|
||||
|
||||
Reference in new issue
Block a user