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

Conflicts:
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/game/Spells/Spell.cpp
	src/server/game/Spells/SpellEffects.cpp
	src/server/scripts/Spells/spell_paladin.cpp

sql/old/3.3.5a/2012_02_14_00_world_achievement_criteria_data.sql

@@ -4,4 +4,4 @@ INSERT INTO `achievement_criteria_data` (`criteria_id`,`type`,`value1`,`value2`,
 (13013, 12, 1, 0, ""), -- heroic
 (13012, 12, 1, 0, ""), -- heroic
 (13011, 12, 0, 0, ""), -- normal
-(12780, 12, 0, 0, ""); -- normal
+(12780, 12, 0, 0, ""); -- normal

sql/old/3.3.5a/2012_02_16_00_world_conditions.sql

@@ -4,8 +4,8 @@ CREATE TABLE `temp_convert_spells`
 	PRIMARY KEY (`id`)
 );
 
-# spells with EffectImplicitTarget In (6,21, 25) + spells having Targets & 1115534
-# those spells are the ones which require explicit unit target to cast
+-- spells with EffectImplicitTarget In (6,21, 25) + spells having Targets & 1115534
+-- those spells are the ones which require explicit unit target to cast
 INSERT INTO `temp_convert_spells` VALUES
 (5),
 (11),
@@ -12783,13 +12783,13 @@ INSERT IGNORE INTO `temp_item_spell` SELECT `entry`, `spellid_5` FROM `item_temp
 INSERT INTO `temp_cond_vals` (`spellId`, `entry`, `dead`, `errorTextId`, `comment`) SELECT DISTINCT (SELECT `spellId` FROM `temp_item_spell` WHERE `itemId` = `SourceEntry`), `ConditionValue2`, (`ConditionValue1` - 1), `ErrorTextId`, `Comment` FROM `conditions`
 WHERE `SourceTypeOrReferenceId` = 18;
 
-#use CONDITION_OBJECT_ENTRY instead of CONDITION_ITEM_TARGET
+-- use CONDITION_OBJECT_ENTRY instead of CONDITION_ITEM_TARGET
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`)
 SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 31, 1, 3, `entry`, 0, 0, `errorTextId`, `comment` FROM `temp_cond_vals`;
-#for CONDITION_ITEM_TARGET with ConditionValue1 = DEAD we're adding !CONDITION_ALIVE as a second requirement
+-- for CONDITION_ITEM_TARGET with ConditionValue1 = DEAD we're adding !CONDITION_ALIVE as a second requirement
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`, `SourceGroup`, `SourceEntry`, `SourceId`, `ElseGroup`, `ConditionTypeOrReference`, `ConditionTarget`, `ConditionValue1`, `ConditionValue2`, `ConditionValue3`, `NegativeCondition`, `ErrorTextId`, `Comment`)
 SELECT DISTINCT 17, 0, `spellId`, 0, `elseGroup` - 1, 36, 1, 0, 0, 0, 1, `errorTextId`, `comment` FROM `temp_cond_vals` WHERE `dead`;
-#remove entries which could be converted by this sql
+-- remove entries which could be converted by this sql
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` = 18 AND `SourceEntry` IN (SELECT `itemId` FROM `temp_item_spell`);
 DROP TABLE `temp_convert_spells`;
 DROP TABLE `temp_cond_vals`;

sql/old/3.3.5a/2012_02_18_02_world_gossip.sql

