diff options
16 files changed, 74 insertions, 45 deletions
diff --git a/sql/updates/world/3.3.5/2016_09_17_00_world.sql b/sql/updates/world/3.3.5/2016_09_17_00_world.sql new file mode 100644 index 00000000000..105576bd492 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_17_00_world.sql @@ -0,0 +1,2 @@ +-- "Remnant of Dahlia Suntouch" should be NPC immune +UPDATE `creature_template` SET `unit_flags`=(`unit_flags`|0x200) WHERE `entry`=27683; diff --git a/sql/updates/world/3.3.5/2016_09_17_01_world_335.sql b/sql/updates/world/3.3.5/2016_09_17_01_world_335.sql new file mode 100644 index 00000000000..86c5ce32d78 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_17_01_world_335.sql @@ -0,0 +1,2 @@ +-- Update location of Tua'kea's Fishing Hook +UPDATE `gameobject` SET `position_x`=2651.38, `position_y`=1007.243, `position_z`=-24.03463, `orientation`=-2.33874 WHERE `guid`=150122; diff --git a/sql/updates/world/3.3.5/2016_09_17_02_world.sql b/sql/updates/world/3.3.5/2016_09_17_02_world.sql new file mode 100644 index 00000000000..328827c72f6 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_17_02_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_bonus_data` WHERE `entry`=58879; +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(58879, 0, 0, 0, 0, 'Spirit Hunt Heal'); diff --git a/sql/updates/world/3.3.5/2016_09_17_03_world.sql b/sql/updates/world/3.3.5/2016_09_17_03_world.sql new file mode 100644 index 00000000000..67da0599d08 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_17_03_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_bonus_data` WHERE `entry`=64930; +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(64930, 0, 0, 0, 0, 'Electrified'); diff --git a/sql/updates/world/3.3.5/2016_09_17_04_world.sql b/sql/updates/world/3.3.5/2016_09_17_04_world.sql new file mode 100644 index 00000000000..a37d600b00c --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_17_04_world.sql @@ -0,0 +1,3 @@ +DELETE FROM `spell_bonus_data` WHERE `entry`=71824; +INSERT INTO `spell_bonus_data` (`entry`, `direct_bonus`, `dot_bonus`, `ap_bonus`, `ap_dot_bonus`, `comments`) VALUES +(71824, 0, 0, 0, 0, 'Lava Burst'); diff --git a/sql/updates/world/3.3.5/2016_09_19_00_world.sql b/sql/updates/world/3.3.5/2016_09_19_00_world.sql new file mode 100644 index 00000000000..86e9a84a764 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_19_00_world.sql @@ -0,0 +1,2 @@ +-- Charm SAI fix for "Escape from Silverbrook" +UPDATE `smart_scripts` SET `event_flags`=(`event_flags`|0x200) WHERE (`entryorguid`=27409 AND `source_type`=0) OR (`entryorguid`=2740900 AND `source_type`=9); diff --git a/sql/updates/world/3.3.5/2016_09_19_01_world.sql b/sql/updates/world/3.3.5/2016_09_19_01_world.sql new file mode 100644 index 00000000000..01390902e37 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_19_01_world.sql @@ -0,0 +1,28 @@ +UPDATE `smart_scripts` SET `event_flags`=512 WHERE `entryorguid`=16943 AND `source_type`=0 AND `id` IN(3,4,5); +UPDATE `gameobject` SET `spawntimesecs`=43200 WHERE `id`=20919; +UPDATE `smart_scripts` SET `target_param2`=0 WHERE `entryorguid`=478100 AND `source_type`=9 AND `id`=1 AND `link`=0; +UPDATE `smart_scripts` SET `target_param2`=0 WHERE `entryorguid`=478100 AND `source_type`=9 AND `id`=2 AND `link`=0; +UPDATE `smart_scripts` SET `event_flags`=512 WHERE `entryorguid` IN(28122,28120,28121,28216,28215,28214) AND `source_type`=0; +UPDATE `smart_scripts` SET `event_param3`=15000, `event_param4`=15000 WHERE `entryorguid`IN(28120,28121,28122) AND `source_type`=0 AND `id`=0 AND `link`=1; + +DELETE FROM `smart_scripts` WHERE `entryorguid`=28362 AND `source_type`=0; +DELETE FROM `smart_scripts` WHERE `entryorguid` IN(2836203,2836204,2836205,2836206,2836201,2836202,2812000) AND `source_type`=9; +INSERT INTO `smart_scripts`(`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `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 + +(28362, 0, 0, 0, 1, 0, 100, 0, 1000, 1000, 1000, 1000, 23, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - OOC - Increment Phase By 1'), +(28362, 0, 1, 0, 11, 0, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Spawn - Set Phase 1'), +(28362, 0, 2, 10, 38, 1, 100, 0, 1, 1, 0, 0, 11, 51397, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Data Set 1 1 (Phase 1) - Cast Dig Up Shining Crystal'), +(28362, 0, 3, 10, 38, 2, 100, 0, 1, 1, 0, 0, 11, 51441, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Data Set 1 1 (Phase 2) - Cast Dig Up Sparkling Hare'), +(28362, 0, 4, 10, 38, 4, 100, 0, 1, 1, 0, 0, 11, 51398, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Data Set 1 1 (Phase 3) - Cast Dig Up Glinting Armor'), +(28362, 0, 5, 10, 38, 8, 100, 0, 1, 1, 0, 0, 11, 51400, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Data Set 1 1 (Phase 4) - Cast Dig Up Glowing Gem'), +(28362, 0, 6, 10, 38, 16, 100, 0, 1, 1, 0, 0, 11, 51401, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Data Set 1 1 (Phase 5) - Cast Dig Up Polished Platter'), +(28362, 0, 7, 10, 38, 32, 100, 0, 1, 1, 0, 0, 11, 51402, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Data Set 1 1 (Phase 6) - Cast Dig Up Sparkling Treasure'), +(28362, 0, 8, 10, 38, 64, 100, 0, 1, 1, 0, 0, 11, 51443, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Data Set 1 1 (Phase 7) - Cast Dig Up Glinting Bug'), +(28362, 0, 9, 0, 1, 128, 100, 0, 0, 0, 0, 0, 22, 1, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - OOC (Phase 8)- Set Phase 1'), +(28362, 0, 10, 0, 61, 0, 100, 0, 0, 0, 0, 0, 41, 1000, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - Link - Despawn'), +(28362, 0, 11, 0, 11, 0, 100, 0, 0, 0, 0, 0, 11, 52213, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Respawn - Cast \'Rainspeaker Treasures: Invisibility\''), +(28362, 0, 12, 0, 38, 0, 50, 0, 1, 1, 0, 0, 11, 51443, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Glinting Dirt - On Data Set 1 1 - Cast Dig Up Glinting Bug'), +(2812000, 9, 0, 0, 61, 0, 100, 512, 0, 0, 0, 0, 69, 0, 0, 0, 0, 0, 0, 11, 28362, 10, 0, 0, 0, 0, 0, 'Lafoo - On Script - Move To Closest Creature \'Glinting Dirt\''), +(2812000, 9, 1, 0, 61, 0, 100, 512, 2500, 2500, 0, 0, 11, 51405, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lafoo - On Script - Cast \'Digging for Treasure\''), +(2812000, 9, 2, 0, 61, 0, 100, 512, 5000, 5000, 0, 0, 45, 1, 1, 0, 0, 0, 0, 9, 28362, 0, 2, 0, 0, 0, 0, 'Lafoo - On Script - Set Data 1 1'), +(2812000, 9, 3, 0, 61, 0, 100, 512, 1000, 5000, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 'Lafoo - On Script - Evade'); diff --git a/sql/updates/world/3.3.5/2016_09_19_02_world.sql b/sql/updates/world/3.3.5/2016_09_19_02_world.sql new file mode 100644 index 00000000000..d210aab8164 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_19_02_world.sql @@ -0,0 +1,2 @@ +UPDATE `smart_scripts` SET `event_flags`=512 WHERE `entryorguid`=27626 AND `source_type`=0 AND `id`IN(5,6,7,8,9,10); +UPDATE `smart_scripts` SET `event_flags`=512 WHERE `entryorguid`=2762600 AND `source_type`=9; diff --git a/sql/updates/world/3.3.5/2016_09_19_03_world.sql b/sql/updates/world/3.3.5/2016_09_19_03_world.sql new file mode 100644 index 00000000000..c79e50af467 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_19_03_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `reputation_reward_rate` SET `quest_rate`=2, `spell_rate`=1 WHERE `faction`=978; diff --git a/sql/updates/world/3.3.5/2016_09_19_04_world.sql b/sql/updates/world/3.3.5/2016_09_19_04_world.sql new file mode 100644 index 00000000000..e5e76063510 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_19_04_world.sql @@ -0,0 +1 @@ +UPDATE `creature_template` SET `unit_flags`=`unit_flags`|33554432 WHERE `entry`=27632; diff --git a/sql/updates/world/3.3.5/2016_09_19_05_world.sql b/sql/updates/world/3.3.5/2016_09_19_05_world.sql new file mode 100644 index 00000000000..e72b0a84696 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_19_05_world.sql @@ -0,0 +1,10 @@ +-- +DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=35460; +INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES +(17, 0, 35460, 0, 0, 31, 1, 3, 19354, 0, 0, 0, 0, "", "Spell 'Fury of the Dreghood Elders' can only be used on NPC 'Arzeth the Merciless'"); + +UPDATE `smart_scripts` SET `action_type`=1, `action_param1`=0 WHERE `entryorguid`=19354 AND `id`=4; +UPDATE `creature_text` SET `groupid`=0 WHERE `entry`=20680; +DELETE FROM `smart_scripts` WHERE `entryorguid`=19354 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 +(19354, 0, 5, 0, 25, 0, 100, 0, 0, 0, 0, 0, 36, 19354, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Arzeth the Merciless - On Reset - Update Template To 'Arzeth the Merciless'"); diff --git a/sql/updates/world/3.3.5/2016_09_19_06_world.sql b/sql/updates/world/3.3.5/2016_09_19_06_world.sql new file mode 100644 index 00000000000..a512b53cf79 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_19_06_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_loot_template` SET `QuestRequired`=0 WHERE `Item`=24291; diff --git a/sql/updates/world/3.3.5/2016_09_19_07_world.sql b/sql/updates/world/3.3.5/2016_09_19_07_world.sql new file mode 100644 index 00000000000..e43b6a1ee76 --- /dev/null +++ b/sql/updates/world/3.3.5/2016_09_19_07_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_loot_template` SET `Chance`=100 WHERE `Item`=29588; diff --git a/sql/updates/world/3.3.5/9999_99_99_99_world_SPLINECHAINS.sql b/sql/updates/world/3.3.5/2016_09_20_00_world.sql index ae2caf249f9..ae2caf249f9 100644 --- a/sql/updates/world/3.3.5/9999_99_99_99_world_SPLINECHAINS.sql +++ b/sql/updates/world/3.3.5/2016_09_20_00_world.sql diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp index e7143dc49c9..b7f0b5782b2 100644 --- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp +++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp @@ -1272,7 +1272,6 @@ class npc_crate_helper : public CreatureScript } }; - void AddSC_culling_of_stratholme() { new npc_arthas(); diff --git a/src/server/scripts/World/npcs_special.cpp b/src/server/scripts/World/npcs_special.cpp index 29ca63eef95..a598f017eb6 100644 --- a/src/server/scripts/World/npcs_special.cpp +++ b/src/server/scripts/World/npcs_special.cpp @@ -1781,14 +1781,8 @@ class npc_wormhole : public CreatureScript enum PetTrainer { - MENU_ID_PET_TRAINING = 4783, MENU_ID_PET_UNLEARN = 6520, - NPC_TEXT_PET_FAMILIES = 13474, - NPC_TEXT_PET_TRAINING = 5838, - NPC_TEXT_UNLEARN = 7722, - OPTION_ID_HOW_DO_I_TRAIN = 0, - OPTION_ID_UNTRAIN_MY_PET = 1, - OPTION_ID_PLEASE_DO = 0, + OPTION_ID_PLEASE_DO = 0 }; class npc_pet_trainer : public CreatureScript @@ -1796,49 +1790,23 @@ class npc_pet_trainer : public CreatureScript public: npc_pet_trainer() : CreatureScript("npc_pet_trainer") { } - bool OnGossipHello(Player* player, Creature* creature) /*override*/ + struct npc_pet_trainerAI : public ScriptedAI { - ClearGossipMenuFor(player); - - if (creature->IsQuestGiver()) - player->PrepareQuestMenu(creature->GetGUID()); + npc_pet_trainerAI(Creature* creature) : ScriptedAI(creature) { } - if (player->GetPet() && player->GetPet()->getPetType() == HUNTER_PET) + void sGossipSelect(Player* player, uint32 menuId, uint32 gossipListId) override { - AddGossipItemFor(player, MENU_ID_PET_TRAINING, OPTION_ID_HOW_DO_I_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - AddGossipItemFor(player, MENU_ID_PET_TRAINING, OPTION_ID_UNTRAIN_MY_PET, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 2); - SendGossipMenuFor(player, NPC_TEXT_PET_TRAINING, creature->GetGUID()); - } - else - { - AddGossipItemFor(player, MENU_ID_PET_TRAINING, OPTION_ID_HOW_DO_I_TRAIN, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 1); - SendGossipMenuFor(player, NPC_TEXT_PET_TRAINING, creature->GetGUID()); + if (menuId == MENU_ID_PET_UNLEARN && gossipListId == OPTION_ID_PLEASE_DO) + { + player->ResetPetTalents(); + CloseGossipMenuFor(player); + } } - return true; - } + }; - bool OnGossipSelect(Player* player, Creature* creature, uint32 /*sender*/, uint32 action) /*override*/ + CreatureAI* GetAI(Creature* creature) const override { - ClearGossipMenuFor(player); - switch (action) - { - case GOSSIP_ACTION_INFO_DEF + 1: - SendGossipMenuFor(player, NPC_TEXT_PET_FAMILIES, creature->GetGUID()); - break; - case GOSSIP_ACTION_INFO_DEF + 2: - { - AddGossipItemFor(player, MENU_ID_PET_UNLEARN, OPTION_ID_PLEASE_DO, GOSSIP_SENDER_MAIN, GOSSIP_ACTION_INFO_DEF + 3); - SendGossipMenuFor(player, NPC_TEXT_UNLEARN, creature->GetGUID()); - } - break; - case GOSSIP_ACTION_INFO_DEF + 3: - { - player->ResetPetTalents(); - CloseGossipMenuFor(player); - } - break; - } - return true; + return new npc_pet_trainerAI(creature); } }; |