From 2ac0089d165a86c54858b11b1b775416ddc555f7 Mon Sep 17 00:00:00 2001
From: Kudlaty <none@none>
Date: Fri, 19 Jun 2009 00:22:19 +0200
Subject: Merge [SD2] r1056 Added some texts for future use + added one
 additional waypoint for npc 24358 r1057 Add spell and correct gossip text for
 npc 24358. Move open door code to instance script r1058 Simplify scripts
 using manual call ActivateTaxiPathTo().       Added ScriptName for npc 22112,
 also cleanup code. r1059 Remove redundant call to activateTaxiPathTo(), taxi
 already implemented for related spell. Some code cleanup r1060 Update scripts
 with SD2 code style for a few commonly used pointers passed in functions
 (Player* pPlayer, Creature* pCreature, etc)       Remove some useless
 whitespace - Skip r1061 Trim trailing whitespace in source files. - Skip
 r1062 Added script to control misc alarm/rooftop bots, summoning guards when
 hostile players comes in range and trigger AttackStart based on aura. r1063
 Fixed missing call to AI constructor for npc 18585. Code cleanup. r1064
 Correcting a few wrong gossip icons. Code cleanup. r1065 Fixed two more lost
 calls to ai constructors.       Add one missing scriptname to *full.sql added
 in rev 982

--HG--
branch : trunk
---
 sql/FULL/world_script_texts.sql     | 1 +
 sql/FULL/world_script_waypoints.sql | 7 +++++++
 sql/FULL/world_scripts_full.sql     | 1 +
 sql/updates/4154_world_script.sql   | 1 +
 4 files changed, 10 insertions(+)
 create mode 100644 sql/updates/4154_world_script.sql

(limited to 'sql')

diff --git a/sql/FULL/world_script_texts.sql b/sql/FULL/world_script_texts.sql
index 3f37206eed7..59a7c208cee 100644
--- a/sql/FULL/world_script_texts.sql
+++ b/sql/FULL/world_script_texts.sql
@@ -999,6 +999,7 @@ INSERT INTO `script_texts` (`entry`, `content_default`, `content_loc1`, `content
 (-1543014, 'Die, weakling!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10282, 1, 0, 0, 'omor SAY_KILL_1'),
 (-1543015, 'It is... not over.', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10284, 1, 0, 0, 'omor SAY_DIE'),
 (-1543016, 'I am victorious!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10283, 1, 0, 0, 'omor SAY_WIPE'),
+
 (-1543017, 'You have faced many challenges, pity they were all in vain. Soon your people will kneel to my lord!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10292, 1, 0, 0, 'vazruden SAY_INTRO'),
 (-1543018, 'Is there no one left to test me?', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10293, 1, 0, 0, 'vazruden SAY_WIPE'),
 (-1543019, 'Your time is running out!', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 10294, 1, 0, 0, 'vazruden SAY_AGGRO_1'),
diff --git a/sql/FULL/world_script_waypoints.sql b/sql/FULL/world_script_waypoints.sql
index a92d60114a1..6c73a8e9c90 100644
--- a/sql/FULL/world_script_waypoints.sql
+++ b/sql/FULL/world_script_waypoints.sql
@@ -13,6 +13,13 @@ 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=24358;
+INSERT INTO script_waypoint VALUES
+(24358, 0, 121.193970, 1645.619385, 42.021, 0, ''),
+(24358, 1, 132.051468, 1642.176025, 42.021, 5000, 'SAY_AT_GONG'),
+(24358, 2, 120.670631, 1636.346802, 42.415, 0, ''),
+(24358, 3, 120.536003, 1611.654663, 43.473, 10000, 'SAY_OPEN_ENTRANCE'),
+(24358, 4, 120.536003, 1611.654663, 43.473, 0, '');
 
 DELETE FROM script_waypoint WHERE entry=16295;
 INSERT INTO script_waypoint VALUES
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index 50736793824..14a5d5e8f22 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -83,6 +83,7 @@ UPDATE `item_template` SET `ScriptName`='item_only_for_flight' WHERE `entry` IN
 UPDATE `item_template` SET `ScriptName`='item_inoculating_crystal' WHERE `entry`=22962;
 
 /* NPC (usually creatures to be found in more than one specific zone) */
+UPDATE `creature_template` SET `ScriptName`='npc_air_force_bots' WHERE `entry` IN (2614, 2615, 21974, 21993, 21996, 21997, 21999, 22001, 22002, 22003, 22063, 22065, 22066, 22068, 22069, 22070, 22071, 22078, 22079, 22080, 22086, 22087, 22088, 22090, 22124, 22125, 22126);
 UPDATE `creature_template` SET `ScriptName`='npc_chicken_cluck' WHERE `entry`=620;
 UPDATE `creature_template` SET `ScriptName`='npc_dancing_flames' WHERE `entry`=25305;
 UPDATE `creature_template` SET `ScriptName`='npc_garments_of_quests' WHERE `entry` IN (12429,12423,12427,12430,12428);
diff --git a/sql/updates/4154_world_script.sql b/sql/updates/4154_world_script.sql
new file mode 100644
index 00000000000..1372842790b
--- /dev/null
+++ b/sql/updates/4154_world_script.sql
@@ -0,0 +1 @@
+UPDATE creature_template SET ScriptName='npc_air_force_bots' WHERE entry IN (2614, 2615, 21974, 21993, 21996, 21997, 21999, 22001, 22002, 22003, 22063, 22065, 22066, 22068, 22069, 22070, 22071, 22078, 22079, 22080, 22086, 22087, 22088, 22090, 22124, 22125, 22126);
-- 
cgit v1.2.3