aboutsummaryrefslogtreecommitdiff
path: root/sql/scripts
diff options
context:
space:
mode:
authorShauren <none@none>2010-08-19 16:40:47 +0200
committerShauren <none@none>2010-08-19 16:40:47 +0200
commita693f49bd1cf9fb43b7da4172a1ba66369047a7d (patch)
treeb10d50448ab3109a83a39a65bd917c11f426c1a0 /sql/scripts
parent46438f9f92c52deef2c6f0ed35402885127eeeb7 (diff)
Vehicles: Prohibit entering vehicle in combat only if it is a multi-passenger mount
Scripts/Icecrown Citadel: Changed Bone Spike id and remove teleport z+3 hack, its a vehicle, thx wowgargamel Scripts/Icecrown Citadel: Fixed typo in variable name, thx Paradox Scripts/Icecrown Citadel: Added warning emote for Bone Storm --HG-- branch : trunk
Diffstat (limited to 'sql/scripts')
-rw-r--r--sql/scripts/world_script_texts.sql3
-rw-r--r--sql/scripts/world_scripts_full.sql2
2 files changed, 3 insertions, 2 deletions
diff --git a/sql/scripts/world_script_texts.sql b/sql/scripts/world_script_texts.sql
index 9e35b9a7b49..8416c69d574 100644
--- a/sql/scripts/world_script_texts.sql
+++ b/sql/scripts/world_script_texts.sql
@@ -2649,7 +2649,8 @@ INSERT INTO `script_texts` (`npc_entry`,`entry`,`content_default`,`content_loc1`
(36612,-1631006,'More bones for the offering!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16942,1,0,0,'SAY_KILL_1'),
(36612,-1631007,'Languish in damnation!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16943,1,0,0,'SAY_KILL_2'),
(36612,-1631008,'I see... only darkness...',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16944,1,0,0,'SAY_DEATH'),
- (36612,-1631009,'THE MASTER''S RAGE COURSES THROUGH ME!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16945,1,0,0,'SAY_BERSERK');
+ (36612,-1631009,'THE MASTER''S RAGE COURSES THROUGH ME!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,16945,1,0,0,'SAY_BERSERK'),
+ (36612,-1631010,'Lord Marrowgar creates a whirling storm of bone!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,0,3,0,0,'SAY_BONE_STORM_EMOTE'),
-- -1 632 000 ICECROWN CITADEL: FROZEN HALLS: FORGE OF SOULS
-- Bronjham
diff --git a/sql/scripts/world_scripts_full.sql b/sql/scripts/world_scripts_full.sql
index fbdf1d5c863..9997c8984ce 100644
--- a/sql/scripts/world_scripts_full.sql
+++ b/sql/scripts/world_scripts_full.sql
@@ -830,7 +830,7 @@ UPDATE `creature_template` SET `ScriptName`='npc_guardian_pavilion' WHERE `entry
UPDATE `instance_template` SET `script`='instance_icecrown_citadel' WHERE `map`=631;
UPDATE `creature_template` SET `ScriptName`='boss_lord_marrowgar' WHERE `entry`=36612;
UPDATE `creature_template` SET `ScriptName`='npc_coldflame' WHERE `entry`=36672;
-UPDATE `creature_template` SET `ScriptName`='npc_bone_spike' WHERE `entry`=38711;
+UPDATE `creature_template` SET `ScriptName`='npc_bone_spike' WHERE `entry`=36619;
/* IRONFORGE */
UPDATE `creature_template` SET `ScriptName`='npc_royal_historian_archesonus' WHERE `entry`=8879;