diff options
| -rw-r--r-- | data/sql/updates/pending_db_world/rev_1758373162295230300.sql | 9 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_dragonblight.cpp | 26 |
2 files changed, 9 insertions, 26 deletions
diff --git a/data/sql/updates/pending_db_world/rev_1758373162295230300.sql b/data/sql/updates/pending_db_world/rev_1758373162295230300.sql new file mode 100644 index 0000000000..80b6ee04f6 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1758373162295230300.sql @@ -0,0 +1,9 @@ +-- +DELETE FROM `smart_scripts` WHERE (`source_type` = 0 AND `entryorguid` = 26321); +INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `event_param5`, `event_param6`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_param4`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(26321, 0, 0, 1, 8, 0, 100, 512, 47530, 0, 0, 0, 0, 0, 33, 26321, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, 'Lothalor Ancient - On Spellhit \'Bark of the Walkers\' - Quest Credit \'null\''), +(26321, 0, 1, 2, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lothalor Ancient - On Spellhit \'Bark of the Walkers\' - Say Line 0'), +(26321, 0, 2, 3, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 28, 47044, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lothalor Ancient - On Spellhit \'Bark of the Walkers\' - Remove Aura \'Cosmetic - Confused State Visual (Big)\''), +(26321, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 0, 0, 41, 4000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 'Lothalor Ancient - On Spellhit \'Bark of the Walkers\' - Despawn In 4000 ms'); + +DELETE FROM `spell_script_names` WHERE `ScriptName` = 'spell_q12096_q12092_bark'; diff --git a/src/server/scripts/Northrend/zone_dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index 982f5bf967..e1f50f3cde 100644 --- a/src/server/scripts/Northrend/zone_dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp @@ -2033,12 +2033,8 @@ enum StrengthenAncientsMisc { SAY_WALKER_FRIENDLY = 0, SAY_WALKER_ENEMY = 1, - SAY_LOTHALOR = 0, SPELL_CREATE_ITEM_BARK = 47550, - SPELL_CONFUSED = 47044, - - NPC_LOTHALOR = 26321 }; class spell_q12096_q12092_dummy : public SpellScript @@ -2082,27 +2078,6 @@ class spell_q12096_q12092_dummy : public SpellScript } }; -class spell_q12096_q12092_bark : public SpellScript -{ - PrepareSpellScript(spell_q12096_q12092_bark); - - void HandleDummy(SpellEffIndex /*effIndex*/) - { - Creature* lothalor = GetHitCreature(); - if (!lothalor || lothalor->GetEntry() != NPC_LOTHALOR) - return; - - lothalor->AI()->Talk(SAY_LOTHALOR); - lothalor->RemoveAura(SPELL_CONFUSED); - lothalor->DespawnOrUnsummon(4000); - } - - void Register() override - { - OnEffectHitTarget += SpellEffectFn(spell_q12096_q12092_bark::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - } -}; - /*##### # npc_torturer_lecraft #####*/ @@ -2320,7 +2295,6 @@ void AddSC_dragonblight() new npc_spiritual_insight(); new npc_commander_eligor_dawnbringer(); RegisterSpellScript(spell_q12096_q12092_dummy); - RegisterSpellScript(spell_q12096_q12092_bark); new npc_torturer_lecraft(); RegisterSpellScript(spell_dragonblight_corrosive_spit); RegisterSpellScript(spell_handover_reins); |