From 0b87bb0ddf542768b40d54d65d0e3b0cb6cf1e48 Mon Sep 17 00:00:00 2001 From: Emir Date: Fri, 30 Apr 2021 02:59:09 +0200 Subject: [PATCH] fix(Script/Instance) [Deadmines] Smite Slam (#5373) --- .../pending_db_world/rev_1618986200217539600.sql | 3 +++ .../EasternKingdoms/Deadmines/boss_mr_smite.cpp | 15 ++++++++++----- 2 files changed, 13 insertions(+), 5 deletions(-) create mode 100644 data/sql/updates/pending_db_world/rev_1618986200217539600.sql diff --git a/data/sql/updates/pending_db_world/rev_1618986200217539600.sql b/data/sql/updates/pending_db_world/rev_1618986200217539600.sql new file mode 100644 index 000000000..243348e36 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1618986200217539600.sql @@ -0,0 +1,3 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1618986200217539600'); +DELETE FROM `creature_template_spell` WHERE (`CreatureID` = 646) AND (`Index` IN (3)); + diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp index 5fb5046ee..c8c702b62 100644 --- a/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp +++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_mr_smite.cpp @@ -6,7 +6,7 @@ #include "ScriptedCreature.h" #include "ScriptMgr.h" -enum Spels +enum Spells { SPELL_SMITE_STOMP = 6432, SPELL_SMITE_SLAM = 6435, @@ -73,10 +73,6 @@ public: events.Update(diff); switch (events.ExecuteEvent()) { - case EVENT_SMITE_SLAM: - me->CastSpell(me->GetVictim(), SPELL_SMITE_SLAM, false); - events.ScheduleEvent(EVENT_SMITE_SLAM, 15000); - break; case EVENT_CHECK_HEALTH1: if (me->HealthBelowPct(67) && !health67) { @@ -107,6 +103,15 @@ public: } events.ScheduleEvent(EVENT_CHECK_HEALTH2, 500); break; + case EVENT_SMITE_SLAM: + if (me->HealthBelowPct(33)) + { + me->CastSpell(me->GetVictim(), SPELL_SMITE_SLAM, false); + events.ScheduleEvent(EVENT_SMITE_SLAM, 6000); + break; + } + events.ScheduleEvent(EVENT_SMITE_SLAM, 500); + break; case EVENT_SWAP_WEAPON1: me->LoadEquipment(EQUIP_TWO_SWORDS); me->SetCanDualWield(true);