From ed637fbf1fec965c8eaaf6e41e939107a5ea9aab Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Thu, 13 Aug 2009 02:48:34 +0200 Subject: Merge [SD2] r1211 Correct tempsummon type for adds and add spellId for future use. Patch by Abim - skip r1212 Added support for quest 6523. Patch by Meldanor - skip (already have that, just move waypoints to db) r1213 Add a few missing address-of operators and some general cleanup. r1214 Adjusting how pet are summoned and check when new pet can be summoned for sharkkis. - skip r1215 Added support for event related to quest 12727. Original patch by ckegg r1216 Some adjustments to function for controlling combat movement (MoveChase()) r1217 Use SetCombatMovement() for more scripts where expected and remove one useless function from Scripted_NoMovementAI (this may be fully removed) r1218 Correct script_texts, adding variable %s where missing (...and where expected. Note that not all creature emote texts contain name of sender). - skip r1219 Reset DATA_OPERA_OZ_DEATHCOUNT to 0 at start, in case event was previously run and incremented counter. r1220 Correct lost-in-process FillPointMovementListForCreature() for quest 12727 (copy/paste == bad) --HG-- branch : trunk --- sql/FULL/world_script_texts.sql | 14 +++++++++-- sql/FULL/world_script_waypoints.sql | 36 ++++++++++++++++++++++++++ sql/FULL/world_scripts_full.sql | 1 + sql/updates/4944_world.sql | 50 +++++++++++++++++++++++++++++++++++++ 4 files changed, 99 insertions(+), 2 deletions(-) create mode 100644 sql/updates/4944_world.sql (limited to 'sql') diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql index ecfef337f5e..1cc94bcc09b 100644 --- a/sql/FULL/world_script_texts.sql +++ b/sql/FULL/world_script_texts.sql @@ -30,7 +30,7 @@ CREATE TABLE `script_texts` ( INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES (-1000000, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'DEFAULT_TEXT'), -(-1000001, 'goes into a killing frenzy!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, 0, 0, 'EMOTE_GENERIC_FRENZY_KILL'), +(-1000001, '%s goes into a killing frenzy!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, 0, 0, 'EMOTE_GENERIC_FRENZY_KILL'), (-1000004, 'goes into a berserker rage!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 2, 0, 0, 'EMOTE_GENERIC_BERSERK'), (-1000005, 'UNUSED', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 0, 0, 0, 0, 'REUSE ME'); @@ -1952,7 +1952,17 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content (-1609085,'You have challenged death itself!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_F'), (-1609086,'The Lich King will see his true champion on this day!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_G'), (-1609087,'You\'re going down!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_H'), -(-1609088,'You don\'t stand a chance, $n', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_I'); +(-1609088,'You don\'t stand a chance, $n', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'dk_initiate SAY_DUEL_I'), +(-1609089, 'I\'ll need to get my runeblade and armor... Just need a little more time.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,399,'koltira SAY_BREAKOUT1'), +(-1609090, 'I\'m still weak, but I think I can get an anti-magic barrier up. Stay inside it or you\'ll be destroyed by their spells.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT2'), +(-1609091, 'Maintaining this barrier will require all of my concentration. Kill them all!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,16,'koltira SAY_BREAKOUT3'), +(-1609092, 'There are more coming. Defend yourself! Don\'t fall out of the anti-magic field! They\'ll tear you apart without its protection!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT4'), +(-1609093, 'I can\'t keep barrier up much longer... Where is that coward?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT5'), +(-1609094, 'The High Inquisitor comes! Be ready, death knight! Do not let him draw you out of the protective bounds of my anti-magic field! Kill him and take his head!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT6'), +(-1609095, 'Stay in the anti-magic field! Make them come to you!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT7'), +(-1609096, 'The death of the High Inquisitor of New Avalon will not go unnoticed. You need to get out of here at once! Go, before more of them show up. I\'ll be fine on my own.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT8'), +(-1609097, 'I\'ll draw their fire, you make your escape behind me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT9'), +(-1609098, 'Your High Inquisitor is nothing more than a pile of meat, Crusaders! There are none beyond the grasp of the Scourge!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,1,0,0,'koltira SAY_BREAKOUT10'); -- -- Below just for beautiful view in table, run at own desire diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql index 4bee03e175b..df7b78aaffd 100644 --- a/sql/FULL/world_script_waypoints.sql +++ b/sql/FULL/world_script_waypoints.sql @@ -13,6 +13,42 @@ CREATE TABLE script_waypoint ( PRIMARY KEY (entry, pointid) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 ROW_FORMAT=FIXED COMMENT='Script Creature waypoints'; +DELETE FROM script_waypoint WHERE entry=28912; +INSERT INTO script_waypoint VALUES +(28912, 0, 1653.518, -6038.374, 127.585, 0, 'Jump off'), +(28912, 1, 1653.978, -6034.614, 127.585, 5000, 'To Box'), +(28912, 2, 1653.854, -6034.726, 127.585, 500, 'Equip'), +(28912, 3, 1652.297, -6035.671, 127.585, 3000, 'Recover'), +(28912, 4, 1639.762, -6046.343, 127.948, 0, 'Escape'), +(28912, 5, 1640.963, -6028.119, 134.740, 0, ''), +(28912, 6, 1625.805, -6029.197, 134.740, 0, ''), +(28912, 7, 1626.845, -6015.085, 134.740, 0, ''), +(28912, 8, 1649.150, -6016.975, 133.240, 0, ''), +(28912, 9, 1653.063, -5974.844, 132.652, 5000, 'Mount'), +(28912, 10, 1654.747, -5926.424, 121.191, 0, 'Disappear'); + +DELETE FROM script_waypoint WHERE entry=11856; +INSERT INTO script_waypoint VALUES +(11856, 0, 113.91, -350.13, 4.55, 0, ''), +(11856, 1, 109.54, -350.08, 3.74, 0, ''), +(11856, 2, 106.95, -353.40, 3.60, 0, ''), +(11856, 3, 100.28, -338.89, 2.97, 0, ''), +(11856, 4, 110.11, -320.26, 3.47, 0, ''), +(11856, 5, 109.78, -287.80, 5.30, 0, ''), +(11856, 6, 105.02, -269.71, 4.71, 0, ''), +(11856, 7, 86.71, -251.81, 5.34, 0, ''), +(11856, 8, 64.10, -246.38, 5.91, 0, ''), +(11856, 9, -2.55, -243.58, 6.3, 0, ''), +(11856, 10, -27.78, -267.53, -1.08, 0, ''), +(11856, 11, -31.27, -283.54, -4.36, 0, ''), +(11856, 12, -28.96, -322.44, -9.19, 0, ''), +(11856, 13, -35.63, -360.03, -16.59, 0, ''), +(11856, 14, -58.30, -412.26, -30.60, 0, ''), +(11856, 15, -58.88, -474.17, -44.54, 0, ''), +(11856, 16, -45.92, -496.57, -46.26, 5000, 'AMBUSH'), +(11856, 17, -40.25, -510.07, -46.05, 0, ''), +(11856, 18, -38.88, -520.72, -46.06, 5000, 'END'); + DELETE FROM script_waypoint WHERE entry=24358; INSERT INTO script_waypoint VALUES (24358, 0, 121.193970, 1645.619385, 42.021, 0, ''), diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index 386090b735b..aef85a874f5 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -103,6 +103,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_dark_rider_of_acherus' WHERE `e UPDATE `creature_template` SET `ScriptName`='npc_ros_dark_rider' WHERE `entry`=28768; UPDATE `creature_template` SET `ScriptName`='npc_dkc1_gothik' WHERE `entry`=28658; UPDATE `creature_template` SET `ScriptName`='npc_a_special_surprise' WHERE `entry` IN (29032,29061,29065,29067,29068,29070,29074,29072,29073,29071); +UPDATE `creature_template` SET `ScriptName`='npc_koltira_deathweaver' WHERE `entry`=28912; UPDATE `creature_template` SET `ScriptName`='npc_demolisher_engineerer' WHERE `entry` IN (30400,30499); UPDATE `creature_template` SET `ScriptName`='npc_valkyr_battle_maiden' WHERE `entry`=28534; UPDATE `creature_template` SET `ScriptName`='npc_mirror_image' WHERE `entry`=31216; diff --git a/sql/updates/4944_world.sql b/sql/updates/4944_world.sql new file mode 100644 index 00000000000..cc1c26f20d6 --- /dev/null +++ b/sql/updates/4944_world.sql @@ -0,0 +1,50 @@ +DELETE FROM script_waypoint WHERE entry=11856; +INSERT INTO script_waypoint VALUES +(11856, 0, 113.91, -350.13, 4.55, 0, ''), +(11856, 1, 109.54, -350.08, 3.74, 0, ''), +(11856, 2, 106.95, -353.40, 3.60, 0, ''), +(11856, 3, 100.28, -338.89, 2.97, 0, ''), +(11856, 4, 110.11, -320.26, 3.47, 0, ''), +(11856, 5, 109.78, -287.80, 5.30, 0, ''), +(11856, 6, 105.02, -269.71, 4.71, 0, ''), +(11856, 7, 86.71, -251.81, 5.34, 0, ''), +(11856, 8, 64.10, -246.38, 5.91, 0, ''), +(11856, 9, -2.55, -243.58, 6.3, 0, ''), +(11856, 10, -27.78, -267.53, -1.08, 0, ''), +(11856, 11, -31.27, -283.54, -4.36, 0, ''), +(11856, 12, -28.96, -322.44, -9.19, 0, ''), +(11856, 13, -35.63, -360.03, -16.59, 0, ''), +(11856, 14, -58.30, -412.26, -30.60, 0, ''), +(11856, 15, -58.88, -474.17, -44.54, 0, ''), +(11856, 16, -45.92, -496.57, -46.26, 5000, 'AMBUSH'), +(11856, 17, -40.25, -510.07, -46.05, 0, ''), +(11856, 18, -38.88, -520.72, -46.06, 5000, 'END'); + +DELETE FROM script_waypoint WHERE entry=28912; +INSERT INTO script_waypoint VALUES +(28912, 0, 1653.518, -6038.374, 127.585, 0, 'Jump off'), +(28912, 1, 1653.978, -6034.614, 127.585, 5000, 'To Box'), +(28912, 2, 1653.854, -6034.726, 127.585, 500, 'Equip'), +(28912, 3, 1652.297, -6035.671, 127.585, 3000, 'Recover'), +(28912, 4, 1639.762, -6046.343, 127.948, 0, 'Escape'), +(28912, 5, 1640.963, -6028.119, 134.740, 0, ''), +(28912, 6, 1625.805, -6029.197, 134.740, 0, ''), +(28912, 7, 1626.845, -6015.085, 134.740, 0, ''), +(28912, 8, 1649.150, -6016.975, 133.240, 0, ''), +(28912, 9, 1653.063, -5974.844, 132.652, 5000, 'Mount'), +(28912, 10, 1654.747, -5926.424, 121.191, 0, 'Disappear'); + +UPDATE creature_template SET ScriptName='npc_koltira_deathweaver' WHERE entry=28912; + +DELETE FROM `script_texts` WHERE `entry` between -1609098 AND -1609089; +INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content_loc2`, `content_loc3`, `content_loc4`, `content_loc5`, `content_loc6`, `content_loc7`, `content_loc8`, `sound`, `type`, `language`, `emote`, `comment`) VALUES +(-1609089, 'I\'ll need to get my runeblade and armor... Just need a little more time.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,399,'koltira SAY_BREAKOUT1'), +(-1609090, 'I\'m still weak, but I think I can get an anti-magic barrier up. Stay inside it or you\'ll be destroyed by their spells.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT2'), +(-1609091, 'Maintaining this barrier will require all of my concentration. Kill them all!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,16,'koltira SAY_BREAKOUT3'), +(-1609092, 'There are more coming. Defend yourself! Don\'t fall out of the anti-magic field! They\'ll tear you apart without its protection!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT4'), +(-1609093, 'I can\'t keep barrier up much longer... Where is that coward?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT5'), +(-1609094, 'The High Inquisitor comes! Be ready, death knight! Do not let him draw you out of the protective bounds of my anti-magic field! Kill him and take his head!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT6'), +(-1609095, 'Stay in the anti-magic field! Make them come to you!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT7'), +(-1609096, 'The death of the High Inquisitor of New Avalon will not go unnoticed. You need to get out of here at once! Go, before more of them show up. I\'ll be fine on my own.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT8'), +(-1609097, 'I\'ll draw their fire, you make your escape behind me.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,0,0,0,'koltira SAY_BREAKOUT9'), +(-1609098, 'Your High Inquisitor is nothing more than a pile of meat, Crusaders! There are none beyond the grasp of the Scourge!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,0,1,0,0,'koltira SAY_BREAKOUT10'); -- cgit v1.2.3