From c54bf34e39d9cb1390a379020d4717cc8c9e9a52 Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 02:18:27 -0700 Subject: [PATCH 01/16] Script/Quest: Rivenwood Captives --- .../scripts/Northrend/zone_howling_fjord.cpp | 62 +++++++++++++++++++ 1 file changed, 62 insertions(+) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 1bbf5adcb3d..666cc6f8015 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -587,6 +587,67 @@ class spell_mindless_abomination_explosion_fx_master : public SpellScriptLoader } }; +enum SummonSpells +{ + SPELL_SUMMON_BABY_RIVEN_WIDOWS = 43275, + SPELL_SUMMON_DARKCLAW_BAT = 43276, + SPELL_SUMMON_FANGGORE_WORG = 43277, + SPELL_SUMMON_GJALERBRON_RUNECASTER = 43278, + SPELL_SUMMON_GJALERBRON_SLEEPWATCHER = 43279, + SPELL_SUMMON_GJALERBRON_WARRIOR = 43280, + SPELL_SUMMON_PUTRID_HORROR = 43281, + SPELL_SUMMON_WINTERSKORN_BERSERKER = 43282, + SPELL_SUMMON_WINTERSKORN_WOODSMAN = 43283, + SPELL_SUMMON_WINTERSKORN_TRIBESMAN = 43284, + SPELL_SUMMON_WINTERSKORN_ORACLE = 43285, + SPELL_SUMMON_FREED_MIST_WHISPER_SCOUT = 43289, + NPC_MIST_WHISPER_SCOUT = 24211 +}; + +const uint32 rivenWidowCocoonVictims[11] = +{ + SPELL_SUMMON_BABY_RIVEN_WIDOWS, SPELL_SUMMON_DARKCLAW_BAT, SPELL_SUMMON_FANGGORE_WORG, SPELL_SUMMON_GJALERBRON_RUNECASTER, SPELL_SUMMON_GJALERBRON_SLEEPWATCHER, SPELL_SUMMON_GJALERBRON_WARRIOR, + SPELL_SUMMON_PUTRID_HORROR, SPELL_SUMMON_WINTERSKORN_BERSERKER, SPELL_SUMMON_WINTERSKORN_WOODSMAN, SPELL_SUMMON_WINTERSKORN_TRIBESMAN, SPELL_SUMMON_WINTERSKORN_ORACLE +}; + +class npc_riven_widow_cocoon : public CreatureScript +{ +public: + npc_riven_widow_cocoon() : CreatureScript("npc_riven_widow_cocoon") { } + + struct npc_riven_widow_cocoonAI : public ScriptedAI + { + npc_riven_widow_cocoonAI(Creature* creature) : ScriptedAI(creature) { } + + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } + + void JustDied(Unit* killer) override + { + Player* player = killer->ToPlayer(); + uint8 uiRand = urand(0, 99); + + if (!player) + return; + + if (uiRand < 20) + { + player->CastSpell(me, SPELL_SUMMON_FREED_MIST_WHISPER_SCOUT, true); + player->KilledMonsterCredit(NPC_MIST_WHISPER_SCOUT); + } + else if (uiRand >= 20) + player->CastSpell(me, rivenWidowCocoonVictims[urand(0, 10)], true); + } + }; + + CreatureAI* GetAI(Creature* creature) const override + { + return new npc_riven_widow_cocoonAI(creature); + } + +}; + void AddSC_howling_fjord() { new npc_apothecary_hanes(); @@ -595,4 +656,5 @@ void AddSC_howling_fjord() new npc_daegarn(); new npc_mindless_abomination(); new spell_mindless_abomination_explosion_fx_master(); + new npc_riven_widow_cocoonAI(); } From 50c8f7fb0a5b904e2f3ab4ae1f9f59bb685da9ce Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 14:12:15 -0700 Subject: [PATCH 02/16] Fix coding style and build error --- .../scripts/Northrend/zone_howling_fjord.cpp | 85 +++++++++---------- 1 file changed, 42 insertions(+), 43 deletions(-) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 666cc6f8015..529376ea655 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -589,63 +589,62 @@ class spell_mindless_abomination_explosion_fx_master : public SpellScriptLoader enum SummonSpells { - SPELL_SUMMON_BABY_RIVEN_WIDOWS = 43275, - SPELL_SUMMON_DARKCLAW_BAT = 43276, - SPELL_SUMMON_FANGGORE_WORG = 43277, - SPELL_SUMMON_GJALERBRON_RUNECASTER = 43278, - SPELL_SUMMON_GJALERBRON_SLEEPWATCHER = 43279, - SPELL_SUMMON_GJALERBRON_WARRIOR = 43280, - SPELL_SUMMON_PUTRID_HORROR = 43281, - SPELL_SUMMON_WINTERSKORN_BERSERKER = 43282, - SPELL_SUMMON_WINTERSKORN_WOODSMAN = 43283, - SPELL_SUMMON_WINTERSKORN_TRIBESMAN = 43284, - SPELL_SUMMON_WINTERSKORN_ORACLE = 43285, - SPELL_SUMMON_FREED_MIST_WHISPER_SCOUT = 43289, - NPC_MIST_WHISPER_SCOUT = 24211 + SPELL_SUMMON_BABY_RIVEN_WIDOWS = 43275, + SPELL_SUMMON_DARKCLAW_BAT = 43276, + SPELL_SUMMON_FANGGORE_WORG = 43277, + SPELL_SUMMON_GJALERBRON_RUNECASTER = 43278, + SPELL_SUMMON_GJALERBRON_SLEEPWATCHER = 43279, + SPELL_SUMMON_GJALERBRON_WARRIOR = 43280, + SPELL_SUMMON_PUTRID_HORROR = 43281, + SPELL_SUMMON_WINTERSKORN_BERSERKER = 43282, + SPELL_SUMMON_WINTERSKORN_WOODSMAN = 43283, + SPELL_SUMMON_WINTERSKORN_TRIBESMAN = 43284, + SPELL_SUMMON_WINTERSKORN_ORACLE = 43285, + SPELL_SUMMON_FREED_MIST_WHISPER_SCOUT = 43289, + NPC_MIST_WHISPER_SCOUT = 24211 }; const uint32 rivenWidowCocoonVictims[11] = { - SPELL_SUMMON_BABY_RIVEN_WIDOWS, SPELL_SUMMON_DARKCLAW_BAT, SPELL_SUMMON_FANGGORE_WORG, SPELL_SUMMON_GJALERBRON_RUNECASTER, SPELL_SUMMON_GJALERBRON_SLEEPWATCHER, SPELL_SUMMON_GJALERBRON_WARRIOR, - SPELL_SUMMON_PUTRID_HORROR, SPELL_SUMMON_WINTERSKORN_BERSERKER, SPELL_SUMMON_WINTERSKORN_WOODSMAN, SPELL_SUMMON_WINTERSKORN_TRIBESMAN, SPELL_SUMMON_WINTERSKORN_ORACLE + SPELL_SUMMON_BABY_RIVEN_WIDOWS, SPELL_SUMMON_DARKCLAW_BAT, SPELL_SUMMON_FANGGORE_WORG, SPELL_SUMMON_GJALERBRON_RUNECASTER, SPELL_SUMMON_GJALERBRON_SLEEPWATCHER, SPELL_SUMMON_GJALERBRON_WARRIOR, + SPELL_SUMMON_PUTRID_HORROR, SPELL_SUMMON_WINTERSKORN_BERSERKER, SPELL_SUMMON_WINTERSKORN_WOODSMAN, SPELL_SUMMON_WINTERSKORN_TRIBESMAN, SPELL_SUMMON_WINTERSKORN_ORACLE }; class npc_riven_widow_cocoon : public CreatureScript { public: - npc_riven_widow_cocoon() : CreatureScript("npc_riven_widow_cocoon") { } + npc_riven_widow_cocoon() : CreatureScript("npc_riven_widow_cocoon") { } - struct npc_riven_widow_cocoonAI : public ScriptedAI - { - npc_riven_widow_cocoonAI(Creature* creature) : ScriptedAI(creature) { } + struct npc_riven_widow_cocoonAI : public ScriptedAI + { + npc_riven_widow_cocoonAI(Creature* creature) : ScriptedAI(creature) { } - void Reset() override { } - void EnterCombat(Unit* /*who*/) override { } - void MoveInLineOfSight(Unit* /*who*/) override { } + void Reset() override { } + void EnterCombat(Unit* /*who*/) override { } + void MoveInLineOfSight(Unit* /*who*/) override { } - void JustDied(Unit* killer) override - { - Player* player = killer->ToPlayer(); - uint8 uiRand = urand(0, 99); - - if (!player) - return; + void JustDied(Unit* killer) override + { + Player* player = killer->ToPlayer(); + uint8 uiRand = urand(0, 99); - if (uiRand < 20) - { - player->CastSpell(me, SPELL_SUMMON_FREED_MIST_WHISPER_SCOUT, true); - player->KilledMonsterCredit(NPC_MIST_WHISPER_SCOUT); - } - else if (uiRand >= 20) - player->CastSpell(me, rivenWidowCocoonVictims[urand(0, 10)], true); - } - }; + if (!player) + return; - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_riven_widow_cocoonAI(creature); - } + if (roll_chance_i(20)) + { + player->CastSpell(me, SPELL_SUMMON_FREED_MIST_WHISPER_SCOUT, true); + player->KilledMonsterCredit(NPC_MIST_WHISPER_SCOUT); + } + else + player->CastSpell(me, rivenWidowCocoonVictims[urand(0, 10)], true); + } + }; + CreatureAI* GetAI(Creature* creature) const override + { + return new npc_riven_widow_cocoon(creature); + } }; void AddSC_howling_fjord() @@ -656,5 +655,5 @@ void AddSC_howling_fjord() new npc_daegarn(); new npc_mindless_abomination(); new spell_mindless_abomination_explosion_fx_master(); - new npc_riven_widow_cocoonAI(); + new npc_riven_widow_cocoon(); } From c1fcb7d8bcc87715db01957dd72d9ba988131288 Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 14:18:57 -0700 Subject: [PATCH 03/16] Unused variable --- src/server/scripts/Northrend/zone_howling_fjord.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 529376ea655..8ac80081317 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -626,7 +626,6 @@ public: void JustDied(Unit* killer) override { Player* player = killer->ToPlayer(); - uint8 uiRand = urand(0, 99); if (!player) return; From 16d222aff34baa4340b5eb583a66b628bc6d3e83 Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 14:27:09 -0700 Subject: [PATCH 04/16] Fix a tab --- src/server/scripts/Northrend/zone_howling_fjord.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 8ac80081317..f2ffd0ea936 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -654,5 +654,5 @@ void AddSC_howling_fjord() new npc_daegarn(); new npc_mindless_abomination(); new spell_mindless_abomination_explosion_fx_master(); - new npc_riven_widow_cocoon(); + new npc_riven_widow_cocoon(); } From d208d6a66c3ddb73abb59ed47a14876676f6e14a Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 15:29:03 -0700 Subject: [PATCH 05/16] Is this what it wants? --- src/server/scripts/Northrend/zone_howling_fjord.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index f2ffd0ea936..7a5a6128495 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -642,7 +642,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_riven_widow_cocoon(creature); + return new npc_riven_widow_cocoon(); } }; From 3dcaf0aee8ad519567583ef36bf6eb1221f3ed3f Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 15:49:25 -0700 Subject: [PATCH 06/16] This should do it --- .../scripts/Northrend/zone_howling_fjord.cpp | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/src/server/scripts/Northrend/zone_howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index 7a5a6128495..837be87e615 100644 --- a/src/server/scripts/Northrend/zone_howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp @@ -606,8 +606,17 @@ enum SummonSpells const uint32 rivenWidowCocoonVictims[11] = { - SPELL_SUMMON_BABY_RIVEN_WIDOWS, SPELL_SUMMON_DARKCLAW_BAT, SPELL_SUMMON_FANGGORE_WORG, SPELL_SUMMON_GJALERBRON_RUNECASTER, SPELL_SUMMON_GJALERBRON_SLEEPWATCHER, SPELL_SUMMON_GJALERBRON_WARRIOR, - SPELL_SUMMON_PUTRID_HORROR, SPELL_SUMMON_WINTERSKORN_BERSERKER, SPELL_SUMMON_WINTERSKORN_WOODSMAN, SPELL_SUMMON_WINTERSKORN_TRIBESMAN, SPELL_SUMMON_WINTERSKORN_ORACLE + SPELL_SUMMON_BABY_RIVEN_WIDOWS, + SPELL_SUMMON_DARKCLAW_BAT, + SPELL_SUMMON_FANGGORE_WORG, + SPELL_SUMMON_GJALERBRON_RUNECASTER, + SPELL_SUMMON_GJALERBRON_SLEEPWATCHER, + SPELL_SUMMON_GJALERBRON_WARRIOR, + SPELL_SUMMON_PUTRID_HORROR, + SPELL_SUMMON_WINTERSKORN_BERSERKER, + SPELL_SUMMON_WINTERSKORN_WOODSMAN, + SPELL_SUMMON_WINTERSKORN_TRIBESMAN, + SPELL_SUMMON_WINTERSKORN_ORACLE }; class npc_riven_widow_cocoon : public CreatureScript @@ -642,7 +651,7 @@ public: CreatureAI* GetAI(Creature* creature) const override { - return new npc_riven_widow_cocoon(); + return new npc_riven_widow_cocoonAI(creature); } }; From 8346f095c554bfe14dbde3744e5d5737562afb30 Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 18:28:34 -0700 Subject: [PATCH 07/16] Script/Quest: Rivenwood Captives --- .../3.3.5/2016_10_17_rivenwood_captives.sql | 79 +++++++++++++++++++ 1 file changed, 79 insertions(+) create mode 100644 sql/updates/world/3.3.5/2016_10_17_rivenwood_captives.sql diff --git a/sql/updates/world/3.3.5/2016_10_17_rivenwood_captives.sql b/sql/updates/world/3.3.5/2016_10_17_rivenwood_captives.sql new file mode 100644 index 00000000000..ff14d802224 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_10_17_rivenwood_captives.sql @@ -0,0 +1,79 @@ +-- core script (and delete the incomplete SAI) +DELETE FROM `smart_scripts` WHERE `entryorguid`=24210; +UPDATE `creature_template` SET `AIName`='' WHERE `entry`= 24210; +UPDATE `creature_template` SET `ScriptName`='npc_riven_widow_cocoon' WHERE `entry`= 24210; + +-- set creatures that spawn to SmartAI (the ones that aren't already) +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24219; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24073; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24026; + +-- Add an attack summoner on just summoned to each creature. Some of these creatures already have SmartAI, did all this to avoid errors. + +DELETE FROM `smart_scripts` WHERE `entryorguid`=24219; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(24219, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Baby Riven Widow - On Just Summoned - Attack Summoner'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=24073; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(24073, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Fearsome Horror - On Just Summoned - Attack Summoner'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=23661; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23661, 0, 0, 1, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), +(23661, 0, 3, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Just Summoned - Attack Summoner'), +(23661, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Aggro - Cast \'Gruesome, But Necessary: Kill Credit\''), +(23661, 0, 2, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - In Combat - Say Line 0'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=23666; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23666, 0, 4, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Just Summoned - Attack Summoner'), +(23666, 0, 0, 1, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), +(23666, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), +(23666, 0, 2, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - In Combat - Say Line 0'), +(23666, 0, 3, 0, 1, 0, 100, 0, 0, 60000, 15000, 70000, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - Out of Combat - Say Line 1'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=23991; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23991, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Warrior - On Agro - Say'), +(23991, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Warrior - On Just Summoned - Attack Summoner'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=23990; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23990, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Rune-Caster - On Agro - Say'), +(23990, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Runecaster - On Just Summoned - Attack Summoner'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=23989; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23989, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Sleep-Watcher - On Agro - Say'), +(23989, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron SleepWatcher - On Just Summoned - Attack Summoner'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=23669; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23669, 0, 0, 0, 0, 0, 100, 0, 1000, 3500, 3000, 9000, 11, 43083, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - In Combat - Cast \'Frostbolt\''), +(23669, 0, 1, 2, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), +(23669, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Just Summoned - Attack Summoner'), +(23669, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), +(23669, 0, 3, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 5, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - In Combat - Say Line 0'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=23959; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23959, 0, 0, 0, 38, 0, 100, 0, 0, 1, 0, 0, 69, 1, 0, 0, 0, 0, 0, 19, 24230, 50, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Data Set 0 1 - Move To Closest Creature \'Feknut\'s Firecrackers Bunny\' (No Repeat) (Dungeon)'), +(23959, 0, 1, 0, 34, 0, 100, 512, 0, 1, 0, 0, 45, 0, 1, 0, 0, 0, 0, 19, 24230, 5, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Reached Point 1 - Set Data 0 1 (No Repeat) (Dungeon)'), +(23959, 0, 2, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Just Summoned - Attack Summoner'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=23662; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(23662, 0, 0, 0, 0, 0, 100, 0, 100, 1000, 5000, 14500, 11, 38557, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Cast \'Throw\''), +(23662, 0, 1, 0, 0, 0, 100, 0, 1000, 4500, 4900, 8100, 11, 43410, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Cast \'Chop\''), +(23662, 0, 2, 3, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), +(23662, 0, 2, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Just Summoned - Attack Summoner'), +(23662, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), +(23662, 0, 4, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Say Line 0'); + +DELETE FROM `smart_scripts` WHERE `entryorguid`=24026; +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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES +(24026, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Fanggore Worg - On Just Summoned - Attack Summoner'); + +-- fixes the cocoon being able to attack +UPDATE `creature_template` SET `unit_flags`=131076 WHERE `entry`=24210; From 5fe9fd5c2896289f7287c92e281aaa49717aca4a Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 22:49:41 -0700 Subject: [PATCH 08/16] Fix sql name --- .../{2016_10_17_rivenwood_captives.sql => 9999_99_99_world.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql/updates/world/3.3.5/{2016_10_17_rivenwood_captives.sql => 9999_99_99_world.sql} (100%) diff --git a/sql/updates/world/3.3.5/2016_10_17_rivenwood_captives.sql b/sql/updates/world/3.3.5/9999_99_99_world.sql similarity index 100% rename from sql/updates/world/3.3.5/2016_10_17_rivenwood_captives.sql rename to sql/updates/world/3.3.5/9999_99_99_world.sql From 50e3a8307e5414f30cd35618dfbbd8a192f1c9da Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Mon, 17 Oct 2016 23:40:41 -0700 Subject: [PATCH 09/16] might as well while I'm here --- .../3.3.5/{9999_99_99_world.sql => 9999_99_99_18094_world.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql/updates/world/3.3.5/{9999_99_99_world.sql => 9999_99_99_18094_world.sql} (100%) diff --git a/sql/updates/world/3.3.5/9999_99_99_world.sql b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql similarity index 100% rename from sql/updates/world/3.3.5/9999_99_99_world.sql rename to sql/updates/world/3.3.5/9999_99_99_18094_world.sql From abe79c0e5e444c241530b1e325cfd97d293a0587 Mon Sep 17 00:00:00 2001 From: tkrokli Date: Tue, 18 Oct 2016 19:47:54 +0200 Subject: [PATCH 10/16] SQL improvements - 1 update line is enough to set SmartAI for the 3 NPCs - use only 1 DELETE FROM / INSERT INTO pair for the SAI lines - added alignment spacing for readability in the SAI columns - use double quotation marks (" ") around comments when single quotes are used within --- .../world/3.3.5/9999_99_99_18094_world.sql | 116 +++++++----------- 1 file changed, 42 insertions(+), 74 deletions(-) diff --git a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql index ff14d802224..13130a01b17 100644 --- a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql +++ b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql @@ -1,79 +1,47 @@ --- core script (and delete the incomplete SAI) +-- Remove incomplete SAI and set core scriptname DELETE FROM `smart_scripts` WHERE `entryorguid`=24210; -UPDATE `creature_template` SET `AIName`='' WHERE `entry`= 24210; -UPDATE `creature_template` SET `ScriptName`='npc_riven_widow_cocoon' WHERE `entry`= 24210; +UPDATE `creature_template` SET `AIName`='', `ScriptName`='npc_riven_widow_cocoon' WHERE `entry`= 24210; + +-- add UNIT_FLAG_PACIFIED to Riven Widow Cocoon +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|131072 WHERE `entry`=24210; -- set creatures that spawn to SmartAI (the ones that aren't already) -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24219; -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24073; -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24026; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (24026,24073,24219); -- Add an attack summoner on just summoned to each creature. Some of these creatures already have SmartAI, did all this to avoid errors. - -DELETE FROM `smart_scripts` WHERE `entryorguid`=24219; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(24219, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Baby Riven Widow - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=24073; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(24073, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Fearsome Horror - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23661; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23661, 0, 0, 1, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), -(23661, 0, 3, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Just Summoned - Attack Summoner'), -(23661, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Aggro - Cast \'Gruesome, But Necessary: Kill Credit\''), -(23661, 0, 2, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - In Combat - Say Line 0'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23666; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23666, 0, 4, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Just Summoned - Attack Summoner'), -(23666, 0, 0, 1, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), -(23666, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), -(23666, 0, 2, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - In Combat - Say Line 0'), -(23666, 0, 3, 0, 1, 0, 100, 0, 0, 60000, 15000, 70000, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - Out of Combat - Say Line 1'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23991; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23991, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Warrior - On Agro - Say'), -(23991, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Warrior - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23990; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23990, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Rune-Caster - On Agro - Say'), -(23990, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Runecaster - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23989; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23989, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Sleep-Watcher - On Agro - Say'), -(23989, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron SleepWatcher - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23669; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23669, 0, 0, 0, 0, 0, 100, 0, 1000, 3500, 3000, 9000, 11, 43083, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - In Combat - Cast \'Frostbolt\''), -(23669, 0, 1, 2, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), -(23669, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Just Summoned - Attack Summoner'), -(23669, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), -(23669, 0, 3, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 5, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - In Combat - Say Line 0'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23959; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23959, 0, 0, 0, 38, 0, 100, 0, 0, 1, 0, 0, 69, 1, 0, 0, 0, 0, 0, 19, 24230, 50, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Data Set 0 1 - Move To Closest Creature \'Feknut\'s Firecrackers Bunny\' (No Repeat) (Dungeon)'), -(23959, 0, 1, 0, 34, 0, 100, 512, 0, 1, 0, 0, 45, 0, 1, 0, 0, 0, 0, 19, 24230, 5, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Reached Point 1 - Set Data 0 1 (No Repeat) (Dungeon)'), -(23959, 0, 2, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23662; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23662, 0, 0, 0, 0, 0, 100, 0, 100, 1000, 5000, 14500, 11, 38557, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Cast \'Throw\''), -(23662, 0, 1, 0, 0, 0, 100, 0, 1000, 4500, 4900, 8100, 11, 43410, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Cast \'Chop\''), -(23662, 0, 2, 3, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), -(23662, 0, 2, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Just Summoned - Attack Summoner'), -(23662, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), -(23662, 0, 4, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Say Line 0'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=24026; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(24026, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Fanggore Worg - On Just Summoned - Attack Summoner'); - --- fixes the cocoon being able to attack -UPDATE `creature_template` SET `unit_flags`=131076 WHERE `entry`=24210; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23661,23662,23666,23669,23959,23989,23990,23991,24026,24073,24219); +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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23661,23662,23666,23669,23959,23989,23990,23991,24026,24073,24219); +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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(24219,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Baby Riven Widow - On Just Summoned - Attack Summoner'), +(24073,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fearsome Horror - On Just Summoned - Attack Summoner'), +(23661,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23661,0, 3,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Tribesman - On Just Summoned - Attack Summoner'), +(23661,0, 1,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Aggro - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23661,0, 2,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Tribesman - In Combat - Say Line 0'), +(23666,0, 4,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Berserker - On Just Summoned - Attack Summoner'), +(23666,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23666,0, 1,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23666,0, 2,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Berserker - In Combat - Say Line 0'), +(23666,0, 3,0, 1,0,100, 0, 0, 60000, 15000, 70000, 1, 1, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Berserker - Out of Combat - Say Line 1'), +(23991,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Warrior - On Aggro - Say (No Repeat)'), +(23991,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron Warrior - On Just Summoned - Attack Summoner'), +(23990,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Rune-Caster - On Aggro - Say (No Repeat)'), +(23990,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron Runecaster - On Just Summoned - Attack Summoner'), +(23989,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Sleep-Watcher - On Aggro - Say (No Repeat)'), +(23989,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron SleepWatcher - On Just Summoned - Attack Summoner'), +(23669,0, 0,0, 0,0,100, 0, 1000, 3500, 3000, 9000, 11, 43083, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Oracle - In Combat - Cast 'Frostbolt'"), +(23669,0, 1,2, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23669,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Oracle - On Just Summoned - Attack Summoner'), +(23669,0, 2,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23669,0, 3,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 5, 1, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Oracle - In Combat - Say Line 0'), +(23959,0, 0,0, 38,0,100, 0, 0, 1, 0, 0, 69, 1, 0,0,0,0,0, 19, 24230,50,0,0,0,0,0,"Darkclaw Bat - On Data Set 0 1 - Move To Closest Creature 'Feknut's Firecrackers Bunny'"), +(23959,0, 1,0, 34,0,100, 512, 0, 1, 0, 0, 45, 0, 1,0,0,0,0, 19, 24230, 5,0,0,0,0,0,'Darkclaw Bat - On Reached Point 1 - Set Data 0 1'), +(23959,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Darkclaw Bat - On Just Summoned - Attack Summoner'), +(23662,0, 0,0, 0,0,100, 0, 100, 1000, 5000, 14500, 11, 38557, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - In Combat - Cast 'Throw'"), +(23662,0, 1,0, 0,0,100, 0, 1000, 4500, 4900, 8100, 11, 43410, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - In Combat - Cast 'Chop'"), +(23662,0, 2,3, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23662,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - On Just Summoned - Attack Summoner'), +(23662,0, 3,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23662,0, 4,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - In Combat - Say Line 0'), +(24026,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fanggore Worg - On Just Summoned - Attack Summoner'); From 20f62c05bf86709c45b470c4e91028391771db39 Mon Sep 17 00:00:00 2001 From: tkrokli Date: Tue, 18 Oct 2016 19:50:44 +0200 Subject: [PATCH 11/16] Remove copy-paste error from SQL file Paste fail, inserted double DELETE FROM / INSERT INTO pair in previous edit --- sql/updates/world/3.3.5/9999_99_99_18094_world.sql | 2 -- 1 file changed, 2 deletions(-) diff --git a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql index 13130a01b17..0fbb53cb2ac 100644 --- a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql +++ b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql @@ -11,8 +11,6 @@ UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (24026,24073, -- Add an attack summoner on just summoned to each creature. Some of these creatures already have SmartAI, did all this to avoid errors. DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23661,23662,23666,23669,23959,23989,23990,23991,24026,24073,24219); 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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23661,23662,23666,23669,23959,23989,23990,23991,24026,24073,24219); -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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES (24219,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Baby Riven Widow - On Just Summoned - Attack Summoner'), (24073,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fearsome Horror - On Just Summoned - Attack Summoner'), (23661,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), From 2492b15adb4e5e6f28e6f022a74b8aa0ca9e2890 Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Sat, 29 Oct 2016 00:04:40 -0700 Subject: [PATCH 12/16] Disable experience, add follow to Freed Winterhoof Longerunner's SAI and rename the file. --- .../world/3.3.5/9999_99_99_18094_world.sql | 79 ------------------- ...9999_99_99_99_rivenwood_captives_world.sql | 49 ++++++++++++ 2 files changed, 49 insertions(+), 79 deletions(-) delete mode 100644 sql/updates/world/3.3.5/9999_99_99_18094_world.sql create mode 100644 sql/updates/world/3.3.5/9999_99_99_99_rivenwood_captives_world.sql diff --git a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql deleted file mode 100644 index ff14d802224..00000000000 --- a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql +++ /dev/null @@ -1,79 +0,0 @@ --- core script (and delete the incomplete SAI) -DELETE FROM `smart_scripts` WHERE `entryorguid`=24210; -UPDATE `creature_template` SET `AIName`='' WHERE `entry`= 24210; -UPDATE `creature_template` SET `ScriptName`='npc_riven_widow_cocoon' WHERE `entry`= 24210; - --- set creatures that spawn to SmartAI (the ones that aren't already) -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24219; -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24073; -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`= 24026; - --- Add an attack summoner on just summoned to each creature. Some of these creatures already have SmartAI, did all this to avoid errors. - -DELETE FROM `smart_scripts` WHERE `entryorguid`=24219; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(24219, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Baby Riven Widow - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=24073; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(24073, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Fearsome Horror - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23661; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23661, 0, 0, 1, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), -(23661, 0, 3, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Just Summoned - Attack Summoner'), -(23661, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - On Aggro - Cast \'Gruesome, But Necessary: Kill Credit\''), -(23661, 0, 2, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Tribesman - In Combat - Say Line 0'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23666; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23666, 0, 4, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Just Summoned - Attack Summoner'), -(23666, 0, 0, 1, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), -(23666, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), -(23666, 0, 2, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - In Combat - Say Line 0'), -(23666, 0, 3, 0, 1, 0, 100, 0, 0, 60000, 15000, 70000, 1, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Berserker - Out of Combat - Say Line 1'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23991; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23991, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Warrior - On Agro - Say'), -(23991, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Warrior - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23990; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23990, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Rune-Caster - On Agro - Say'), -(23990, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Runecaster - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23989; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23989, 0, 0, 0, 4, 0, 50, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron Sleep-Watcher - On Agro - Say'), -(23989, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Gjalerbron SleepWatcher - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23669; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23669, 0, 0, 0, 0, 0, 100, 0, 1000, 3500, 3000, 9000, 11, 43083, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - In Combat - Cast \'Frostbolt\''), -(23669, 0, 1, 2, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), -(23669, 0, 1, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Just Summoned - Attack Summoner'), -(23669, 0, 2, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), -(23669, 0, 3, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 5, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Oracle - In Combat - Say Line 0'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23959; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23959, 0, 0, 0, 38, 0, 100, 0, 0, 1, 0, 0, 69, 1, 0, 0, 0, 0, 0, 19, 24230, 50, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Data Set 0 1 - Move To Closest Creature \'Feknut\'s Firecrackers Bunny\' (No Repeat) (Dungeon)'), -(23959, 0, 1, 0, 34, 0, 100, 512, 0, 1, 0, 0, 45, 0, 1, 0, 0, 0, 0, 19, 24230, 5, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Reached Point 1 - Set Data 0 1 (No Repeat) (Dungeon)'), -(23959, 0, 2, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Darkclaw Bat - On Just Summoned - Attack Summoner'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=23662; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(23662, 0, 0, 0, 0, 0, 100, 0, 100, 1000, 5000, 14500, 11, 38557, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Cast \'Throw\''), -(23662, 0, 1, 0, 0, 0, 100, 0, 1000, 4500, 4900, 8100, 11, 43410, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Cast \'Chop\''), -(23662, 0, 2, 3, 8, 0, 100, 0, 43036, 0, 0, 0, 11, 43059, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Vrykul On Dismember\''), -(23662, 0, 2, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Just Summoned - Attack Summoner'), -(23662, 0, 3, 0, 61, 0, 100, 0, 0, 0, 0, 0, 11, 43037, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - On Spellhit \'Dismembering Corpse\' - Cast \'Gruesome, But Necessary: Kill Credit\''), -(23662, 0, 4, 0, 0, 0, 100, 0, 1000, 15000, 7200, 35000, 1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Winterskorn Woodsman - In Combat - Say Line 0'); - -DELETE FROM `smart_scripts` WHERE `entryorguid`=24026; -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`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES -(24026, 0, 0, 0, 54, 0, 100, 512, 0, 0, 0, 0, 49, 0, 0, 0, 0, 0, 0, 23, 0, 0, 0, 0, 0, 0, 0, 'Fanggore Worg - On Just Summoned - Attack Summoner'); - --- fixes the cocoon being able to attack -UPDATE `creature_template` SET `unit_flags`=131076 WHERE `entry`=24210; diff --git a/sql/updates/world/3.3.5/9999_99_99_99_rivenwood_captives_world.sql b/sql/updates/world/3.3.5/9999_99_99_99_rivenwood_captives_world.sql new file mode 100644 index 00000000000..7597a1c58b2 --- /dev/null +++ b/sql/updates/world/3.3.5/9999_99_99_99_rivenwood_captives_world.sql @@ -0,0 +1,49 @@ +-- Remove incomplete SAI and set core scriptname +DELETE FROM `smart_scripts` WHERE `entryorguid`=24210; +UPDATE `creature_template` SET `AIName`='', `ScriptName`='npc_riven_widow_cocoon' WHERE `entry`= 24210; + +-- add UNIT_FLAG_PACIFIED to Riven Widow Cocoon and disable experience +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|131072 AND `flags_extra`=`flags_extra`|64 WHERE `entry`=24210; + +-- set creatures that spawn to SmartAI (the ones that aren't already) +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (24026,24073,24219); + +-- Add an attack summoner on just summoned to each creature. Some of these creatures already have SmartAI, did all this to avoid errors. +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23661,23662,23666,23669,23959,23989,23990,23991,24026,24073,24219,24211); +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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(24219,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Baby Riven Widow - On Just Summoned - Attack Summoner'), +(24073,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fearsome Horror - On Just Summoned - Attack Summoner'), +(23661,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23661,0, 3,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Tribesman - On Just Summoned - Attack Summoner'), +(23661,0, 1,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Aggro - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23661,0, 2,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Tribesman - In Combat - Say Line 0'), +(23666,0, 4,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Berserker - On Just Summoned - Attack Summoner'), +(23666,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23666,0, 1,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23666,0, 2,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Berserker - In Combat - Say Line 0'), +(23666,0, 3,0, 1,0,100, 0, 0, 60000, 15000, 70000, 1, 1, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Berserker - Out of Combat - Say Line 1'), +(23991,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Warrior - On Aggro - Say (No Repeat)'), +(23991,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron Warrior - On Just Summoned - Attack Summoner'), +(23990,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Rune-Caster - On Aggro - Say (No Repeat)'), +(23990,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron Runecaster - On Just Summoned - Attack Summoner'), +(23989,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Sleep-Watcher - On Aggro - Say (No Repeat)'), +(23989,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron SleepWatcher - On Just Summoned - Attack Summoner'), +(23669,0, 0,0, 0,0,100, 0, 1000, 3500, 3000, 9000, 11, 43083, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Oracle - In Combat - Cast 'Frostbolt'"), +(23669,0, 1,2, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23669,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Oracle - On Just Summoned - Attack Summoner'), +(23669,0, 2,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23669,0, 3,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 5, 1, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Oracle - In Combat - Say Line 0'), +(23959,0, 0,0, 38,0,100, 0, 0, 1, 0, 0, 69, 1, 0,0,0,0,0, 19, 24230,50,0,0,0,0,0,"Darkclaw Bat - On Data Set 0 1 - Move To Closest Creature 'Feknut's Firecrackers Bunny'"), +(23959,0, 1,0, 34,0,100, 512, 0, 1, 0, 0, 45, 0, 1,0,0,0,0, 19, 24230, 5,0,0,0,0,0,'Darkclaw Bat - On Reached Point 1 - Set Data 0 1'), +(23959,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Darkclaw Bat - On Just Summoned - Attack Summoner'), +(23662,0, 0,0, 0,0,100, 0, 100, 1000, 5000, 14500, 11, 38557, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - In Combat - Cast 'Throw'"), +(23662,0, 1,0, 0,0,100, 0, 1000, 4500, 4900, 8100, 11, 43410, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - In Combat - Cast 'Chop'"), +(23662,0, 2,3, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23662,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - On Just Summoned - Attack Summoner'), +(23662,0, 3,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23662,0, 4,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - In Combat - Say Line 0'), +(24026,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fanggore Worg - On Just Summoned - Attack Summoner'); +(24211,0, 1,2, 61,0,100, 512, 0, 0, 0, 0, 29, 0,0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Follow Summoner'); +(24211,0, 2,0, 61,0,100, 512, 0, 0, 0, 0, 41, 6000, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Despawn In 6000 ms'); +(24211,0, 0,1, 54,0,100, 512, 0, 0, 0, 0, 1, 0,0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Say Line 0'); + From 7b98737ba61bcd1dce14d39dfb0ab03a039fe953 Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Sat, 29 Oct 2016 00:10:38 -0700 Subject: [PATCH 13/16] disable experience for cocoon, add follow on summon for freed winterhoof longrunner --- .../world/3.3.5/9999_99_99_18094_world.sql | 49 +++++++++++++++++++ 1 file changed, 49 insertions(+) create mode 100644 sql/updates/world/3.3.5/9999_99_99_18094_world.sql diff --git a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql new file mode 100644 index 00000000000..7597a1c58b2 --- /dev/null +++ b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql @@ -0,0 +1,49 @@ +-- Remove incomplete SAI and set core scriptname +DELETE FROM `smart_scripts` WHERE `entryorguid`=24210; +UPDATE `creature_template` SET `AIName`='', `ScriptName`='npc_riven_widow_cocoon' WHERE `entry`= 24210; + +-- add UNIT_FLAG_PACIFIED to Riven Widow Cocoon and disable experience +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|131072 AND `flags_extra`=`flags_extra`|64 WHERE `entry`=24210; + +-- set creatures that spawn to SmartAI (the ones that aren't already) +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (24026,24073,24219); + +-- Add an attack summoner on just summoned to each creature. Some of these creatures already have SmartAI, did all this to avoid errors. +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23661,23662,23666,23669,23959,23989,23990,23991,24026,24073,24219,24211); +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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(24219,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Baby Riven Widow - On Just Summoned - Attack Summoner'), +(24073,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fearsome Horror - On Just Summoned - Attack Summoner'), +(23661,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23661,0, 3,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Tribesman - On Just Summoned - Attack Summoner'), +(23661,0, 1,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Aggro - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23661,0, 2,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Tribesman - In Combat - Say Line 0'), +(23666,0, 4,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Berserker - On Just Summoned - Attack Summoner'), +(23666,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23666,0, 1,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23666,0, 2,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Berserker - In Combat - Say Line 0'), +(23666,0, 3,0, 1,0,100, 0, 0, 60000, 15000, 70000, 1, 1, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Berserker - Out of Combat - Say Line 1'), +(23991,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Warrior - On Aggro - Say (No Repeat)'), +(23991,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron Warrior - On Just Summoned - Attack Summoner'), +(23990,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Rune-Caster - On Aggro - Say (No Repeat)'), +(23990,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron Runecaster - On Just Summoned - Attack Summoner'), +(23989,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Sleep-Watcher - On Aggro - Say (No Repeat)'), +(23989,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron SleepWatcher - On Just Summoned - Attack Summoner'), +(23669,0, 0,0, 0,0,100, 0, 1000, 3500, 3000, 9000, 11, 43083, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Oracle - In Combat - Cast 'Frostbolt'"), +(23669,0, 1,2, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23669,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Oracle - On Just Summoned - Attack Summoner'), +(23669,0, 2,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23669,0, 3,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 5, 1, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Oracle - In Combat - Say Line 0'), +(23959,0, 0,0, 38,0,100, 0, 0, 1, 0, 0, 69, 1, 0,0,0,0,0, 19, 24230,50,0,0,0,0,0,"Darkclaw Bat - On Data Set 0 1 - Move To Closest Creature 'Feknut's Firecrackers Bunny'"), +(23959,0, 1,0, 34,0,100, 512, 0, 1, 0, 0, 45, 0, 1,0,0,0,0, 19, 24230, 5,0,0,0,0,0,'Darkclaw Bat - On Reached Point 1 - Set Data 0 1'), +(23959,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Darkclaw Bat - On Just Summoned - Attack Summoner'), +(23662,0, 0,0, 0,0,100, 0, 100, 1000, 5000, 14500, 11, 38557, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - In Combat - Cast 'Throw'"), +(23662,0, 1,0, 0,0,100, 0, 1000, 4500, 4900, 8100, 11, 43410, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - In Combat - Cast 'Chop'"), +(23662,0, 2,3, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), +(23662,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - On Just Summoned - Attack Summoner'), +(23662,0, 3,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), +(23662,0, 4,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - In Combat - Say Line 0'), +(24026,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fanggore Worg - On Just Summoned - Attack Summoner'); +(24211,0, 1,2, 61,0,100, 512, 0, 0, 0, 0, 29, 0,0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Follow Summoner'); +(24211,0, 2,0, 61,0,100, 512, 0, 0, 0, 0, 41, 6000, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Despawn In 6000 ms'); +(24211,0, 0,1, 54,0,100, 512, 0, 0, 0, 0, 1, 0,0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Say Line 0'); + From 4cf58cd0d6302109b801fd069716d3c17e13e051 Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Sat, 29 Oct 2016 00:10:53 -0700 Subject: [PATCH 14/16] disable experience for cocoon, add follow on summon for freed winterhoof longrunner --- ...9999_99_99_99_rivenwood_captives_world.sql | 49 ------------------- 1 file changed, 49 deletions(-) delete mode 100644 sql/updates/world/3.3.5/9999_99_99_99_rivenwood_captives_world.sql diff --git a/sql/updates/world/3.3.5/9999_99_99_99_rivenwood_captives_world.sql b/sql/updates/world/3.3.5/9999_99_99_99_rivenwood_captives_world.sql deleted file mode 100644 index 7597a1c58b2..00000000000 --- a/sql/updates/world/3.3.5/9999_99_99_99_rivenwood_captives_world.sql +++ /dev/null @@ -1,49 +0,0 @@ --- Remove incomplete SAI and set core scriptname -DELETE FROM `smart_scripts` WHERE `entryorguid`=24210; -UPDATE `creature_template` SET `AIName`='', `ScriptName`='npc_riven_widow_cocoon' WHERE `entry`= 24210; - --- add UNIT_FLAG_PACIFIED to Riven Widow Cocoon and disable experience -UPDATE `creature_template` SET `unit_flags`=`unit_flags`|131072 AND `flags_extra`=`flags_extra`|64 WHERE `entry`=24210; - --- set creatures that spawn to SmartAI (the ones that aren't already) -UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry` IN (24026,24073,24219); - --- Add an attack summoner on just summoned to each creature. Some of these creatures already have SmartAI, did all this to avoid errors. -DELETE FROM `smart_scripts` WHERE `entryorguid` IN (23661,23662,23666,23669,23959,23989,23990,23991,24026,24073,24219,24211); -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`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES -(24219,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Baby Riven Widow - On Just Summoned - Attack Summoner'), -(24073,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fearsome Horror - On Just Summoned - Attack Summoner'), -(23661,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), -(23661,0, 3,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Tribesman - On Just Summoned - Attack Summoner'), -(23661,0, 1,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Tribesman - On Aggro - Cast 'Gruesome, But Necessary: Kill Credit'"), -(23661,0, 2,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Tribesman - In Combat - Say Line 0'), -(23666,0, 4,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Berserker - On Just Summoned - Attack Summoner'), -(23666,0, 0,1, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), -(23666,0, 1,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), -(23666,0, 2,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Berserker - In Combat - Say Line 0'), -(23666,0, 3,0, 1,0,100, 0, 0, 60000, 15000, 70000, 1, 1, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Berserker - Out of Combat - Say Line 1'), -(23991,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Warrior - On Aggro - Say (No Repeat)'), -(23991,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron Warrior - On Just Summoned - Attack Summoner'), -(23990,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Rune-Caster - On Aggro - Say (No Repeat)'), -(23990,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron Runecaster - On Just Summoned - Attack Summoner'), -(23989,0, 0,0, 4,0, 50, 1, 0, 0, 0, 0, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Gjalerbron Sleep-Watcher - On Aggro - Say (No Repeat)'), -(23989,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Gjalerbron SleepWatcher - On Just Summoned - Attack Summoner'), -(23669,0, 0,0, 0,0,100, 0, 1000, 3500, 3000, 9000, 11, 43083, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Oracle - In Combat - Cast 'Frostbolt'"), -(23669,0, 1,2, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), -(23669,0, 1,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Oracle - On Just Summoned - Attack Summoner'), -(23669,0, 2,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), -(23669,0, 3,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 5, 1, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Oracle - In Combat - Say Line 0'), -(23959,0, 0,0, 38,0,100, 0, 0, 1, 0, 0, 69, 1, 0,0,0,0,0, 19, 24230,50,0,0,0,0,0,"Darkclaw Bat - On Data Set 0 1 - Move To Closest Creature 'Feknut's Firecrackers Bunny'"), -(23959,0, 1,0, 34,0,100, 512, 0, 1, 0, 0, 45, 0, 1,0,0,0,0, 19, 24230, 5,0,0,0,0,0,'Darkclaw Bat - On Reached Point 1 - Set Data 0 1'), -(23959,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Darkclaw Bat - On Just Summoned - Attack Summoner'), -(23662,0, 0,0, 0,0,100, 0, 100, 1000, 5000, 14500, 11, 38557, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - In Combat - Cast 'Throw'"), -(23662,0, 1,0, 0,0,100, 0, 1000, 4500, 4900, 8100, 11, 43410, 0,0,0,0,0, 2, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - In Combat - Cast 'Chop'"), -(23662,0, 2,3, 8,0,100, 0, 43036, 0, 0, 0, 11, 43059, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Vrykul On Dismember'"), -(23662,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - On Just Summoned - Attack Summoner'), -(23662,0, 3,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), -(23662,0, 4,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - In Combat - Say Line 0'), -(24026,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fanggore Worg - On Just Summoned - Attack Summoner'); -(24211,0, 1,2, 61,0,100, 512, 0, 0, 0, 0, 29, 0,0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Follow Summoner'); -(24211,0, 2,0, 61,0,100, 512, 0, 0, 0, 0, 41, 6000, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Despawn In 6000 ms'); -(24211,0, 0,1, 54,0,100, 512, 0, 0, 0, 0, 1, 0,0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Say Line 0'); - From 935aef6c8e02f3fe91400355d8901a9d18d2128d Mon Sep 17 00:00:00 2001 From: Staleness89 Date: Sat, 29 Oct 2016 00:51:18 -0700 Subject: [PATCH 15/16] fix syntax error --- sql/updates/world/3.3.5/9999_99_99_18094_world.sql | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql index 7597a1c58b2..ccbb4b3a6cf 100644 --- a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql +++ b/sql/updates/world/3.3.5/9999_99_99_18094_world.sql @@ -42,8 +42,8 @@ INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type (23662,0, 2,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - On Just Summoned - Attack Summoner'), (23662,0, 3,0, 61,0,100, 0, 0, 0, 0, 0, 11, 43037, 0,0,0,0,0, 7, 0, 0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit 'Dismembering Corpse' - Cast 'Gruesome, But Necessary: Kill Credit'"), (23662,0, 4,0, 0,0,100, 0, 1000, 15000, 7200, 35000, 1, 0, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Winterskorn Woodsman - In Combat - Say Line 0'), -(24026,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fanggore Worg - On Just Summoned - Attack Summoner'); -(24211,0, 1,2, 61,0,100, 512, 0, 0, 0, 0, 29, 0,0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Follow Summoner'); -(24211,0, 2,0, 61,0,100, 512, 0, 0, 0, 0, 41, 6000, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Despawn In 6000 ms'); +(24026,0, 0,0, 54,0,100, 512, 0, 0, 0, 0, 49, 0, 0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Fanggore Worg - On Just Summoned - Attack Summoner'), +(24211,0, 1,2, 61,0,100, 512, 0, 0, 0, 0, 29, 0,0,0,0,0,0, 23, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Follow Summoner'), +(24211,0, 2,0, 61,0,100, 512, 0, 0, 0, 0, 41, 6000, 0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Despawn In 6000 ms'), (24211,0, 0,1, 54,0,100, 512, 0, 0, 0, 0, 1, 0,0,0,0,0,0, 1, 0, 0,0,0,0,0,0,'Freed Winterhoof Longrunner - On Just Summoned - Say Line 0'); From 9a51fabe4f52630c8e1b29e404c24129ac686558 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Wed, 23 Nov 2016 02:31:11 +0100 Subject: [PATCH 16/16] Rename 9999_99_99_18094_world.sql to 2016_11_23_00_world.sql --- .../3.3.5/{9999_99_99_18094_world.sql => 2016_11_23_00_world.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename sql/updates/world/3.3.5/{9999_99_99_18094_world.sql => 2016_11_23_00_world.sql} (100%) diff --git a/sql/updates/world/3.3.5/9999_99_99_18094_world.sql b/sql/updates/world/3.3.5/2016_11_23_00_world.sql similarity index 100% rename from sql/updates/world/3.3.5/9999_99_99_18094_world.sql rename to sql/updates/world/3.3.5/2016_11_23_00_world.sql