5 files changed, 41 insertions, 1 deletions
diff --git a/sql/updates/world/2014_07_09_07_world_misc.sql b/sql/updates/world/2014_07_09_07_world_misc.sql
new file mode 100644
index 00000000000..b42a34a38d3
--- /dev/null
+++ b/sql/updates/world/2014_07_09_07_world_misc.sql
@@ -0,0 +1,28 @@
+--
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=17 AND `SourceEntry`=49859;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(17, 0, 49859, 0, 0, 31, 1, 3, 23725, 0, 0, 0, 0, '', NULL);
+
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=13 AND `SourceEntry`=43546;
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorType`, `ErrorTextId`, `ScriptName`, `Comment`) VALUES
+(13, 1, 43546, 0, 0, 31, 0, 3, 24336, 0, 0, 0, 0, '', 'Runed Orb Targets Orb Target');
+
+UPDATE `creature` SET `MovementType`=0 WHERE  `guid` IN (97715,97748);
+
+UPDATE `creature_template` SET AIName='SmartAI' WHERE `entry`=24335;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=24335 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 
+(24335, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 11, 43546, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Runed Orb - On Spawn - Cast Runed Orb");
+
+UPDATE `creature_template` SET AIName='SmartAI' WHERE `entry`=23725;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=23725 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 
+(23725, 0, 0, 1, 8, 0, 100, 0, 49859, 0, 0, 0, 11, 43564, 1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, "Stone Giant - On Spellhit - Cast Captive Stone Giant Kill Credit"),
+(23725, 0, 1, 0, 61, 0, 100, 0, 0, 0, 0, 0, 24, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Stone Giant - On Spellhit - Evade");
+
+UPDATE `creature_template` SET AIName='SmartAI' WHERE `entry`=24345;
+DELETE FROM `smart_scripts` WHERE (`entryorguid`=24345 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 
+(24345, 0, 0, 0, 11, 0, 100, 0, 0, 0, 0, 0, 11, 43312, 1, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, "Captive Stone Giant - On Spawn - Cast Elemental Prison (Cosmetic)");
+
+UPDATE `creature_template` SET `InhabitType`=4 WHERE  `entry`=24336;
diff --git a/sql/updates/world/2014_07_09_08_world_misc.sql b/sql/updates/world/2014_07_09_08_world_misc.sql
new file mode 100644
index 00000000000..d82b011bbae
--- /dev/null
+++ b/sql/updates/world/2014_07_09_08_world_misc.sql
@@ -0,0 +1,7 @@
+-- Grimtotem Spirit-Shifter
+SET @ENTRY := 23593;
+UPDATE `creature_template` SET `AIName`='SmartAI' WHERE `entry`=@ENTRY;
+DELETE FROM `smart_scripts` WHERE `source_type`=0 AND `entryorguid`=@ENTRY;
+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
+(@ENTRY,0,0,1,0,0,100,0,0,0,30000,45000,11,43110,0,0,0,0,0,1,0,0,0,5,0,0,0,'Grimtotem Spirit-Shifter - IC - Cast Summon Spirit Wolf'),
+(@ENTRY,0,2,0,0,0,100,0,2000,3000,12000,13000,11,11824,0,0,0,0,0,2,0,0,0,0,0,0,0,'Grimtotem Spirit-Shifter IC - Cast Shock');
diff --git a/sql/updates/world/2014_07_10_00_world_misc.sql b/sql/updates/world/2014_07_10_00_world_misc.sql
new file mode 100644
index 00000000000..9422bfced0a
--- /dev/null
+++ b/sql/updates/world/2014_07_10_00_world_misc.sql
@@ -0,0 +1,2 @@
+UPDATE `creature` SET `spawndist`=0 WHERE `id` IN (24335,24336);
+UPDATE `smart_scripts` SET `action_type`=85,`action_param1`=38228,`action_param2`=1 WHERE `entryorguid`=19823 AND `source_type`=0 AND `id`=0;
diff --git a/sql/updates/world/2014_07_10_01_world_misc.sql b/sql/updates/world/2014_07_10_01_world_misc.sql
new file mode 100644
index 00000000000..040e3f54909
--- /dev/null
+++ b/sql/updates/world/2014_07_10_01_world_misc.sql
@@ -0,0 +1,3 @@
+--
+UPDATE `smart_scripts` SET `link`=0 WHERE `entryorguid`=23593 AND `source_type`=0 AND `id`=0;
+UPDATE `smart_scripts` SET `id`=1 WHERE `entryorguid`=23593 AND `source_type`=0 AND `id`=2;
diff --git a/src/server/game/Battlegrounds/Battleground.h b/src/server/game/Battlegrounds/Battleground.h
index e1ad11927e7..fdbd4d0cfc3 100644
--- a/src/server/game/Battlegrounds/Battleground.h
+++ b/src/server/game/Battlegrounds/Battleground.h
@@ -23,6 +23,7 @@
 #include "SharedDefines.h"
 #include "DBCEnums.h"
 #include "WorldPacket.h"
+#include "Object.h"
 
 class Creature;
 class GameObject;
@@ -34,7 +35,6 @@ class WorldPacket;
 class BattlegroundMap;
 
 struct BattlegroundScore;
-struct Position;
 struct PvPDifficultyEntry;
 struct WorldSafeLocsEntry;