From 08c1a8109636f3bdb9c41d0c1691c098d27fbc2d Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 15 Jul 2013 01:00:07 +0200 Subject: Scripted/Misc: Fix random stuff --- .../TrialOfTheCrusader/trial_of_the_crusader.cpp | 16 +++++++--------- src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp | 15 ++++----------- .../UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp | 4 +++- 3 files changed, 14 insertions(+), 21 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index 24cbbee76b8..aee82529ed7 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -318,7 +318,7 @@ class boss_lich_king_toc : public CreatureScript _instance->SetData(TYPE_EVENT, 5080); break; case 5080: - if (GameObject* go = _instance->instance->GetGameObject(_instance->GetData64(GO_ARGENT_COLISEUM_FLOOR))) + if (GameObject* go = GameObject::GetGameObject(*me, _instance->GetData64(GO_ARGENT_COLISEUM_FLOOR))) { go->SetDisplayId(DISPLAYID_DESTROYED_FLOOR); go->SetFlag(GAMEOBJECT_FLAGS, GO_FLAG_DAMAGED | GO_FLAG_NODESPAWN); @@ -328,15 +328,13 @@ class boss_lich_king_toc : public CreatureScript me->CastSpell(me, SPELL_CORPSE_TELEPORT, false); me->CastSpell(me, SPELL_DESTROY_FLOOR_KNOCKUP, false); - if (_instance) - { - _instance->SetBossState(BOSS_LICH_KING, DONE); - Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK)); - if (!temp || !temp->IsAlive()) - temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); + _instance->SetBossState(BOSS_LICH_KING, DONE); + Creature* temp = Unit::GetCreature(*me, _instance->GetData64(NPC_ANUBARAK)); + if (!temp || !temp->IsAlive()) + temp = me->SummonCreature(NPC_ANUBARAK, AnubarakLoc[0].GetPositionX(), AnubarakLoc[0].GetPositionY(), AnubarakLoc[0].GetPositionZ(), 3, TEMPSUMMON_CORPSE_TIMED_DESPAWN, DESPAWN_TIME); + + _instance->SetData(TYPE_EVENT, 0); - _instance->SetData(TYPE_EVENT, 0); - } me->DespawnOrUnsummon(); _updateTimer = 20*IN_MILLISECONDS; break; diff --git a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp index 52ffc12f154..e5f8cce6c46 100644 --- a/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp +++ b/src/server/scripts/Northrend/Nexus/Oculus/oculus.cpp @@ -354,9 +354,7 @@ public: void MovementInform(uint32 type, uint32 id) OVERRIDE { if (type == POINT_MOTION_TYPE && id == 0) - { me->SetDisableGravity(false); // Needed this for proper animation after spawn, the summon in air fall to ground bug leave no other option for now, if this isn't used the drake will only walk on move. - } } void UpdateAI(uint32 diff) OVERRIDE @@ -388,9 +386,7 @@ public: } else WelcomeSequelTimer -= diff; } - } - if (me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE)) - { + if (instance->GetBossState(DATA_UROM_EVENT) == DONE) { if (!(SpecialOff)) @@ -403,9 +399,7 @@ public: else SpecialTimer -= diff; } } - } - if (me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE)) - { + if (!(HealthWarningOff)) { if (me->GetHealthPct() <= 40.0f) @@ -414,9 +408,7 @@ public: HealthWarningOff = true; } } - } - if (me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE)) - { + if (HealthWarningOff) { if (WarningTimer <= diff) @@ -427,6 +419,7 @@ public: else WarningTimer -= diff; } } + if (!(me->HasAuraType(SPELL_AURA_CONTROL_VEHICLE))) { if (!(DisableTakeOff)) diff --git a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp index 0cf7636a86e..b70bda76d76 100644 --- a/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp +++ b/src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp @@ -234,7 +234,9 @@ public: { if (currentPhase == PHASE_NONE) { - instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); + if (instance) + instance->SetData(DATA_GORTOK_PALEHOOF_EVENT, IN_PROGRESS); + me->SummonCreature(NPC_STASIS_CONTROLLER, moveLocs[5].x, moveLocs[5].y, moveLocs[5].z, 0, TEMPSUMMON_CORPSE_DESPAWN); } Phase move = PHASE_NONE; -- cgit v1.2.3 From baeecba6c9e3a2b9d4e98551b9746d27016305a2 Mon Sep 17 00:00:00 2001 From: Vincent-Michael Date: Mon, 15 Jul 2013 01:07:02 +0200 Subject: Core: Fix build --- .../TrialOfTheCrusader/trial_of_the_crusader.cpp | 2 ++ .../Outland/BlackTemple/boss_shade_of_akama.cpp | 4 ++-- .../scripts/Outland/TempestKeep/Eye/boss_alar.cpp | 21 +++++---------------- 3 files changed, 9 insertions(+), 18 deletions(-) (limited to 'src/server/scripts/Northrend') diff --git a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp index aee82529ed7..b590b963c34 100644 --- a/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp +++ b/src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.cpp @@ -318,6 +318,7 @@ class boss_lich_king_toc : public CreatureScript _instance->SetData(TYPE_EVENT, 5080); break; case 5080: + { if (GameObject* go = GameObject::GetGameObject(*me, _instance->GetData64(GO_ARGENT_COLISEUM_FLOOR))) { go->SetDisplayId(DISPLAYID_DESTROYED_FLOOR); @@ -338,6 +339,7 @@ class boss_lich_king_toc : public CreatureScript me->DespawnOrUnsummon(); _updateTimer = 20*IN_MILLISECONDS; break; + } default: break; } diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp index d86c9a2afe7..4a4304bcd24 100644 --- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp +++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp @@ -72,7 +72,7 @@ enum Spells // Ashtongue Spiritbinder SPELL_SPIRIT_MEND = 42025, SPELL_CHAIN_HEAL = 42027, - SPELL_SPIRIT_HEAL = 42317 + SPELL_SPIRITBINDER_SPIRIT_HEAL = 42317 }; enum Creatures @@ -1189,7 +1189,7 @@ public: switch (eventId) { case EVENT_SPIRIT_HEAL: - DoCast(me, SPELL_SPIRIT_HEAL); + DoCast(me, SPELL_SPIRITBINDER_SPIRIT_HEAL); events.ScheduleEvent(EVENT_SPIRIT_HEAL, urand (13000, 16000)); break; default: diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp index 389634a50bf..09fb235edb9 100644 --- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp +++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp @@ -75,11 +75,8 @@ enum WaitEventType class boss_alar : public CreatureScript { public: + boss_alar() : CreatureScript("boss_alar") { } - boss_alar() - : CreatureScript("boss_alar") - { - } struct boss_alarAI : public ScriptedAI { boss_alarAI(Creature* creature) : ScriptedAI(creature) @@ -162,7 +159,6 @@ class boss_alar : public CreatureScript void MoveInLineOfSight(Unit* /*who*/) OVERRIDE {} - void AttackStart(Unit* who) OVERRIDE { if (Phase1) @@ -462,11 +458,7 @@ class boss_alar : public CreatureScript class npc_ember_of_alar : public CreatureScript { public: - - npc_ember_of_alar() - : CreatureScript("npc_ember_of_alar") - { - } + npc_ember_of_alar() : CreatureScript("npc_ember_of_alar") { } struct npc_ember_of_alarAI : public ScriptedAI { @@ -484,10 +476,12 @@ class npc_ember_of_alar : public CreatureScript { toDie = false; } + void EnterCombat(Unit* /*who*/) OVERRIDE { DoZoneInCombat(); } + void EnterEvadeMode() OVERRIDE { me->setDeathState(JUST_DIED); @@ -541,11 +535,7 @@ class npc_ember_of_alar : public CreatureScript class npc_flame_patch_alar : public CreatureScript { public: - - npc_flame_patch_alar() - : CreatureScript("npc_flame_patch_alar") - { - } + npc_flame_patch_alar() : CreatureScript("npc_flame_patch_alar") { } struct npc_flame_patch_alarAI : public ScriptedAI { @@ -570,4 +560,3 @@ void AddSC_boss_alar() new npc_ember_of_alar(); new npc_flame_patch_alar(); } - -- cgit v1.2.3