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
@@ -163,7 +163,7 @@ struct advisorbase_ai : public ScriptedAI
|
||||
bool FakeDeath;
|
||||
bool m_bDoubled_Health;
|
||||
uint32 DelayRes_Timer;
|
||||
uint64 DelayRes_Target;
|
||||
ObjectGuid DelayRes_Target;
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
@@ -175,7 +175,7 @@ struct advisorbase_ai : public ScriptedAI
|
||||
|
||||
FakeDeath = false;
|
||||
DelayRes_Timer = 0;
|
||||
DelayRes_Target = 0;
|
||||
DelayRes_Target.Clear();
|
||||
|
||||
me->SetStandState(UNIT_STAND_STATE_STAND);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NON_ATTACKABLE);
|
||||
@@ -245,7 +245,7 @@ struct advisorbase_ai : public ScriptedAI
|
||||
me->ModifyAuraState(AURA_STATE_HEALTHLESS_35_PERCENT, false);
|
||||
me->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
|
||||
me->ClearAllReactives();
|
||||
me->SetTarget(0);
|
||||
me->SetTarget(ObjectGuid::Empty);
|
||||
me->GetMotionMaster()->Clear();
|
||||
me->GetMotionMaster()->MoveIdle();
|
||||
me->SetStandState(UNIT_STAND_STATE_DEAD);
|
||||
@@ -290,7 +290,6 @@ class boss_kaelthas : public CreatureScript
|
||||
boss_kaelthasAI(Creature* creature) : ScriptedAI(creature), summons(me)
|
||||
{
|
||||
instance = creature->GetInstanceScript();
|
||||
memset(&m_auiAdvisorGuid, 0, sizeof(m_auiAdvisorGuid));
|
||||
}
|
||||
|
||||
InstanceScript* instance;
|
||||
@@ -316,7 +315,7 @@ class boss_kaelthas : public CreatureScript
|
||||
|
||||
SummonList summons;
|
||||
|
||||
uint64 m_auiAdvisorGuid[MAX_ADVISORS];
|
||||
ObjectGuid m_auiAdvisorGuid[MAX_ADVISORS];
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
|
||||
@@ -137,7 +137,7 @@ class boss_void_reaver : public CreatureScript
|
||||
target = me->GetVictim();
|
||||
|
||||
if (target)
|
||||
me->CastSpell(target, SPELL_ARCANE_ORB, false, NULL, NULL, 0);
|
||||
me->CastSpell(target, SPELL_ARCANE_ORB, false, NULL, NULL);
|
||||
ArcaneOrb_Timer = 3000;
|
||||
}
|
||||
else
|
||||
|
||||
@@ -66,8 +66,6 @@ class boss_high_botanist_freywinn : public CreatureScript
|
||||
{
|
||||
boss_high_botanist_freywinnAI(Creature* creature) : BossAI(creature, DATA_HIGH_BOTANIST_FREYWINN) { }
|
||||
|
||||
std::list<uint64> Adds_List;
|
||||
|
||||
uint32 SummonSeedling_Timer;
|
||||
uint32 TreeForm_Timer;
|
||||
uint32 MoveCheck_Timer;
|
||||
@@ -76,7 +74,7 @@ class boss_high_botanist_freywinn : public CreatureScript
|
||||
|
||||
void Reset() override
|
||||
{
|
||||
Adds_List.clear();
|
||||
summons.DespawnAll();
|
||||
|
||||
SummonSeedling_Timer = 6000;
|
||||
TreeForm_Timer = 30000;
|
||||
@@ -93,7 +91,12 @@ class boss_high_botanist_freywinn : public CreatureScript
|
||||
void JustSummoned(Creature* summoned) override
|
||||
{
|
||||
if (summoned->GetEntry() == NPC_FRAYER)
|
||||
Adds_List.push_back(summoned->GetGUID());
|
||||
summons.Summon(summoned);
|
||||
}
|
||||
|
||||
void SummonedCreatureDespawn(Creature* summon) override
|
||||
{
|
||||
summons.Despawn(summon);
|
||||
}
|
||||
|
||||
void DoSummonSeedling()
|
||||
@@ -147,18 +150,15 @@ class boss_high_botanist_freywinn : public CreatureScript
|
||||
{
|
||||
if (MoveCheck_Timer <= diff)
|
||||
{
|
||||
if (!Adds_List.empty())
|
||||
for (SummonList::iterator itr = summons.begin(); itr != summons.end(); ++itr)
|
||||
{
|
||||
for (std::list<uint64>::iterator itr = Adds_List.begin(); itr != Adds_List.end(); ++itr)
|
||||
if (Unit* temp = ObjectAccessor::GetUnit(*me, *itr))
|
||||
{
|
||||
if (Unit* temp = ObjectAccessor::GetUnit(*me, *itr))
|
||||
if (!temp->IsAlive())
|
||||
{
|
||||
if (!temp->IsAlive())
|
||||
{
|
||||
Adds_List.erase(itr);
|
||||
++DeadAddsCount;
|
||||
break;
|
||||
}
|
||||
summons.erase(itr);
|
||||
++DeadAddsCount;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -168,7 +168,7 @@ class boss_high_botanist_freywinn : public CreatureScript
|
||||
|
||||
if (DeadAddsCount >= 3)
|
||||
{
|
||||
Adds_List.clear();
|
||||
summons.DespawnAll();
|
||||
DeadAddsCount = 0;
|
||||
|
||||
me->InterruptNonMeleeSpells(true);
|
||||
|
||||
@@ -74,10 +74,9 @@ class npc_warp_splinter_treant : public CreatureScript
|
||||
{
|
||||
npc_warp_splinter_treantAI(Creature* creature) : ScriptedAI(creature)
|
||||
{
|
||||
WarpGuid = 0;
|
||||
}
|
||||
|
||||
uint64 WarpGuid;
|
||||
ObjectGuid WarpGuid;
|
||||
uint32 check_Timer;
|
||||
|
||||
void Reset() override
|
||||
|
||||
Reference in new issue
Block a user