aboutsummaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql')
-rw-r--r--sql/updates/world/2012_08_27_00_world_creature_template.sql (renamed from sql/updates/world/2012_08_27_00_creature_template.sql)0
-rw-r--r--sql/updates/world/2012_08_27_01_world_sai.sql13
-rw-r--r--sql/updates/world/2012_08_27_02_world_creature.sql4
-rw-r--r--sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql9
-rw-r--r--sql/updates/world/2012_08_27_03_world_gameobject.sql6
-rw-r--r--sql/updates/world/2012_08_27_04_world_quest_template.sql1
-rw-r--r--sql/updates/world/2012_08_27_05_world_sai.sql56
-rw-r--r--sql/updates/world/2012_08_27_06_world_sai.sql43
-rw-r--r--sql/updates/world/2012_08_27_07_world_spell_area.sql4
-rw-r--r--sql/updates/world/2012_08_27_08_world_misc.sql29
-rw-r--r--sql/updates/world/2012_08_27_09_world_conditions.sql8
-rw-r--r--sql/updates/world/2012_08_27_10_world_spell_script_names.sql4
12 files changed, 177 insertions, 0 deletions
diff --git a/sql/updates/world/2012_08_27_00_creature_template.sql b/sql/updates/world/2012_08_27_00_world_creature_template.sql
index 804d7b5c61d..804d7b5c61d 100644
--- a/sql/updates/world/2012_08_27_00_creature_template.sql
+++ b/sql/updates/world/2012_08_27_00_world_creature_template.sql
diff --git a/sql/updates/world/2012_08_27_01_world_sai.sql b/sql/updates/world/2012_08_27_01_world_sai.sql
new file mode 100644
index 00000000000..302c3ac1942
--- /dev/null
+++ b/sql/updates/world/2012_08_27_01_world_sai.sql
@@ -0,0 +1,13 @@
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=17398;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=17398;
+
+DELETE FROM `smart_scripts` WHERE `entryorguid` IN (-85712,-85717,-85719,-85724);
+INSERT INTO `smart_scripts` (`entryorguid`, `source_type`, `id`, `link`, `event_type`, `event_phase_mask`, `event_chance`, `event_flags`, `event_param1`, `event_param2`, `event_param3`, `event_param4`, `action_type`, `action_param1`, `action_param2`, `action_param3`, `action_param4`, `action_param5`, `action_param6`, `target_type`, `target_param1`, `target_param2`, `target_param3`, `target_x`, `target_y`, `target_z`, `target_o`, `comment`) VALUES
+(-85724, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 9, 29607, 0, 0, 0, 0, 0, 14, 22299, 0, 0, 0, 0, 0, 0, 'Blood Furnace - First Cell'),
+(-85719, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 9, 29607, 0, 0, 0, 0, 0, 14, 22297, 0, 0, 0, 0, 0, 0, 'Blood Furnace - Second Cell'),
+(-85717, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 9, 29607, 0, 0, 0, 0, 0, 14, 22298, 0, 0, 0, 0, 0, 0, 'Blood Furnace - Third Cell'),
+(-85712, 0, 0, 0, 6, 0, 100, 0, 0, 0, 0, 0, 9, 29607, 0, 0, 0, 0, 0, 14, 22296, 0, 0, 0, 0, 0, 0, 'Blood Furnace - Fourth Cell');
+
+DELETE FROM `gameobject_scripts` WHERE `id`=150441;
+INSERT INTO `gameobject_scripts` (`id`, `delay`, `command`, `datalong`, `datalong2`, `dataint`, `x`, `y`, `z`, `o`) VALUES
+(150441, 3, 11, 22295, 0, 0, 0, 0, 0, 0);
diff --git a/sql/updates/world/2012_08_27_02_world_creature.sql b/sql/updates/world/2012_08_27_02_world_creature.sql
new file mode 100644
index 00000000000..3595ea7b576
--- /dev/null
+++ b/sql/updates/world/2012_08_27_02_world_creature.sql
@@ -0,0 +1,4 @@
+SET @GUID = 42638; -- Set by TDB team (need X)
+DELETE FROM `creature` WHERE `guid`=@GUID AND `id`=7172;
+INSERT INTO `creature` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `modelid`, `equipment_id`, `position_x`, `position_y`, `position_z`, `orientation`, `spawntimesecs`, `spawndist`, `currentwaypoint`, `curhealth`, `curmana`, `MovementType`, `npcflag`, `unit_flags`, `dynamicflags`) VALUES
+(@GUID,7172,70,1,1,0,0,150.466,306.014,-49.543,5.2359,300,0,0,1,0,0,0,0,0);
diff --git a/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql b/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql
new file mode 100644
index 00000000000..9c664142bba
--- /dev/null
+++ b/sql/updates/world/2012_08_27_02_world_playercreateinfo_spell.sql
@@ -0,0 +1,9 @@
+DELETE FROM `playercreateinfo_spell` WHERE `Spell` IN (59221,59535,59536,59538,59539,59540,59541);
+INSERT INTO `playercreateinfo_spell` (`race`, `class`, `Spell`, `Note`) VALUES
+(11,1,59221,'Shadow Resistance'),
+(11,2,59535,'Shadow Resistance'),
+(11,3,59536,'Shadow Resistance'),
+(11,5,59538,'Shadow Resistance'),
+(11,6,59539,'Shadow Resistance'),
+(11,7,59540,'Shadow Resistance'),
+(11,8,59541,'Shadow Resistance');
diff --git a/sql/updates/world/2012_08_27_03_world_gameobject.sql b/sql/updates/world/2012_08_27_03_world_gameobject.sql
new file mode 100644
index 00000000000..1bf836c96e0
--- /dev/null
+++ b/sql/updates/world/2012_08_27_03_world_gameobject.sql
@@ -0,0 +1,6 @@
+-- Spawn Blackened Urn (194092) GO based on sniff by Aokromes
+SET @GUID := 334; -- Set by TDB team
+
+DELETE FROM `gameobject` WHERE `id`=194092;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(@GUID,194092,532,1,1,-11126.87,-1874.455,91.47264,6.056293,0,0,-0.113203,0.9935719,180,100,1);
diff --git a/sql/updates/world/2012_08_27_04_world_quest_template.sql b/sql/updates/world/2012_08_27_04_world_quest_template.sql
new file mode 100644
index 00000000000..9169a6e5862
--- /dev/null
+++ b/sql/updates/world/2012_08_27_04_world_quest_template.sql
@@ -0,0 +1 @@
+UPDATE `quest_template` SET `NextQuestId`=12257 WHERE `ID`=12468;
diff --git a/sql/updates/world/2012_08_27_05_world_sai.sql b/sql/updates/world/2012_08_27_05_world_sai.sql
new file mode 100644
index 00000000000..3da0143e6e6
--- /dev/null
+++ b/sql/updates/world/2012_08_27_05_world_sai.sql
@@ -0,0 +1,56 @@
+-- A Race Against Time (11671)
+
+SET @NPC_SALRAND := 25584; -- Inquisitor Salrand
+SET @NPC_BERYL_INVISMAN := 25594; -- Beryl Point InvisMan
+SET @GOB_BERYL_SHIELD := 187773; -- Beryl Shield
+SET @GOB_BERYL_SHIELD_FOCUS := 300176; -- TEMP Beryl Force Shield
+SET @SPELL_BEAM := 45777; -- Salrand's Beam
+SET @SPELL_THROW_DETONATOR := 45780; -- Throw Beryl Shield Detonator
+SET @SPELL_SUMMON_DETONATOR := 45791; -- Summon Beryl Detonator
+SET @SPELL_EXPLOSION := 45796; -- Beryl Shield Explosion
+SET @SPELL_LOCKBOX := 45809; -- Summon Salrand's Lockbox
+SET @GUID := 60441; -- used for a wrong go spawn,will reuse
+
+UPDATE `gameobject_template` SET `data1`=80 WHERE `entry`=300176; -- spell focus radius
+UPDATE `gameobject_template` SET `flags`=32 WHERE `entry`=187773; -- shield:nodespawn flag
+
+-- missing spell focus
+DELETE FROM `gameobject` WHERE `guid`=@GUID;
+INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`,`position_y`,`position_z`,`orientation`,`rotation0`,`rotation1`,`rotation2`,`rotation3`,`spawntimesecs`,`animprogress`,`state`) VALUES
+(@GUID,@GOB_BERYL_SHIELD_FOCUS,571,1,1,3392.85,6161.089,79.8313,0,0,0,0,0,300,0,1);
+
+UPDATE `creature_template` SET `InhabitType`=0x4,`unit_flags`=0x100,`AIName`='SmartAI' WHERE `entry`=@NPC_SALRAND;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@NPC_BERYL_INVISMAN;
+
+DELETE FROM `creature_template_addon` WHERE `entry`=@NPC_SALRAND;
+INSERT INTO `creature_template_addon` (`entry`,`mount`,`bytes1`,`bytes2`,`auras`) VALUES
+(@NPC_SALRAND,0,0x0,0x1,'45775');
+
+DELETE FROM `creature_ai_scripts` WHERE `creature_id`=@NPC_SALRAND;
+DELETE FROM `smart_scripts` WHERE (`source_type`=0 AND `entryorguid` IN (@NPC_SALRAND,@NPC_BERYL_INVISMAN)) OR (`source_type`=9 AND `entryorguid` IN (@NPC_SALRAND*100,@NPC_BERYL_INVISMAN*100));
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@NPC_SALRAND,0,0,0,38,0,100,1,1,1,0,0,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On data 1 1 - Say'),
+(@NPC_SALRAND,0,1,2,38,0,100,1,1,2,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'On data 1 2 - Say'),
+(@NPC_SALRAND,0,2,0,61,0,100,1,0,0,0,0,80,@NPC_SALRAND*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'On link - Run script'),
+(@NPC_SALRAND,0,3,4,6,0,100,1,0,0,0,0,11,@SPELL_LOCKBOX,0,0,0,0,0,1,0,0,0,0,0,0,0,'On death - Cast spell'),
+(@NPC_SALRAND,0,4,0,61,0,100,1,0,0,0,0,1,2,0,0,0,0,0,1,0,0,0,0,0,0,0,'On death - Say'),
+(@NPC_SALRAND,0,5,0,11,0,100,1,0,0,0,0,24,0,0,0,0,0,0,15,0,0,0,0,0,0,0,'On respawn - Evade'),
+(@NPC_SALRAND*100,9,0,0,0,0,100,0,0,0,0,0,60,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'On script - set fly off'),
+(@NPC_SALRAND*100,9,1,0,0,0,100,0,0,0,0,0,69,0,0,0,0,0,0,8,0,0,0,3392.852,6161.092,79.83095,0,'On script - Move to pos'),
+(@NPC_SALRAND*100,9,2,0,0,0,100,0,3000,3000,0,0,19,256,0,0,0,0,0,1,0,0,0,0,0,0,0,'On script - Set unit flags'),
+--
+(@NPC_BERYL_INVISMAN,0,0,0,8,0,100,0,@SPELL_THROW_DETONATOR,0,0,0,80,@NPC_BERYL_INVISMAN*100,0,0,0,0,0,1,0,0,0,0,0,0,0,'On spellhit - Run Script'),
+(@NPC_BERYL_INVISMAN*100,9,0,0,0,0,100,0,0,0,0,0,11,@SPELL_SUMMON_DETONATOR,0,0,0,0,0,1,0,0,0,0,0,0,0,'On script - Cast Spell'),
+(@NPC_BERYL_INVISMAN*100,9,1,0,0,0,100,0,0,0,0,0,45,1,1,0,0,0,0,19,@NPC_SALRAND,100,0,0,0,0,0,'On script - Set Data'),
+(@NPC_BERYL_INVISMAN*100,9,2,0,0,0,100,0,8000,8000,0,0,45,1,2,0,0,0,0,19,@NPC_SALRAND,100,0,0,0,0,0,'On script - Set Data'),
+(@NPC_BERYL_INVISMAN*100,9,3,0,0,0,100,0,2000,2000,0,0,11,@SPELL_EXPLOSION,0,0,0,0,0,1,0,0,0,0,0,0,0,'On script - Cast Spell');
+
+DELETE FROM `creature_text` WHERE `entry`=@NPC_SALRAND;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@NPC_SALRAND,0,0,'What is the meaning of this disturbance?!',14,0,100,0,0,0,'Inquisitor Salrand to Beryl Point InvisMan'),
+(@NPC_SALRAND,1,0,'Who dares interrupt my work!? Show yourself, coward!',14,0,100,0,0,0,'Inquisitor Salrand to Beryl Point InvisMan'),
+(@NPC_SALRAND,2,0,'I''ve destroyed the key! Your cherished archmage belongs to Malygos!',12,0,100,0,0,0,'Inquisitor Salrand');
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=@SPELL_THROW_DETONATOR;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,@SPELL_THROW_DETONATOR,0,0,31,0,3,@NPC_BERYL_INVISMAN,0,0,0,'','Throw Beryl Shield Detonator target npc');
diff --git a/sql/updates/world/2012_08_27_06_world_sai.sql b/sql/updates/world/2012_08_27_06_world_sai.sql
new file mode 100644
index 00000000000..8b1aafd1558
--- /dev/null
+++ b/sql/updates/world/2012_08_27_06_world_sai.sql
@@ -0,0 +1,43 @@
+-- Fix {Q/A} The Shining Light ID: 11288
+-- Makes it blizzlike timed 10 minutes
+UPDATE `quest_template` SET `LimitTime`=600 WHERE `id`=11288;
+-- Decomposing Ghoul SAI
+SET @Ghoul := 24177;
+SET @SpellTrigger := 43202;
+SET @Spell := 43203;
+SET @Ares := 24189;
+UPDATE `creature_template` SET `AIname`='SmartAI' WHERE `entry`=@Ghoul;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Ghoul;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@Ghoul,0,0,0,1,0,100,0,20000,300000,50000,350000,1,0,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - Occ - Say random text'),
+(@Ghoul,0,1,2,8,0,100,0,@Spell,0,0,0,18,33685506,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - On hit by spell - Set unit flag for not targetable'),
+(@Ghoul,0,2,3,61,0,100,0,0,0,0,0,2,35,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - Linked with previous event - Switch faction to clear aggro'),
+(@Ghoul,0,3,0,61,0,100,0,0,0,0,0,1,1,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - Linked with previous event - Say random text'),
+(@Ghoul,0,4,5,1,0,100,0,3500,3500,3500,3500,19,33685506,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - OOC for 3,5 sec - Remove unit flag'),
+(@Ghoul,0,5,0,61,0,100,0,0,0,0,0,2,14,0,0,0,0,0,1,0,0,0,0,0,0,0,'Decomposing Ghoul - Linked with previous event - Change faction back to 14');
+-- Add SAI for Ares - quest giver
+UPDATE `creature_template` SET `AIname`='SmartAI' WHERE `entry`=@Ares;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@Ares;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(@Ares,0,0,0,19,0,100,0,11288,0,0,0,85,@SpellTrigger,0,0,0,0,0,7,0,0,0,0,0,0,0,'Ares - On target quest accepted 11288 - Cast spell Shining Light');
+-- Decomposing Ghoul texts
+DELETE FROM `creature_text` WHERE `entry`=@Ghoul;
+INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`probability`,`emote`,`duration`,`sound`,`comment`) VALUES
+(@Ghoul,0,1,'Light... light so bright...',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,0,2,'ARGHHHH...',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,0,3,'Away... go...',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,0,4,'Bad light... hurt...',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,0,5,'BURNS! IT BURNS!',12,0,50,0,0,0,'Decomposing Ghoul - On spell hit'),
+(@Ghoul,1,1,'So... Hungry...',12,0,50,0,0,0,'Decomposing Ghoul - OOC'),
+(@Ghoul,1,2,'Closer... come closer...',12,0,50,0,0,0,'Decomposing Ghoul - OOC'),
+(@Ghoul,1,3,'FEED ME...',12,0,50,0,0,0,'Decomposing Ghoul - OOC'),
+(@Ghoul,1,4,'FOOD! EAT YOU!',12,0,50,0,0,0,'Decomposing Ghoul - OOC'),
+(@Ghoul,1,5,'BRAINNNS!',12,0,50,0,0,0,'Decomposing Ghoul - OOC');
+-- Add conditions for spell Shining Light to hit only Ghouls
+DELETE FROM `conditions` WHERE `SourceEntry`=@Spell AND `SourceTypeOrReferenceId`=13;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,1,@Spell,0,0,31,0,3,@Ghoul,0,0,0,'', 'Shinning Light can only hit Decomposing Ghouls');
+-- Add conditions for spell Shining Light to be available only, if on quest
+DELETE FROM `conditions` WHERE `SourceEntry`=@Spell AND `SourceTypeOrReferenceId`=17;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17,0,@Spell,0,0,9,0,11288,0,0,0,0,'', 'Shinning Light can only hit targets on the quest');
diff --git a/sql/updates/world/2012_08_27_07_world_spell_area.sql b/sql/updates/world/2012_08_27_07_world_spell_area.sql
new file mode 100644
index 00000000000..18be6ff0dbe
--- /dev/null
+++ b/sql/updates/world/2012_08_27_07_world_spell_area.sql
@@ -0,0 +1,4 @@
+-- Fix quest - The Angry Gorloc ID: 12578
+DELETE FROM `spell_area` WHERE `spell`=54057;
+INSERT INTO `spell_area` (`spell`, `area`, `quest_start`, `quest_start_active`, `quest_end`, `aura_spell`, `racemask`, `gender`, `autocast`) VALUES
+(54057, 4297, 12578, 1, 12578, 0, 0, 2, 1);
diff --git a/sql/updates/world/2012_08_27_08_world_misc.sql b/sql/updates/world/2012_08_27_08_world_misc.sql
new file mode 100644
index 00000000000..62a57cd42de
--- /dev/null
+++ b/sql/updates/world/2012_08_27_08_world_misc.sql
@@ -0,0 +1,29 @@
+-- Fire Upon the Waters (12243) quest fix
+-- add Fire Upon the Waters Kill Credit Bunny at sail locations
+SET @GUID =42887;
+DELETE FROM `creature` WHERE `id`=28013;
+INSERT INTO `creature` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`modelid`,`equipment_id`,`position_x`,`position_y`,`position_z`,`orientation`,`spawntimesecs`,`spawndist`,`currentwaypoint`,`curhealth`,`curmana`,`MovementType`,`npcflag`,`unit_flags`,`dynamicflags`) VALUES
+(@GUID+0,28013,571,1,1,0,0,2488.86,-400.017,19.0803,2.99498,300,0,0,42,0,0,0,33554432,0),
+(@GUID+1,28013,571,1,1,0,0,2458.96,-401.066,20.7778,0.108631,300,0,0,42,0,0,0,33554432,0);
+
+-- SAI
+UPDATE `creature_template` SET `AIName` = 'SmartAI' WHERE `entry` = 28013;
+DELETE FROM `smart_scripts` WHERE `entryorguid`=28013 AND `source_type`=0;
+INSERT INTO `smart_scripts` (`entryorguid`,`source_type`,`id`,`link`,`event_type`,`event_phase_mask`,`event_chance`,`event_flags`,`event_param1`,`event_param2`,`event_param3`,`event_param4`,`action_type`,`action_param1`,`action_param2`,`action_param3`,`action_param4`,`action_param5`,`action_param6`,`target_type`,`target_param1`,`target_param2`,`target_param3`,`target_x`,`target_y`,`target_z`,`target_o`,`comment`) VALUES
+(28013,0,0,0,8,0,100,0,48455,0,0,0,33,28013,0,0,0,0,0,7,0,0,0,0,0,0,0,"Fire Upon the Waters Kill Credit Bunny - On SpellHit Apothecary's Burning Water - Call KilledMonster Fire Upon the Waters Kill Credit Bunny");
+
+-- Ensure spell only works on Fire Upon the Waters Kill Credit Bunny
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=48455;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`SourceId`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(13,1,48455,0,0,31,0,3,28013,0,0,0,'',"Fire Upon the Waters - spell to Fire Upon the Waters Kill Credit Bunny");
+
+-- add quest item loot to Captain Shely
+DELETE FROM `creature_loot_template` WHERE `entry`=27232;
+INSERT INTO `creature_loot_template` (`entry`,`item`,`ChanceOrQuestChance`,`lootmode`,`groupid`,`mincountOrRef`,`maxcount`) VALUES
+(27232,37305,-100,1,0,1,1), -- Captain Shely's Rutters
+(27232,43851,25,1,0,1,1), -- Fur Clothing Scraps
+(27232,33470,10,1,0,1,3), -- Frostweave Cloth
+(27232,33443,5,1,0,1,1), -- Sour Goat Cheese
+(27232,33444,2,1,0,1,1), -- Pungent Seal Whey
+(27232,22829,1,1,0,1,1), -- Super Healing Potion
+(27232,45912,0.05,1,0,1,1); -- Book Glyph of Mastery
diff --git a/sql/updates/world/2012_08_27_09_world_conditions.sql b/sql/updates/world/2012_08_27_09_world_conditions.sql
new file mode 100644
index 00000000000..6d536859060
--- /dev/null
+++ b/sql/updates/world/2012_08_27_09_world_conditions.sql
@@ -0,0 +1,8 @@
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry` IN (62973,62991);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13,3,62973,0,0, 1,0,62972,0,0,0,0,'','Foam Sword Attack'),
+(13,3,62973,0,0,31,0,4,0,0,0,0,'','Foam Sword Attack'),
+(13,3,62973,0,0,33,0,1,0,0,1,0,'','Foam Sword Attack'),
+(13,3,62991,0,0, 1,0,62972,0,0,0,0,'','Bonked!'),
+(13,3,62991,0,0,31,0,4,0,0,0,0,'','Bonked!'),
+(13,3,62991,0,0,33,0,1,0,0,1,0,'','Bonked!');
diff --git a/sql/updates/world/2012_08_27_10_world_spell_script_names.sql b/sql/updates/world/2012_08_27_10_world_spell_script_names.sql
new file mode 100644
index 00000000000..9ffb153f498
--- /dev/null
+++ b/sql/updates/world/2012_08_27_10_world_spell_script_names.sql
@@ -0,0 +1,4 @@
+DELETE FROM `spell_script_names` WHERE `spell_id`IN (64142,62991);
+INSERT INTO `spell_script_names` (`spell_id`,`ScriptName`) VALUES
+(64142,'spell_gen_upper_deck_create_foam_sword'),
+(62991,'spell_gen_bonked');