aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorKudlaty <none@none>2009-08-14 21:58:29 +0200
committerKudlaty <none@none>2009-08-14 21:58:29 +0200
commitf37885c086be2c937afa62dfde868ebbcd97d79c (patch)
tree85eeaf0c10a2233d3eb1e0f44299a9268f41e815 /sql
parent372655d86263396738cc30a06026a3e16579dc3b (diff)
Merge [SD2]
r1281 Added support for quest 12247. Patch by Azuritus r1282 Added support for quest 11708. Patch by Azuritus. Additional cleanup and code style applied. r1283 Add support for quest 12807. Patch by Azuritus --HG-- branch : trunk
Diffstat (limited to 'sql')
-rw-r--r--sql/FULL/world_scripts_full.sql9
-rw-r--r--sql/updates/5023_world_scripts.sql5
2 files changed, 13 insertions, 1 deletions
diff --git a/sql/FULL/world_scripts_full.sql b/sql/FULL/world_scripts_full.sql
index b85b4b8cbb1..d53e4fed703 100644
--- a/sql/FULL/world_scripts_full.sql
+++ b/sql/FULL/world_scripts_full.sql
@@ -298,10 +298,11 @@ UPDATE `creature_template` SET `ScriptName`='mob_webbed_creature' WHERE `entry`=
UPDATE `creature_template` SET `ScriptName`='npc_captured_sunhawk_agent' WHERE `entry`=17824;
/* BOREAN TUNDRA */
+UPDATE `creature_template` SET `ScriptName`='npc_fizzcrank_fullthrottle' WHERE `entry`=25590;
UPDATE `creature_template` SET `ScriptName`='npc_surristrasz' WHERE `entry`=24795;
UPDATE `creature_template` SET `ScriptName`='npc_tiare' WHERE `entry`=30051;
UPDATE `creature_template` SET `ScriptName`='npc_sinkhole_kill_credit' WHERE `entry` IN (26248,26249);
-UPDATE `creature_template` SET `ScriptName`='npc_khunok_the_behemoth' WHERE (`entry`='25862');
+UPDATE `creature_template` SET `ScriptName`='npc_khunok_the_behemoth' WHERE `entry`=25862;
/* BURNING STEPPES */
UPDATE `creature_template` SET `ScriptName`='npc_ragged_john' WHERE `entry`=9563;
@@ -474,6 +475,9 @@ UPDATE `gameobject_template` SET `ScriptName`='go_gilded_brazier' WHERE `entry`=
/* GNOMEREGAN */
+/* GRIZZLY HILLS */
+UPDATE `creature_template` SET `ScriptName`='npc_orsonn_and_kodian' WHERE `entry` IN (27274, 27275);
+
/* GRUUL'S LAIR */
UPDATE `instance_template` SET `script`='instance_gruuls_lair' WHERE `map`=565;
UPDATE `creature_template` SET `ScriptName`='boss_gruul' WHERE `entry`=19044;
@@ -548,6 +552,9 @@ UPDATE `gameobject_template` SET `ScriptName`='go_haaleshi_altar' WHERE `entry`=
/* HINTERLANDS */
UPDATE `creature_template` SET `ScriptName`='npc_rinji' WHERE `entry`=7780;
+/* ICECROWN */
+UPDATE creature_template SET ScriptName='npc_arete' WHERE entry=29344;
+
/* IRONFORGE */
UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHERE `entry`=8879;
diff --git a/sql/updates/5023_world_scripts.sql b/sql/updates/5023_world_scripts.sql
new file mode 100644
index 00000000000..e753174d850
--- /dev/null
+++ b/sql/updates/5023_world_scripts.sql
@@ -0,0 +1,5 @@
+UPDATE creature_template SET ScriptName='npc_orsonn_and_kodian' WHERE entry IN (27274, 27275);
+
+UPDATE creature_template SET ScriptName='npc_fizzcrank_fullthrottle' WHERE entry=25590;
+
+UPDATE creature_template SET ScriptName='npc_arete' WHERE entry=29344;