diff options
| -rw-r--r-- | sql/updates/world/3.3.5/2020_05_25_04_world_335.sql | 56 | ||||
| -rw-r--r-- | src/server/scripts/World/go_scripts.cpp | 36 |
2 files changed, 56 insertions, 36 deletions
diff --git a/sql/updates/world/3.3.5/2020_05_25_04_world_335.sql b/sql/updates/world/3.3.5/2020_05_25_04_world_335.sql new file mode 100644 index 00000000000..26d8488ee40 --- /dev/null +++ b/sql/updates/world/3.3.5/2020_05_25_04_world_335.sql @@ -0,0 +1,56 @@ +-- Inconspicuous Landmark SAI +UPDATE `gameobject_template` SET `AIName` = "SmartGameObjectAI", `ScriptName` = "" WHERE `entry` = 142189; +DELETE FROM `smart_scripts` WHERE `entryorguid` = 142189 AND `source_type` = 1; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(142189,1,0,0,64,0,100,0,1,0,0,0,0,85,11462,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Inconspicuous Landmark - On Gossip Hello - Self Cast 'Summon Pirate Treasure and Trigger Mob'"); + +-- Pirate treasure trigger mob +UPDATE `creature_template` SET `flags_extra` = `flags_extra` |0x80 WHERE `entry` = 7898; +UPDATE `smart_scripts` SET `event_flags` = 0, `comment` = "Pirate treasure trigger mob - On Just Created - Run Script" WHERE `entryorguid` = 7898 AND `source_type` = 0 AND `id` = 0; +UPDATE `smart_scripts` SET `event_param3` = 0, `event_param4` = 0 WHERE `entryorguid` = 789800 AND `source_type` = 9; +DELETE FROM `smart_scripts` WHERE `entryorguid` = 789800 AND `source_type` = 9 AND `id` = 5; + +-- Treasure Hunting Pirate SAI (Source: ACID 4.0.3 Official Data) +-- Original script was without initial timers for the 'Strike' and without the third emote +SET @ID := 7899; +UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID; +DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ID,0,0,0,4,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Treasure Hunting Pirate - On Aggro - Say Line 0"), +(@ID,0,1,0,0,0,100,0,6100,16400,8200,18100,0,11,11976,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Treasure Hunting Pirate - In Combat - Cast 'Strike'"); + +DELETE FROM `creature_text` WHERE `CreatureID` = @ID; +INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES +(@ID,0,0,"Hey! Get away from our treasure!",12,0,100,0,0,0,3931,0,"Treasure Hunting Pirate"), +(@ID,0,1,"That's our treasure, you lubber!",12,0,100,0,0,0,3932,0,"Treasure Hunting Pirate"), +(@ID,0,2,"We didn't hide this stuff just you could steal it!",12,0,100,0,0,0,3933,0,"Treasure Hunting Pirate"); + +-- Treasure Hunting Swashbuckler SAI (Source: ACID 4.0.3 Official Data) +-- Original script was without the third emote +SET @ID := 7901; +UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID; +DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ID,0,0,0,4,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Treasure Hunting Swashbuckler - On Aggro - Say Line 0"), +(@ID,0,1,0,0,0,100,0,10200,23100,21900,28400,0,11,6713,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Treasure Hunting Swashbuckler - In Combat - Cast 'Disarm'"); + +DELETE FROM `creature_text` WHERE `CreatureID` = @ID; +INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES +(@ID,0,0,"Hey! Get away from our treasure!",12,0,100,0,0,0,3931,0,"Treasure Hunting Swashbuckler"), +(@ID,0,1,"That's our treasure, you lubber!",12,0,100,0,0,0,3932,0,"Treasure Hunting Swashbuckler"), +(@ID,0,2,"We didn't hide this stuff just you could steal it!",12,0,100,0,0,0,3933,0,"Treasure Hunting Swashbuckler"); + +-- Treasure Hunting Buccaneer SAI (Source: ACID 4.0.3 Official Data) +-- Original script was without initial timers for the 'Strike' and without the third emote +SET @ID := 7902; +UPDATE `creature_template` SET `AIName` = "SmartAI" WHERE `entry` = @ID; +DELETE FROM `smart_scripts` WHERE `entryorguid` = @ID AND `source_type` = 0; +INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`event_param5`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_param4`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES +(@ID,0,0,0,4,0,100,0,0,0,0,0,0,1,0,0,0,0,0,0,7,0,0,0,0,0,0,0,0,"Treasure Hunting Buccaneer - On Aggro - Say Line 0"), +(@ID,0,1,0,0,0,100,0,6100,16400,8200,18100,0,11,11976,0,0,0,0,0,2,0,0,0,0,0,0,0,0,"Treasure Hunting Buccaneer - In Combat - Cast 'Strike'"); + +DELETE FROM `creature_text` WHERE `CreatureID` = @ID; +INSERT INTO `creature_text` (`CreatureID`,`GroupID`,`ID`,`Text`,`Type`,`Language`,`Probability`,`Emote`,`Duration`,`Sound`,`BroadcastTextId`,`TextRange`,`comment`) VALUES +(@ID,0,0,"Hey! Get away from our treasure!",12,0,100,0,0,0,3931,0,"Treasure Hunting Buccaneer"), +(@ID,0,1,"That's our treasure, you lubber!",12,0,100,0,0,0,3932,0,"Treasure Hunting Buccaneer"), +(@ID,0,2,"We didn't hide this stuff just you could steal it!",12,0,100,0,0,0,3933,0,"Treasure Hunting Buccaneer");
\ No newline at end of file diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 57ecc3fcc47..ad4c57d07b0 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -652,41 +652,6 @@ public: }; /*###### -## go_inconspicuous_landmark -######*/ - -enum InconspicuousLandmark -{ - SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB = 11462, - ITEM_CUERGOS_KEY = 9275, -}; - -class go_inconspicuous_landmark : public GameObjectScript -{ -public: - go_inconspicuous_landmark() : GameObjectScript("go_inconspicuous_landmark") { } - - struct go_inconspicuous_landmarkAI : public GameObjectAI - { - go_inconspicuous_landmarkAI(GameObject* go) : GameObjectAI(go) { } - - bool GossipHello(Player* player) override - { - if (player->HasItemCount(ITEM_CUERGOS_KEY)) - return false; - - player->CastSpell(player, SPELL_SUMMON_PIRATES_TREASURE_AND_TRIGGER_MOB, true); - return true; - } - }; - - GameObjectAI* GetAI(GameObject* go) const override - { - return new go_inconspicuous_landmarkAI(go); - } -}; - -/*###### ## go_soulwell ######*/ @@ -1642,7 +1607,6 @@ void AddSC_go_scripts() new go_blood_filled_orb(); new go_jotunheim_cage(); new go_table_theka(); - new go_inconspicuous_landmark(); new go_soulwell(); new go_amberpine_outhouse(); new go_hive_pod(); |