From f6ec531d4d467945d169aabbf86a3444a710117a Mon Sep 17 00:00:00 2001 From: Kudlaty Date: Thu, 13 Aug 2009 05:47:23 +0200 Subject: Merge [SD2] r1221 Restore compile after changes to KilledMonster(). Remove no longer needed code where creature_template are expected to have definitions for KillCredit. Replace one creature script with areatrigger script and some related code cleanup. Requires Mangos 8190+ r1222 Move waypoints for Barnes to database. Also adjust code and simplify parts of pre-event. Some additional code cleanup r1223 Clean up labels for Kara instance. r1224 Replace use of MANGOS_DLL_SPEC with MANGOS_DLL_DECL as expected in script. Thanks Zor for notice. - skip r1225 Add new options for escortAI. For normal escorts, InstantRespawn can be set true (normal will despawn creature and use database spawntimesecs) For non-escorting scripts, option to loop path can be set. Creature will return to respawn coords and after, start path from beginning. r1226 Remove escortAI option to defend self. Creature must be able to enter combat with any attacking and then defend self by attacking back. If custom cases exist where creature must not be set in combat with attacking, then custom script is expected. r1227 Using _SECURE_SCL=0 to speedup iterators in Windows (release build, ref Mangos rev 8194). Patch by Vladimir - skip r1228 Clean up gruul instance + scripts, add instance save and apply sd2 code style. Some adjustment to hurtful strike. Minor adjustments to other spell abilities. Create own AI for adds, and avoid repetitive code being common for all adds. Patch by Abim - skip r1229 Move door code to instance script and simplify Set/GetData() code and aggro check. - skip r1230 Remove no longer needed call to Reset() in Council_Base_AI and correct typo. - skip --HG-- branch : trunk --- sql/FULL/world_script_waypoints.sql | 13 +++++++++++++ sql/FULL/world_scripts_full.sql | 4 +++- sql/updates/4959_world.sql | 17 +++++++++++++++++ 3 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 sql/updates/4959_world.sql (limited to 'sql') diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql index df7b78aaffd..020b4b6f292 100644 --- a/sql/FULL/world_script_waypoints.sql +++ b/sql/FULL/world_script_waypoints.sql @@ -13,6 +13,19 @@ 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=16812; +INSERT INTO script_waypoint VALUES +(16812, 0, -10868.260, -1779.836, 90.476, 2500, 'Open door, begin walking'), +(16812, 1, -10875.585, -1779.581, 90.478, 0, ''), +(16812, 2, -10887.447, -1779.258, 90.476, 0, ''), +(16812, 3, -10894.592, -1780.668, 90.476, 0, ''), +(16812, 4, -10895.015, -1782.036, 90.476, 2500, 'Begin Speech after this'), +(16812, 5, -10894.592, -1780.668, 90.476, 0, 'Resume walking (back to spawn point now) after speech'), +(16812, 6, -10887.447, -1779.258, 90.476, 0, ''), +(16812, 7, -10875.585, -1779.581, 90.478, 0, ''), +(16812, 8, -10868.260, -1779.836, 90.476, 5000, 'close door'), +(16812, 9, -10866.799, -1780.958, 90.470, 2000, 'Summon mobs, open curtains'); + DELETE FROM script_waypoint WHERE entry=28912; INSERT INTO script_waypoint VALUES (28912, 0, 1653.518, -6038.374, 127.585, 0, 'Jump off'), diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql index aef85a874f5..06d18af2485 100644 --- a/sql/FULL/world_scripts_full.sql +++ b/sql/FULL/world_scripts_full.sql @@ -115,7 +115,6 @@ UPDATE `creature_template` SET `ScriptName`='npc_lightwell' WHERE `entry` IN (31 /* */ /* ALTERAC MOUNTAINS */ -UPDATE `creature_template` SET `ScriptName`='npc_ravenholdt' WHERE `entry`=13936; /* ALTERAC VALLEY */ @@ -1198,3 +1197,6 @@ UPDATE `creature_template` SET `ScriptName` = 'npc_skywing' WHERE entry=22424; DELETE FROM areatrigger_scripts WHERE entry = 4156; INSERT INTO areatrigger_scripts VALUES (4156, 'at_naxxramas_frostwyrm_wing'); + +DELETE FROM areatrigger_scripts WHERE entry=3066; +INSERT INTO areatrigger_scripts VALUES (3066,'at_ravenholdt'); diff --git a/sql/updates/4959_world.sql b/sql/updates/4959_world.sql new file mode 100644 index 00000000000..cfcebe70db6 --- /dev/null +++ b/sql/updates/4959_world.sql @@ -0,0 +1,17 @@ +UPDATE creature_template SET ScriptName='' WHERE entry=13936; + +DELETE FROM areatrigger_scripts WHERE entry=3066; +INSERT INTO areatrigger_scripts VALUES (3066,'at_ravenholdt'); + +DELETE FROM script_waypoint WHERE entry=16812; +INSERT INTO script_waypoint VALUES +(16812, 0, -10868.260, -1779.836, 90.476, 2500, 'Open door, begin walking'), +(16812, 1, -10875.585, -1779.581, 90.478, 0, ''), +(16812, 2, -10887.447, -1779.258, 90.476, 0, ''), +(16812, 3, -10894.592, -1780.668, 90.476, 0, ''), +(16812, 4, -10895.015, -1782.036, 90.476, 2500, 'Begin Speech after this'), +(16812, 5, -10894.592, -1780.668, 90.476, 0, 'Resume walking (back to spawn point now) after speech'), +(16812, 6, -10887.447, -1779.258, 90.476, 0, ''), +(16812, 7, -10875.585, -1779.581, 90.478, 0, ''), +(16812, 8, -10868.260, -1779.836, 90.476, 5000, 'close door'), +(16812, 9, -10866.799, -1780.958, 90.470, 2000, 'Summon mobs, open curtains'); -- cgit v1.2.3