diff options
| -rw-r--r-- | sql/updates/world/2013_01_02_06_world_sai.sql | 9 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_02_06_world_waypoints.sql | 283 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_02_07_world_waypoints.sql | 157 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_02_08_world_sai.sql | 392 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_02_09_world_waypoints.sql | 138 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_02_10_world_sai.sql | 2 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_02_11_world_sai.sql | 34 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_02_12_world_go_script.sql | 11 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_02_12_world_waypoints.sql | 218 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_03_00_world_gameobject_scripts.sql | 6 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_03_01_world_sai.sql | 7 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_03_02_world_sai.sql | 10 | ||||
| -rw-r--r-- | sql/updates/world/2013_01_03_03_world_spelldifficulty_dbc.sql | 3 | ||||
| -rw-r--r-- | src/server/game/AI/CoreAI/UnitAI.cpp | 22 | ||||
| -rw-r--r-- | src/server/game/AI/CreatureAI.cpp | 88 | ||||
| -rw-r--r-- | src/server/game/AI/CreatureAIImpl.h | 110 | ||||
| -rw-r--r-- | src/server/game/Battlefield/BattlefieldMgr.cpp | 2 | ||||
| -rw-r--r-- | src/server/game/Spells/Spell.cpp | 8 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/CMakeLists.txt | 48 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp | 11 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp (renamed from src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp (renamed from src/server/scripts/EasternKingdoms/alterac_mountains.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp (renamed from src/server/scripts/EasternKingdoms/arathi_highlands.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp (renamed from src/server/scripts/EasternKingdoms/blasted_lands.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp (renamed from src/server/scripts/EasternKingdoms/burning_steppes.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_duskwood.cpp (renamed from src/server/scripts/EasternKingdoms/duskwood.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp (renamed from src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp (renamed from src/server/scripts/EasternKingdoms/eversong_woods.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_ghostlands.cpp (renamed from src/server/scripts/EasternKingdoms/ghostlands.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_hinterlands.cpp (renamed from src/server/scripts/EasternKingdoms/hinterlands.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_ironforge.cpp (renamed from src/server/scripts/EasternKingdoms/ironforge.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp (renamed from src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_loch_modan.cpp (renamed from src/server/scripts/EasternKingdoms/loch_modan.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp (renamed from src/server/scripts/EasternKingdoms/redridge_mountains.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp (renamed from src/server/scripts/EasternKingdoms/silvermoon_city.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp (renamed from src/server/scripts/EasternKingdoms/silverpine_forest.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp (renamed from src/server/scripts/EasternKingdoms/stormwind_city.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp (renamed from src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp (renamed from src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp (renamed from src/server/scripts/EasternKingdoms/tirisfal_glades.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_undercity.cpp (renamed from src/server/scripts/EasternKingdoms/undercity.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp (renamed from src/server/scripts/EasternKingdoms/western_plaguelands.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_westfall.cpp (renamed from src/server/scripts/EasternKingdoms/westfall.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/EasternKingdoms/zone_wetlands.cpp (renamed from src/server/scripts/EasternKingdoms/wetlands.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/CMakeLists.txt | 45 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_ashenvale.cpp (renamed from src/server/scripts/Kalimdor/ashenvale.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_azshara.cpp (renamed from src/server/scripts/Kalimdor/azshara.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp (renamed from src/server/scripts/Kalimdor/azuremyst_isle.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp (renamed from src/server/scripts/Kalimdor/bloodmyst_isle.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_darkshore.cpp (renamed from src/server/scripts/Kalimdor/darkshore.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_desolace.cpp (renamed from src/server/scripts/Kalimdor/desolace.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_durotar.cpp (renamed from src/server/scripts/Kalimdor/durotar.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp (renamed from src/server/scripts/Kalimdor/dustwallow_marsh.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_felwood.cpp (renamed from src/server/scripts/Kalimdor/felwood.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_feralas.cpp (renamed from src/server/scripts/Kalimdor/feralas.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_moonglade.cpp (renamed from src/server/scripts/Kalimdor/moonglade.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_mulgore.cpp (renamed from src/server/scripts/Kalimdor/mulgore.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_orgrimmar.cpp (renamed from src/server/scripts/Kalimdor/orgrimmar.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_silithus.cpp (renamed from src/server/scripts/Kalimdor/silithus.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp (renamed from src/server/scripts/Kalimdor/stonetalon_mountains.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_tanaris.cpp (renamed from src/server/scripts/Kalimdor/tanaris.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_teldrassil.cpp (renamed from src/server/scripts/Kalimdor/teldrassil.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_the_barrens.cpp (renamed from src/server/scripts/Kalimdor/the_barrens.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_thousand_needles.cpp (renamed from src/server/scripts/Kalimdor/thousand_needles.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_thunder_bluff.cpp (renamed from src/server/scripts/Kalimdor/thunder_bluff.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_ungoro_crater.cpp (renamed from src/server/scripts/Kalimdor/ungoro_crater.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Kalimdor/zone_winterspring.cpp (renamed from src/server/scripts/Kalimdor/winterspring.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/CMakeLists.txt | 26 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp (renamed from src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp (renamed from src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_borean_tundra.cpp (renamed from src/server/scripts/Northrend/borean_tundra.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_crystalsong_forest.cpp (renamed from src/server/scripts/Northrend/crystalsong_forest.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_dalaran.cpp (renamed from src/server/scripts/Northrend/dalaran.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_dragonblight.cpp (renamed from src/server/scripts/Northrend/dragonblight.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_grizzly_hills.cpp (renamed from src/server/scripts/Northrend/grizzly_hills.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_howling_fjord.cpp (renamed from src/server/scripts/Northrend/howling_fjord.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_icecrown.cpp (renamed from src/server/scripts/Northrend/icecrown.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_sholazar_basin.cpp (renamed from src/server/scripts/Northrend/sholazar_basin.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_storm_peaks.cpp (renamed from src/server/scripts/Northrend/storm_peaks.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_wintergrasp.cpp (renamed from src/server/scripts/Northrend/wintergrasp.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Northrend/zone_zuldrak.cpp (renamed from src/server/scripts/Northrend/zuldrak.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp (renamed from src/server/scripts/Outland/TempestKeep/botanica/thorngrin_the_tender.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_blades_edge_mountains.cpp (renamed from src/server/scripts/Outland/blades_edge_mountains.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_hellfire_peninsula.cpp (renamed from src/server/scripts/Outland/hellfire_peninsula.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_nagrand.cpp (renamed from src/server/scripts/Outland/nagrand.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_netherstorm.cpp (renamed from src/server/scripts/Outland/netherstorm.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_shadowmoon_valley.cpp (renamed from src/server/scripts/Outland/shadowmoon_valley.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_shattrath_city.cpp (renamed from src/server/scripts/Outland/shattrath_city.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_terokkar_forest.cpp (renamed from src/server/scripts/Outland/terokkar_forest.cpp) | 0 | ||||
| -rw-r--r-- | src/server/scripts/Outland/zone_zangarmarsh.cpp (renamed from src/server/scripts/Outland/zangarmarsh.cpp) | 0 | ||||
| -rw-r--r-- | src/server/shared/Database/PreparedStatement.cpp | 6 | ||||
| -rw-r--r-- | src/server/shared/Database/PreparedStatement.h | 2 |
93 files changed, 1466 insertions, 190 deletions
diff --git a/sql/updates/world/2013_01_02_06_world_sai.sql b/sql/updates/world/2013_01_02_06_world_sai.sql new file mode 100644 index 00000000000..2ce089188d6 --- /dev/null +++ b/sql/updates/world/2013_01_02_06_world_sai.sql @@ -0,0 +1,9 @@ +DELETE FROM `gameobject_scripts` WHERE `id`=12148; +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (17156,17157); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (17156,17157) 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`,`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 +-- Stonewraught Gate +(17156,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,30084,150138,0,0,0,0,0,'Door lever - On activate - Activate Door'), -- autoclose is set to 3s, old script suggested 15s !? +(17157,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14, 6943,150137,0,0,0,0,0,'Door lever - On activate - Activate Door'); -- autoclose is set to 3s, old script suggested 15s !? +-- uldaman shit +DELETE FROM `gameobject_scripts` where `id` =14393; -- the keystone already has a cpp, if the door doesnt open, then add it there! diff --git a/sql/updates/world/2013_01_02_06_world_waypoints.sql b/sql/updates/world/2013_01_02_06_world_waypoints.sql new file mode 100644 index 00000000000..c7302a457a2 --- /dev/null +++ b/sql/updates/world/2013_01_02_06_world_waypoints.sql @@ -0,0 +1,283 @@ +-- Pathing for Commander Sarannis Entry: 17976 +SET @NPC := 82986; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=125.7293,`position_y`=321.185,`position_z`=-3.635947 WHERE `guid`=@NPC; +DELETE FROM `creature_template_addon` WHERE `entry`=17976; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (17976,@PATH,1,0, '19818'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,125.7293,321.185,-3.635947,1000,0,0,100,0), +(@PATH,2,135.6253,311.316,-1.57836,0,0,0,100,0), +(@PATH,3,150.9637,296.034,-4.566956,1000,0,0,100,0), +(@PATH,4,135.6253,311.316,-1.57836,0,0,0,100,0); + +-- Pathing for High Botanist Freywinn Entry: 17975 +SET @NPC := 82987; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=116.3259,`position_y`=455.5696,`position_z`=-4.941401 WHERE `guid`=@NPC; +DELETE FROM `creature_template_addon` WHERE `entry`=17975; +INSERT INTO `creature_template_addon` (`entry`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (17975,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,116.3259,455.5696,-4.941401,3.385939,20000,0,0,100,0), +(@PATH,2,120.164,450.6817,-4.894922,0,500,0,0,100,0), +(@PATH,3,120.164,450.6817,-4.894922,4.555309,20000,0,0,100,0), +(@PATH,4,116.3259,455.5696,-4.941401,0,500,0,0,100,0); + +-- Pathing for Bloodwarder Greenkeeper Entry: 18419 +SET @NPC := 82994; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-4.453328,`position_y`=252.8713,`position_z`=-5.396591 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-4.453328,252.8713,-5.396591,0.06981317,10000,0,49,100,0), +(@PATH,2,-4.453328,252.8713,-5.396591,2.146755,19000,0,476,100,0); + +-- Pathing for Bloodwarder Greenkeeper Entry: 18419 +SET @NPC := 82993; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=3.139327,`position_y`=253.476,`position_z`=-5.392399 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,3.139327,253.476,-5.392399,3.141593,10000,0,49,100,0), +(@PATH,2,3.139327,253.476,-5.392399,0.9773844,19000,0,476,100,0); + +DELETE FROM `waypoint_scripts` WHERE `id`=49; +INSERT INTO `waypoint_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`guid`) VALUES +(49,1,1,378,1,68); + +-- Pathing for Bloodwarder Greenkeeper Entry: 18419 +SET @NPC := 82983; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=2.213146,`position_y`=163.0322,`position_z`=-5.54038 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,2.213146,163.0322,-5.54038,2.251475,26000,0,0,100,0), +(@PATH,2,-0.7086419,160.2672,-5.540373,0,0,0,0,100,0), +(@PATH,3,-4.294355,161.2607,-5.540364,0,0,0,0,100,0), +(@PATH,4,-6.205455,163.514,-5.54036,0,0,0,0,100,0), +(@PATH,5,-6.24241,166.6921,-5.540361,0,0,0,0,100,0), +(@PATH,6,-6.24241,166.6921,-5.540361,1.780236,18000,0,0,100,0), +(@PATH,7,-3.464332,161.0224,-5.540366,0,0,0,0,100,0), +(@PATH,8,0.992403,160.6039,-5.540379,0,0,0,0,100,0), +(@PATH,9,2.213146,163.0322,-5.54038,0,0,0,0,100,0); + +-- Pathing for Bloodwarder Greenkeeper Entry: 18419 +SET @NPC := 82977; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=13.11812,`position_y`=198.4727,`position_z`=-5.54039 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,13.11812,198.4727,-5.54039,0,0,0,0,100,0), +(@PATH,2,13.11812,198.4727,-5.54039,0.8552113,7000,0,0,100,0), +(@PATH,3,13.77349,194.1652,-5.540394,0,0,0,0,100,0), +(@PATH,4,17.34217,193.0448,-5.540406,0,0,0,0,100,0), +(@PATH,5,17.34217,193.0448,-5.540406,0.9424778,18000,0,0,100,0), +(@PATH,6,13.03814,196.0347,-5.540391,0,0,0,0,100,0); + +-- Pathing for Bloodwarder Greenkeeper Entry: 18419 +SET @NPC := 82981; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=-8.21974,`position_y`=204.3309,`position_z`=-5.540359 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,-8.21974,204.3309,-5.540359,3.560472,26000,0,0,100,0), +(@PATH,2,-7.085683,202.0462,-5.540362,0,0,0,0,100,0), +(@PATH,3,-10.7415,199.8233,-5.540348,0,0,0,0,100,0), +(@PATH,4,-12.49067,195.6114,-5.540347,0,0,0,0,100,0), +(@PATH,5,-16.42434,194.2959,-5.540349,0,0,0,0,100,0), +(@PATH,6,-19.61755,196.9462,-5.540346,0,0,0,0,100,0), +(@PATH,7,-19.61755,196.9462,-5.540346,1.361357,22000,0,0,100,0), +(@PATH,8,-16.42434,194.2959,-5.540349,0,0,0,0,100,0), +(@PATH,9,-10.83238,198.4772,-5.540348,0,0,0,0,100,0), +(@PATH,10,-7.085683,202.0462,-5.540362,0,0,0,0,100,0), +(@PATH,11,-8.21974,204.3309,-5.540359,0,0,0,0,100,0); + +-- Pathing for Tempest-Forge Peacekeeper Entry: 18405 +SET @NPC := 82992; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=14.39464,`position_y`=191.6226,`position_z`=-5.540398 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,14.39464,191.6226,-5.540398,0,0,0,100,0), +(@PATH,2,14.18493,177.3456,-5.540413,0,0,0,100,0), +(@PATH,3,14.39464,191.6226,-5.540398,0,0,0,100,0), +(@PATH,4,9.744885,197.8509,-5.540387,0,0,0,100,0), +(@PATH,5,-0.7083383,202.6878,-5.540373,0,0,0,100,0), +(@PATH,6,-0.863688,242.4021,-5.575537,0,0,0,100,0), +(@PATH,7,-0.771556,202.717,-5.540379,0,0,0,100,0), +(@PATH,8,9.744885,197.8509,-5.540387,0,0,0,100,0); + +-- Pathing for Bloodfalcon Entry: 18155 +SET @NPC := 83010; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=100.8468,`position_y`=280.3725,`position_z`=-6.887547 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,100.8468,280.3725,-6.887547,0,0,0,100,0), +(@PATH,2,77.20944,279.0805,-5.444278,0,0,0,100,0), +(@PATH,3,84.07146,264.8167,-5.424605,0,0,0,100,0), +(@PATH,4,92.04115,267.708,-5.393034,0,0,0,100,0), +(@PATH,5,99.9794,272.1951,-6.974396,0,0,0,100,0); + +-- Pathing for Bloodfalcon Entry: 18155 +SET @NPC := 83009; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=109.3741,`position_y`=279.2442,`position_z`=-6.94078 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,109.3741,279.2442,-6.94078,0,0,0,100,0), +(@PATH,2,106.6039,296.3932,-6.736755,0,0,0,100,0), +(@PATH,3,114.8603,296.713,-5.403351,0,0,0,100,0), +(@PATH,4,120.5567,289.947,-5.410193,0,0,0,100,0), +(@PATH,5,119.7589,278.0228,-5.423053,0,0,0,100,0), +(@PATH,6,114.742,276.3138,-6.998993,0,0,0,100,0); + +-- Pathing for Bloodfalcon Entry: 18155 +SET @NPC := 83008; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=101.2185,`position_y`=295.671,`position_z`=-6.719101 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,101.2185,295.671,-6.719101,0,0,0,100,0), +(@PATH,2,101.0785,294.0834,-6.736097,0,0,0,100,0), +(@PATH,3,99.73528,294.2418,-6.727928,0,0,0,100,0), +(@PATH,4,99.9539,294.9124,-6.721509,0,0,0,100,0), +(@PATH,5,101.4649,294.7929,-6.730046,0,0,0,100,0), +(@PATH,6,97.40523,292.5155,-6.736019,0,0,0,100,0), +(@PATH,7,99.61896,292.5375,-6.746336,0,0,0,100,0), +(@PATH,8,99.74017,296.1521,-6.706696,0,0,0,100,0), +(@PATH,9,98.21532,295.972,-6.701425,0,0,0,100,0), +(@PATH,10,100.0779,295.0646,-6.720407,0,0,0,100,0), +(@PATH,11,101.4872,291.8169,-6.763266,0,0,0,100,0), +(@PATH,12,99.03914,291.6151,-6.753832,0,0,0,100,0), +(@PATH,13,100.0113,293.701,-6.735262,0,0,0,100,0), +(@PATH,14,99.75899,294.4994,-6.725174,0,0,0,100,0), +(@PATH,15,99.56416,293.6588,-6.733598,0,0,0,100,0), +(@PATH,16,99.97965,293.2847,-6.739742,0,0,0,100,0); + +-- Pathing for Bloodwarder Falconer Entry: 17994 +SET @NPC := 83007; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=102.2101,`position_y`=287.5207,`position_z`=-6.814517 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,102.2101,287.5207,-6.814517,0,0,0,0,100,0), +(@PATH,2,102.5804,286.6708,-6.825739,0,0,0,0,100,0), +(@PATH,3,102.1126,287.9805,-6.808935,0,0,0,0,100,0), +(@PATH,4,103.0655,288.2263,-6.810746,0,0,0,0,100,0), +(@PATH,5,102.2138,287.1823,-6.818299,0,0,0,0,100,0), +(@PATH,6,100.6942,286.5314,-6.818292,0,0,0,0,100,0), +(@PATH,7,101.7873,287.9028,-6.808247,0,0,0,0,100,0), +(@PATH,8,101.8391,289.0352,-6.795895,0,0,0,0,100,0), +(@PATH,9,102.7853,288.8042,-6.802979,0,0,0,0,100,0), +(@PATH,10,102.7853,288.8042,-6.802979,0.8377581,3000,0,50,100,0), +(@PATH,11,102.208,288.0875,-6.808199,0,0,0,0,100,0), +(@PATH,12,103.2457,288.6324,-6.807087,0,0,0,0,100,0), +(@PATH,13,101.3874,289.0022,-6.794107,0,0,0,0,100,0), +(@PATH,14,102.0153,287.4591,-6.814272,0,0,0,0,100,0), +(@PATH,15,101.6863,285.8949,-6.830106,0,0,0,0,100,0), +(@PATH,16,103.6638,286.2337,-6.83577,0,0,0,0,100,0), +(@PATH,17,103.6638,286.2337,-6.83577,0.8377581,3000,0,50,100,0), +(@PATH,18,101.7167,286.4881,-6.823652,0,0,0,0,100,0), +(@PATH,19,102.2377,286.9568,-6.820922,0,0,0,0,100,0), +(@PATH,20,102.3838,285.2078,-6.841079,0,0,0,0,100,0), +(@PATH,21,102.3838,285.2078,-6.841079,0.8377581,3000,0,50,100,0); + +DELETE FROM `waypoint_scripts` WHERE `id`=50; +INSERT INTO `waypoint_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`guid`) VALUES +(50,0,1,25,0,69); + +-- Pathing for Sunseeker Researcher Entry: 18421 +SET @NPC := 83052; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=158.1747,`position_y`=496.2738,`position_z`=-3.868253 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,158.1747,496.2738,-3.868253,0,0,0,100,0), +(@PATH,2,156.1526,489.3673,-4.857466,0,0,0,100,0), +(@PATH,3,150.5289,483.8496,-4.521907,0,0,0,100,0), +(@PATH,4,138.1562,471.4412,-1.710583,0,0,0,100,0), +(@PATH,5,125.0919,458.282,-4.002612,25000,0,0,100,0), +(@PATH,6,136.7875,469.6367,-1.535325,0,0,0,100,0), +(@PATH,7,143.6099,477.3061,-2.875249,0,0,0,100,0), +(@PATH,8,151.2965,484.3168,-4.559049,0,0,0,100,0), +(@PATH,9,157.2852,490.9466,-4.815495,0,0,0,100,0), +(@PATH,10,159.9993,499.248,-2.327699,0,0,0,100,0), +(@PATH,11,164.1381,501.6526,-2.169621,25000,0,0,100,0); + +-- Pathing for Sunseeker Botanist Entry: 18422 +SET @NPC := 83017; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=161.3267,`position_y`=377.6318,`position_z`=-5.38641 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,161.3267,377.6318,-5.38641,0,0,0,0,100,0), +(@PATH,2,161.3267,377.6318,-5.38641,3.892084,25000,0,0,100,0), +(@PATH,3,164.7352,383.6933,-5.386415,0,0,0,0,100,0), +(@PATH,4,164.0884,388.1612,-5.386421,0,0,0,0,100,0), +(@PATH,5,161.8422,392.5251,-5.386427,0,0,0,0,100,0), +(@PATH,6,159.0437,394.9259,-5.386432,0,0,0,0,100,0), +(@PATH,7,154.6845,398.0776,-5.386438,0,0,0,0,100,0), +(@PATH,8,153.9412,401.8906,-5.386443,0,0,0,0,100,0), +(@PATH,9,153.9412,401.8906,-5.386443,0.9424778,25000,0,0,100,0), +(@PATH,10,155.4246,397.5377,-5.386436,0,0,0,0,100,0), +(@PATH,11,157.8206,395.4006,-5.386433,0,0,0,0,100,0), +(@PATH,12,160.7398,392.5124,-5.386428,0,0,0,0,100,0), +(@PATH,13,163.7198,388.017,-5.386421,0,0,0,0,100,0), +(@PATH,14,163.845,385.0679,-5.386418,0,0,0,0,100,0), +(@PATH,15,163.1142,380.8199,-5.386413,0,0,0,0,100,0); +-- 0xF13047F60000354E .go 161.3267 377.6318 -5.38641 + +-- Pathing for Sunseeker Botanist Entry: 18422 +SET @NPC := 83030; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=185.3934,`position_y`=384.4199,`position_z`=-5.391479 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,185.3934,384.4199,-5.391479,0,0,0,0,100,0), +(@PATH,2,191.3777,384.4846,-5.404879,0,0,0,0,100,0), +(@PATH,3,191.3777,384.4846,-5.404879,0.7679449,25000,0,0,100,0), +(@PATH,4,186.8178,385.4778,-5.394615,0,0,0,0,100,0), +(@PATH,5,183.8889,388.4998,-5.3879,0,0,0,0,100,0), +(@PATH,6,182.7735,392.4268,-5.386416,0,0,0,0,100,0), +(@PATH,7,181.8264,397.8481,-5.386423,0,0,0,0,100,0), +(@PATH,8,177.4602,402.4377,-5.386431,0,0,0,0,100,0), +(@PATH,9,169.0016,404.7528,-5.386438,0,0,0,0,100,0), +(@PATH,10,161.5859,402.9305,-5.38644,0,0,0,0,100,0), +(@PATH,11,161.5859,402.9305,-5.38644,2.268928,25000,0,0,100,0), +(@PATH,12,165.1373,399.9031,-5.386434,0,0,0,0,100,0), +(@PATH,13,168.7618,399.839,-5.386432,0,0,0,0,100,0), +(@PATH,14,172.8151,400.5747,-5.386431,0,0,0,0,100,0), +(@PATH,15,177.9102,400.0075,-5.386427,0,0,0,0,100,0), +(@PATH,16,181.755,397.4692,-5.386423,0,0,0,0,100,0), +(@PATH,17,182.4747,393.0989,-5.386417,0,0,0,0,100,0), +(@PATH,18,183.0329,388.3197,-5.386411,0,0,0,0,100,0); + +DELETE FROM `creature` WHERE `guid` IN (83022,83027,83023,83026); diff --git a/sql/updates/world/2013_01_02_07_world_waypoints.sql b/sql/updates/world/2013_01_02_07_world_waypoints.sql new file mode 100644 index 00000000000..b49fd0b28a6 --- /dev/null +++ b/sql/updates/world/2013_01_02_07_world_waypoints.sql @@ -0,0 +1,157 @@ +-- Pathing for Hath'ar Necromagus Entry: 28257 +SET @NPC := 104622; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5019.215,`position_y`=-3688.894,`position_z`=320.5594 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5019.215,-3688.894,320.5594,0,0,0,100,0), +(@PATH,2,5002.956,-3658.76,323.2104,0,0,0,100,0), +(@PATH,3,4992.721,-3643.726,324.9065,0,0,0,100,0), +(@PATH,4,5002.956,-3658.76,323.2104,0,0,0,100,0), +(@PATH,5,5019.215,-3688.894,320.5594,0,0,0,100,0), +(@PATH,6,5019.668,-3703.462,320.5379,0,0,0,100,0); + +-- Pathing for Hath'ar Necromagus Entry: 28257 +SET @NPC := 104614; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5025.362,`position_y`=-3604.257,`position_z`=349.464 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5025.362,-3604.257,349.464,0,0,0,100,0), +(@PATH,2,5041.33,-3605.005,352.8885,0,0,0,100,0), +(@PATH,3,5052.726,-3607.239,355.7938,0,0,0,100,0), +(@PATH,4,5066.022,-3605.421,360.1152,0,0,0,100,0), +(@PATH,5,5080.014,-3609.861,362.831,0,0,0,100,0), +(@PATH,6,5095.403,-3626.727,359.9017,0,0,0,100,0), +(@PATH,7,5109.978,-3643.893,366.1679,0,0,0,100,0), +(@PATH,8,5115.737,-3659.64,372.9412,0,0,0,100,0), +(@PATH,9,5119.728,-3671.96,375.7362,0,0,0,100,0), +(@PATH,10,5115.737,-3659.64,372.9412,0,0,0,100,0), +(@PATH,11,5110.043,-3644.025,366.2568,0,0,0,100,0), +(@PATH,12,5095.57,-3627.037,360.0706,0,0,0,100,0), +(@PATH,13,5080.014,-3609.861,362.831,0,0,0,100,0), +(@PATH,14,5066.022,-3605.421,360.1152,0,0,0,100,0), +(@PATH,15,5052.726,-3607.239,355.7938,0,0,0,100,0), +(@PATH,16,5041.33,-3605.005,352.8885,0,0,0,100,0); + +-- Pathing for Hath'ar Necromagus Entry: 28257 +SET @NPC := 104619; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5071.903,`position_y`=-3665.457,`position_z`=295.4549 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5071.903,-3665.457,295.4549,0,0,0,100,0), +(@PATH,2,5059.392,-3682.827,295.5384,0,0,0,100,0), +(@PATH,3,5037.78,-3681.667,299.7601,0,0,0,100,0), +(@PATH,4,5028.569,-3670.129,300.9308,0,0,0,100,0), +(@PATH,5,5026.874,-3657.909,301.366,0,0,0,100,0), +(@PATH,6,5035.031,-3642.29,299.8145,0,0,0,100,0), +(@PATH,7,5053.08,-3636.957,297.5071,0,0,0,100,0), +(@PATH,8,5067.131,-3644.62,295.7921,0,0,0,100,0); + +-- Pathing for Drakuru's Guard Entry: 28803 +SET @NPC := 107821; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6114.339,`position_y`=-2034.41,`position_z`=417.6801 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6114.339,-2034.41,417.6801,0,0,0,100,0), +(@PATH,2,6129.907,-2060.738,417.5455,0,0,0,100,0), +(@PATH,3,6144.443,-2073.784,417.6692,0,0,0,100,0), +(@PATH,4,6171.715,-2080.903,417.5605,0,0,0,100,0), +(@PATH,5,6185.524,-2080.392,417.5476,0,0,0,100,0), +(@PATH,6,6171.715,-2080.903,417.5605,0,0,0,100,0), +(@PATH,7,6144.443,-2073.784,417.6692,0,0,0,100,0), +(@PATH,8,6129.907,-2060.738,417.5455,0,0,0,100,0); + +-- Pathing for Drakuru's Guard Entry: 28803 +SET @NPC := 107817; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6194.729,`position_y`=-2078.011,`position_z`=417.6379 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6194.729,-2078.011,417.6379,0,0,0,100,0), +(@PATH,2,6217.196,-2064.708,417.5335,0,0,0,100,0), +(@PATH,3,6232.834,-2048.468,417.6579,0,0,0,100,0), +(@PATH,4,6240.251,-2020.826,417.5575,0,0,0,100,0), +(@PATH,5,6238.296,-2002.501,417.7368,0,0,0,100,0), +(@PATH,6,6240.251,-2020.826,417.5575,0,0,0,100,0), +(@PATH,7,6232.834,-2048.468,417.6579,0,0,0,100,0), +(@PATH,8,6217.196,-2064.708,417.5335,0,0,0,100,0); + +-- Pathing for Drakuru's Guard Entry: 28803 +SET @NPC := 107836; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6236.967,`position_y`=-1995.491,`position_z`=417.6333 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6236.967,-1995.491,417.6333,0,0,0,100,0), +(@PATH,2,6228.093,-1980.412,417.5516,0,0,0,100,0), +(@PATH,3,6215.869,-1967.486,417.5413,0,0,0,100,0), +(@PATH,4,6196.992,-1955.543,417.5889,0,0,0,100,0), +(@PATH,5,6174.948,-1953.596,417.5572,0,0,0,100,0), +(@PATH,6,6164.511,-1955.177,417.5472,0,0,0,100,0), +(@PATH,7,6174.948,-1953.596,417.5572,0,0,0,100,0), +(@PATH,8,6196.992,-1955.543,417.5889,0,0,0,100,0), +(@PATH,9,6215.869,-1967.486,417.5413,0,0,0,100,0), +(@PATH,10,6228.093,-1980.412,417.5516,0,0,0,100,0); + +-- Pathing for Drakuru's Guard Entry: 28803 +SET @NPC := 107821; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6119.209,`position_y`=-1985.834,`position_z`=417.6736 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6119.209,-1985.834,417.6736,0,0,0,100,0), +(@PATH,2,6109.752,-2008.77,417.5636,0,0,0,100,0), +(@PATH,3,6113.512,-2033.001,417.7308,0,0,0,100,0), +(@PATH,4,6109.752,-2008.77,417.5636,0,0,0,100,0); + +-- Pathing for Drakuru's Guard Entry: 28803 +SET @NPC := 107837; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6194.729,`position_y`=-2078.011,`position_z`=417.6379 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6194.729,-2078.011,417.6379,0,0,0,100,0), +(@PATH,2,6217.196,-2064.708,417.5335,0,0,0,100,0), +(@PATH,3,6232.834,-2048.468,417.6579,0,0,0,100,0), +(@PATH,4,6240.251,-2020.826,417.5575,0,0,0,100,0), +(@PATH,5,6238.296,-2002.501,417.7368,0,0,0,100,0), +(@PATH,6,6240.251,-2020.826,417.5575,0,0,0,100,0), +(@PATH,7,6232.834,-2048.468,417.6579,0,0,0,100,0), +(@PATH,8,6217.196,-2064.708,417.5335,0,0,0,100,0); + +-- Pathing for Shalewing Guard Entry: 28879 +SET @NPC := 115429; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6184.199,`position_y`=-1985.717,`position_z`=434.6442 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6184.199,-1985.717,434.6442,0,0,0,100,0), +(@PATH,2,6205.602,-1997.712,423.9775,0,0,0,100,0), +(@PATH,3,6209.002,-2021.652,426.0051,0,0,0,100,0), +(@PATH,4,6191.328,-2043.418,431.6164,0,0,0,100,0), +(@PATH,5,6172.321,-2047.748,423.9775,0,0,0,100,0), +(@PATH,6,6159.705,-2039.765,423.9775,0,0,0,100,0), +(@PATH,7,6151.034,-2030.29,423.9775,0,0,0,100,0), +(@PATH,8,6148.249,-2012.318,427.6442,0,0,0,100,0), +(@PATH,9,6160.55,-1991.355,423.9775,0,0,0,100,0); diff --git a/sql/updates/world/2013_01_02_08_world_sai.sql b/sql/updates/world/2013_01_02_08_world_sai.sql new file mode 100644 index 00000000000..a3f0dde4658 --- /dev/null +++ b/sql/updates/world/2013_01_02_08_world_sai.sql @@ -0,0 +1,392 @@ +-- SAI for Mummified Atal''ai +SET @ENTRY := 5263; +UPDATE `smart_scripts` SET `event_flags`=2 WHERE `entryorguid`=5263 AND `id`=0; +DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY AND `id`=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`,`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 +(@ENTRY,0,1,0,0,0,100,0,8000,15000,4000,10000,11,16186,32,0,0,0,0,2,0,0,0,0,0,0,0,'Mummified Atal''ai - In Combat - Cast Fevered Plague'); + +UPDATE `smart_scripts` SET `event_flags`=1 WHERE `entryorguid` IN (824,5243); +UPDATE `smart_scripts` SET `event_flags`=0 WHERE `entryorguid` IN (5261); + +DELETE FROM `linked_respawn` WHERE `guid` IN (83022,83027,83023,83026); + +-- Winterskorn Tribesman SAI +SET @ENTRY := 23661; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,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"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Tribesman - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Winterskorn Woodsman SAI +SET @ENTRY := 23662; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,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"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Woodsman - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Winterskorn Shield-Maiden SAI +SET @ENTRY := 23663; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Shield-Maiden - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Winterskorn Warrior SAI +SET @ENTRY := 23664; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Warrior - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Warrior - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Winterskorn Raider SAI +SET @ENTRY := 23665; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Raider - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Raider - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Winterskorn Berserker SAI +SET @ENTRY := 23666; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Berserker - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Berserker - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Berserker - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,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"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Berserker - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Winterskorn Rune-Seer SAI +SET @ENTRY := 23667; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Seer - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Winterskorn Rune-Caster SAI +SET @ENTRY := 23668; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Rune-Caster - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Winterskorn Oracle SAI +SET @ENTRY := 23669; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,11,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Oracle - On Respawn - Set Phase 0"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,28,43059,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Oracle - On Respawn - Remove Aura Gruesome, But Necessary: Vrykul On Dismember"), +(@ENTRY,0,2,0,6,0,100,1,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Oracle - On Death - Set Phase 1"), +(@ENTRY,0,3,4,8,1,100,0,43036,0,0,0,11,43059,16,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"), +(@ENTRY,0,4,5,61,1,100,0,0,0,0,0,11,43037,16,0,0,0,0,7,0,0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit Dismembering Corpse - Cast Gruesome, But Necessary: Kill Credit"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,22,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Winterskorn Oracle - On Spellhit Dismembering Corpse - Set Phase 2"); + +-- Illidari Heartseeker SAI +SET @ENTRY := 23339; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,1,0,100,3,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - Out Of Combat - Start Auto Attack"), +(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,41169,0,0,0,0,0,2,0,0,0,0,0,0,0,"Illidari Heartseeker - On Aggro - Cast Shoot"), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - On Aggro - Increment Phase"), +(@ENTRY,0,4,5,9,1,100,2,5,30,3900,5900,11,41169,0,0,0,0,0,2,0,0,0,0,0,0,0,"Illidari Heartseeker - At 5 - 30 Range - Cast Shoot"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 5 - 30 Range - Display ranged weapon"), +(@ENTRY,0,6,7,9,1,100,3,25,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 25 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 25 - 80 Range - Start Auto Attack"), +(@ENTRY,0,8,9,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,9,10,9,1,100,3,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 0 - 5 Range - Display melee weapon"), +(@ENTRY,0,10,0,61,1,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 0 - 5 Range - Start Auto Attack"), +(@ENTRY,0,11,12,9,1,100,3,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,12,0,61,1,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - At 5 - 15 Range - Start Auto Attack"), +(@ENTRY,0,13,0,0,0,100,2,7000,11000,19000,25000,11,41173,1,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - In Combat - Cast Rapid Shot"), +(@ENTRY,0,14,0,0,0,100,2,45000,60000,60000,75000,11,41171,1,0,0,0,0,2,0,0,0,0,0,0,0,"Illidari Heartseeker - In Combat - Cast Skeleton Shot"), +(@ENTRY,0,15,0,2,0,100,3,0,50,0,0,11,41170,1,0,0,0,0,2,0,0,0,0,0,0,0,"Illidari Heartseeker - At 50% HP - Cast Curse of the Bleakheart"), +(@ENTRY,0,16,0,7,0,100,0,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Illidari Heartseeker - On Evade - Display melee weapon"); + +-- Ashtongue Stormcaller SAI +SET @ENTRY := 22846; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,0,1,0,100,3,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,0,1,0,100,3,1000,1000,0,0,11,39534,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - Out Of Combat - Cast Summon Storm Fury"), +(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,41151,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - On Aggro - Cast Lightning Shield"), +(@ENTRY,0,3,4,61,0,100,0,0,0,0,0,11,20793,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ashtongue Stormcaller - On Aggro - Cast Fireball"), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - On Aggro - Increment Phase"), +(@ENTRY,0,5,0,9,1,100,2,0,40,3800,5200,11,41184,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 0 - 40 Range - Cast Lightning Bolt"), +(@ENTRY,0,6,7,3,1,100,3,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 15% Mana - Allow Combat Movement"), +(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 15% Mana - Increment Phase"), +(@ENTRY,0,8,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 35 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,9,0,9,1,100,3,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,10,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,11,0,3,2,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ashtongue Stormcaller - At Mana +30% - Decrement Phase"), +(@ENTRY,0,12,0,0,0,100,2,12000,18000,22000,28000,11,41183,1,0,0,0,0,5,0,0,0,0,0,0,0,"Ashtongue Stormcaller - In Combat - Cast Chain Lightning"); + +-- Sandfury Acolyte SAI +SET @ENTRY := 8876; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,0,11,0,100,3,0,0,0,0,79,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - On Respawn - Set Ranged Movement"), +(@ENTRY,0,1,2,4,0,100,3,0,0,0,0,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Acolyte - On Aggro - Cast Shadow Bolt"), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - On Aggro - Increment Phase"), +(@ENTRY,0,3,0,9,1,100,2,0,40,2400,3800,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Acolyte - At 0 - 40 Range - Cast Shadow Bolt"), +(@ENTRY,0,4,5,3,1,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 15% Mana - Allow Combat Movement"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 15% Mana - Increment Phase"), +(@ENTRY,0,6,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 35 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,7,0,9,1,100,3,5,15,0,0,79,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 5 - 15 Range - Set Ranged Movement"), +(@ENTRY,0,8,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,9,0,3,2,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Acolyte - At 30% Mana - Decrement Phase"), +(@ENTRY,0,10,0,0,0,100,2,8000,10000,25000,31000,11,11639,1,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Acolyte - In Combat - Cast Shadow Word: Pain"), +(@ENTRY,0,11,0,0,0,100,2,4000,6000,120000,135000,11,11980,1,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Acolyte - In Combat - Cast Curse of Weakness"), +(@ENTRY,0,12,0,0,0,100,2,5000,6000,15000,22000,11,11981,1,0,0,0,0,5,0,0,0,0,0,0,0,"Sandfury Acolyte - In Combat - Cast Mana Burn"); + +-- Oro Eyegouge SAI +SET @ENTRY := 7606; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,0,11,0,100,3,0,0,0,0,79,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - On Respawn - Set Ranged Movement"), +(@ENTRY,0,1,2,4,0,100,3,0,0,0,0,11,12741,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - On Aggro - Cast Curse of Weakness"), +(@ENTRY,0,2,3,61,0,100,0,0,0,0,0,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,"Oro Eyegouge - On Aggro - Cast Shadow Bolt"), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - On Aggro - Increment Phase"), +(@ENTRY,0,4,0,9,1,100,2,0,40,2400,3800,11,9613,0,0,0,0,0,2,0,0,0,0,0,0,0,"Oro Eyegouge - At 0 - 40 Range - Cast Shadow Bolt"), +(@ENTRY,0,5,6,3,1,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 15% Mana - Allow Combat Movement"), +(@ENTRY,0,6,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 15% Mana - Increment Phase"), +(@ENTRY,0,7,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 35 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,8,0,9,1,100,3,5,15,0,0,79,15,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 5 - 15 Range - Set Ranged Movement"), +(@ENTRY,0,9,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,10,0,3,2,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Oro Eyegouge - At 30% Mana - Decrement Phase"), +(@ENTRY,0,11,0,0,0,80,2,5000,7000,23000,27000,11,11962,0,0,0,0,0,2,0,0,0,0,0,0,0,"Oro Eyegouge - In Combat - Cast Immolate"), +(@ENTRY,0,12,0,0,0,80,2,8000,10000,15000,18250,11,11990,0,0,0,0,0,2,0,0,0,0,0,0,0,"Oro Eyegouge - In Combat - Cast Rain of Fire"); + +-- Sandfury Shadowhunter SAI +SET @ENTRY := 7246; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,1,0,100,2,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - Out Of Combat - Start Auto Attack"), +(@ENTRY,0,2,3,4,0,100,2,0,0,0,0,11,15547,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Shadowhunter - On Aggro - Cast Shoot"), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - On Aggro - Increment Phase"), +(@ENTRY,0,4,5,9,1,100,2,5,30,2300,3900,11,15547,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 5 - 30 Range - Cast Shoot"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 5 - 30 Range - Display ranged weapon"), +(@ENTRY,0,6,7,9,1,100,2,25,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 25 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,7,0,61,1,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 25 - 80 Range - Start Auto Attack"), +(@ENTRY,0,8,9,9,1,100,2,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,9,10,61,1,100,0,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 0 - 5 Range - Display melee weapon"), +(@ENTRY,0,10,0,61,1,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 0 - 5 Range - Start Auto Attack"), +(@ENTRY,0,11,12,9,1,100,2,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,12,0,61,1,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 5 - 15 Range - Start Auto Attack"), +(@ENTRY,0,13,0,0,0,100,2,7000,12000,18000,25000,11,11641,1,0,0,0,0,6,0,0,0,0,0,0,0,"Sandfury Shadowhunter - In Combat - Cast Hex"), +(@ENTRY,0,14,0,2,0,100,3,0,15,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 15% HP - Increment Phase"), +(@ENTRY,0,15,16,2,2,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 15% HP - Allow Combat Movement"), +(@ENTRY,0,16,0,61,2,100,0,0,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Sandfury Shadowhunter - At 15% HP - Flee For Assist"), +(@ENTRY,0,17,0,7,0,100,2,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowhunter - On Evade - Display melee weapon"); + +-- Sandfury Shadowcaster SAI +SET @ENTRY := 5648; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,0,1,0,100,3,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,0,1,0,100,2,1000,1000,1800000,1800000,11,20798,1,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - Out Of Combat - Cast Demon Skin"), +(@ENTRY,0,2,3,4,0,100,2,0,0,0,0,11,12471,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Shadowcaster - On Aggro - Cast Shadow Bolt"), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - On Aggro - Increment Phase"), +(@ENTRY,0,4,0,9,1,100,2,0,40,2400,3800,11,12471,0,0,0,0,0,2,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 0 - 40 Range - Cast Shadow Bolt"), +(@ENTRY,0,5,6,3,1,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% Mana - Allow Combat Movement"), +(@ENTRY,0,6,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% Mana - Increment Phase"), +(@ENTRY,0,7,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 35 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,8,0,9,1,100,3,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,9,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,10,0,3,4,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 30% Mana - Decrement Phase"), +(@ENTRY,0,11,0,0,0,100,2,6000,9000,23000,28000,11,14032,1,0,0,0,0,5,0,0,0,0,0,0,0,"Sandfury Shadowcaster - In Combat - Cast Shadow Word: Pain"), +(@ENTRY,0,12,0,2,2,100,3,0,15,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% HP - Set Phase 3"), +(@ENTRY,0,13,14,2,2,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% HP - Allow Combat Movement"), +(@ENTRY,0,14,0,61,0,100,0,0,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Sandfury Shadowcaster - At 15% HP - Flee For Assist"); + +-- Druid of the Fang SAI +SET @ENTRY := 3840; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,0,1,0,100,3,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,2,4,0,100,2,0,0,0,0,11,9532,0,0,0,0,0,2,0,0,0,0,0,0,0,"Druid of the Fang - On Aggro - Cast Lightning Bolt"), +(@ENTRY,0,2,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - On Aggro - Increment Phase"), +(@ENTRY,0,3,0,9,1,100,2,0,40,2400,3800,11,9532,0,0,0,0,0,2,0,0,0,0,0,0,0,"Druid of the Fang - At 0 - 40 Range - Cast Lightning Bolt"), +(@ENTRY,0,4,5,3,1,100,2,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 15% Mana - Allow Combat Movement"), +(@ENTRY,0,5,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 15% Mana - Increment Phase"), +(@ENTRY,0,6,0,9,1,100,3,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 35 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,7,0,9,1,100,3,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,8,0,9,1,100,3,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,9,0,0,1,100,2,8000,11000,10000,20000,11,8040,33,0,0,0,0,6,0,0,0,0,0,0,0,"Druid of the Fang - In Combat - Cast Druid's Slumber"), +(@ENTRY,0,10,0,14,1,100,2,0,40,12000,18000,11,5187,1,0,0,0,0,7,0,0,0,0,0,0,0,"Druid of the Fang - On Friendly Unit At 0 - 40% Health - Cast Healing Touch"), +(@ENTRY,0,11,0,3,2,100,2,30,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 30% Mana - Decrement Phase"), +(@ENTRY,0,12,13,2,0,100,2,0,50,20000,25000,11,8041,1,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 50% HP - Cast Serpent Form"), +(@ENTRY,0,13,14,61,0,100,0,0,0,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 50% HP - Allow Combat Movement"), +(@ENTRY,0,14,0,61,0,100,0,0,0,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - At 50% HP - Set Phase 3"), +(@ENTRY,0,15,16,16,0,100,2,8041,5,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - On Friendly Buff Missing - Allow Combat Movement"), +(@ENTRY,0,16,0,61,0,100,0,0,0,0,0,22,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Druid of the Fang - On Friendly Buff Missing - Set Phase 1"); + +-- Ymirjar Necromancer SAI +SET @ENTRY := 28368; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,1,0,100,7,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - Out Of Combat - Set Phase 0"), +(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,51432,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Necromancer (Normal) - On Aggro - Cast Shadow Bolt"), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer (Normal) - On Aggro - Increment Phase"), +(@ENTRY,0,4,0,9,1,100,2,0,40,5000,7000,11,51432,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Necromancer (Normal) - At 0 - 40 Range - Cast Shadow Bolt"), +(@ENTRY,0,5,6,4,0,100,5,0,0,0,0,11,59254,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Necromancer (Heroic) - On Aggro - Cast Shadow Bolt"), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer (Heroic) - On Aggro - Increment Phase"), +(@ENTRY,0,7,0,9,1,100,4,0,40,5000,7000,11,59254,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Necromancer (Heroic) - At 0 - 40 Range - Cast Shadow Bolt"), +(@ENTRY,0,8,9,3,1,100,6,0,7,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 7% Mana - Allow Combat Movement"), +(@ENTRY,0,9,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 7% Mana - Increment Phase"), +(@ENTRY,0,10,0,9,1,100,7,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 35 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,11,0,9,1,100,7,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,12,0,9,1,100,7,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,13,0,3,2,100,6,15,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 15% Mana - Decrement Phase"), +(@ENTRY,0,14,0,0,0,100,2,9000,14000,18000,22000,11,49205,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ymirjar Necromancer (Normal) - In Combat - Cast Shadow Bolt Volley"), +(@ENTRY,0,15,0,0,0,100,4,9000,14000,18000,22000,11,59255,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ymirjar Necromancer (Heroic) - In Combat - Cast Shadow Bolt Volley"), +(@ENTRY,0,16,0,2,0,100,7,0,15,0,0,22,3,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 15% HP - Set Phase 3"), +(@ENTRY,0,17,18,2,4,100,6,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 15% HP - Allow Combat Movement"), +(@ENTRY,0,18,0,61,0,100,0,0,0,0,0,25,0,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ymirjar Necromancer - At 15% HP - Flee For Assist"); + +-- Ymirjar Flesh Hunter SAI +SET @ENTRY := 26670; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,1,0,100,6,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - Out Of Combat - Start Auto Attack"), +(@ENTRY,0,2,0,4,0,15,7,0,0,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - On Aggro - Say Line 0"), +(@ENTRY,0,3,4,4,0,100,3,0,0,0,0,11,48854,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - On Aggro - Cast Shoot"), +(@ENTRY,0,4,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - On Aggro - Increment Phase"), +(@ENTRY,0,5,6,9,1,100,2,5,30,5000,8000,11,48854,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - At 5 - 30 Range - Cast Shoot"), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - At 5 - 30 Range - Display ranged weapon"), +(@ENTRY,0,7,8,4,0,100,5,0,0,0,0,11,59241,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - On Aggro - Cast Shoot"), +(@ENTRY,0,8,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - On Aggro - Increment Phase"), +(@ENTRY,0,9,10,9,1,100,4,5,30,5000,8000,11,59241,0,0,0,0,0,2,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - At 5 - 30 Range - Cast Shoot"), +(@ENTRY,0,10,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - At 5 - 30 Range - Display ranged weapon"), +(@ENTRY,0,11,12,9,1,100,6,25,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 25 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,12,0,61,0,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 25 - 80 Range - Start Auto Attack"), +(@ENTRY,0,13,14,9,1,100,6,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,14,15,61,0,100,0,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 0 - 5 Range - Display melee weapon"), +(@ENTRY,0,15,0,61,0,100,0,0,0,0,0,20,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 0 - 5 Range - Start Auto Attack"), +(@ENTRY,0,16,17,9,1,100,6,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,17,0,61,0,100,0,0,0,0,0,20,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 5 - 15 Range - Start Auto Attack"), +(@ENTRY,0,18,19,0,0,100,2,9000,14000,22000,26000,11,48871,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - In Combat - Cast Aimed Shot"), +(@ENTRY,0,19,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - In Combat - Display ranged weapon"), +(@ENTRY,0,20,21,0,0,100,4,9000,14000,22000,26000,11,59243,0,0,0,0,0,5,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - In Combat - Cast Aimed Shot"), +(@ENTRY,0,21,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - In Combat - Display ranged weapon"), +(@ENTRY,0,22,23,0,0,100,2,14000,17000,24000,27000,11,48872,1,0,0,0,0,6,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - In Combat - Cast Multi-Shot"), +(@ENTRY,0,23,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Normal) - In Combat - Display ranged weapon"), +(@ENTRY,0,24,25,0,0,100,4,14000,17000,24000,27000,11,59244,1,0,0,0,0,6,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - In Combat - Cast Multi-Shot"), +(@ENTRY,0,25,0,61,0,100,0,0,0,0,0,40,2,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter (Heroic) - In Combat - Display ranged weapon"), +(@ENTRY,0,26,0,2,0,100,7,0,15,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 15% HP - Increment Phase"), +(@ENTRY,0,27,28,2,2,100,6,0,15,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 15% HP - Allow Combat Movement"), +(@ENTRY,0,28,0,61,0,100,0,0,0,0,0,25,1,0,0,0,0,0,0,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - At 15% HP - Flee For Assist"), +(@ENTRY,0,29,0,7,0,100,6,0,0,0,0,40,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Ymirjar Flesh Hunter - On Evade - Display melee weapon"); + +-- Dragonflayer Seer SAI +SET @ENTRY := 26554; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,1,0,100,6,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - Out Of Combat - Set Phase 0"), +(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,48698,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - On Aggro - Cast Lightning Bolt"), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - On Aggro - Increment Phase"), +(@ENTRY,0,4,0,9,1,100,2,0,40,7000,11000,11,48698,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - At 0 - 40 Range - Cast Lightning Bolt"), +(@ENTRY,0,5,6,4,0,100,5,0,0,0,0,11,59081,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - On Aggro - Cast Lightning Bolt"), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - On Aggro - Increment Phase"), +(@ENTRY,0,7,0,9,1,100,4,0,40,7000,11000,11,59081,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - At 0 - 40 Range - Cast Lightning Bolt"), +(@ENTRY,0,8,9,3,1,100,6,0,7,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 7% Mana - Allow Combat Movement"), +(@ENTRY,0,9,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 7% Mana - Increment Phase"), +(@ENTRY,0,10,0,9,1,100,7,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 35 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,11,0,9,1,100,7,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,12,0,9,1,100,7,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,13,0,3,2,100,6,15,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Dragonflayer Seer - At 15% Mana - Decrement Phase"), +(@ENTRY,0,14,0,0,0,100,2,4000,7000,12000,15000,11,48699,0,0,0,0,0,5,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - In Combat - Cast Chain Lightning"), +(@ENTRY,0,15,0,0,0,100,4,4000,7000,12000,15000,11,59082,0,0,0,0,0,5,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - In Combat - Cast Chain Lightning"), +(@ENTRY,0,16,0,14,0,100,2,0,30,18000,21000,11,48700,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dragonflayer Seer (Normal) - On Friendly Unit At 0 - 30% Health - Cast Healing Wave"), +(@ENTRY,0,17,0,14,0,100,4,0,30,18000,21000,11,59083,0,0,0,0,0,7,0,0,0,0,0,0,0,"Dragonflayer Seer (Heroic) - On Friendly Unit At 0 - 30% Health - Cast Healing Wave"); + +-- Dark Rune Shaper SAI +SET @ENTRY := 27965; +UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY; +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@ENTRY; +DELETE FROM `smart_scripts` WHERE `entryorguid`=@ENTRY 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`,`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 +(@ENTRY,0,0,1,1,0,100,7,0,0,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - Out Of Combat - Allow Combat Movement"), +(@ENTRY,0,1,0,61,0,100,0,0,0,0,0,22,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - Out Of Combat - Set Phase 0"), +(@ENTRY,0,2,3,4,0,100,3,0,0,0,0,11,51496,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Rune Shaper (Normal) - On Aggro - Cast Chiseling Ray"), +(@ENTRY,0,3,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper (Normal) - On Aggro - Increment Phase"), +(@ENTRY,0,4,0,9,1,100,2,0,40,6000,9000,11,51496,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Rune Shaper (Normal) - At 0 - 40 Range - Cast Chiseling Ray"), +(@ENTRY,0,5,6,4,0,100,5,0,0,0,0,11,59034,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Rune Shaper (Heroic) - On Aggro - Cast Chiseling Ray"), +(@ENTRY,0,6,0,61,0,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper (Heroic) - On Aggro - Increment Phase"), +(@ENTRY,0,7,0,9,1,100,4,0,40,6000,9000,11,59034,0,0,0,0,0,2,0,0,0,0,0,0,0,"Dark Rune Shaper (Heroic) - At 0 - 40 Range - Cast Chiseling Ray"), +(@ENTRY,0,8,9,3,1,100,7,0,7,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 7% Mana - Allow Combat Movement"), +(@ENTRY,0,9,0,61,1,100,0,0,0,0,0,23,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 7% Mana - Increment Phase"), +(@ENTRY,0,10,0,9,1,100,7,35,80,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 35 - 80 Range - Allow Combat Movement"), +(@ENTRY,0,11,0,9,1,100,7,5,15,0,0,21,0,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 5 - 15 Range - Allow Combat Movement"), +(@ENTRY,0,12,0,9,1,100,7,0,5,0,0,21,1,0,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 0 - 5 Range - Allow Combat Movement"), +(@ENTRY,0,13,0,3,2,100,6,15,100,100,100,23,0,1,0,0,0,0,1,0,0,0,0,0,0,0,"Dark Rune Shaper - At 15% Mana - Decrement Phase"); diff --git a/sql/updates/world/2013_01_02_09_world_waypoints.sql b/sql/updates/world/2013_01_02_09_world_waypoints.sql new file mode 100644 index 00000000000..1c2492fcce8 --- /dev/null +++ b/sql/updates/world/2013_01_02_09_world_waypoints.sql @@ -0,0 +1,138 @@ +-- Pathing for Thrym Entry: 28243 +SET @NPC := 103290; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5448.966,`position_y`=-1600.008,`position_z`=248.3331 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5448.966,-1600.008,248.3331,0,0,0,100,0), +(@PATH,2,5447.655,-1631.053,248.3331,0,0,0,100,0), +(@PATH,3,5447.865,-1663.079,248.3032,0,0,0,100,0), +(@PATH,4,5446.966,-1704.903,248.2398,0,0,0,100,0), +(@PATH,5,5446.957,-1736.751,248.3335,0,0,0,100,0), +(@PATH,6,5445.319,-1773.959,248.2313,0,0,0,100,0), +(@PATH,7,5443.451,-1814.034,248.2451,0,0,0,100,0), +(@PATH,8,5443.122,-1860.167,248.2451,0,0,0,100,0), +(@PATH,9,5442.573,-1896.295,248.2961,0,0,0,100,0), +(@PATH,10,5444.602,-1934.296,248.3471,0,0,0,100,0), +(@PATH,11,5445.959,-1975.212,248.3471,0,0,0,100,0), +(@PATH,12,5448.557,-2015.833,248.3328,0,0,0,100,0), +(@PATH,13,5450.393,-2055.615,248.3471,0,0,0,100,0), +(@PATH,14,5452.368,-2095.424,248.3471,0,0,0,100,0), +(@PATH,15,5450.376,-2130.012,248.3557,0,0,0,100,0), +(@PATH,16,5448.958,-2154.166,248.3565,0,0,0,100,0), +(@PATH,17,5450.228,-2193.794,248.4327,0,0,0,100,0), +(@PATH,18,5449.065,-2155.135,248.3565,0,0,0,100,0), +(@PATH,19,5451.041,-2130.209,248.3557,0,0,0,100,0), +(@PATH,20,5452.368,-2095.424,248.3471,0,0,0,100,0), +(@PATH,21,5450.393,-2055.615,248.3471,0,0,0,100,0), +(@PATH,22,5448.557,-2015.833,248.3328,0,0,0,100,0), +(@PATH,23,5445.959,-1975.212,248.3471,0,0,0,100,0), +(@PATH,24,5444.602,-1934.296,248.3471,0,0,0,100,0), +(@PATH,25,5442.573,-1896.295,248.2961,0,0,0,100,0), +(@PATH,26,5443.122,-1860.167,248.2451,0,0,0,100,0), +(@PATH,27,5443.451,-1814.034,248.2451,0,0,0,100,0), +(@PATH,28,5445.319,-1773.959,248.2313,0,0,0,100,0), +(@PATH,29,5446.957,-1736.751,248.3335,0,0,0,100,0), +(@PATH,30,5446.966,-1704.903,248.2398,0,0,0,100,0), +(@PATH,31,5447.865,-1663.079,248.3032,0,0,0,100,0), +(@PATH,32,5447.655,-1631.053,248.3331,0,0,0,100,0), +(@PATH,33,5448.966,-1600.008,248.3331,0,0,0,100,0), +(@PATH,34,5448.563,-1572.11,248.3242,0,0,0,100,0), +(@PATH,35,5448.359,-1535.512,248.3503,0,0,0,100,0), +(@PATH,36,5446.37,-1496.475,248.3165,0,0,0,100,0), +(@PATH,37,5445.602,-1454.377,248.3085,0,0,0,100,0), +(@PATH,38,5445.826,-1433.070,248.4012,0,0,0,100,0), +(@PATH,39,5446.118,-1417.052,239.2611,0,0,0,100,0), +(@PATH,40,5446.015,-1411.64,239.3458,0,0,0,100,0), +(@PATH,41,5446.15,-1372.373,239.3458,0,0,0,100,0), +(@PATH,42,5445.78,-1326.04,239.2721,0,0,0,100,0), +(@PATH,43,5446.15,-1372.373,239.3458,0,0,0,100,0), +(@PATH,44,5446.015,-1411.64,239.3458,0,0,0,100,0), +(@PATH,45,5446.118,-1417.052,239.2611,0,0,0,100,0), +(@PATH,46,5445.826,-1433.070,248.4012,0,0,0,100,0), +(@PATH,47,5445.602,-1454.377,248.3085,0,0,0,100,0), +(@PATH,48,5446.37,-1496.475,248.3165,0,0,0,100,0), +(@PATH,49,5448.359,-1535.512,248.3503,0,0,0,100,0), +(@PATH,50,5448.563,-1572.11,248.3242,0,0,0,100,0); + +-- Pathing for Mam'toth Disciple Entry: 28861 +SET @NPC := 113829; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6405.855,`position_y`=-4262.899,`position_z`=455.5814 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '52574'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6405.855,-4262.899,455.5814,0,0,0,100,0), +(@PATH,2,6406.651,-4247.01,454.8314,0,0,0,100,0), +(@PATH,3,6411.053,-4230.215,456.8571,0,0,0,100,0), +(@PATH,4,6407.01,-4207.069,461.7675,0,0,0,100,0), +(@PATH,5,6385.251,-4191.354,460.4738,0,0,0,100,0), +(@PATH,6,6367.858,-4193.421,459.0136,0,0,0,100,0), +(@PATH,7,6367.621,-4216.292,458.9676,0,0,0,100,0), +(@PATH,8,6359.056,-4238.381,458.9309,0,0,0,100,0), +(@PATH,9,6368.265,-4261.602,458.9691,0,0,0,100,0), +(@PATH,10,6368.305,-4284.628,458.8995,0,0,0,100,0), +(@PATH,11,6390.221,-4289.859,461.7745,0,0,0,100,0), +(@PATH,12,6402.944,-4284.963,457.5383,0,0,0,100,0); + +-- Pathing for Segacedi Entry: 32664 +SET @NPC := 110306; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5924.809,`position_y`=564.5653,`position_z`=601.5578 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5924.809,564.5653,601.5578,0,0,0,100,0), +(@PATH,2,5917.506,559.5457,599.975,0,0,0,100,0), +(@PATH,3,5924.809,564.5653,601.5578,0,0,0,100,0), +(@PATH,4,5923.932,570.1338,603.1688,0,0,0,100,0), +(@PATH,5,5926.551,575.4876,602.0579,0,0,0,100,0), +(@PATH,6,5930.981,574.3068,602.5855,0,0,0,100,0), +(@PATH,7,5933.025,569.929,601.4746,0,0,0,100,0), +(@PATH,8,5932.214,563.8223,600.2523,0,0,0,100,0), +(@PATH,9,5929.565,561.0128,602.0024,0,0,0,100,0), +(@PATH,10,5925.193,559.6426,603.4468,0,0,0,100,0), +(@PATH,11,5922.899,557.1088,603.3078,0,0,0,100,0), +(@PATH,12,5918.246,557.59,603.447,0,0,0,100,0), +(@PATH,13,5914.375,559.9744,603.5861,0,0,0,100,0), +(@PATH,14,5906.045,566.9766,602.8636,0,0,0,100,0), +(@PATH,15,5911.538,571.5968,603.2217,0,0,0,100,0), +(@PATH,16,5919.368,574.7385,603.5026,0,0,0,100,0), +(@PATH,17,5911.538,571.5968,603.2217,0,0,0,100,0), +(@PATH,18,5906.045,566.9766,602.8636,0,0,0,100,0), +(@PATH,19,5914.375,559.9744,603.5861,0,0,0,100,0), +(@PATH,20,5918.246,557.59,603.447,0,0,0,100,0), +(@PATH,21,5922.899,557.1088,603.3078,0,0,0,100,0), +(@PATH,22,5925.193,559.6426,603.4468,0,0,0,100,0), +(@PATH,23,5929.565,561.0128,602.0024,0,0,0,100,0), +(@PATH,24,5932.214,563.8223,600.2523,0,0,0,100,0), +(@PATH,25,5933.025,569.929,601.4746,0,0,0,100,0), +(@PATH,26,5930.981,574.3068,602.5855,0,0,0,100,0), +(@PATH,27,5926.551,575.4876,602.0579,0,0,0,100,0), +(@PATH,28,5923.932,570.1338,603.1688,0,0,0,100,0); + +-- Pathing for Claw of Har'koa Entry: 28402 +SET @NPC := 88732; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5475.932,`position_y`=-3943.574,`position_z`=362.062 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5475.932,-3943.574,362.062,0,0,0,100,0), +(@PATH,2,5496.939,-3933.918,362.062,0,0,0,100,0), +(@PATH,3,5503.387,-3912.114,362.0851,0,0,0,100,0), +(@PATH,4,5505.28,-3887.115,362.0851,0,0,0,100,0), +(@PATH,5,5494.267,-3863.793,362.0794,0,0,0,100,0), +(@PATH,6,5474.92,-3854.984,362.0794,0,0,0,100,0), +(@PATH,7,5449.384,-3848.412,362.0686,0,0,0,100,0), +(@PATH,8,5429.913,-3847.965,362.0359,0,0,0,100,0), +(@PATH,9,5409.766,-3868.374,361.9735,0,0,0,100,0), +(@PATH,10,5407.17,-3903.612,362.0776,0,0,0,100,0), +(@PATH,11,5407.908,-3925.006,362.0776,0,0,0,100,0), +(@PATH,12,5433.907,-3945.061,362.062,0,0,0,100,0), +(@PATH,13,5449.745,-3949.848,362.062,0,0,0,100,0); diff --git a/sql/updates/world/2013_01_02_10_world_sai.sql b/sql/updates/world/2013_01_02_10_world_sai.sql new file mode 100644 index 00000000000..0be2c5c2d6b --- /dev/null +++ b/sql/updates/world/2013_01_02_10_world_sai.sql @@ -0,0 +1,2 @@ +-- Gameobject Type 3 does NOT support gameobject_scripts +DELETE FROM `gameobject_scripts` WHERE `id` BETWEEN 35843 AND 35848; diff --git a/sql/updates/world/2013_01_02_11_world_sai.sql b/sql/updates/world/2013_01_02_11_world_sai.sql new file mode 100644 index 00000000000..7496a765470 --- /dev/null +++ b/sql/updates/world/2013_01_02_11_world_sai.sql @@ -0,0 +1,34 @@ +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (176346,176349,176350,176351,176352,176353); +DELETE FROM `smart_scripts` WHERE `entryorguid`IN (176346,176349,176350,176351,176352,176353) AND `source_type`=1; +DELETE FROM `smart_scripts` WHERE `entryorguid`IN (17634600,17634900,17635000,17635100,17635200,17635300) 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 +(176346,1,0,0,70,0,100,0,2,0,0,0,80,17634600,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Market Row Postbox - On Activate - Start Script'), +(176349,1,0,0,70,0,100,0,2,0,0,0,80,17634900,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Crusaders Square Postbox - On Activate - Start Script'), +(176350,1,0,0,70,0,100,0,2,0,0,0,80,17635000,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Festival Lane Postbox - On Activate - Start Script'), +(176351,1,0,0,70,0,100,0,2,0,0,0,80,17635100,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Elders Square Postbox - On Activate - Start Script'), +(176352,1,0,0,70,0,100,0,2,0,0,0,80,17635200,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Kings Square Postbox - On Activate - Start Script'), +(176353,1,0,0,70,0,100,0,2,0,0,0,80,17635300,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Fras Siabis Postbox - On Activate - Start Script'), +-- Market Row Postbox Script +(17634600,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3675.35,-3395.92,132.86,5.83,'MR Postbox Script - After 2s - Summon Undead Postman'), +(17634600,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3679.93,-3408.58,133.18,1.04,'MR Postbox Script - After 2s - Summon Undead Postman'), +(17634600,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3687.89,-3410.59,133.04,1.64,'MR Postbox Script - After 2s - Summon Undead Postman'), +-- Crusaders' Square Postbox Script +(17634900,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3664.55,-3176.47,126.42,2.20,'CS Postbox Script - After 2s - Summon Undead Postman'), +(17634900,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3656.82,-3160.63,129.03,4.84,'CS Postbox Script - After 2s - Summon Undead Postman'), +(17634900,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3644.62,-3168.25,128.52,5.93,'CS Postbox Script - After 2s - Summon Undead Postman'), +-- Festival Lane Postbox Script +(17635000,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3651.67,-3477.88,138.05,5.59,'FL Postbox Script - After 2s - Summon Undead Postman'), +(17635000,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3657.14,-3475.36,138.70,4.91,'FL Postbox Script - After 2s - Summon Undead Postman'), +(17635000,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3669.61,-3478.49,137.49,3.39,'FL Postbox Script - After 2s - Summon Undead Postman'), +-- Elders' Square Postbox Script +(17635100,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3659.46,-3634.96,138.33,1.28,'ES Postbox Script - After 2s - Summon Undead Postman'), +(17635100,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3656.25,-3635.08,138.36,1.02,'ES Postbox Script - After 2s - Summon Undead Postman'), +(17635100,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3661.24,-3621.00,138.40,3.58,'ES Postbox Script - After 2s - Summon Undead Postman'), +-- King's Square Postbox Script +(17635200,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3568.50,-3356.91,131.06,2.07,'KS Postbox Script - After 2s - Summon Undead Postman'), +(17635200,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3570.91,-3351.01,130.57,2.71,'KS Postbox Script - After 2s - Summon Undead Postman'), +(17635200,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3562.79,-3353.38,130.78,0.81,'KS Postbox Script - After 2s - Summon Undead Postman'), +-- Fras Siabi's Postbox Script +(17635300,9,0,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3493.00,-3300.28,130.47,0.07,'FS Postbox Script - After 2s - Summon Undead Postman'), +(17635300,9,1,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3503.16,-3294.90,131.09,4.28,'FS Postbox Script - After 2s - Summon Undead Postman'), +(17635300,9,2,0,0,0,100,0,2000,2000,0,0,12,11142,1,300000,0,1,0,8,0,0,0,3496.26,-3295.40,130.98,5.34,'FS Postbox Script - After 2s - Summon Undead Postman'); diff --git a/sql/updates/world/2013_01_02_12_world_go_script.sql b/sql/updates/world/2013_01_02_12_world_go_script.sql new file mode 100644 index 00000000000..aea0a67c47e --- /dev/null +++ b/sql/updates/world/2013_01_02_12_world_go_script.sql @@ -0,0 +1,11 @@ +-- remove the summoning of the herald and closing of the gate via the brazier +-- this is an instance encounter and should be handled via cpp, reopen the door if npc is dead +DELETE FROM `gameobject_scripts` WHERE `id`=43208; + +-- This script will NOT work untill CPP changes are made, this UNSUPPORTS Scarlet Monestry Cathedral wing! +DELETE FROM `gameobject_scripts` WHERE `id` IN (11881,11894); +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (104589,97701); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (104589,97701) 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`,`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 +(104589,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,11875,104591,0,0,0,0,0,'Lever - On activate - Activate Chapel Door'), +( 97701,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,11876, 97700,0,0,0,0,0,'Torch - On activate - Activate Secret Door'); diff --git a/sql/updates/world/2013_01_02_12_world_waypoints.sql b/sql/updates/world/2013_01_02_12_world_waypoints.sql new file mode 100644 index 00000000000..6ec7875d8ef --- /dev/null +++ b/sql/updates/world/2013_01_02_12_world_waypoints.sql @@ -0,0 +1,218 @@ +-- Pathing for Dark Ritualist Entry: 34734 +SET @NPC := 63124; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=8508.912,`position_y`=1423.379,`position_z`=642.1677 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,8508.912,1423.379,642.1677,0,0,0,100,0), +(@PATH,2,8515.332,1430.247,642.2927,0,0,0,100,0), +(@PATH,3,8523.013,1437.788,642.3946,0,0,0,100,0), +(@PATH,4,8526.778,1446.524,642.3687,0,0,0,100,0), +(@PATH,5,8530.59,1452.149,642.3568,0,0,0,100,0), +(@PATH,6,8534.38,1456.161,642.9715,0,0,0,100,0), +(@PATH,7,8530.59,1452.149,642.3568,0,0,0,100,0), +(@PATH,8,8526.778,1446.524,642.3687,0,0,0,100,0), +(@PATH,9,8523.013,1437.788,642.3946,0,0,0,100,0), +(@PATH,10,8515.332,1430.247,642.2927,0,0,0,100,0); + +-- Pathing for Dark Ritualist Entry: 34734 +SET @NPC := 62889; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=8514.877,`position_y`=1673.441,`position_z`=646.5894 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,8514.877,1673.441,646.5894,0,0,0,100,0), +(@PATH,2,8518.864,1693.484,645.4977,0,0,0,100,0), +(@PATH,3,8515.326,1712.451,643.958,0,0,0,100,0), +(@PATH,4,8518.864,1693.484,645.4977,0,0,0,100,0), +(@PATH,5,8514.877,1673.441,646.5894,0,0,0,100,0), +(@PATH,6,8510.175,1661.057,647.1356,0,0,0,100,0), +(@PATH,7,8504.302,1654.377,647.6522,0,0,0,100,0), +(@PATH,8,8499.16,1651.429,649.0247,0,0,0,100,0), +(@PATH,9,8504.302,1654.377,647.6522,0,0,0,100,0), +(@PATH,10,8510.175,1661.057,647.1356,0,0,0,100,0); + +-- Pathing for Dark Ritualist Entry: 34734 +SET @NPC := 62178; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=8561.401,`position_y`=1416.401,`position_z`=643.1947 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,8561.401,1416.401,643.1947,0,0,0,100,0), +(@PATH,2,8559.43,1405.359,643.6021,0,0,0,100,0), +(@PATH,3,8561.401,1416.401,643.1947,0,0,0,100,0), +(@PATH,4,8559.165,1427.087,642.582,0,0,0,100,0), +(@PATH,5,8558.565,1438.543,642.76,0,0,0,100,0), +(@PATH,6,8563.757,1448.488,643.133,0,0,0,100,0), +(@PATH,7,8558.565,1438.543,642.76,0,0,0,100,0), +(@PATH,8,8559.165,1427.087,642.582,0,0,0,100,0); + +-- Pathing for Dark Ritualist Entry: 34734 +SET @NPC := 62886; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=8558.849,`position_y`=1638.248,`position_z`=642.7181 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,8558.849,1638.248,642.7181,0,0,0,100,0), +(@PATH,2,8569.741,1643.606,643.0836,0,0,0,100,0), +(@PATH,3,8580.118,1650.653,643.5215,0,0,0,100,0), +(@PATH,4,8569.741,1643.606,643.0836,0,0,0,100,0), +(@PATH,5,8558.849,1638.248,642.7181,0,0,0,100,0), +(@PATH,6,8543.526,1634.698,642.6174,0,0,0,100,0), +(@PATH,7,8527.557,1636.082,642.7275,0,0,0,100,0), +(@PATH,8,8543.526,1634.698,642.6174,0,0,0,100,0); + +-- Pathing for Swift Alliance Steed Entry: 35808 +SET @NPC := 85115; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=8541.001,`position_y`=980.2708,`position_z`=547.4177 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,8541.001,980.2708,547.4177,0,1000,0,0,100,0), +(@PATH,2,8541.001,980.2708,547.4177,1.064651,21000,0,0,100,0), +(@PATH,3,8538.89,981.222,547.4177,0,13000,0,51,100,0); + +DELETE FROM `waypoint_scripts` WHERE `id`=51; +INSERT INTO `waypoint_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`guid`) VALUES +(51,1,1,402,0,70); + +-- Missing spawns Swift Horde Wolf +SET @GUID := 83022; +DELETE FROM `creature` WHERE `guid` IN (@GUID,@GUID+1); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,36223,571,1,1,0,0,8540.497,986.4167,547.4177,0.01343229,120,0,0,1,0,0), +(@GUID+1,36223,571,1,1,0,0,8533.108,985.1597,547.3926,0.6806784,120,0,0,1,0,0); + +-- Pathing for Swift Horde Wolf Entry: 36223 +SET @NPC := 83022; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=8537.03,`position_y`=986.37,`position_z`=547.4177 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`orientation`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,8537.03,986.37,547.4177,0,13000,0,52,100,0), +(@PATH,2,8540.497,986.4167,547.4177,0,0,0,0,100,0), +(@PATH,3,8540.497,986.4167,547.4177,5.462881,37000,0,0,100,0); + +DELETE FROM `waypoint_scripts` WHERE `id`=52; +INSERT INTO `waypoint_scripts` (`id`,`delay`,`command`,`datalong`,`datalong2`,`guid`) VALUES +(52,2,1,418,1,71), +(52,10,1,0,1,72); + +-- Pathing for Argent Custodian Entry: 36069 +SET @NPC := 85131; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=8515.2,`position_y`=746.3889,`position_z`=575.785 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,8515.2,746.3889,575.785,0,0,0,100,0), +(@PATH,2,8497.708,749.8507,575.7857,0,0,0,100,0); + +-- Pathing for Argent Custodian Entry: 36069 +SET @NPC := 85130; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=8481.823,`position_y`=791.7691,`position_z`=558.5565 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,8481.823,791.7691,558.5565,0,0,0,100,0), +(@PATH,2,8485.347,778.4419,558.5739,0,0,0,100,0), +(@PATH,3,8490.990,769.2891,558.5689,0,0,0,100,0), +(@PATH,4,8502.299,762.0498,558.5673,0,0,0,100,0), +(@PATH,5,8515.458,759.0677,558.5405,0,0,0,100,0), +(@PATH,6,8528.095,762.0035,558.5671,0,0,0,100,0), +(@PATH,7,8539.435,769.0851,558.5685,0,0,0,100,0), +(@PATH,8,8545.628,779.4549,558.5715,0,0,0,100,0), +(@PATH,9,8548.36,792.8768,558.5598,0,0,0,100,0), +(@PATH,10,8545.584,805.2761,558.5731,0,0,0,100,0), +(@PATH,11,8537.013,818.8125,558.5636,0,0,0,100,0), +(@PATH,12,8515.279,820.3889,558.1152,0,0,0,100,0), +(@PATH,13,8493.552,818.8524,558.5643,0,0,0,100,0), +(@PATH,14,8484.993,804.7049,558.5677,0,0,0,100,0); + +-- Pathing for Kvaldir Reaver Entry: 34838 +SET @NPC := 52604; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=10213.43,`position_y`=785.3785,`position_z`=65.56143 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,10213.43,785.3785,65.56143,0,0,0,100,0), +(@PATH,2,10203.03,791.2552,62.39041,0,0,0,100,0), +(@PATH,3,10192.28,799.4097,57.93019,0,0,0,100,0), +(@PATH,4,10181.2,816.316,52.61528,0,0,0,100,0), +(@PATH,5,10170.49,831.2708,47.18571,0,0,0,100,0), +(@PATH,6,10181.2,816.316,52.61528,0,0,0,100,0), +(@PATH,7,10192.28,799.4097,57.93019,0,0,0,100,0), +(@PATH,8,10203.03,791.2552,62.39041,0,0,0,100,0), +(@PATH,9,10213.43,785.3785,65.56143,0,0,0,100,0), +(@PATH,10,10224.06,785.1649,68.88577,0,0,0,100,0); + +-- Missing spawns Mam'toth Disciple & Claw of Har'koa +SET @GUID := 83026; +DELETE FROM `creature` WHERE `guid` IN (@GUID,@GUID+1); +INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`) VALUES +(@GUID,28861,571,1,1,0,0,6320.923,-4130.368,458.9318,0.01343229,120,0,0,1,0,0), +(@GUID+1,28402,571,1,1,0,0,5493.606,-3712.333,362.6227,0.6806784,120,0,0,1,0,0); + +-- Pathing for Mam'toth Disciple Entry: 28861 +SET @NPC := 83026; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=6320.923,`position_y`=-4130.368,`position_z`=458.9318 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, '52574'); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,6320.923,-4130.368,458.9318,0,0,0,100,0), +(@PATH,2,6303.191,-4100.656,458.9318,0,0,0,100,0), +(@PATH,3,6275.148,-4083.311,458.9212,0,0,0,100,0), +(@PATH,4,6237.833,-4079.906,459.0136,0,0,0,100,0), +(@PATH,5,6215.262,-4070.717,459.0136,0,0,0,100,0), +(@PATH,6,6190.383,-4078.323,459.0136,0,0,0,100,0), +(@PATH,7,6174.816,-4074.354,459.0981,0,0,0,100,0), +(@PATH,8,6190.383,-4078.323,459.0136,0,0,0,100,0), +(@PATH,9,6215.262,-4070.717,459.0136,0,0,0,100,0), +(@PATH,10,6237.833,-4079.906,459.0136,0,0,0,100,0), +(@PATH,11,6275.148,-4083.311,458.9212,0,0,0,100,0), +(@PATH,12,6303.191,-4100.656,458.9318,0,0,0,100,0); + +-- Pathing for Claw of Har'koa Entry: 28402 +SET @NPC := 83027; +SET @PATH := @NPC * 10; +UPDATE `creature` SET `spawndist`=0,`MovementType`=2,`position_x`=5493.606,`position_y`=-3712.333,`position_z`=362.6227 WHERE `guid`=@NPC; +DELETE FROM `creature_addon` WHERE `guid`=@NPC; +INSERT INTO `creature_addon` (`guid`,`path_id`,`bytes2`,`mount`,`auras`) VALUES (@NPC,@PATH,1,0, ''); +DELETE FROM `waypoint_data` WHERE `id`=@PATH; +INSERT INTO `waypoint_data` (`id`,`point`,`position_x`,`position_y`,`position_z`,`delay`,`move_flag`,`action`,`action_chance`,`wpguid`) VALUES +(@PATH,1,5493.606,-3712.333,362.6227,0,0,0,100,0), +(@PATH,2,5488.515,-3736.998,361.9892,0,0,0,100,0), +(@PATH,3,5476.753,-3750.571,361.9892,0,0,0,100,0), +(@PATH,4,5461.006,-3767.059,362.002,0,0,0,100,0), +(@PATH,5,5443.998,-3774.203,361.9609,0,0,0,100,0), +(@PATH,6,5421.117,-3781.667,361.9677,0,0,0,100,0), +(@PATH,7,5398.986,-3767.582,361.9875,0,0,0,100,0), +(@PATH,8,5370.875,-3741.746,360.2243,0,0,0,100,0), +(@PATH,9,5354.693,-3725.205,360.0981,0,0,0,100,0), +(@PATH,10,5326.64,-3697.498,362.1892,0,0,0,100,0), +(@PATH,11,5322.16,-3670.425,362.0858,0,0,0,100,0), +(@PATH,12,5332.216,-3656.184,361.9609,0,0,0,100,0), +(@PATH,13,5356.117,-3639.557,361.9609,0,0,0,100,0), +(@PATH,14,5390.954,-3622.599,361.9609,0,0,0,100,0), +(@PATH,15,5416.427,-3639.384,361.9608,0,0,0,100,0), +(@PATH,16,5440.461,-3661.758,361.9644,0,0,0,100,0), +(@PATH,17,5468.425,-3688.130,361.9646,0,0,0,100,0); diff --git a/sql/updates/world/2013_01_03_00_world_gameobject_scripts.sql b/sql/updates/world/2013_01_03_00_world_gameobject_scripts.sql new file mode 100644 index 00000000000..32faf4b03a0 --- /dev/null +++ b/sql/updates/world/2013_01_03_00_world_gameobject_scripts.sql @@ -0,0 +1,6 @@ +-- the brazier should summon multiple bosses, this is part of +-- an instance encounter and should be handled via cpp +DELETE FROM `gameobject_scripts` WHERE `id` IN (28704,21608,21609,21610); +DELETE FROM gameobject WHERE guid IN (21608,21609,21610); +-- while at it, fix startup issue with npc 3939 +UPDATE `creature` SET `MovementType`=0 WHERE `id`=3939; diff --git a/sql/updates/world/2013_01_03_01_world_sai.sql b/sql/updates/world/2013_01_03_01_world_sai.sql new file mode 100644 index 00000000000..9e0e56eb645 --- /dev/null +++ b/sql/updates/world/2013_01_03_01_world_sai.sql @@ -0,0 +1,7 @@ +DELETE FROM `gameobject_scripts` WHERE `id`=47301; +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry`=185512; +DELETE FROM `smart_scripts` WHERE `entryorguid`=185512 AND `source_type`=1; +DELETE FROM `smart_scripts` WHERE `entryorguid`=18551200 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 +(185512,1,0,0,70,0,100,0,2,0,0,0,80,18551200,0,0,0,0,0,1,0,0,0,0,0,0,0, 'Stasis Chamber Alpha - On Activate - Start Script'), +(18551200,9,0,0,0,0,100,0,10000,10000,0,0,12,22920,1,300000,0,1,0,8,0,0,0,3989.02,6071.37,266.41,3.72,'Script - After 10s - Summon Thuk the Defiant'); diff --git a/sql/updates/world/2013_01_03_02_world_sai.sql b/sql/updates/world/2013_01_03_02_world_sai.sql new file mode 100644 index 00000000000..ecd84c96800 --- /dev/null +++ b/sql/updates/world/2013_01_03_02_world_sai.sql @@ -0,0 +1,10 @@ +DELETE FROM `gameobject_scripts` WHERE `id` IN (43177,44809,44811,45625,45428,61664); +UPDATE `gameobject_template` SET `AIName`='SmartGameObjectAI' WHERE `entry` IN (193020,175432,176767,101852,101853,177385); +DELETE FROM `smart_scripts` WHERE `entryorguid` IN (193020,175432,176767,101852,101853,177385) 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`,`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 +(193020,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,61606,193019,0,0,0,0,0, 'Lever - On activate - Activate The Violet Hold'), +(175432,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,45626,175369,0,0,0,0,0, ' - On activate - Activate Elders Square Service Entrance'), +(176767,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,45427,174626,0,0,0,0,0, 'Torch - On activate - Activate Scholomance Door'), +(101852,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,15013,101851,0,0,0,0,0, 'Lever - On activate - Activate Armory Door'), +(101853,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,15012,101850,0,0,0,0,0, 'Lever - On activate - Activate Cathedral Door'), +(177385,1,0,0,70,0,100,0,2,0,0,0,9,0,0,0,0,0,0,14,43178,175610,0,0,0,0,0, 'Torch - On activate - Activate Door'); diff --git a/sql/updates/world/2013_01_03_03_world_spelldifficulty_dbc.sql b/sql/updates/world/2013_01_03_03_world_spelldifficulty_dbc.sql new file mode 100644 index 00000000000..6a41f705491 --- /dev/null +++ b/sql/updates/world/2013_01_03_03_world_spelldifficulty_dbc.sql @@ -0,0 +1,3 @@ +DELETE FROM `spelldifficulty_dbc` WHERE `id`=62166 OR `spellid0`=62166; +INSERT INTO `spelldifficulty_dbc`(`id`,`spellid0`,`spellid1`) VALUES +(62166,62166,63981); -- Stone Grip diff --git a/src/server/game/AI/CoreAI/UnitAI.cpp b/src/server/game/AI/CoreAI/UnitAI.cpp index 81e32a2f8b6..a3cb57b3332 100644 --- a/src/server/game/AI/CoreAI/UnitAI.cpp +++ b/src/server/game/AI/CoreAI/UnitAI.cpp @@ -162,6 +162,28 @@ void UnitAI::DoCast(uint32 spellId) me->CastSpell(target, spellId, false); } +void UnitAI::DoCast(Unit* victim, uint32 spellId, bool triggered) +{ + if (!victim || (me->HasUnitState(UNIT_STATE_CASTING) && !triggered)) + return; + + me->CastSpell(victim, spellId, triggered); +} + +void UnitAI::DoCastVictim(uint32 spellId, bool triggered) +{ + // Why don't we check for casting unit_state and existing target as we do in DoCast(.. ? + me->CastSpell(me->getVictim(), spellId, triggered); +} + +void UnitAI::DoCastAOE(uint32 spellId, bool triggered) +{ + if (!triggered && me->HasUnitState(UNIT_STATE_CASTING)) + return; + + me->CastSpell((Unit*)NULL, spellId, triggered); +} + #define UPDATE_TARGET(a) {if (AIInfo->target<a) AIInfo->target=a;} void UnitAI::FillAISpellInfo() diff --git a/src/server/game/AI/CreatureAI.cpp b/src/server/game/AI/CreatureAI.cpp index 8491a055516..427818fe571 100644 --- a/src/server/game/AI/CreatureAI.cpp +++ b/src/server/game/AI/CreatureAI.cpp @@ -174,3 +174,91 @@ void CreatureAI::EnterEvadeMode() if (!me->getVictim()) AttackStart(attacker); }*/ + +void CreatureAI::SetGazeOn(Unit* target) +{ + if (me->IsValidAttackTarget(target)) + { + AttackStart(target); + me->SetReactState(REACT_PASSIVE); + } +} + +bool CreatureAI::UpdateVictimWithGaze() +{ + if (!me->isInCombat()) + return false; + + if (me->HasReactState(REACT_PASSIVE)) + { + if (me->getVictim()) + return true; + else + me->SetReactState(REACT_AGGRESSIVE); + } + + if (Unit* victim = me->SelectVictim()) + AttackStart(victim); + return me->getVictim(); +} + +bool CreatureAI::UpdateVictim() +{ + if (!me->isInCombat()) + return false; + + if (!me->HasReactState(REACT_PASSIVE)) + { + if (Unit* victim = me->SelectVictim()) + AttackStart(victim); + return me->getVictim(); + } + else if (me->getThreatManager().isThreatListEmpty()) + { + EnterEvadeMode(); + return false; + } + + return true; +} + +bool CreatureAI::_EnterEvadeMode() +{ + if (!me->isAlive()) + return false; + + // dont remove vehicle auras, passengers arent supposed to drop off the vehicle + me->RemoveAllAurasExceptType(SPELL_AURA_CONTROL_VEHICLE); + + // sometimes bosses stuck in combat? + me->DeleteThreatList(); + me->CombatStop(true); + me->LoadCreaturesAddon(); + me->SetLootRecipient(NULL); + me->ResetPlayerDamageReq(); + + if (me->IsInEvadeMode()) + return false; + + return true; +} + +Creature* CreatureAI::DoSummon(uint32 entry, const Position& pos, uint32 despawnTime, TempSummonType summonType) +{ + return me->SummonCreature(entry, pos, summonType, despawnTime); +} + +Creature* CreatureAI::DoSummon(uint32 entry, WorldObject* obj, float radius, uint32 despawnTime, TempSummonType summonType) +{ + Position pos; + obj->GetRandomNearPosition(pos, radius); + return me->SummonCreature(entry, pos, summonType, despawnTime); +} + +Creature* CreatureAI::DoSummonFlyer(uint32 entry, WorldObject* obj, float flightZ, float radius, uint32 despawnTime, TempSummonType summonType) +{ + Position pos; + obj->GetRandomNearPosition(pos, radius); + pos.m_positionZ += flightZ; + return me->SummonCreature(entry, pos, summonType, despawnTime); +} diff --git a/src/server/game/AI/CreatureAIImpl.h b/src/server/game/AI/CreatureAIImpl.h index f3e32b6033d..559240c4a3f 100644 --- a/src/server/game/AI/CreatureAIImpl.h +++ b/src/server/game/AI/CreatureAIImpl.h @@ -540,115 +540,5 @@ struct AISpellInfoType AISpellInfoType* GetAISpellInfo(uint32 i); -inline void CreatureAI::SetGazeOn(Unit* target) -{ - if (me->IsValidAttackTarget(target)) - { - AttackStart(target); - me->SetReactState(REACT_PASSIVE); - } -} - -inline bool CreatureAI::UpdateVictimWithGaze() -{ - if (!me->isInCombat()) - return false; - - if (me->HasReactState(REACT_PASSIVE)) - { - if (me->getVictim()) - return true; - else - me->SetReactState(REACT_AGGRESSIVE); - } - - if (Unit* victim = me->SelectVictim()) - AttackStart(victim); - return me->getVictim(); -} - -inline bool CreatureAI::UpdateVictim() -{ - if (!me->isInCombat()) - return false; - - if (!me->HasReactState(REACT_PASSIVE)) - { - if (Unit* victim = me->SelectVictim()) - AttackStart(victim); - return me->getVictim(); - } - else if (me->getThreatManager().isThreatListEmpty()) - { - EnterEvadeMode(); - return false; - } - - return true; -} - -inline bool CreatureAI::_EnterEvadeMode() -{ - if (!me->isAlive()) - return false; - - // dont remove vehicle auras, passengers arent supposed to drop off the vehicle - me->RemoveAllAurasExceptType(SPELL_AURA_CONTROL_VEHICLE); - - // sometimes bosses stuck in combat? - me->DeleteThreatList(); - me->CombatStop(true); - me->LoadCreaturesAddon(); - me->SetLootRecipient(NULL); - me->ResetPlayerDamageReq(); - - if (me->IsInEvadeMode()) - return false; - - return true; -} - -inline void UnitAI::DoCast(Unit* victim, uint32 spellId, bool triggered) -{ - if (!victim || (me->HasUnitState(UNIT_STATE_CASTING) && !triggered)) - return; - - me->CastSpell(victim, spellId, triggered); -} - -inline void UnitAI::DoCastVictim(uint32 spellId, bool triggered) -{ - // Why don't we check for casting unit_state and existing target as we do in DoCast(.. ? - me->CastSpell(me->getVictim(), spellId, triggered); -} - -inline void UnitAI::DoCastAOE(uint32 spellId, bool triggered) -{ - if (!triggered && me->HasUnitState(UNIT_STATE_CASTING)) - return; - - me->CastSpell((Unit*)NULL, spellId, triggered); -} - -inline Creature* CreatureAI::DoSummon(uint32 entry, const Position& pos, uint32 despawnTime, TempSummonType summonType) -{ - return me->SummonCreature(entry, pos, summonType, despawnTime); -} - -inline Creature* CreatureAI::DoSummon(uint32 entry, WorldObject* obj, float radius, uint32 despawnTime, TempSummonType summonType) -{ - Position pos; - obj->GetRandomNearPosition(pos, radius); - return me->SummonCreature(entry, pos, summonType, despawnTime); -} - -inline Creature* CreatureAI::DoSummonFlyer(uint32 entry, WorldObject* obj, float flightZ, float radius, uint32 despawnTime, TempSummonType summonType) -{ - Position pos; - obj->GetRandomNearPosition(pos, radius); - pos.m_positionZ += flightZ; - return me->SummonCreature(entry, pos, summonType, despawnTime); -} - #endif diff --git a/src/server/game/Battlefield/BattlefieldMgr.cpp b/src/server/game/Battlefield/BattlefieldMgr.cpp index 5375ff8fe46..7e37e947646 100644 --- a/src/server/game/Battlefield/BattlefieldMgr.cpp +++ b/src/server/game/Battlefield/BattlefieldMgr.cpp @@ -51,7 +51,7 @@ void BattlefieldMgr::InitBattlefield() /* For Cataclysm: Tol Barad pBf = new BattlefieldTB; // respawn, init variables - if(!pBf->SetupBattlefield()) + if (!pBf->SetupBattlefield()) { sLog->outDebug(LOG_FILTER_BATTLEFIELD, "Battlefield : Tol Barad init failed."); delete pBf; diff --git a/src/server/game/Spells/Spell.cpp b/src/server/game/Spells/Spell.cpp index 534a8a4b6af..6f29caeeee4 100644 --- a/src/server/game/Spells/Spell.cpp +++ b/src/server/game/Spells/Spell.cpp @@ -823,10 +823,10 @@ void Spell::SelectEffectImplicitTargets(SpellEffIndex effIndex, SpellImplicitTar for (uint32 j = effIndex + 1; j < MAX_SPELL_EFFECTS; ++j) { SpellEffectInfo const* effects = GetSpellInfo()->Effects; - if (effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() - && effects[effIndex].TargetB.GetTarget() == effects[j].TargetB.GetTarget() - && effects[effIndex].ImplicitTargetConditions == effects[j].ImplicitTargetConditions - && effects[effIndex].CalcRadius(m_caster) == effects[j].CalcRadius(m_caster)) + if (effects[effIndex].TargetA.GetTarget() == effects[j].TargetA.GetTarget() && + effects[effIndex].TargetB.GetTarget() == effects[j].TargetB.GetTarget() && + effects[effIndex].ImplicitTargetConditions == effects[j].ImplicitTargetConditions && + effects[effIndex].CalcRadius(m_caster) == effects[j].CalcRadius(m_caster)) { effectMask |= 1 << j; } diff --git a/src/server/scripts/EasternKingdoms/CMakeLists.txt b/src/server/scripts/EasternKingdoms/CMakeLists.txt index 64b0bd5d4e8..6979af4ab0e 100644 --- a/src/server/scripts/EasternKingdoms/CMakeLists.txt +++ b/src/server/scripts/EasternKingdoms/CMakeLists.txt @@ -10,8 +10,8 @@ set(scripts_STAT_SRCS ${scripts_STAT_SRCS} - EasternKingdoms/ghostlands.cpp - EasternKingdoms/eversong_woods.cpp + EasternKingdoms/zone_ghostlands.cpp + EasternKingdoms/zone_eversong_woods.cpp EasternKingdoms/AlteracValley/boss_galvangar.cpp EasternKingdoms/AlteracValley/boss_balinda.cpp EasternKingdoms/AlteracValley/boss_drekthar.cpp @@ -31,7 +31,7 @@ set(scripts_STAT_SRCS EasternKingdoms/Scholomance/instance_scholomance.cpp EasternKingdoms/Scholomance/boss_lorekeeper_polkelt.cpp EasternKingdoms/Scholomance/boss_ras_frostwhisper.cpp - EasternKingdoms/isle_of_queldanas.cpp + EasternKingdoms/zone_isle_of_queldanas.cpp EasternKingdoms/ZulGurub/boss_grilek.cpp EasternKingdoms/ZulGurub/boss_hazzarah.cpp EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp @@ -43,12 +43,12 @@ set(scripts_STAT_SRCS EasternKingdoms/ZulGurub/boss_zanzil.cpp EasternKingdoms/ZulGurub/instance_zulgurub.cpp EasternKingdoms/ZulGurub/zulgurub.h - EasternKingdoms/wetlands.cpp - EasternKingdoms/arathi_highlands.cpp + EasternKingdoms/zone_wetlands.cpp + EasternKingdoms/zone_arathi_highlands.cpp EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp EasternKingdoms/Gnomeregan/gnomeregan.cpp EasternKingdoms/Gnomeregan/gnomeregan.h - EasternKingdoms/redridge_mountains.cpp + EasternKingdoms/zone_redridge_mountains.cpp EasternKingdoms/BlackrockDepths/boss_high_interrogator_gerstahn.cpp EasternKingdoms/BlackrockDepths/boss_gorosh_the_dervish.cpp EasternKingdoms/BlackrockDepths/blackrock_depths.cpp @@ -62,12 +62,12 @@ set(scripts_STAT_SRCS EasternKingdoms/BlackrockDepths/blackrock_depths.h EasternKingdoms/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp EasternKingdoms/BlackrockDepths/boss_magmus.cpp - EasternKingdoms/ironforge.cpp + EasternKingdoms/zone_ironforge.cpp EasternKingdoms/ScarletEnclave/chapter2.cpp EasternKingdoms/ScarletEnclave/chapter5.cpp EasternKingdoms/ScarletEnclave/chapter1.cpp - EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp - EasternKingdoms/eastern_plaguelands.cpp + EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp + EasternKingdoms/zone_eastern_plaguelands.cpp EasternKingdoms/MoltenCore/boss_gehennas.cpp EasternKingdoms/MoltenCore/boss_lucifron.cpp EasternKingdoms/MoltenCore/boss_golemagg.cpp @@ -94,7 +94,7 @@ set(scripts_STAT_SRCS EasternKingdoms/Stratholme/boss_postmaster_malown.cpp EasternKingdoms/Stratholme/stratholme.h EasternKingdoms/Stratholme/stratholme.cpp - EasternKingdoms/tirisfal_glades.cpp + EasternKingdoms/zone_tirisfal_glades.cpp EasternKingdoms/SunkenTemple/sunken_temple.cpp EasternKingdoms/SunkenTemple/sunken_temple.h EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp @@ -110,7 +110,7 @@ set(scripts_STAT_SRCS EasternKingdoms/Uldaman/uldaman.h EasternKingdoms/Uldaman/instance_uldaman.cpp EasternKingdoms/Uldaman/boss_archaedas.cpp - EasternKingdoms/swamp_of_sorrows.cpp + EasternKingdoms/zone_swamp_of_sorrows.cpp EasternKingdoms/BlackrockSpire/boss_pyroguard_emberseer.cpp EasternKingdoms/BlackrockSpire/boss_drakkisath.cpp EasternKingdoms/BlackrockSpire/boss_warmaster_voone.cpp @@ -134,12 +134,12 @@ set(scripts_STAT_SRCS EasternKingdoms/SunwellPlateau/boss_brutallus.cpp EasternKingdoms/SunwellPlateau/sunwell_plateau.cpp EasternKingdoms/SunwellPlateau/boss_felmyst.cpp - EasternKingdoms/stranglethorn_vale.cpp + EasternKingdoms/zone_stranglethorn_vale.cpp EasternKingdoms/Deadmines/deadmines.h EasternKingdoms/Deadmines/deadmines.cpp EasternKingdoms/Deadmines/boss_mr_smite.cpp EasternKingdoms/Deadmines/instance_deadmines.cpp - EasternKingdoms/duskwood.cpp + EasternKingdoms/zone_duskwood.cpp EasternKingdoms/ScarletMonastery/boss_azshir_the_sleepless.cpp EasternKingdoms/ScarletMonastery/boss_mograine_and_whitemane.cpp EasternKingdoms/ScarletMonastery/boss_bloodmage_thalnos.cpp @@ -152,13 +152,13 @@ set(scripts_STAT_SRCS EasternKingdoms/ScarletMonastery/boss_arcanist_doan.cpp EasternKingdoms/ScarletMonastery/boss_herod.cpp EasternKingdoms/ScarletMonastery/boss_scorn.cpp - EasternKingdoms/undercity.cpp - EasternKingdoms/silvermoon_city.cpp - EasternKingdoms/loch_modan.cpp + EasternKingdoms/zone_undercity.cpp + EasternKingdoms/zone_silvermoon_city.cpp + EasternKingdoms/zone_loch_modan.cpp EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp EasternKingdoms/ShadowfangKeep/shadowfang_keep.h - EasternKingdoms/burning_steppes.cpp + EasternKingdoms/zone_burning_steppes.cpp EasternKingdoms/BlackwingLair/boss_chromaggus.cpp EasternKingdoms/BlackwingLair/boss_razorgore.cpp EasternKingdoms/BlackwingLair/boss_firemaw.cpp @@ -169,8 +169,8 @@ set(scripts_STAT_SRCS EasternKingdoms/BlackwingLair/boss_nefarian.cpp EasternKingdoms/BlackwingLair/boss_flamegor.cpp EasternKingdoms/BlackwingLair/boss_victor_nefarius.cpp - EasternKingdoms/blasted_lands.cpp - EasternKingdoms/stormwind_city.cpp + EasternKingdoms/zone_blasted_lands.cpp + EasternKingdoms/zone_stormwind_city.cpp EasternKingdoms/ZulAman/boss_halazzi.cpp EasternKingdoms/ZulAman/boss_hexlord.cpp EasternKingdoms/ZulAman/boss_zuljin.cpp @@ -180,11 +180,11 @@ set(scripts_STAT_SRCS EasternKingdoms/ZulAman/boss_nalorakk.cpp EasternKingdoms/ZulAman/zulaman.cpp EasternKingdoms/ZulAman/zulaman.h - EasternKingdoms/hinterlands.cpp - EasternKingdoms/western_plaguelands.cpp - EasternKingdoms/alterac_mountains.cpp - EasternKingdoms/westfall.cpp - EasternKingdoms/silverpine_forest.cpp + EasternKingdoms/zone_hinterlands.cpp + EasternKingdoms/zone_western_plaguelands.cpp + EasternKingdoms/zone_alterac_mountains.cpp + EasternKingdoms/zone_westfall.cpp + EasternKingdoms/zone_silverpine_forest.cpp EasternKingdoms/Karazhan/instance_karazhan.cpp EasternKingdoms/Karazhan/boss_nightbane.cpp EasternKingdoms/Karazhan/karazhan.cpp diff --git a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp index 19b717fa6ea..85a113ec495 100644 --- a/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp +++ b/src/server/scripts/EasternKingdoms/MagistersTerrace/boss_vexallus.cpp @@ -70,9 +70,9 @@ public: return new boss_vexallusAI (creature); }; - struct boss_vexallusAI : public ScriptedAI + struct boss_vexallusAI : public BossAI { - boss_vexallusAI(Creature* creature) : ScriptedAI(creature) + boss_vexallusAI(Creature* creature) : BossAI(creature, DATA_VEXALLUS_EVENT) { instance = creature->GetInstanceScript(); } @@ -87,6 +87,7 @@ public: void Reset() { + summons.DespawnAll(); ChainLightningTimer = 8000; ArcaneShockTimer = 5000; OverloadTimer = 1200; @@ -104,6 +105,7 @@ public: void JustDied(Unit* /*killer*/) { + summons.DespawnAll(); if (instance) instance->SetData(DATA_VEXALLUS_EVENT, DONE); } @@ -206,7 +208,10 @@ public: struct mob_pure_energyAI : public ScriptedAI { - mob_pure_energyAI(Creature* creature) : ScriptedAI(creature) {} + mob_pure_energyAI(Creature* creature) : ScriptedAI(creature) + { + me->SetDisplayId(me->GetCreatureTemplate()->Modelid2); + } void Reset() {} diff --git a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp index b04327d8ac9..b04327d8ac9 100644 --- a/src/server/scripts/EasternKingdoms/ScarletEnclave/the_scarlet_enclave.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletEnclave/zone_the_scarlet_enclave.cpp diff --git a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp index 9b9af494554..9b9af494554 100644 --- a/src/server/scripts/EasternKingdoms/alterac_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_alterac_mountains.cpp diff --git a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp index 1ece674d0b8..1ece674d0b8 100644 --- a/src/server/scripts/EasternKingdoms/arathi_highlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_arathi_highlands.cpp diff --git a/src/server/scripts/EasternKingdoms/blasted_lands.cpp b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp index 4f76edf4406..4f76edf4406 100644 --- a/src/server/scripts/EasternKingdoms/blasted_lands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_blasted_lands.cpp diff --git a/src/server/scripts/EasternKingdoms/burning_steppes.cpp b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp index 808515269ad..808515269ad 100644 --- a/src/server/scripts/EasternKingdoms/burning_steppes.cpp +++ b/src/server/scripts/EasternKingdoms/zone_burning_steppes.cpp diff --git a/src/server/scripts/EasternKingdoms/duskwood.cpp b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp index 1ce83d31a63..1ce83d31a63 100644 --- a/src/server/scripts/EasternKingdoms/duskwood.cpp +++ b/src/server/scripts/EasternKingdoms/zone_duskwood.cpp diff --git a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp index a2522fd9495..a2522fd9495 100644 --- a/src/server/scripts/EasternKingdoms/eastern_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp diff --git a/src/server/scripts/EasternKingdoms/eversong_woods.cpp b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp index 432768a51de..432768a51de 100644 --- a/src/server/scripts/EasternKingdoms/eversong_woods.cpp +++ b/src/server/scripts/EasternKingdoms/zone_eversong_woods.cpp diff --git a/src/server/scripts/EasternKingdoms/ghostlands.cpp b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp index 0703f95a22c..0703f95a22c 100644 --- a/src/server/scripts/EasternKingdoms/ghostlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ghostlands.cpp diff --git a/src/server/scripts/EasternKingdoms/hinterlands.cpp b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp index 8373b20bc66..8373b20bc66 100644 --- a/src/server/scripts/EasternKingdoms/hinterlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_hinterlands.cpp diff --git a/src/server/scripts/EasternKingdoms/ironforge.cpp b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp index fb5758fa5cf..fb5758fa5cf 100644 --- a/src/server/scripts/EasternKingdoms/ironforge.cpp +++ b/src/server/scripts/EasternKingdoms/zone_ironforge.cpp diff --git a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp index bfd4d24cec6..bfd4d24cec6 100644 --- a/src/server/scripts/EasternKingdoms/isle_of_queldanas.cpp +++ b/src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp diff --git a/src/server/scripts/EasternKingdoms/loch_modan.cpp b/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp index c9ad06b919c..c9ad06b919c 100644 --- a/src/server/scripts/EasternKingdoms/loch_modan.cpp +++ b/src/server/scripts/EasternKingdoms/zone_loch_modan.cpp diff --git a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp index 9f1c33e0b1e..9f1c33e0b1e 100644 --- a/src/server/scripts/EasternKingdoms/redridge_mountains.cpp +++ b/src/server/scripts/EasternKingdoms/zone_redridge_mountains.cpp diff --git a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp index e750faefbf5..e750faefbf5 100644 --- a/src/server/scripts/EasternKingdoms/silvermoon_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silvermoon_city.cpp diff --git a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp index 5c7ff632c3e..5c7ff632c3e 100644 --- a/src/server/scripts/EasternKingdoms/silverpine_forest.cpp +++ b/src/server/scripts/EasternKingdoms/zone_silverpine_forest.cpp diff --git a/src/server/scripts/EasternKingdoms/stormwind_city.cpp b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp index 72520cf8dea..72520cf8dea 100644 --- a/src/server/scripts/EasternKingdoms/stormwind_city.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stormwind_city.cpp diff --git a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp index 6e14ef840a3..6e14ef840a3 100644 --- a/src/server/scripts/EasternKingdoms/stranglethorn_vale.cpp +++ b/src/server/scripts/EasternKingdoms/zone_stranglethorn_vale.cpp diff --git a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp index 110cead529e..110cead529e 100644 --- a/src/server/scripts/EasternKingdoms/swamp_of_sorrows.cpp +++ b/src/server/scripts/EasternKingdoms/zone_swamp_of_sorrows.cpp diff --git a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp index 903c88ad89a..903c88ad89a 100644 --- a/src/server/scripts/EasternKingdoms/tirisfal_glades.cpp +++ b/src/server/scripts/EasternKingdoms/zone_tirisfal_glades.cpp diff --git a/src/server/scripts/EasternKingdoms/undercity.cpp b/src/server/scripts/EasternKingdoms/zone_undercity.cpp index 2c3017a2f1a..2c3017a2f1a 100644 --- a/src/server/scripts/EasternKingdoms/undercity.cpp +++ b/src/server/scripts/EasternKingdoms/zone_undercity.cpp diff --git a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp index ee22b766154..ee22b766154 100644 --- a/src/server/scripts/EasternKingdoms/western_plaguelands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_western_plaguelands.cpp diff --git a/src/server/scripts/EasternKingdoms/westfall.cpp b/src/server/scripts/EasternKingdoms/zone_westfall.cpp index 1b93cf1be71..1b93cf1be71 100644 --- a/src/server/scripts/EasternKingdoms/westfall.cpp +++ b/src/server/scripts/EasternKingdoms/zone_westfall.cpp diff --git a/src/server/scripts/EasternKingdoms/wetlands.cpp b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp index c8a1fc2b2b4..c8a1fc2b2b4 100644 --- a/src/server/scripts/EasternKingdoms/wetlands.cpp +++ b/src/server/scripts/EasternKingdoms/zone_wetlands.cpp diff --git a/src/server/scripts/Kalimdor/CMakeLists.txt b/src/server/scripts/Kalimdor/CMakeLists.txt index 460d46c4e7a..4c22cdd080b 100644 --- a/src/server/scripts/Kalimdor/CMakeLists.txt +++ b/src/server/scripts/Kalimdor/CMakeLists.txt @@ -10,9 +10,9 @@ set(scripts_STAT_SRCS ${scripts_STAT_SRCS} - Kalimdor/stonetalon_mountains.cpp - Kalimdor/silithus.cpp - Kalimdor/moonglade.cpp + Kalimdor/zone_stonetalon_mountains.cpp + Kalimdor/zone_silithus.cpp + Kalimdor/zone_moonglade.cpp Kalimdor/RazorfenDowns/razorfen_downs.cpp Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp Kalimdor/RazorfenDowns/boss_amnennar_the_coldbringer.cpp @@ -58,10 +58,10 @@ set(scripts_STAT_SRCS Kalimdor/BlackfathomDeeps/blackfathom_deeps.cpp Kalimdor/BlackfathomDeeps/boss_aku_mai.cpp Kalimdor/BlackfathomDeeps/blackfathom_deeps.h - Kalimdor/azuremyst_isle.cpp - Kalimdor/orgrimmar.cpp - Kalimdor/desolace.cpp - Kalimdor/feralas.cpp + Kalimdor/zone_azuremyst_isle.cpp + Kalimdor/zone_orgrimmar.cpp + Kalimdor/zone_desolace.cpp + Kalimdor/zone_feralas.cpp Kalimdor/Maraudon/boss_princess_theradras.cpp Kalimdor/Maraudon/boss_landslide.cpp Kalimdor/Maraudon/boss_celebras_the_cursed.cpp @@ -78,7 +78,7 @@ set(scripts_STAT_SRCS Kalimdor/TempleOfAhnQiraj/boss_skeram.cpp Kalimdor/TempleOfAhnQiraj/boss_ouro.cpp Kalimdor/TempleOfAhnQiraj/boss_bug_trio.cpp - Kalimdor/darkshore.cpp + Kalimdor/zone_darkshore.cpp Kalimdor/RuinsOfAhnQiraj/boss_buru.cpp Kalimdor/RuinsOfAhnQiraj/instance_ruins_of_ahnqiraj.cpp Kalimdor/RuinsOfAhnQiraj/boss_rajaxx.cpp @@ -87,26 +87,27 @@ set(scripts_STAT_SRCS Kalimdor/RuinsOfAhnQiraj/boss_moam.cpp Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h Kalimdor/RuinsOfAhnQiraj/boss_kurinnaxx.cpp - Kalimdor/mulgore.cpp - Kalimdor/bloodmyst_isle.cpp - Kalimdor/thunder_bluff.cpp - Kalimdor/azshara.cpp + Kalimdor/zone_mulgore.cpp + Kalimdor/zone_bloodmyst_isle.cpp + Kalimdor/zone_thunder_bluff.cpp + Kalimdor/zone_azshara.cpp Kalimdor/RazorfenKraul/razorfen_kraul.h Kalimdor/RazorfenKraul/instance_razorfen_kraul.cpp Kalimdor/RazorfenKraul/razorfen_kraul.cpp - Kalimdor/the_barrens.cpp - Kalimdor/ungoro_crater.cpp + Kalimdor/zone_the_barrens.cpp + Kalimdor/zone_ungoro_crater.cpp Kalimdor/WailingCaverns/wailing_caverns.h Kalimdor/WailingCaverns/instance_wailing_caverns.cpp Kalimdor/WailingCaverns/wailing_caverns.cpp - Kalimdor/durotar.cpp - Kalimdor/felwood.cpp - Kalimdor/tanaris.cpp - Kalimdor/dustwallow_marsh.cpp - Kalimdor/winterspring.cpp - Kalimdor/thousand_needles.cpp - Kalimdor/ashenvale.cpp - Kalimdor/teldrassil.cpp + Kalimdor/zone_durotar.cpp + Kalimdor/zone_felwood.cpp + Kalimdor/boss_azuregos.cpp + Kalimdor/zone_tanaris.cpp + Kalimdor/zone_dustwallow_marsh.cpp + Kalimdor/zone_winterspring.cpp + Kalimdor/zone_thousand_needles.cpp + Kalimdor/zone_ashenvale.cpp + Kalimdor/zone_teldrassil.cpp Kalimdor/OnyxiasLair/boss_onyxia.cpp Kalimdor/OnyxiasLair/onyxias_lair.h Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp diff --git a/src/server/scripts/Kalimdor/ashenvale.cpp b/src/server/scripts/Kalimdor/zone_ashenvale.cpp index 94c68a1d3ec..94c68a1d3ec 100644 --- a/src/server/scripts/Kalimdor/ashenvale.cpp +++ b/src/server/scripts/Kalimdor/zone_ashenvale.cpp diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/zone_azshara.cpp index a44568e0472..a44568e0472 100644 --- a/src/server/scripts/Kalimdor/azshara.cpp +++ b/src/server/scripts/Kalimdor/zone_azshara.cpp diff --git a/src/server/scripts/Kalimdor/azuremyst_isle.cpp b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp index 08356070c36..08356070c36 100644 --- a/src/server/scripts/Kalimdor/azuremyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_azuremyst_isle.cpp diff --git a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp index 102a9494a65..102a9494a65 100644 --- a/src/server/scripts/Kalimdor/bloodmyst_isle.cpp +++ b/src/server/scripts/Kalimdor/zone_bloodmyst_isle.cpp diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/zone_darkshore.cpp index b98c51b552e..b98c51b552e 100644 --- a/src/server/scripts/Kalimdor/darkshore.cpp +++ b/src/server/scripts/Kalimdor/zone_darkshore.cpp diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/zone_desolace.cpp index 0ecf5e51c1f..0ecf5e51c1f 100644 --- a/src/server/scripts/Kalimdor/desolace.cpp +++ b/src/server/scripts/Kalimdor/zone_desolace.cpp diff --git a/src/server/scripts/Kalimdor/durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp index 7a8b4567699..7a8b4567699 100644 --- a/src/server/scripts/Kalimdor/durotar.cpp +++ b/src/server/scripts/Kalimdor/zone_durotar.cpp diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp index 59f707dadd9..59f707dadd9 100644 --- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp +++ b/src/server/scripts/Kalimdor/zone_dustwallow_marsh.cpp diff --git a/src/server/scripts/Kalimdor/felwood.cpp b/src/server/scripts/Kalimdor/zone_felwood.cpp index 47a6d10f67b..47a6d10f67b 100644 --- a/src/server/scripts/Kalimdor/felwood.cpp +++ b/src/server/scripts/Kalimdor/zone_felwood.cpp diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/zone_feralas.cpp index bde5e6ac25e..bde5e6ac25e 100644 --- a/src/server/scripts/Kalimdor/feralas.cpp +++ b/src/server/scripts/Kalimdor/zone_feralas.cpp diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/zone_moonglade.cpp index 7e52bd0eedf..7e52bd0eedf 100644 --- a/src/server/scripts/Kalimdor/moonglade.cpp +++ b/src/server/scripts/Kalimdor/zone_moonglade.cpp diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/zone_mulgore.cpp index 1ffe1179fbf..1ffe1179fbf 100644 --- a/src/server/scripts/Kalimdor/mulgore.cpp +++ b/src/server/scripts/Kalimdor/zone_mulgore.cpp diff --git a/src/server/scripts/Kalimdor/orgrimmar.cpp b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp index ccc8bdc257a..ccc8bdc257a 100644 --- a/src/server/scripts/Kalimdor/orgrimmar.cpp +++ b/src/server/scripts/Kalimdor/zone_orgrimmar.cpp diff --git a/src/server/scripts/Kalimdor/silithus.cpp b/src/server/scripts/Kalimdor/zone_silithus.cpp index 03a865a9620..03a865a9620 100644 --- a/src/server/scripts/Kalimdor/silithus.cpp +++ b/src/server/scripts/Kalimdor/zone_silithus.cpp diff --git a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp index 4c22b4fc81d..4c22b4fc81d 100644 --- a/src/server/scripts/Kalimdor/stonetalon_mountains.cpp +++ b/src/server/scripts/Kalimdor/zone_stonetalon_mountains.cpp diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/zone_tanaris.cpp index 97641e429ad..97641e429ad 100644 --- a/src/server/scripts/Kalimdor/tanaris.cpp +++ b/src/server/scripts/Kalimdor/zone_tanaris.cpp diff --git a/src/server/scripts/Kalimdor/teldrassil.cpp b/src/server/scripts/Kalimdor/zone_teldrassil.cpp index d7983c2cbe6..d7983c2cbe6 100644 --- a/src/server/scripts/Kalimdor/teldrassil.cpp +++ b/src/server/scripts/Kalimdor/zone_teldrassil.cpp diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/zone_the_barrens.cpp index a821a262764..a821a262764 100644 --- a/src/server/scripts/Kalimdor/the_barrens.cpp +++ b/src/server/scripts/Kalimdor/zone_the_barrens.cpp diff --git a/src/server/scripts/Kalimdor/thousand_needles.cpp b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp index df75b045309..df75b045309 100644 --- a/src/server/scripts/Kalimdor/thousand_needles.cpp +++ b/src/server/scripts/Kalimdor/zone_thousand_needles.cpp diff --git a/src/server/scripts/Kalimdor/thunder_bluff.cpp b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp index 1139122f73b..1139122f73b 100644 --- a/src/server/scripts/Kalimdor/thunder_bluff.cpp +++ b/src/server/scripts/Kalimdor/zone_thunder_bluff.cpp diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp index 823fe56d364..823fe56d364 100644 --- a/src/server/scripts/Kalimdor/ungoro_crater.cpp +++ b/src/server/scripts/Kalimdor/zone_ungoro_crater.cpp diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/zone_winterspring.cpp index 06f01033a25..06f01033a25 100644 --- a/src/server/scripts/Kalimdor/winterspring.cpp +++ b/src/server/scripts/Kalimdor/zone_winterspring.cpp diff --git a/src/server/scripts/Northrend/CMakeLists.txt b/src/server/scripts/Northrend/CMakeLists.txt index 233d49192e6..1da1e4ab178 100644 --- a/src/server/scripts/Northrend/CMakeLists.txt +++ b/src/server/scripts/Northrend/CMakeLists.txt @@ -10,9 +10,9 @@ set(scripts_STAT_SRCS ${scripts_STAT_SRCS} - Northrend/wintergrasp.cpp + Northrend/zone_wintergrasp.cpp Northrend/isle_of_conquest.cpp - Northrend/storm_peaks.cpp + Northrend/zone_storm_peaks.cpp Northrend/Ulduar/HallsOfLightning/instance_halls_of_lightning.cpp Northrend/Ulduar/HallsOfLightning/boss_bjarngrim.cpp Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h @@ -78,8 +78,8 @@ set(scripts_STAT_SRCS Northrend/Nexus/Oculus/boss_urom.cpp Northrend/Nexus/Oculus/oculus.cpp Northrend/Nexus/Oculus/instance_oculus.cpp - Northrend/Nexus/Nexus/commander_kolurg.cpp - Northrend/Nexus/Nexus/commander_stoutbeard.cpp + Northrend/Nexus/Nexus/boss_commander_kolurg.cpp + Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp Northrend/Nexus/Nexus/boss_ormorok.cpp Northrend/Nexus/Nexus/boss_magus_telestra.cpp Northrend/Nexus/Nexus/instance_nexus.cpp @@ -117,14 +117,14 @@ set(scripts_STAT_SRCS Northrend/Naxxramas/instance_naxxramas.cpp Northrend/Naxxramas/boss_grobbulus.cpp Northrend/Naxxramas/boss_noth.cpp - Northrend/crystalsong_forest.cpp + Northrend/zone_crystalsong_forest.cpp Northrend/VaultOfArchavon/boss_archavon.cpp Northrend/VaultOfArchavon/boss_koralon.cpp Northrend/VaultOfArchavon/vault_of_archavon.h Northrend/VaultOfArchavon/instance_vault_of_archavon.cpp Northrend/VaultOfArchavon/boss_emalon.cpp Northrend/VaultOfArchavon/boss_toravon.cpp - Northrend/sholazar_basin.cpp + Northrend/zone_sholazar_basin.cpp Northrend/UtgardeKeep/UtgardePinnacle/boss_palehoof.cpp Northrend/UtgardeKeep/UtgardePinnacle/boss_svala.cpp Northrend/UtgardeKeep/UtgardePinnacle/instance_pinnacle.cpp @@ -137,8 +137,8 @@ set(scripts_STAT_SRCS Northrend/UtgardeKeep/UtgardeKeep/instance_utgarde_keep.cpp Northrend/UtgardeKeep/UtgardeKeep/boss_keleseth.cpp Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp - Northrend/dragonblight.cpp - Northrend/grizzly_hills.cpp + Northrend/zone_dragonblight.cpp + Northrend/zone_grizzly_hills.cpp Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h Northrend/AzjolNerub/AzjolNerub/instance_azjol_nerub.cpp Northrend/AzjolNerub/AzjolNerub/boss_krikthir_the_gatewatcher.cpp @@ -176,8 +176,8 @@ set(scripts_STAT_SRCS Northrend/IcecrownCitadel/boss_valithria_dreamwalker.cpp Northrend/IcecrownCitadel/boss_sindragosa.cpp Northrend/IcecrownCitadel/boss_the_lich_king.cpp - Northrend/zuldrak.cpp - Northrend/icecrown.cpp + Northrend/zone_zuldrak.cpp + Northrend/zone_icecrown.cpp Northrend/Gundrak/boss_slad_ran.cpp Northrend/Gundrak/instance_gundrak.cpp Northrend/Gundrak/boss_drakkari_colossus.cpp @@ -185,9 +185,9 @@ set(scripts_STAT_SRCS Northrend/Gundrak/boss_gal_darah.cpp Northrend/Gundrak/boss_moorabi.cpp Northrend/Gundrak/boss_eck.cpp - Northrend/borean_tundra.cpp - Northrend/howling_fjord.cpp - Northrend/dalaran.cpp + Northrend/zone_borean_tundra.cpp + Northrend/zone_howling_fjord.cpp + Northrend/zone_dalaran.cpp Northrend/DraktharonKeep/boss_trollgore.cpp Northrend/DraktharonKeep/instance_drak_tharon_keep.cpp Northrend/DraktharonKeep/boss_novos.cpp diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp index fedb1f5cebc..fedb1f5cebc 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_kolurg.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_kolurg.cpp diff --git a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp index 39c93f15d6f..39c93f15d6f 100644 --- a/src/server/scripts/Northrend/Nexus/Nexus/commander_stoutbeard.cpp +++ b/src/server/scripts/Northrend/Nexus/Nexus/boss_commander_stoutbeard.cpp diff --git a/src/server/scripts/Northrend/borean_tundra.cpp b/src/server/scripts/Northrend/zone_borean_tundra.cpp index 8e7507bce61..8e7507bce61 100644 --- a/src/server/scripts/Northrend/borean_tundra.cpp +++ b/src/server/scripts/Northrend/zone_borean_tundra.cpp diff --git a/src/server/scripts/Northrend/crystalsong_forest.cpp b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp index d12b5176b15..d12b5176b15 100644 --- a/src/server/scripts/Northrend/crystalsong_forest.cpp +++ b/src/server/scripts/Northrend/zone_crystalsong_forest.cpp diff --git a/src/server/scripts/Northrend/dalaran.cpp b/src/server/scripts/Northrend/zone_dalaran.cpp index d16b6fe4588..d16b6fe4588 100644 --- a/src/server/scripts/Northrend/dalaran.cpp +++ b/src/server/scripts/Northrend/zone_dalaran.cpp diff --git a/src/server/scripts/Northrend/dragonblight.cpp b/src/server/scripts/Northrend/zone_dragonblight.cpp index a8fb0215902..a8fb0215902 100644 --- a/src/server/scripts/Northrend/dragonblight.cpp +++ b/src/server/scripts/Northrend/zone_dragonblight.cpp diff --git a/src/server/scripts/Northrend/grizzly_hills.cpp b/src/server/scripts/Northrend/zone_grizzly_hills.cpp index fe1f561071c..fe1f561071c 100644 --- a/src/server/scripts/Northrend/grizzly_hills.cpp +++ b/src/server/scripts/Northrend/zone_grizzly_hills.cpp diff --git a/src/server/scripts/Northrend/howling_fjord.cpp b/src/server/scripts/Northrend/zone_howling_fjord.cpp index ff4d8ec7a79..ff4d8ec7a79 100644 --- a/src/server/scripts/Northrend/howling_fjord.cpp +++ b/src/server/scripts/Northrend/zone_howling_fjord.cpp diff --git a/src/server/scripts/Northrend/icecrown.cpp b/src/server/scripts/Northrend/zone_icecrown.cpp index 2ec5a3e8164..2ec5a3e8164 100644 --- a/src/server/scripts/Northrend/icecrown.cpp +++ b/src/server/scripts/Northrend/zone_icecrown.cpp diff --git a/src/server/scripts/Northrend/sholazar_basin.cpp b/src/server/scripts/Northrend/zone_sholazar_basin.cpp index 2aa355084a1..2aa355084a1 100644 --- a/src/server/scripts/Northrend/sholazar_basin.cpp +++ b/src/server/scripts/Northrend/zone_sholazar_basin.cpp diff --git a/src/server/scripts/Northrend/storm_peaks.cpp b/src/server/scripts/Northrend/zone_storm_peaks.cpp index 85ab1dc1127..85ab1dc1127 100644 --- a/src/server/scripts/Northrend/storm_peaks.cpp +++ b/src/server/scripts/Northrend/zone_storm_peaks.cpp diff --git a/src/server/scripts/Northrend/wintergrasp.cpp b/src/server/scripts/Northrend/zone_wintergrasp.cpp index 8935c77b30e..8935c77b30e 100644 --- a/src/server/scripts/Northrend/wintergrasp.cpp +++ b/src/server/scripts/Northrend/zone_wintergrasp.cpp diff --git a/src/server/scripts/Northrend/zuldrak.cpp b/src/server/scripts/Northrend/zone_zuldrak.cpp index 69e8d900435..69e8d900435 100644 --- a/src/server/scripts/Northrend/zuldrak.cpp +++ b/src/server/scripts/Northrend/zone_zuldrak.cpp diff --git a/src/server/scripts/Outland/CMakeLists.txt b/src/server/scripts/Outland/CMakeLists.txt index 173af3374ad..f038af07634 100644 --- a/src/server/scripts/Outland/CMakeLists.txt +++ b/src/server/scripts/Outland/CMakeLists.txt @@ -10,7 +10,7 @@ set(scripts_STAT_SRCS ${scripts_STAT_SRCS} - Outland/nagrand.cpp + Outland/zone_nagrand.cpp Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h Outland/HellfireCitadel/MagtheridonsLair/instance_magtheridons_lair.cpp Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp @@ -44,7 +44,7 @@ set(scripts_STAT_SRCS Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp Outland/CoilfangReservoir/underbog/boss_hungarfen.cpp Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp - Outland/shattrath_city.cpp + Outland/zone_shattrath_city.cpp Outland/TempestKeep/Mechanar/boss_mechano_lord_capacitus.cpp Outland/TempestKeep/Mechanar/boss_pathaleon_the_calculator.cpp Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp @@ -62,7 +62,7 @@ set(scripts_STAT_SRCS Outland/TempestKeep/botanica/the_botanica.h Outland/TempestKeep/botanica/instance_the_botanica.cpp Outland/TempestKeep/botanica/boss_commander_sarannis.cpp - Outland/TempestKeep/botanica/thorngrin_the_tender.cpp + Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp Outland/TempestKeep/botanica/boss_high_botanist_freywinn.cpp Outland/TempestKeep/botanica/boss_warp_splinter.cpp Outland/TempestKeep/botanica/boss_laj.cpp @@ -85,8 +85,8 @@ set(scripts_STAT_SRCS Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h Outland/Auchindoun/ShadowLabyrinth/boss_grandmaster_vorpil.cpp Outland/boss_doomwalker.cpp - Outland/terokkar_forest.cpp - Outland/hellfire_peninsula.cpp + Outland/zone_terokkar_forest.cpp + Outland/zone_hellfire_peninsula.cpp Outland/boss_doomlord_kazzak.cpp Outland/BlackTemple/boss_teron_gorefiend.cpp Outland/BlackTemple/black_temple.h @@ -100,14 +100,14 @@ set(scripts_STAT_SRCS Outland/BlackTemple/boss_warlord_najentus.cpp Outland/BlackTemple/boss_bloodboil.cpp Outland/BlackTemple/boss_illidan.cpp - Outland/shadowmoon_valley.cpp - Outland/blades_edge_mountains.cpp + Outland/zone_shadowmoon_valley.cpp + Outland/zone_blades_edge_mountains.cpp Outland/GruulsLair/boss_high_king_maulgar.cpp Outland/GruulsLair/boss_gruul.cpp Outland/GruulsLair/gruuls_lair.h Outland/GruulsLair/instance_gruuls_lair.cpp - Outland/netherstorm.cpp - Outland/zangarmarsh.cpp + Outland/zone_netherstorm.cpp + Outland/zone_zangarmarsh.cpp ) message(" -> Prepared: Outland") diff --git a/src/server/scripts/Outland/TempestKeep/botanica/thorngrin_the_tender.cpp b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp index ffd48f4dcb5..ffd48f4dcb5 100644 --- a/src/server/scripts/Outland/TempestKeep/botanica/thorngrin_the_tender.cpp +++ b/src/server/scripts/Outland/TempestKeep/botanica/boss_thorngrin_the_tender.cpp diff --git a/src/server/scripts/Outland/blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp index d03abc82b9c..d03abc82b9c 100644 --- a/src/server/scripts/Outland/blades_edge_mountains.cpp +++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp diff --git a/src/server/scripts/Outland/hellfire_peninsula.cpp b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp index 64b484268df..64b484268df 100644 --- a/src/server/scripts/Outland/hellfire_peninsula.cpp +++ b/src/server/scripts/Outland/zone_hellfire_peninsula.cpp diff --git a/src/server/scripts/Outland/nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp index 0a92b985c95..0a92b985c95 100644 --- a/src/server/scripts/Outland/nagrand.cpp +++ b/src/server/scripts/Outland/zone_nagrand.cpp diff --git a/src/server/scripts/Outland/netherstorm.cpp b/src/server/scripts/Outland/zone_netherstorm.cpp index 769ee7dc68d..769ee7dc68d 100644 --- a/src/server/scripts/Outland/netherstorm.cpp +++ b/src/server/scripts/Outland/zone_netherstorm.cpp diff --git a/src/server/scripts/Outland/shadowmoon_valley.cpp b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp index 0a016f0923c..0a016f0923c 100644 --- a/src/server/scripts/Outland/shadowmoon_valley.cpp +++ b/src/server/scripts/Outland/zone_shadowmoon_valley.cpp diff --git a/src/server/scripts/Outland/shattrath_city.cpp b/src/server/scripts/Outland/zone_shattrath_city.cpp index ac26614ae69..ac26614ae69 100644 --- a/src/server/scripts/Outland/shattrath_city.cpp +++ b/src/server/scripts/Outland/zone_shattrath_city.cpp diff --git a/src/server/scripts/Outland/terokkar_forest.cpp b/src/server/scripts/Outland/zone_terokkar_forest.cpp index 2b046a7518e..2b046a7518e 100644 --- a/src/server/scripts/Outland/terokkar_forest.cpp +++ b/src/server/scripts/Outland/zone_terokkar_forest.cpp diff --git a/src/server/scripts/Outland/zangarmarsh.cpp b/src/server/scripts/Outland/zone_zangarmarsh.cpp index 319da372bf8..319da372bf8 100644 --- a/src/server/scripts/Outland/zangarmarsh.cpp +++ b/src/server/scripts/Outland/zone_zangarmarsh.cpp diff --git a/src/server/shared/Database/PreparedStatement.cpp b/src/server/shared/Database/PreparedStatement.cpp index 38c67495a65..86010e61686 100644 --- a/src/server/shared/Database/PreparedStatement.cpp +++ b/src/server/shared/Database/PreparedStatement.cpp @@ -241,7 +241,7 @@ void MySQLPreparedStatement::ClearParameters() } } -static bool ParementerIndexAssertFail(uint32 stmtIndex, uint8 index, uint32 paramCount) +static bool ParamenterIndexAssertFail(uint32 stmtIndex, uint8 index, uint32 paramCount) { sLog->outError(LOG_FILTER_SQL_DRIVER, "Attempted to bind parameter %u%s on a PreparedStatement %u (statement has only %u parameters)", uint32(index) + 1, (index == 1 ? "st" : (index == 2 ? "nd" : (index == 3 ? "rd" : "nd"))), stmtIndex, paramCount); return false; @@ -250,7 +250,7 @@ static bool ParementerIndexAssertFail(uint32 stmtIndex, uint8 index, uint32 para //- Bind on mysql level bool MySQLPreparedStatement::CheckValidIndex(uint8 index) { - ASSERT(index < m_paramCount || ParementerIndexAssertFail(m_stmt->m_index, index, m_paramCount)); + ASSERT(index < m_paramCount || ParamenterIndexAssertFail(m_stmt->m_index, index, m_paramCount)); if (m_paramsSet[index]) sLog->outWarn(LOG_FILTER_SQL, "[WARNING] Prepared Statement (id: %u) trying to bind value on already bound index (%u).", m_stmt->m_index, index); @@ -386,7 +386,7 @@ void MySQLPreparedStatement::setValue(MYSQL_BIND* param, enum_field_types type, memcpy(param->buffer, value, len); } -std::string MySQLPreparedStatement::getQueryString(std::string const &sqlPattern) const +std::string MySQLPreparedStatement::getQueryString(std::string const& sqlPattern) const { std::string queryString = sqlPattern; diff --git a/src/server/shared/Database/PreparedStatement.h b/src/server/shared/Database/PreparedStatement.h index 9334bc6dc66..2cab6e40de0 100644 --- a/src/server/shared/Database/PreparedStatement.h +++ b/src/server/shared/Database/PreparedStatement.h @@ -135,7 +135,7 @@ class MySQLPreparedStatement PreparedStatement* m_stmt; void ClearParameters(); bool CheckValidIndex(uint8 index); - std::string getQueryString(std::string const &sqlPattern) const; + std::string getQueryString(std::string const& sqlPattern) const; private: void setValue(MYSQL_BIND* param, enum_field_types type, const void* value, uint32 len, bool isUnsigned); |