diff options
| -rw-r--r-- | sql/updates/world/master/2022_03_12_09_world_2021_08_10_08_world.sql | 28 | ||||
| -rw-r--r-- | src/server/scripts/Spells/spell_quest.cpp | 32 |
2 files changed, 28 insertions, 32 deletions
diff --git a/sql/updates/world/master/2022_03_12_09_world_2021_08_10_08_world.sql b/sql/updates/world/master/2022_03_12_09_world_2021_08_10_08_world.sql new file mode 100644 index 00000000000..1f38d76d222 --- /dev/null +++ b/sql/updates/world/master/2022_03_12_09_world_2021_08_10_08_world.sql @@ -0,0 +1,28 @@ +-- Texts 2353 & 2351 are not used on retail so removed +DELETE FROM `creature_text` WHERE `CreatureID` IN (6172,6177) AND `GroupID` = 1; +DELETE FROM `spell_script_names` WHERE `spell_id` = 8593 AND `ScriptName` = 'spell_symbol_of_life_dummy'; +UPDATE `creature_template` SET `unit_flags` = 768, `unit_flags2` = 0 WHERE `entry` IN (6172,6177); +UPDATE `creature_template_addon` SET `bytes1` = 7 WHERE `entry` IN (6172,6177); + +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (6172,6177) AND `source_type` = 0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (617200,617700) AND `source_type` = 9; +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`,`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 +(6172,0,0,0,25,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Henze Faulk - On Reset - Remove NPC Flag Questgiver"), +(6172,0,1,0,8,0,100,0,8593,0,0,0,0,80,617200,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Henze Faulk - On Spellhit 'Symbol of Life' - Run Script"), + +(617200,9,0,0,0,0,100,0,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Henze Faulk - On Script - Remove Flag Standstate Dead"), +(617200,9,1,0,0,0,100,0,0,0,0,0,0,11,25155,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Henze Faulk - On Script - Cast 'Quest - Self Healing from resurrect'"), +(617200,9,2,0,0,0,100,0,4000,4000,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Henze Faulk - On Script - Set Orientation Invoker"), +(617200,9,3,0,0,0,100,0,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Henze Faulk - On Script - Add NPC Flag Questgiver"), +(617200,9,4,0,0,0,100,0,2000,2000,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,0,"Henze Faulk - On Script - Say Line 0"), +(617200,9,5,0,0,0,100,0,120000,120000,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Henze Faulk - On Script - Evade"), + +(6177,0,0,0,25,0,100,0,0,0,0,0,0,83,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Narm Faulk - On Reset - Remove NPC Flag Questgiver"), +(6177,0,1,0,8,0,100,0,8593,0,0,0,0,80,617700,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Narm Faulk - On Spellhit 'Symbol of Life' - Run Script"), + +(617700,9,0,0,0,0,100,0,0,0,0,0,0,91,7,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Narm Faulk - On Script - Remove Flag Standstate Dead"), +(617700,9,1,0,0,0,100,0,0,0,0,0,0,11,25155,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Narm Faulk - On Script - Cast 'Quest - Self Healing from resurrect'"), +(617700,9,2,0,0,0,100,0,4000,4000,0,0,0,66,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Narm Faulk - On Script - Set Orientation Invoker"), +(617700,9,3,0,0,0,100,0,0,0,0,0,0,82,2,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Narm Faulk - On Script - Add NPC Flag Questgiver"), +(617700,9,4,0,0,0,100,0,2000,2000,0,0,0,1,0,0,1,0,0,0,7,0,0,0,0,0,0,0,0,"Narm Faulk - On Script - Say Line 0"), +(617700,9,5,0,0,0,100,0,120000,120000,0,0,0,24,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,"Narm Faulk - On Script - Evade"); diff --git a/src/server/scripts/Spells/spell_quest.cpp b/src/server/scripts/Spells/spell_quest.cpp index 886223d16ea..62e87fedd1d 100644 --- a/src/server/scripts/Spells/spell_quest.cpp +++ b/src/server/scripts/Spells/spell_quest.cpp @@ -687,37 +687,6 @@ class spell_q10041_q10040_who_are_they : public SpellScript } }; -enum symboloflife -{ - SPELL_PERMANENT_FEIGN_DEATH = 29266, -}; - -// 8593 - Symbol of Life (Dummy) -class spell_symbol_of_life_dummy : public SpellScript -{ - PrepareSpellScript(spell_symbol_of_life_dummy); - - void HandleDummy(SpellEffIndex /*effIndex*/) - { - if (Creature* target = GetHitCreature()) - { - if (target->HasAura(SPELL_PERMANENT_FEIGN_DEATH)) - { - target->RemoveAurasDueToSpell(SPELL_PERMANENT_FEIGN_DEATH); - target->SetDynamicFlags(0); - target->SetUnitFlags2(UnitFlags2(0)); - target->SetHealth(target->GetMaxHealth() / 2); - target->SetPower(POWER_MANA, uint32(target->GetMaxPower(POWER_MANA) * 0.75f)); - } - } - } - - void Register() override - { - OnEffectHitTarget += SpellEffectFn(spell_symbol_of_life_dummy::HandleDummy, EFFECT_0, SPELL_EFFECT_DUMMY); - } -}; - // http://www.wowhead.com/quest=12659 Scalps! enum Quest12659Data { @@ -2470,7 +2439,6 @@ void AddSC_quest_spell_scripts() RegisterSpellScript(spell_q12851_going_bearback); RegisterSpellScript(spell_q12937_relief_for_the_fallen); RegisterSpellScript(spell_q10041_q10040_who_are_they); - RegisterSpellScript(spell_symbol_of_life_dummy); RegisterSpellScript(spell_q12659_ahunaes_knife); RegisterSpellScript(spell_q9874_liquid_fire); RegisterSpellScript(spell_q12805_lifeblood_dummy); |