diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-25 23:10:45 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-02-25 23:10:45 +0100 |
| commit | 8d64a77bc074280747317c99a2b6e0074223ad5b (patch) | |
| tree | 50fd89f3fbb16e732b64891b077eacd21667c103 /sql | |
| parent | 529c4b7592b7e9b2f15436e98566bbe5da463534 (diff) | |
| parent | 4bdc9e6f1cf104fc8f09ab2d9e7c7832c012e2d5 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
Diffstat (limited to 'sql')
3 files changed, 7 insertions, 0 deletions
diff --git a/sql/updates/world/2013_02_25_00_world_smart_scripts.sql b/sql/updates/world/2013_02_25_00_world_smart_scripts.sql new file mode 100644 index 00000000000..b1576d4189e --- /dev/null +++ b/sql/updates/world/2013_02_25_00_world_smart_scripts.sql @@ -0,0 +1,5 @@ +DELETE FROM `smart_scripts` WHERE `entryorguid`=29861 AND `source_type`=0; +INSERT INTO `smart_scripts`(`entryorguid`,`source_type`,`id`,`event_type`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`target_type`,`comment`) VALUES +(29861,0,0,54,0,0,0,0,80,2986100,2,1,'Stormforged Eradictor - Just summoned - Call timed actionlist 2986100'), +(29861,0,1,0,3000,7000,14000,18000,11,56352,0,2,'Stormforged Eradictor - Cast Storm Punch'), +(29861,0,2,0,9000,12000,13000,18000,11,15588,0,0,'Stormforged Eradictor - Cast Thunderclap'); diff --git a/sql/updates/world/2013_02_25_01_world_creature_ai_scripts.sql b/sql/updates/world/2013_02_25_01_world_creature_ai_scripts.sql new file mode 100644 index 00000000000..e095414552c --- /dev/null +++ b/sql/updates/world/2013_02_25_01_world_creature_ai_scripts.sql @@ -0,0 +1 @@ +DELETE FROM `creature_ai_scripts` WHERE `creature_id`=29861; diff --git a/sql/updates/world/2013_02_25_02_world_areatrigger_teleport.sql b/sql/updates/world/2013_02_25_02_world_areatrigger_teleport.sql new file mode 100644 index 00000000000..aa74fd46810 --- /dev/null +++ b/sql/updates/world/2013_02_25_02_world_areatrigger_teleport.sql @@ -0,0 +1 @@ +UPDATE `areatrigger_teleport` SET `target_position_x`=728.055,`target_position_y`= 1329.03,`target_position_z`=275,`target_orientation`=5.51524 WHERE `id`=5290; -- The Eye of Eternity (entrance) |