@@ -49,4 +49,4 @@ INSERT INTO `gossip_menu_option` (`menu_id`, `id`, `option_icon`,`option_text`,`
 (573,0,0,'These dwarves are the same ones today, yes?  Do dwarves maintain any other links to the Earthen?',1,1,574,0,0,0,''),
 (574,0,0,'Who are the Creators?',1,1,575,0,0,0,''),
 (575,0,0,'This is a lot to think about.',1,1,576,0,0,0,''),
-(576,0,0,'I will access the discs now.',1,1,0,0,0,0,'');
+(576,0,0,'I will access the discs now.',1,1,0,0,0,0,'');

sql/old/3.3.5a/2012_02_20_02_world_conditons.sql

@@ -1,9 +1,10 @@
-# Update a typo in original data entry
+-- Update a typo in original data entry
 UPDATE `npc_spellclick_spells` SET `quest_end`=11999 WHERE `npc_entry`=26477 AND `spell_id`=61832 AND `quest_start`=11999;
-# Delete redundant data with invalid condition type
+
+-- Delete redundant data with invalid condition type
 DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId`=18;
 
-# Static Data
+-- Static Data
 INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 `ElseGroup`,`ConditionTypeOrReference`,`ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`NegativeCondition`,`Comment`) VALUES
 (18,24752,44363,0,8,0,11460,0,0,1,'Forbidden rewarded quest for spellclick'),
@@ -167,9 +168,10 @@ INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,
 (18,40176,74905,0,8,0,25444,0,0,1,'Forbidden rewarded quest for spellclick'),
 (18,40176,74905,0,9,0,25444,0,0,0,'Required quest active for spellclick');
 
-# Below is a procedure to dynamically convert custom content to conditions table.
-# However this procedure only works for MySQL server versions >= 5.6 due to 
-# a bug / missing feature in older MySQL versions.
+-- Below is a procedure to dynamically convert custom content to conditions table.
+-- However this procedure only works for MySQL server versions >= 5.6 due to 
+-- a bug / missing feature in older MySQL versions.
+
 /*
 
 DROP PROCEDURE IF EXISTS ConvertSpellClickConditions;
@@ -185,7 +187,7 @@ BEGIN
     DECLARE quest INT DEFAULT 0;
     DECLARE quest2 INT DEFAULT 0;
     DECLARE questStartCanActive INT DEFAULT 0;
-    DECLARE maxElseGroupId INT DEFAULT 14; # Change this for custom content
+    DECLARE maxElseGroupId INT DEFAULT 14; -- Change this for custom content
     SELECT COUNT(*) INTO recordCount FROM `npc_spellclick_spells` WHERE `aura_required` !=0;
     WHILE counter < recordCount DO
         SELECT `npc_entry`, `spell_id`, `aura_required`
@@ -228,12 +230,12 @@ BEGIN
         `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
         VALUES (18,npcEntry,spellId,maxElseGroupId+1,8,0,quest,0,0,'Required quest rewarded for spellclick');
         SET maxElseGroupId = maxElseGroupId+1;
-        # ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest)
+        -- ELSE IF quest2 != 0 is handled in next loop (forbidden rewarded quest)
         ELSEIF questStartCanActive = 1 && quest2 = quest THEN
         INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
         `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)
         VALUES (18,npcEntry,spellId,9,0,quest,0,0,'Required quest active for spellclick');
-        # ^Adds the required active quest condition. Prohibit quest reward is done in next loop
+        -- ^Adds the required active quest condition. Prohibit quest reward is done in next loop
         ELSEIF questStartCanActive = 0 THEN
         INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ConditionTypeOrReference`,
         `ConditionTarget`,`ConditionValue1`,`ConditionValue2`,`NegativeCondition`,`Comment`)

sql/old/3.3.5a/2012_02_21_01_world_conditions.sql

@@ -3589,4 +3589,4 @@ UPDATE `conditions` SET `ConditionTypeOrReference` = 32, `ConditionValue1` = 0x9
 UPDATE `conditions` SET `ConditionTypeOrReference` = 31, `ConditionValue1` = 5 WHERE `ConditionTypeOrReference` = 18 AND `ConditionValue1` = 0;
 
 DROP TABLE `temp_convert_spells`;
-DROP TABLE `temp_cond_vals`;
+DROP TABLE `temp_cond_vals`;

sql/old/3.3.5a/2012_02_22_01_world_creature_text.sql

@@ -31,4 +31,4 @@ INSERT INTO `creature_text` (`entry`,`groupid`,`id`,`text`,`type`,`language`,`pr
 (15214,27,0, 'The Horde has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'),
 (15214,28,0, 'The Horde has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'),
 (15214,29,0, 'The Alliance has defended Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker'),
-(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker');
+(15214,30,0, 'The Alliance has captured Wintergrasp Fortress!',41,0,100,0,0,0, 'Invisible Stalker');

sql/old/3.3.5a/2012_02_28_00_world_wintergrasp_spawns.sql

@@ -363,4 +363,4 @@ INSERT INTO `gameobject` (`guid`,`id`,`map`,`spawnMask`,`phaseMask`,`position_x`
 (@OGUID+16,192400,571,1,32,5041.650879,3294.318604,381.919952,-1.605702,0,0,0,1,180,0,1),
 (@OGUID+17,192401,571,1,32,4855.444336,3297.600830,376.495758,-3.115388,0,0,0,1,180,0,1),
 (@OGUID+18,192281,571,1,32,4857.971191,3335.415771,369.291901,-2.888511,0,0,0,1,180,0,1),
-(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1);
+(@OGUID+19,192282,571,1,32,5006.322754,3280.362061,371.242249,2.242746,0,0,0,1,180,0,1);

sql/old/3.3.5a/2012_03_07_00_world_trinity_string.sql

@@ -1,3 +1,3 @@
 DELETE FROM `trinity_string` WHERE `entry`=175;
 INSERT INTO `trinity_string` (`entry`,`content_default`) VALUES
-(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.');
+(175, 'Liquid level: %f, ground: %f, type: %u, flags %u, status: %d.');