Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

Conflicts:
	src/server/game/Battlegrounds/BattlegroundScore.h

1 files changed, 19 insertions, 0 deletions

diff --git a/sql/updates/world/2014_07_05_01_world_smart_scripts.sql b/sql/updates/world/2014_07_05_01_world_smart_scripts.sql
new file mode 100644
index 00000000000..ddd158c83a8
--- /dev/null
+++ b/sql/updates/world/2014_07_05_01_world_smart_scripts.sql
@@ -0,0 +1,19 @@
+UPDATE `smart_scripts` SET
+  `action_type`=11, `action_param1`=37903, `action_param2`=1, `comment`='Razaani Light Orb - Between 0-30% Health - Cast Trapping the Light: Kill Credit (No Repeat)' WHERE
+  `entryorguid`=20635 AND `source_type`=0 AND `id`=3 AND `link`=4;
+
+UPDATE `smart_scripts` SET
+  `action_type`=11, `action_param1`=37903, `action_param2`=1, `comment`='Razaani Light Orb - Mini - On Reached Point 1 - Cast  Trapping the Light: Kill Credit (No Repeat)' WHERE
+  `entryorguid`=20771 AND `source_type`=0 AND `id`=3 AND `link`=4;
+
+UPDATE `smart_scripts` SET
+  `action_type`=11, `action_param1`=37903, `action_param2`=1, `comment`='Multi-Spectrum Light Trap Bunny - On Data Set 1 1 - Cast Trapping the Light: Kill Credit ' WHERE
+  `entryorguid`=21926 AND `source_type`=0 AND `id`=4 AND `link`=5;
+
+UPDATE `smart_scripts` SET
+  `action_type`=85, `action_param1`=37829, `action_param2`=1, `comment`='Scalewing Serpent - On Spellhit - Cast Ride the Lightning: Kill Credit' WHERE
+  `entryorguid`=20749 AND `source_type`=0 AND `id`=1 AND `link`=0;
+
+UPDATE `smart_scripts` SET
+ `action_type`=85, `action_param1`=43174, `action_param2`=1, `comment`='Proto-Drake - On Death - Cast Draconis Gastritis: Kill Credit' WHERE
+ `entryorguid`=23689 AND `source_type`=0 AND `id`=7 AND `link`=0;