Remove some guardAI gossip (handled DB-side), remove some NPC gossip (handled DB-side)

--HG--
branch : trunk

2 files changed, 45 insertions, 17 deletions

diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index c2401205e08..43758eda6c1 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -86,25 +86,9 @@ UPDATE `gameobject_template` SET `ScriptName`='go_dragonflayer_cage' WHERE entry
 UPDATE `gameobject_template` SET `ScriptName`='go_black_cage' WHERE `entry`=195310;
 
 /* GUARD */
-UPDATE `creature_template` SET `ScriptName`='guard_azuremyst' WHERE `entry`=18038;
+UPDATE `creature_template` SET `ScriptName`='guard_generic' WHERE `entry` IN (727,1423,1735,1738,1742,1743,1744,1745,1746,2209,2210,3084,3212,3215,3217,3218,3219,3220,3221,3222,3223,3224,3502,3571,4262,4264,5595,5624,5725,5953,9460,11190,13076,15184,16221,16222,16733,18038,19687);
 UPDATE `creature_template` SET `ScriptName`='guard_orgrimmar' WHERE `entry`=3296;
 UPDATE `creature_template` SET `ScriptName`='guard_stormwind' WHERE `entry` IN (68,1976);
-UPDATE `creature_template` SET `ScriptName`='guard_contested' WHERE `entry` IN (9460,4624,3502,11190,15184);
-UPDATE `creature_template` SET `ScriptName`='guard_elwynnforest' WHERE `entry`=1423;
-UPDATE `creature_template` SET `ScriptName`='guard_eversong' WHERE `entry`=16221;
-UPDATE `creature_template` SET `ScriptName`='guard_darnassus' WHERE `entry`=4262;
-UPDATE `creature_template` SET `ScriptName`='guard_teldrassil' WHERE `entry`=3571;
-UPDATE `creature_template` SET `ScriptName`='guard_ironforge' WHERE `entry`=5595;
-UPDATE `creature_template` SET `ScriptName`='guard_dunmorogh' WHERE `entry` IN (727,13076);
-UPDATE `creature_template` SET `ScriptName`='guard_undercity' WHERE `entry`=5624;
-UPDATE `creature_template` SET `ScriptName`='guard_bluffwatcher' WHERE `entry`=3084;
-UPDATE `creature_template` SET `ScriptName`='guard_durotar' WHERE `entry`=5953;
-UPDATE `creature_template` SET `ScriptName`='guard_mulgore' WHERE `entry` IN (3212,3215,3217,3218,3219,3220,3221,3222,3223,3224);
-UPDATE `creature_template` SET `ScriptName`='guard_dunmorogh' WHERE `entry` IN (727,13076);
-UPDATE `creature_template` SET `ScriptName`='guard_tirisfal' WHERE `entry` IN (1735,1738,2210,1744,1745,5725,1743,2209,1746,1742);
-UPDATE `creature_template` SET `ScriptName`='guard_silvermoon' WHERE `entry`=16222;
-UPDATE `creature_template` SET `ScriptName`='guard_exodar' WHERE `entry`=16733;
-UPDATE `creature_template` SET `ScriptName`='guard_shattrath' WHERE `entry`=19687;
 UPDATE `creature_template` SET `ScriptName`='guard_shattrath_aldor' WHERE `entry`=18549;
 UPDATE `creature_template` SET `ScriptName`='guard_shattrath_scryer' WHERE `entry`=18568;
 
diff --git a/sql/updates/8306_world_scriptname.sql b/sql/updates/8306_world_scriptname.sql
new file mode 100644
index 00000000000..7578cfd60fd
--- /dev/null
+++ b/sql/updates/8306_world_scriptname.sql
@@ -0,0 +1,44 @@
+--
+-- Update basic NPC guards to use a common AI - gossip now handled in database
+--
+-- guard_azuremyst -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (18038);
+-- guard_bluffwatcher -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (3084);
+-- guard_contested -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (3502,4624,9460,11190,15184);
+-- guard_darnassus -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (4262);
+-- guard_dunmorogh -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (727,13076);
+-- guard_durotar -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (5953);
+-- guard_elwynnforest -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (1423);
+-- guard_eversong -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (16221);
+-- guard_exodar -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (16733);
+-- guard_ironforge -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (5595);
+-- guard_mulgore -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (3212,3215,3217,3218,3219,3220,3221,3222,3223,3224);
+-- guard_shattrath -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (19687);
+-- guard_silvermoon -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (16222);
+-- guard_teldrassil -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (3571);
+-- guard_tirisfal -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (1735,1738,1742,1743,1744,1745,1746,2209,2210,5725);
+-- guard_undercity -> guard_generic
+UPDATE `creature_template` SET `ScriptName` = 'guard_generic' WHERE `entry` IN (5624);
+--
+-- Update (remove) scripts from NPCs that had gossip - gossip now handled in database (AI removed)
+--
+-- NPC Surristrasz
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` IN (24795);
+-- NPC Tiare
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` IN (30051);
+-- NPC Fizzcrank Fullthrottle
+UPDATE `creature_template` SET `ScriptName` = '' WHERE `entry` IN (25590);