From 9be609c49e1caa9115160964e059e8681b4c3534 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 21 Sep 2014 12:51:05 +0100 Subject: DB/Misc: Remove some hacks for additem * Replace sai to add some items with sai action 56 with correct spells to create items * Add option and sai to replace Blood Elf Disguise for What Illidan Wants, Illidan Gets... --- sql/updates/world/2014_09_21_04_world_misc.sql | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 sql/updates/world/2014_09_21_04_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2014_09_21_04_world_misc.sql b/sql/updates/world/2014_09_21_04_world_misc.sql new file mode 100644 index 00000000000..2885e30b1ff --- /dev/null +++ b/sql/updates/world/2014_09_21_04_world_misc.sql @@ -0,0 +1,17 @@ +DELETE FROM `gossip_menu_option` WHERE `menu_id`=8301 AND `id`=1; +INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES +(8301, 1, 0, 'I need another disguise, Borak. I lost the last one.', 19182, 1, 1, 0, 0, 0, 0, '', 0); + +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=37064, `action_param2`=2, `comment`='Borak, Son of Oronok - On Gossip Option 0 Selected -Cast Create Bundle of Bloodthistle' WHERE `entryorguid`=21293 AND `source_type`=0 AND `id`=2 AND `link`=3; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24806, `action_param2`=2, `comment`='Hive\'Ashi Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Ashi Rubbing DND' WHERE `entryorguid`=180454 AND `source_type`=1 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24807, `action_param2`=2, `comment`='Hive\'Regal Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Regal Rubbing DND' WHERE `entryorguid`=180453 AND `source_type`=1 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24805, `action_param2`=2, `comment`='Hive\'Zora Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Zora Rubbing DND' WHERE `entryorguid`=180455 AND `source_type`=1 AND `id`=1 AND `link`=0; + +DELETE FROM `smart_scripts` WHERE `entryorguid`=21293 AND `source_type`=0 AND `id`=5; +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 +(21293, 0, 5, 3, 62, 0, 100, 0, 8301, 1, 0, 0, 85, 37100, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Borak, Son of Oronok - On Gossip Option 1 Selected -Cast Create Blood Elf Disguise'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8301 AND `SourceEntry`=1; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 8301, 1, 0, 0, 9, 0, 10577, 0, 0, 0, 0, 0, '', 'Show gossip menu option if player has quest What Illidan Wants, Illidan Gets...'), +(15, 8301, 1, 0, 0, 2, 0, 30639, 1, 0, 1, 0, 0, '', 'Show gossip menu option if player does not have item Blood Elf Disguise'); -- cgit v1.2.3 From cd48ee01c0b1465c5b07427bb6fe9baa57f053b9 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 21 Sep 2014 10:46:49 -0230 Subject: Scripting/Shadowmoon Vally: Added scripting for Infernal Attackers. --- sql/updates/world/2014_09_21_05_world.sql | 3 + .../scripts/Outland/zone_shadowmoon_valley.cpp | 139 +++++++++++++++++++++ 2 files changed, 142 insertions(+) create mode 100644 sql/updates/world/2014_09_21_05_world.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2014_09_21_05_world.sql b/sql/updates/world/2014_09_21_05_world.sql new file mode 100644 index 00000000000..b2a4fc2a0d4 --- /dev/null +++ b/sql/updates/world/2014_09_21_05_world.sql @@ -0,0 +1,3 @@ +UPDATE `creature_template` SET `ScriptName`= 'npc_invis_infernal_caster' WHERE `entry`=21417; +UPDATE `creature_template` SET `AIName`="", `ScriptName`= 'npc_infernal_attacker' WHERE `entry`=21419; +DELETE FROM `smart_scripts` WHERE `entryorguid`=21419 AND `source_type`=0; diff --git a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 54a7455d3f8..fe323452c29 100644 --- a/src/server/scripts/Outland/zone_shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp @@ -24,6 +24,8 @@ SDCategory: Shadowmoon Valley EndScriptData */ /* ContentData +npc_invis_infernal_caster +npc_infernal_attacker npc_mature_netherwing_drake npc_enslaved_netherwing_drake npc_drake_dealer_hurlunk @@ -47,6 +49,141 @@ EndContentData */ #include "Player.h" #include "WorldSession.h" +/*##### +# npc_invis_infernal_caster +#####*/ + +enum InvisInfernalCaster +{ + EVENT_CAST_SUMMON_INFERNAL = 1, + NPC_INFERNAL_ATTACKER = 21419, + MODEL_INVISIBLE = 20577, + MODEL_INFERNAL = 17312, + SPELL_SUMMON_INFERNAL = 37277, + TYPE_INFERNAL = 1, + DATA_DIED = 1 +}; + +class npc_invis_infernal_caster : public CreatureScript +{ +public: + npc_invis_infernal_caster() : CreatureScript("npc_invis_infernal_caster") { } + + struct npc_invis_infernal_casterAI : public ScriptedAI + { + npc_invis_infernal_casterAI(Creature* creature) : ScriptedAI(creature) { } + + void Reset() override + { + ground = me->GetMap()->GetHeight(me->GetPositionX(), me->GetPositionY(), me->GetPositionZMinusOffset()); + SummonInfernal(); + events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, urand(1000, 3000)); + } + + void SetData(uint32 id, uint32 data) override + { + if (id == TYPE_INFERNAL && data == DATA_DIED) + SummonInfernal(); + } + + void SummonInfernal() + { + Creature* infernal = me->SummonCreature(NPC_INFERNAL_ATTACKER, me->GetPositionX(), me->GetPositionY(), ground + 0.05f, 0.0f, TEMPSUMMON_TIMED_OR_DEAD_DESPAWN, 60000); + infernalGUID = infernal->GetGUID(); + } + + void UpdateAI(uint32 diff) override + { + events.Update(diff); + + while (uint32 eventId = events.ExecuteEvent()) + { + switch (eventId) + { + case EVENT_CAST_SUMMON_INFERNAL: + { + if (Unit* infernal = ObjectAccessor::GetUnit(*me, infernalGUID)) + if (infernal->GetDisplayId() == MODEL_INVISIBLE) + me->CastSpell(infernal, SPELL_SUMMON_INFERNAL, true); + events.ScheduleEvent(EVENT_CAST_SUMMON_INFERNAL, 12000); + break; + } + default: + break; + } + } + } + + private: + EventMap events; + ObjectGuid infernalGUID; + float ground; + }; + + CreatureAI* GetAI(Creature* creature) const override + { + return new npc_invis_infernal_casterAI(creature); + } +}; + +/*##### +# npc_infernal_attacker +#####*/ + +class npc_infernal_attacker : public CreatureScript +{ +public: + npc_infernal_attacker() : CreatureScript("npc_infernal_attacker") { } + + struct npc_infernal_attackerAI : public ScriptedAI + { + npc_infernal_attackerAI(Creature* creature) : ScriptedAI(creature) { } + + void Reset() override + { + me->SetDisplayId(MODEL_INVISIBLE); + me->GetMotionMaster()->MoveRandom(5.0f); + } + + void IsSummonedBy(Unit* summoner) override + { + if (summoner->ToCreature()) + caster = summoner->ToCreature(); + } + + void JustDied(Unit* /*killer*/) override + { + if (caster) + caster->AI()->SetData(TYPE_INFERNAL, DATA_DIED); + } + + void SpellHit(Unit* /*caster*/, const SpellInfo* spell) override + { + if (spell->Id == SPELL_SUMMON_INFERNAL) + { + me->RemoveFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_IMMUNE_TO_PC | UNIT_FLAG_PACIFIED | UNIT_FLAG_NOT_SELECTABLE); + me->SetDisplayId(MODEL_INFERNAL); + } + } + + void UpdateAI(uint32 diff) override + { + if (!UpdateVictim()) + return; + + DoMeleeAttackIfReady(); + } + + private: + Creature* caster; + }; + + CreatureAI* GetAI(Creature* creature) const override + { + return new npc_infernal_attackerAI(creature); + } +}; + /*##### # npc_mature_netherwing_drake #####*/ @@ -1826,6 +1963,8 @@ public: void AddSC_shadowmoon_valley() { + new npc_invis_infernal_caster(); + new npc_infernal_attacker(); new npc_mature_netherwing_drake(); new npc_enslaved_netherwing_drake(); new npc_dragonmaw_peon(); -- cgit v1.2.3 From ffa6e37abcd8eaa4bfb0ecc769476a08c83f7015 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 21 Sep 2014 16:05:56 +0100 Subject: DB/Misc: Remove more additem hacks Use proper spells for creating items instead of sai action 56, this leaves only NR items using this action to add items as data missing for spells. --- sql/updates/world/2014_09_21_06_world.sql | 72 +++++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 sql/updates/world/2014_09_21_06_world.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2014_09_21_06_world.sql b/sql/updates/world/2014_09_21_06_world.sql new file mode 100644 index 00000000000..8f1f22d4486 --- /dev/null +++ b/sql/updates/world/2014_09_21_06_world.sql @@ -0,0 +1,72 @@ +UPDATE `gossip_menu_option` SET `OptionBroadcastTextID`=19252 WHERE `menu_id`=8301 AND `id`=1; + +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28945, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 0 Selected - Cast Summon Confessor\'s Belt DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=0 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28939, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 0 Selected - Cast Summon Madcap\'s Bracers DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=0 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=22958, `action_param2`=2, `comment`='Highlord Demitrian - On Gossip Complete - Cast Summon Vessel of Rebirth DND' WHERE `entryorguid`=14347 AND `source_type`=0 AND `id`=0 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28920, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 0 Selected - Cast Summon Freethinker\'s Bracers DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=0 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28923, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 0 Selected - Summon Augur\'s Belt DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=0 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=38255, `action_param2`=2, `comment`='Tally Zapnabber - On Gossip Option 0 Selected - Cast Create Gnome Cannon Waiver' WHERE `entryorguid`=21460 AND `source_type`=0 AND `id`=0 AND `link`=1; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=25763, `action_param2`=2, `comment`='Draconic for Dummies - On Gossip Option 0 Selected - Cast Draconic For Dummies 7 DND' WHERE `entryorguid`=180667 AND `source_type`=1 AND `id`=0 AND `link`=1; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=25765, `action_param2`=2, `comment`='Draconic for Dummies - On Gossip Option 0 Selected - Cast Draconic For Dummies 4 DND' WHERE `entryorguid`=180666 AND `source_type`=1 AND `id`=0 AND `link`=1; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=25764, `action_param2`=2, `comment`='Draconic for Dummies - On Gossip Option 0 Selected - Cast Draconic For Dummies 5 DND' WHERE `entryorguid`=180665 AND `source_type`=1 AND `id`=0 AND `link`=1; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28937, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 1 Selected - Cast Summon Madcap\'s Mantle DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28943, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 1 Selected - Cast Summon Confessor\'s Mantle DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28919, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 1 Selected - Cast Summon Freethinker\'s Belt DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28926, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 1 Selected - Cast Summon Augur\'s Bracers DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28946, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 2 Selected - Cast Summon Confessor\'s Bracers DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=2 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28935, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 2 Selected - Cast Summon Madcap\'s BP DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=2 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28909, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 2 Selected - Cast Summon Freethinker\'s BP DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=2 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28959, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 2 Selected - Cast Summon Augur\'s BP DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=2 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24015, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 3 Selected - Cast Create Zul\'Gurub Talisman PRT R4 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=3 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24075, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 3 Selected - Cast Create Zul\'Gurub Talisman ROG R4 DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=3 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24010, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 3 Selected - Cast Zul\'Gurub Talisman PAL R4 DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=3 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24070, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 3 Selected - Cast Create Zul\'Gurub Talisman SHM R4 DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=3 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24012, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 4 Selected - Cast Create Zul\'Gurub Talisman PRT R1 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=4 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24072, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 4 Selected - Cast Create Zul\'Gurub Talisman ROG R1 DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=4 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24007, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 4 Selected - Cast Zul\'Gurub Talisman PAL R1 DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=4 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24067, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 4 Selected - Cast Create Zul\'Gurub Talisman SHM R1 DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=4 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24013, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 5 Selected - Cast Create Zul\'Gurub Talisman PRT R2 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=5 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24073, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 5 Selected - Cast Create Zul\'Gurub Talisman ROG R2 DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=5 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24008, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 5 Selected - Cast Zul\'Gurub Talisman PAL R2 DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=5 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24068, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 5 Selected - Cast Create Zul\'Gurub Talisman SHM R2 DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=5 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24014, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 6 Selected - Cast Create Zul\'Gurub Talisman PRT R3 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=6 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24074, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 6 Selected - Cast Create Zul\'Gurub Talisman ROG R3 DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=6 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24009, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 6 Selected - Cast Zul\'Gurub Talisman PAL R3 DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=6 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24069, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 6 Selected - Cast Create Zul\'Gurub Talisman SHM R3 DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=6 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28956, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 0 Selected - Cast Summon Demoniac\'s Mantle DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=14 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28929, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 0 Selected - Cast Summon Predator\'s Belt DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=14 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28908, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 0 Selected - Cast Summon Vindicator\'s Armguards DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=14 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28941, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 0 Selected - Cast Summon Haruspex\'s Belt DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=14 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28954, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 1 Selected - Summon Demoniac\'s BP DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=15 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28930, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 1 Selected - Cast Summon Predator\'s Bracers DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=15 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28886, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 1 Selected - Cast Summon Vindicator\'s Belt DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=15 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28942, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 1 Selected - Cast Summon Haruspex\'s Bracers DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=15 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28958, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 2 Selected - Casy Summon Demoniac\'s Bracers DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=16 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28921, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 2 Selected - Cast Summon Predator\'s Mantle DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=16 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28885, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 2 Selected - Cast Summon Vindicator\'s BP DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=16 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28940, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 2 Selected - Cast Summon Haruspex\'s BP DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=16 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24047, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 3 Selected - Cast Create Zul\'Gurub Talisman WLK R4 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=17 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24079, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 3 Selected - Cast Create Zul\'Gurub Talisman HUN R4 DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=17 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24001, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 3 Selected - Cast Create Zul\'Gurub Talisman WAR R4 DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=17 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24060, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 3 Selected - Cast Create Zul\'Gurub Talisman DRU R4 DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=17 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24044, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 4 Selected - Cast Create Zul\'Gurub Talisman WLK R1 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=18 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24076, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 4 Selected - Cast Create Zul\'Gurub Talisman HUN R1 DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=18 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=23998, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 4 Selected - Cast Create Zul\'Gurub Talisman WAR R1 DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=18 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24055, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 4 Selected - Cast Create Zul\'Gurub Talisman DRU R1 DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=18 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24045, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 5 Selected - Cast Create Zul\'Gurub Talisman WLK R2 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=19 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24077, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 5 Selected - Cast Create Zul\'Gurub Talisman HUN R2 DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=19 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=23999, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 5 Selected - Cast Create Zul\'Gurub Talisman WAR R2 DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=19 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24056, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 5 Selected - Cast Create Zul\'Gurub Talisman DRU R2 DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=19 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24046, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 6 Selected - Cast Create Zul\'Gurub Talisman WLK R3 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=20 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24078, `action_param2`=2, `comment`='Falthir the Sightless - On Gossip Option 6 Selected - Cast Create Zul\'Gurub Talisman HUN R3 DND' WHERE `entryorguid`=14905 AND `source_type`=0 AND `id`=20 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24000, `action_param2`=2, `comment`='Jin\'rokh the Breaker - On Gossip Option 6 Selected - Cast Create Zul\'Gurub Talisman WAR R3 DND' WHERE `entryorguid`=14902 AND `source_type`=0 AND `id`=20 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24059, `action_param2`=2, `comment`='Maywiki of Zuldazar - On Gossip Option 6 Selected - Cast Create Zul\'Gurub Talisman DRU R3 DND' WHERE `entryorguid`=14904 AND `source_type`=0 AND `id`=20 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28951, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 0 Selected - Cast Summon Illusionist\'s Mantle DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=28 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28949, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 1 Selected - Cast Summon Illusionist\'s BP DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=29 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=28952, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 2 Selected - Cast Summon Illusionist\'s Bracers DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=30 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24041, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 3 Selected - Cast Create Zul\'Gurub Talisman MAG R4 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=31 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24038, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 4 Selected - Cast Create Zul\'Gurub Talisman MAG R1 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=32 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24039, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 5 Selected - Cast Create Zul\'Gurub Talisman MAG R2 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=33 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24040, `action_param2`=2, `comment`='Al\'tabim the All-Seeing - On Gossip Option 6 Selected -Cast Create Zul\'Gurub Talisman MAG R3 DND' WHERE `entryorguid`=14903 AND `source_type`=0 AND `id`=34 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=25600, `action_param2`=2, `comment`='Spirit of Azuregos - On Gossip Option 0 Selected - Cast Idol of Neptulon DND' WHERE `entryorguid`=15481 AND `source_type`=0 AND `id`=0 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=31314, `action_param2`=2, `comment`='Blood Knight Dawnstar - On Gossip Option 0 Selected - Cast Summon Blood Knight Insignia' WHERE `entryorguid`=17832 AND `source_type`=0 AND `id`=0 AND `link`=1; -- cgit v1.2.3 From d33c2952ad69a309fd2904b34ac2abd32fd4531e Mon Sep 17 00:00:00 2001 From: DDuarte Date: Sun, 21 Sep 2014 16:26:20 +0100 Subject: SQLs: Rename updates/world sql files to the new format --- sql/updates/world/2014_09_21_03_world.sql | 1 + sql/updates/world/2014_09_21_03_world_version.sql | 1 - sql/updates/world/2014_09_21_04_world.sql | 17 +++++++++++++++++ sql/updates/world/2014_09_21_04_world_misc.sql | 17 ----------------- 4 files changed, 18 insertions(+), 18 deletions(-) create mode 100644 sql/updates/world/2014_09_21_03_world.sql delete mode 100644 sql/updates/world/2014_09_21_03_world_version.sql create mode 100644 sql/updates/world/2014_09_21_04_world.sql delete mode 100644 sql/updates/world/2014_09_21_04_world_misc.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2014_09_21_03_world.sql b/sql/updates/world/2014_09_21_03_world.sql new file mode 100644 index 00000000000..be9e7de91ba --- /dev/null +++ b/sql/updates/world/2014_09_21_03_world.sql @@ -0,0 +1 @@ +UPDATE `version` SET `db_version`='TDB 335.56', `cache_id`=56 LIMIT 1; diff --git a/sql/updates/world/2014_09_21_03_world_version.sql b/sql/updates/world/2014_09_21_03_world_version.sql deleted file mode 100644 index be9e7de91ba..00000000000 --- a/sql/updates/world/2014_09_21_03_world_version.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE `version` SET `db_version`='TDB 335.56', `cache_id`=56 LIMIT 1; diff --git a/sql/updates/world/2014_09_21_04_world.sql b/sql/updates/world/2014_09_21_04_world.sql new file mode 100644 index 00000000000..2885e30b1ff --- /dev/null +++ b/sql/updates/world/2014_09_21_04_world.sql @@ -0,0 +1,17 @@ +DELETE FROM `gossip_menu_option` WHERE `menu_id`=8301 AND `id`=1; +INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES +(8301, 1, 0, 'I need another disguise, Borak. I lost the last one.', 19182, 1, 1, 0, 0, 0, 0, '', 0); + +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=37064, `action_param2`=2, `comment`='Borak, Son of Oronok - On Gossip Option 0 Selected -Cast Create Bundle of Bloodthistle' WHERE `entryorguid`=21293 AND `source_type`=0 AND `id`=2 AND `link`=3; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24806, `action_param2`=2, `comment`='Hive\'Ashi Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Ashi Rubbing DND' WHERE `entryorguid`=180454 AND `source_type`=1 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24807, `action_param2`=2, `comment`='Hive\'Regal Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Regal Rubbing DND' WHERE `entryorguid`=180453 AND `source_type`=1 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24805, `action_param2`=2, `comment`='Hive\'Zora Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Zora Rubbing DND' WHERE `entryorguid`=180455 AND `source_type`=1 AND `id`=1 AND `link`=0; + +DELETE FROM `smart_scripts` WHERE `entryorguid`=21293 AND `source_type`=0 AND `id`=5; +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 +(21293, 0, 5, 3, 62, 0, 100, 0, 8301, 1, 0, 0, 85, 37100, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Borak, Son of Oronok - On Gossip Option 1 Selected -Cast Create Blood Elf Disguise'); + +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8301 AND `SourceEntry`=1; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(15, 8301, 1, 0, 0, 9, 0, 10577, 0, 0, 0, 0, 0, '', 'Show gossip menu option if player has quest What Illidan Wants, Illidan Gets...'), +(15, 8301, 1, 0, 0, 2, 0, 30639, 1, 0, 1, 0, 0, '', 'Show gossip menu option if player does not have item Blood Elf Disguise'); diff --git a/sql/updates/world/2014_09_21_04_world_misc.sql b/sql/updates/world/2014_09_21_04_world_misc.sql deleted file mode 100644 index 2885e30b1ff..00000000000 --- a/sql/updates/world/2014_09_21_04_world_misc.sql +++ /dev/null @@ -1,17 +0,0 @@ -DELETE FROM `gossip_menu_option` WHERE `menu_id`=8301 AND `id`=1; -INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`, `option_text`, `OptionBroadcastTextID`, `option_id`, `npc_option_npcflag`, `action_menu_id`, `action_poi_id`, `box_coded`, `box_money`, `box_text`, `BoxBroadcastTextID`) VALUES -(8301, 1, 0, 'I need another disguise, Borak. I lost the last one.', 19182, 1, 1, 0, 0, 0, 0, '', 0); - -UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=37064, `action_param2`=2, `comment`='Borak, Son of Oronok - On Gossip Option 0 Selected -Cast Create Bundle of Bloodthistle' WHERE `entryorguid`=21293 AND `source_type`=0 AND `id`=2 AND `link`=3; -UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24806, `action_param2`=2, `comment`='Hive\'Ashi Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Ashi Rubbing DND' WHERE `entryorguid`=180454 AND `source_type`=1 AND `id`=1 AND `link`=0; -UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24807, `action_param2`=2, `comment`='Hive\'Regal Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Regal Rubbing DND' WHERE `entryorguid`=180453 AND `source_type`=1 AND `id`=1 AND `link`=0; -UPDATE `smart_scripts` SET `action_type`=85, `action_param1`=24805, `action_param2`=2, `comment`='Hive\'Zora Glyphed Crystal - On Gossip Option 0 Selected - Cast Create Hive\'Zora Rubbing DND' WHERE `entryorguid`=180455 AND `source_type`=1 AND `id`=1 AND `link`=0; - -DELETE FROM `smart_scripts` WHERE `entryorguid`=21293 AND `source_type`=0 AND `id`=5; -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 -(21293, 0, 5, 3, 62, 0, 100, 0, 8301, 1, 0, 0, 85, 37100, 2, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 'Borak, Son of Oronok - On Gossip Option 1 Selected -Cast Create Blood Elf Disguise'); - -DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=15 AND `SourceGroup`=8301 AND `SourceEntry`=1; -INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES -(15, 8301, 1, 0, 0, 9, 0, 10577, 0, 0, 0, 0, 0, '', 'Show gossip menu option if player has quest What Illidan Wants, Illidan Gets...'), -(15, 8301, 1, 0, 0, 2, 0, 30639, 1, 0, 1, 0, 0, '', 'Show gossip menu option if player does not have item Blood Elf Disguise'); -- cgit v1.2.3 From dc814ed282ee954df8ec4d028e9445237b1b632c Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sun, 21 Sep 2014 13:18:14 -0230 Subject: DB/Creature Model: Fix a few models by AriDEV --- sql/updates/world/2014_09_21_07_world.sql | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 sql/updates/world/2014_09_21_07_world.sql (limited to 'sql/updates') diff --git a/sql/updates/world/2014_09_21_07_world.sql b/sql/updates/world/2014_09_21_07_world.sql new file mode 100644 index 00000000000..db11a7fa3d2 --- /dev/null +++ b/sql/updates/world/2014_09_21_07_world.sql @@ -0,0 +1,9 @@ +-- ModelID Fix For NPC: 21749 +-- Also Remove Dwarf ModelID From ModelID of 21749 +DELETE FROM `creature_model_info` WHERE `modelid` IN (20447, 20448, 20449, 20450, 18790); +INSERT INTO `creature_model_info` (`modelid`, `bounding_radius`, `combat_reach`, `gender`, `modelid_other_gender`) VALUES +(20447, 0.372, 1.5, 0, 20449), -- Male Green Orc +(20448, 0.372, 1.5, 0, 20450), -- Male Dark Green Orc +(20449, 0.236, 1.5, 1, 20448), -- Female Dark Green Orc +(20450, 0.236, 1.5, 1, 20447), -- Female Green Orc +(18790, 0.347, 1.5, 1, 18791); -- Dwarf -- cgit v1.2.3