aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorManuel Carrasco <manue.l@live.com.ar>2011-02-10 22:36:35 -0300
committerManuel Carrasco <manue.l@live.com.ar>2011-02-10 22:36:35 -0300
commit6b2ffc90394941b14081f5b54a8145c828e60c31 (patch)
tree7d29cac880dc1d054f73ba9a67128e2e288e898a /sql
parent71849e0efe28bd1eb14fee0bc4e3f307f6dd1be2 (diff)
Core/GuardAI: Guards don't evade if the target casts Vanish and also can detect players with Feign Death.
Core/Scripts: Moved scripts from ScriptedGuardAI to guards.cpp Core/Creature: Removed custom npcflags UNIT_NPC_FLAG_GUARD (now moved to flag_extras) and UNIT_NPC_FLAG_OUTDOORPVP (not used) Thanks to Kaelima, Xanadu, Shauren and linencloth. Signed-off-by: Manuel Carrasco <manue.l@live.com.ar>
Diffstat (limited to 'sql')
-rw-r--r--sql/scripts/world_scripts_full.sql4
-rw-r--r--sql/updates/world/2011_02_10_3_world_creature_template.sql2
-rw-r--r--sql/updates/world/2011_02_10_4_world_scriptname.sql2
3 files changed, 5 insertions, 3 deletions
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index 8f3aa125b13..d8f8dae3a49 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -96,9 +96,7 @@ UPDATE `gameobject_template` SET `ScriptName`='go_massive_seaforium_charge' WHER
UPDATE `gameobject_template` SET `ScriptName`='go_harpoon_launcher' WHERE `entry` IN (192175,192176,192177);
/* GUARD */
-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_generic' WHERE `entry` IN (68,1976,3218,3296,3502,4624,9460,11190,15184);
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/world/2011_02_10_3_world_creature_template.sql b/sql/updates/world/2011_02_10_3_world_creature_template.sql
new file mode 100644
index 00000000000..1bcf6d69dc3
--- /dev/null
+++ b/sql/updates/world/2011_02_10_3_world_creature_template.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `flags_extra`=`flags_extra`|0x00008000,`npcflag`=`npcflag`&~0x10000000 WHERE `npcflag` & 0x10000000;
+UPDATE `creature_template` SET `npcflag`=`npcflag`&~0x20000000 WHERE `npcflag` & 0x20000000; \ No newline at end of file
diff --git a/sql/updates/world/2011_02_10_4_world_scriptname.sql b/sql/updates/world/2011_02_10_4_world_scriptname.sql
new file mode 100644
index 00000000000..9745c5a3b0a
--- /dev/null
+++ b/sql/updates/world/2011_02_10_4_world_scriptname.sql
@@ -0,0 +1,2 @@
+UPDATE `creature_template` SET `ScriptName`='' WHERE `ScriptName` LIKE 'guard_generic' AND (`spell1`=0 AND `spell2`=0);
+UPDATE `creature_template` SET `ScriptName`='guard_generic' WHERE `ScriptName`='guard_stormwind' OR `ScriptName`='guard_orgrimmar'; \ No newline at end of file