diff --git a/sql/updates/world/custom/custom_2018_06_17_03_world.sql b/sql/updates/world/custom/custom_2018_06_17_03_world.sql new file mode 100644 index 0000000000..da970a0a76 --- /dev/null +++ b/sql/updates/world/custom/custom_2018_06_17_03_world.sql @@ -0,0 +1,3 @@ +UPDATE `creature_template` SET `speed_run`= 0.4285, `DamageModifier`= 20 WHERE `entry`= 48906; +UPDATE `creature_template` SET `DamageModifier`= 20 WHERE `entry` IN (43927, 48953); +UPDATE `creature_template` SET `DamageModifier`= 40 WHERE `entry` IN (43612, 48951); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp index 7729201b84..4bb9c2c7ba 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_high_prophet_barim.cpp @@ -33,7 +33,7 @@ enum Spells SPELL_FIFTY_LASHINGS = 82506, SPELL_PLAGUE_OF_AGES = 82622, SPELL_HEAVENS_FURY = 81939, - SPELL_REPANTANCE = 82320, + SPELL_REPENTANCE = 82320, SPELL_REPENTANCE_PULL = 82168, SPELL_REPENTANCE_STUN = 81947, SPELL_REPENTANCE_KNOCKBACK = 82012, @@ -127,13 +127,20 @@ public: struct boss_high_prophet_barimAI : public BossAI { - boss_high_prophet_barimAI(Creature* creature) : BossAI(creature, DATA_HIGH_PROPHET_BARIM) { } + boss_high_prophet_barimAI(Creature* creature) : BossAI(creature, DATA_HIGH_PROPHET_BARIM) + { + Initialize(); + } + + void Initialize() + { + _repentanceStarted = false; + } void Reset() override { _Reset(); - me->SetReactState(REACT_AGGRESSIVE); - _repentanceStarted = false; + Initialize(); } void JustEngagedWith(Unit* /*who*/) override @@ -182,7 +189,7 @@ public: me->AttackStop(); me->SetReactState(REACT_PASSIVE); me->StopMoving(); - DoCastSelf(SPELL_REPANTANCE); + DoCastSelf(SPELL_REPENTANCE); events.ScheduleEvent(EVENT_REPENTANCE_PULL, Seconds(1)); _repentanceStarted = true; } @@ -194,18 +201,18 @@ public: { case ACTION_PULL_BACK: { - std::list units; - GetCreatureListWithEntryInGrid(units, me, NPC_REPENTANCE, 30.0f); - for (std::list::iterator itr = units.begin(); itr != units.end(); ++itr) - (*itr)->AI()->DoAction(ACTION_PULL_BACK); - - me->RemoveAurasDueToSpell(SPELL_REPANTANCE); + instance->SetData(DATA_REPENTEANCE_ENDED, DONE); + me->RemoveAurasDueToSpell(SPELL_REPENTANCE); me->SetReactState(REACT_AGGRESSIVE); summons.DespawnEntry(NPC_SOUL_FRAGMENT); instance->DoRemoveAurasDueToSpellOnPlayers(SPELL_SOUL_SEVER); if (Creature* blaze = instance->GetCreature(DATA_BLAZE_OF_THE_HEAVENS)) blaze->AI()->DoAction(ACTION_ATTACK_PLAYERS); + + events.ScheduleEvent(EVENT_FIFTY_LASHINGS, Seconds(2)); + events.ScheduleEvent(EVENT_PLAGUE_OF_AGES, Seconds(2)); + events.ScheduleEvent(EVENT_HEAVENS_FURY, Seconds(3) + Milliseconds(500)); break; } case ACTION_BLAZE_DIED: @@ -257,6 +264,9 @@ public: events.ScheduleEvent(EVENT_REPENTANCE_KNOCKBACK, Seconds(6)); break; case EVENT_REPENTANCE_KNOCKBACK: + if (Creature* blaze = instance->GetCreature(DATA_BLAZE_OF_THE_HEAVENS)) + instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, blaze); + DoCastAOE(SPELL_REPENTANCE_KNOCKBACK); DoCastAOE(SPELL_REPENTANCE_SCREEN_EFFECT, true); DoCastSelf(SPELL_WAIL_OF_DARKNESS_DUMMY, true); @@ -434,16 +444,23 @@ public: struct npc_barim_blaze_of_the_heavensAI : public ScriptedAI { - npc_barim_blaze_of_the_heavensAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) { } + npc_barim_blaze_of_the_heavensAI(Creature* creature) : ScriptedAI(creature), _instance(creature->GetInstanceScript()) + { + Initialize(); + } - void IsSummonedBy(Unit* /*summoner*/) override + void Initialize() { _isInEgg = false; _isTransforming = false; + } + + void IsSummonedBy(Unit* /*summoner*/) override + { me->SetReactState(REACT_PASSIVE); + PhasingHandler::ResetPhaseShift(me); DoZoneInCombat(); DoCastSelf(SPELL_BIRTH, true); - PhasingHandler::AddPhase(me, PHASE_ID_REPENTANCE, true); } void JustEngagedWith(Unit* /*who*/) override @@ -472,6 +489,7 @@ public: void EnterEvadeMode(EvadeReason /*why*/) override { + _events.Reset(); _instance->SendEncounterUnit(ENCOUNTER_FRAME_DISENGAGE, me); } @@ -498,6 +516,8 @@ public: case ACTION_MAKE_PASSIVE: _events.Reset(); me->AttackStop(); + me->StopMoving(); + me->RemoveAllAuras(); me->SetReactState(REACT_PASSIVE); break; default: @@ -522,9 +542,6 @@ public: void UpdateAI(uint32 diff) override { - if (!UpdateVictim()) - return; - _events.Update(diff); if (me->HasUnitState(UNIT_STATE_CASTING)) @@ -543,7 +560,8 @@ public: DoCastSelf(SPELL_BLAZE_OF_THE_HEAVENS_TRIGGER, true); break; case EVENT_SUMMON_BLAZE_FLAME: - DoCastSelf(SPELL_BLAZE_OF_THE_HEAVENS_FLAME, true); + if (!me->FindNearestCreature(NPC_BLAZE_OF_THE_HEAVENS_FIRE, 5.0f, true)) + DoCastSelf(SPELL_BLAZE_OF_THE_HEAVENS_FLAME, true); _events.Repeat(Seconds(1)); break; case EVENT_TRANSFORMED: @@ -551,7 +569,7 @@ public: _events.ScheduleEvent(EVENT_CHECK_HEALTH, Seconds(1)); break; case EVENT_CHECK_HEALTH: - if (me->GetHealthPct() == 100.0f) + if (me->GetHealthPct() == 100.0f && me->GetReactState() == REACT_AGGRESSIVE) { me->RemoveAurasDueToSpell(SPELL_TRANSFORM); DoCastSelf(SPELL_BIRTH, true); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp index 8372e9f606..837e37fcc8 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_lockmaw_and_augh.cpp @@ -334,7 +334,7 @@ class boss_augh : public CreatureScript case EVENT_PLAY_EMOTE: me->HandleEmoteCommand(EMOTE_STATE_SPELL_CHANNEL_OMNI); events.ScheduleEvent(EVENT_MAKE_ATTACKABLE, Seconds(4), 0, PHASE_INTRO); - events.ScheduleEvent(EVENT_TALK_TAUNT_1, Seconds(5), PHASE_INTRO); + events.ScheduleEvent(EVENT_TALK_TAUNT_1, Seconds(15), PHASE_INTRO); break; case EVENT_MAKE_ATTACKABLE: me->SetReactState(REACT_AGGRESSIVE); @@ -342,14 +342,15 @@ class boss_augh : public CreatureScript break; case EVENT_TALK_TAUNT_1: Talk(SAY_AUGH_TAUNT_1); - events.ScheduleEvent(EVENT_TALK_TAUNT_2, Seconds(5), 0, PHASE_INTRO); + events.ScheduleEvent(EVENT_TALK_TAUNT_2, Seconds(8), 0, PHASE_INTRO); break; case EVENT_TALK_TAUNT_2: Talk(SAY_AUGH_TAUNT_2); - events.ScheduleEvent(EVENT_TALK_TAUNT_3, Seconds(5), 0, PHASE_INTRO); + events.ScheduleEvent(EVENT_TALK_TAUNT_3, Seconds(8), 0, PHASE_INTRO); break; case EVENT_TALK_TAUNT_3: Talk(SAY_AUGH_TAUNT_3); + events.ScheduleEvent(EVENT_TALK_TAUNT_1, Seconds(8), 0, PHASE_INTRO); break; case EVENT_PARALYTIC_BLOW_DART: DoCastAOE(SPELL_PARALYTIC_BLOW_DART); diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp index f6a7e59161..6a69aedaa2 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/instance_lost_city_of_the_tolvir.cpp @@ -42,6 +42,10 @@ enum Actions ACTION_AUGH_INTRO = 1, ACTION_AUGH_ATTACKABLE = 2, + // High Prophet Barim + + ACTION_PULL_BACK = 1, + // Siamat ACTION_UNLEASHED = 1 }; @@ -94,10 +98,21 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript { InstanceScript::OnCreatureCreate(creature); - if (creature->GetEntry() == NPC_ADD_STALKER) - addStalkerGUIDs.push_back(creature->GetGUID()); - else if (creature->GetEntry() == NPC_WIND_TUNNEL) - creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK); + switch (creature->GetEntry()) + { + case NPC_ADD_STALKER: + addStalkerGUIDs.push_back(creature->GetGUID()); + break; + case NPC_WIND_TUNNEL: + creature->SetFlag(UNIT_NPC_FLAGS, UNIT_NPC_FLAG_SPELLCLICK); + break; + case NPC_REPENTANCE: + repenteanceGUIDs.push_back(creature->GetGUID()); + break; + default: + break; + } + } void OnGameObjectCreate(GameObject* go) override @@ -138,9 +153,11 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript else if (state == FAIL) events.ScheduleEvent(EVENT_SPAWN_AUGH, Seconds(30)); break; + case DATA_HIGH_PROPHET_BARIM: + if (state == FAIL) + repenteanceGUIDs.clear(); case DATA_GENERAL_HUSAM: case DATA_LOCKMAW_AND_AUGH: - case DATA_HIGH_PROPHET_BARIM: if (state == DONE && IsSiamatEnabled()) { if (GameObject* platform = GetGameObject(DATA_SIAMAT_PLATFORM)) @@ -207,6 +224,11 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript break; } break; + case DATA_REPENTEANCE_ENDED: + for (ObjectGuid guid : repenteanceGUIDs) + if (Creature* repenteance = instance->GetCreature(guid)) + repenteance->AI()->DoAction(ACTION_PULL_BACK); + break; default: break; } @@ -261,6 +283,7 @@ class instance_lost_city_of_the_tolvir : public InstanceMapScript EventMap events; bool heroicAughSpawned; GuidVector addStalkerGUIDs; + GuidVector repenteanceGUIDs; }; InstanceScript* GetInstanceScript(InstanceMap* map) const override diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h index ff06c1cb4a..0baebaf575 100644 --- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h +++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.h @@ -39,10 +39,11 @@ enum LCTDataTypes DATA_SIAMAT_PLATFORM = 6, DATA_BLAZE_OF_THE_HEAVENS = 7, DATA_HARBINGER_OF_DARKNESS = 8, - DATA_LOCKMAW_COMBAT_ASSISTANCE = 9, - DATA_SERVANT_OF_SIAMAT_1 = 10, - DATA_SERVANT_OF_SIAMAT_2 = 11, - DATA_SERVANT_OF_SIAMAT_3 = 11, + DATA_REPENTEANCE_ENDED = 9, + DATA_LOCKMAW_COMBAT_ASSISTANCE = 10, + DATA_SERVANT_OF_SIAMAT_1 = 11, + DATA_SERVANT_OF_SIAMAT_2 = 12, + DATA_SERVANT_OF_SIAMAT_3 = 13, }; enum LCTCreatureIds @@ -61,6 +62,7 @@ enum LCTCreatureIds NPC_TOLVIR_LAND_MINE = 44796, NPC_REPENTANCE = 43817, NPC_BLAZE_OF_THE_HEAVENS = 48906, + NPC_BLAZE_OF_THE_HEAVENS_FIRE = 48907, NPC_SOUL_FRAGMENT = 43934, NPC_HARBINGER_OF_DARKNESS = 43927, NPC_DUST_FLAIL_FRONT_STALKER = 43655,