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

Conflicts:
	src/server/shared/Database/Implementation/CharacterDatabase.cpp

14 files changed, 684 insertions, 0 deletions

diff --git a/sql/updates/auth/2013_05_26_00_auth_rbac.sql b/sql/updates/auth/2013_05_26_00_auth_rbac.sql
new file mode 100644
index 00000000000..aa05c842932
--- /dev/null
+++ b/sql/updates/auth/2013_05_26_00_auth_rbac.sql
@@ -0,0 +1,14 @@
+DELETE FROM `rbac_permissions` WHERE `id` = 48;
+INSERT INTO `rbac_permissions` (`id`, `name`) VALUES (48, 'Enable IP, Last Login and EMail output in pinfo');
+
+DELETE FROM `rbac_roles` WHERE `id` = 39;
+INSERT INTO `rbac_roles` (`id`, `name`) VALUES (39, 'Enable IP, Last Login and EMail output in pinfo');
+
+DELETE FROM `rbac_role_permissions` WHERE `roleId` = 39 AND `permissionId` = 48;
+INSERT INTO `rbac_role_permissions` (`roleId`, `permissionId`) VALUES (39, 48);
+
+DELETE FROM `rbac_group_roles` WHERE `groupId` = 3 AND `roleId` = 39;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES (3, 39);
+
+DELETE FROM `rbac_group_roles` WHERE `groupId` = 4 AND `roleId` = 39;
+INSERT INTO `rbac_group_roles` (`groupId`, `roleId`) VALUES (4, 39);
diff --git a/sql/updates/auth/2013_06_02_00_auth_autobroadcast.sql b/sql/updates/auth/2013_06_02_00_auth_autobroadcast.sql
new file mode 100644
index 00000000000..2e689ffd64d
--- /dev/null
+++ b/sql/updates/auth/2013_06_02_00_auth_autobroadcast.sql
@@ -0,0 +1,5 @@
+ALTER TABLE `autobroadcast`
+  CHANGE `realmid` `realmid` INT(11) NOT NULL DEFAULT '-1',
+  CHANGE `id` `id` TINYINT(3) UNSIGNED NOT NULL AUTO_INCREMENT,
+  CHANGE `weight` `weight` TINYINT(3) UNSIGNED DEFAULT '1',
+  ENGINE=INNODB;
diff --git a/sql/updates/world/2013_06_02_00_world_achievement_criteria_data.sql b/sql/updates/world/2013_06_02_00_world_achievement_criteria_data.sql
new file mode 100644
index 00000000000..053ade0486d
--- /dev/null
+++ b/sql/updates/world/2013_06_02_00_world_achievement_criteria_data.sql
@@ -0,0 +1,16 @@
+DELETE FROM `disables` WHERE `sourceType`=4 AND `entry` IN (10082,10083,10084,10085,10086,10087);
+
+DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10082,10083,10084,10085,10086,10087);
+INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES
+(10082, 11, 0, 0, 'achievement_assembly_i_choose_you'),
+(10082, 12, 0, 0, ''),
+(10083, 11, 0, 0, 'achievement_assembly_i_choose_you'),
+(10083, 12, 0, 0, ''),
+(10084, 11, 0, 0, 'achievement_assembly_i_choose_you'),
+(10084, 12, 0, 0, ''),
+(10085, 11, 0, 0, 'achievement_assembly_i_choose_you'),
+(10085, 12, 1, 0, ''),
+(10086, 11, 0, 0, 'achievement_assembly_i_choose_you'),
+(10086, 12, 1, 0, ''),
+(10087, 11, 0, 0, 'achievement_assembly_i_choose_you'),
+(10087, 12, 1, 0, '');
diff --git a/sql/updates/world/2013_06_02_01_world_conditions.sql b/sql/updates/world/2013_06_02_01_world_conditions.sql
new file mode 100644
index 00000000000..4f3993bd1e0
--- /dev/null
+++ b/sql/updates/world/2013_06_02_01_world_conditions.sql
@@ -0,0 +1,78 @@
+-- Add option conditions for mage trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (63,64,4484,4485,4486,4517,4518,4519,4520,4537,4538,4539,4552,4651,4654,4660,4661,4685,4686,6648,7264,9990,9580,7366,4535);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,63,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,63,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,63,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,64,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,64,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,64,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4484,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4484,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4484,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4485,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4485,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4485,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4486,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4486,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4486,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4517,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4517,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4517,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4518,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4518,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4518,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4519,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4519,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4519,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4520,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4520,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4520,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4537,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4537,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4537,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4538,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4538,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4538,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4539,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4539,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4539,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4552,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4552,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4552,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4651,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4651,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4651,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4654,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4654,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4654,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4660,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4660,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4660,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4661,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4661,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4661,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4685,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4685,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4685,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4686,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4686,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4686,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,6648,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,6648,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,6648,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,7264,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,7264,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,7264,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,9990,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,9990,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,9990,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,9580,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,9580,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,9580,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,7366,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,7366,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,7366,2,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4535,0,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4535,1,0,15,128,0,0,0,'','Show gossip option if player is a mage'),
+(15,4535,2,0,15,128,0,0,0,'','Show gossip option if player is a mage');
diff --git a/sql/updates/world/2013_06_02_02_world_conditions.sql b/sql/updates/world/2013_06_02_02_world_conditions.sql
new file mode 100644
index 00000000000..9d1b80e7a3f
--- /dev/null
+++ b/sql/updates/world/2013_06_02_02_world_conditions.sql
@@ -0,0 +1,78 @@
+-- Add option conditions for Warlock trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (1503,1522,2381,2383,2384,4503,4504,4505,4566,4567,4603,4604,4609,4610,4641,4643,4655,4656,4667,4681,4682,6628,7437,7566,4642);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,1503,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,1503,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,1503,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,1522,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,1522,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,1522,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2381,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2381,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2381,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2383,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2383,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2383,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2384,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2384,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,2384,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4503,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4503,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4503,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4504,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4504,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4504,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4505,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4505,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4505,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4566,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4566,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4566,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4567,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4567,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4567,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4603,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4603,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4603,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4604,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4604,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4604,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4609,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4609,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4609,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4610,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4610,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4610,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4641,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4641,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4641,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4643,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4643,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4643,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4655,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4655,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4655,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4656,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4656,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4656,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4667,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4667,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4667,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4681,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4681,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4681,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4682,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4682,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4682,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,6628,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,6628,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,6628,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,7437,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,7437,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,7437,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,7566,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,7566,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,7566,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4642,0,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4642,1,0,15,256,0,0,0,'','Show gossip option if player is a Warlock'),
+(15,4642,2,0,15,256,0,0,0,'','Show gossip option if player is a Warlock');
diff --git a/sql/updates/world/2013_06_02_03_world_conditions.sql b/sql/updates/world/2013_06_02_03_world_conditions.sql
new file mode 100644
index 00000000000..c2d730ffc6d
--- /dev/null
+++ b/sql/updates/world/2013_06_02_03_world_conditions.sql
@@ -0,0 +1,42 @@
+-- Add option conditions for Paladin trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (2304,4556,4557,4469,4470,4471,4662,4663,4664,4677,4678,7260,8111);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,2304,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,2304,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,2304,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4556,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4556,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4556,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4557,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4557,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4557,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4469,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4469,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4469,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4470,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4470,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4470,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4471,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4471,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4471,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4662,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4662,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4662,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4663,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4663,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4663,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4664,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4664,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4664,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4677,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4677,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4677,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4678,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4678,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,4678,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,7260,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,7260,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,7260,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,8111,0,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,8111,1,0,15,2,0,0,0,'','Show gossip option if player is a Paladin'),
+(15,8111,2,0,15,2,0,0,0,'','Show gossip option if player is a Paladin');
diff --git a/sql/updates/world/2013_06_02_04_world_conditions.sql b/sql/updates/world/2013_06_02_04_world_conditions.sql
new file mode 100644
index 00000000000..82ee44df19d
--- /dev/null
+++ b/sql/updates/world/2013_06_02_04_world_conditions.sql
@@ -0,0 +1,93 @@
+-- Add option conditions for Warrior trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (523,655,656,4091,4475,4481,4482,4509,4511,4525,4526,4527,4546,4547,4548,4568,4569,4570,4578,4579,4581,4645,4649,4650,4653,4683,4684,4696,4697,7263);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,523,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,523,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,523,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,655,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,655,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,655,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,656,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,656,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,656,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4091,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4091,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4091,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4475,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4475,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4475,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4481,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4481,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4481,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4482,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4482,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4482,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4509,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4509,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4509,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4511,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4511,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4511,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4525,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4525,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4525,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4526,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4526,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4526,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4527,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4527,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4527,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4546,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4546,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4546,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4547,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4547,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4547,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4548,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4548,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4548,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4568,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4568,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4568,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4569,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4569,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4569,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4570,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4570,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4570,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4578,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4578,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4578,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4579,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4579,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4579,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4581,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4581,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4581,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4645,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4645,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4645,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4649,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4649,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4649,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4650,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4650,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4650,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4653,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4653,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4653,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4683,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4683,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4683,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4684,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4684,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4684,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4696,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4696,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4696,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4697,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4697,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,4697,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,7263,0,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,7263,1,0,15,1,0,0,0,'','Show gossip option if player is a Warrior'),
+(15,7263,2,0,15,1,0,0,0,'','Show gossip option if player is a Warrior');
diff --git a/sql/updates/world/2013_06_02_05_world_conditions.sql b/sql/updates/world/2013_06_02_05_world_conditions.sql
new file mode 100644
index 00000000000..fdee846a275
--- /dev/null
+++ b/sql/updates/world/2013_06_02_05_world_conditions.sql
@@ -0,0 +1,49 @@
+-- Add option conditions for Druid trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (1403,3921,3924,3925,3926,4507,4508,4571,4605,4606,4607,4687,4688,7567,4646);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,1403,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,1403,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,1403,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,1403,3,0,8,0,3781,0,0,'','Mathrengyl Bearwalker - Show gossip option if player has rewarded quest 3781'),
+(15,3921,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3921,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3921,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3924,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3924,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3924,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3925,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3925,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3925,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3926,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3926,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,3926,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4507,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4507,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4507,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4508,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4508,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4508,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4571,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4571,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4571,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4605,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4605,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4605,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4606,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4606,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4606,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4607,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4607,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4607,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4687,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4687,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4687,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4688,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4688,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4688,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,7567,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,7567,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,7567,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4646,0,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4646,1,0,15,1024,0,0,0,'','Show gossip option if player is a Druid'),
+(15,4646,2,0,15,1024,0,0,0,'','Show gossip option if player is a Druid');
diff --git a/sql/updates/world/2013_06_02_06_world_conditions.sql b/sql/updates/world/2013_06_02_06_world_conditions.sql
new file mode 100644
index 00000000000..b2605b97d26
--- /dev/null
+++ b/sql/updates/world/2013_06_02_06_world_conditions.sql
@@ -0,0 +1,4 @@
+-- Add option conditions for Druid trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (1403) AND `SourceEntry` IN (3);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,1403,3,0,8,0,3781,0,0,'','Mathrengyl Bearwalker - Show gossip option if player has rewarded quest 3781');
diff --git a/sql/updates/world/2013_06_02_07_world_conditions.sql b/sql/updates/world/2013_06_02_07_world_conditions.sql
new file mode 100644
index 00000000000..696c69ca62e
--- /dev/null
+++ b/sql/updates/world/2013_06_02_07_world_conditions.sql
@@ -0,0 +1,80 @@
+-- Add option conditions for Hunter trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (4008,4009,4010,4011,4012,4017,4023,4101,4472,4473,4474,4506,4524,4549,4550,4551,4647,4648,4657,4675,4693,4695,6652,7262,7368);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,4008,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4008,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4008,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4009,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4009,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4009,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4010,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4010,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4010,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4011,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4011,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4011,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4012,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4012,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4012,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4017,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4017,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4017,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4023,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4023,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4023,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4101,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4101,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4101,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4472,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4472,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4472,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4473,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4473,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4473,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4474,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4474,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4474,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4506,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4506,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4506,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4524,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4524,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4524,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4549,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4549,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4549,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4550,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4550,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4550,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4551,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4551,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4551,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4647,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4647,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4647,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4648,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4648,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4648,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4657,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4657,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4657,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4675,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4675,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4675,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4693,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4693,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4693,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4695,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4695,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,4695,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,6652,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,6652,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,6652,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,7262,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,7262,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,7262,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,7368,0,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,7368,1,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,7368,2,0,15,4,0,0,0,'','Show gossip option if player is a Hunter'),
+(15,7368,3,0,9,0,9454,0,0,'','Acteon - Show gossip option if player has quest 9454'),
+(15,7368,4,0,9,0,10324,0,0,'','Acteon - Show gossip option if player has quest 10324');
diff --git a/sql/updates/world/2013_06_02_08_world_conditions.sql b/sql/updates/world/2013_06_02_08_world_conditions.sql
new file mode 100644
index 00000000000..2fe812c1934
--- /dev/null
+++ b/sql/updates/world/2013_06_02_08_world_conditions.sql
@@ -0,0 +1,75 @@
+-- Add option conditions for Rogue trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (85,141,381,410,411,436,3984,4502,4512,4513,4540,4541,4542,4561,4562,4575,4576,4577,4658,4659,4676,4690,5061,6650);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,85,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,85,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,85,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,141,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,141,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,141,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,381,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,381,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,381,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,410,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,410,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,410,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,411,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,411,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,411,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,436,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,436,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,436,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,3984,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,3984,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,3984,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4502,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4502,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4502,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4512,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4512,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4512,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4513,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4513,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4513,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4540,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4540,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4540,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4541,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4541,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4541,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4542,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4542,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4542,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4561,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4561,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4561,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4562,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4562,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4562,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4575,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4575,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4575,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4576,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4576,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4576,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4577,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4577,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4577,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4658,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4658,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4658,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4659,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4659,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4659,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4676,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4676,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4676,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4690,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4690,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,4690,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,5061,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,5061,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,5061,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,6650,0,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,6650,1,0,15,8,0,0,0,'','Show gossip option if player is a Rogue'),
+(15,6650,2,0,15,8,0,0,0,'','Show gossip option if player is a Rogue');
diff --git a/sql/updates/world/2013_06_02_09_world_conditions.sql b/sql/updates/world/2013_06_02_09_world_conditions.sql
new file mode 100644
index 00000000000..647e608df87
--- /dev/null
+++ b/sql/updates/world/2013_06_02_09_world_conditions.sql
@@ -0,0 +1,99 @@
+-- Add option conditions for Priest trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (3642,3643,3644,3645,4466,4467,4468,4521,4522,4523,4531,4532,4533,4543,4544,4545,4558,4559,4572,4573,4574,4665,4666,4679,4680,4691,4692,4801,6649,7265,7349,7438);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,3642,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3642,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3642,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3643,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3643,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3643,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3644,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3644,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3644,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3645,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3645,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,3645,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4466,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4466,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4466,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4467,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4467,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4467,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4468,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4468,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4468,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4521,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4521,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4521,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4522,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4522,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4522,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4523,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4523,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4523,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4531,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4531,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4531,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4532,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4532,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4532,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4533,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4533,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4533,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4543,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4543,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4543,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4544,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4544,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4544,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4545,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4545,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4545,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4558,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4558,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4558,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4559,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4559,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4559,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4572,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4572,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4572,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4573,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4573,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4573,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4574,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4574,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4574,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4665,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4665,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4665,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4666,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4666,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4666,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4679,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4679,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4679,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4680,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4680,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4680,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4691,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4691,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4691,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4692,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4692,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4692,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4801,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4801,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,4801,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,6649,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,6649,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,6649,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7265,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7265,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7265,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7349,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7349,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7349,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7438,0,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7438,1,0,15,16,0,0,0,'','Show gossip option if player is a Priest'),
+(15,7438,2,0,15,16,0,0,0,'','Show gossip option if player is a Priest');
diff --git a/sql/updates/world/2013_06_03_00_world_conditions.sql b/sql/updates/world/2013_06_03_00_world_conditions.sql
new file mode 100644
index 00000000000..518479930f2
--- /dev/null
+++ b/sql/updates/world/2013_06_03_00_world_conditions.sql
@@ -0,0 +1,42 @@
+-- Add option conditions for Shaman trainers
+DELETE FROM `conditions` WHERE `SourceTypeOrReferenceId` IN (15) AND `SourceGroup` IN (4103,4104,4515,4516,4528,4529,4530,4652,5123,7357,7467,7522,8110,7377);
+INSERT INTO `conditions` (`SourceTypeOrReferenceId`,`SourceGroup`,`SourceEntry`,`ElseGroup`,`ConditionTypeOrReference`,`ConditionValue1`,`ConditionValue2`,`ConditionValue3`,`ErrorTextId`,`ScriptName`,`Comment`) VALUES
+(15,4103,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4103,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4103,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4104,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4104,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4104,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4515,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4515,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4515,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4516,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4516,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4516,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4528,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4528,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4528,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4529,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4529,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4529,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4530,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4530,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4530,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4652,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4652,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,4652,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,5123,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,5123,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,5123,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7357,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7357,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7357,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7467,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7467,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7467,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,8110,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,8110,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,8110,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7377,0,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7377,1,0,15,64,0,0,0,'','Show gossip option if player is a Shaman'),
+(15,7377,2,0,15,64,0,0,0,'','Show gossip option if player is a Shaman');
diff --git a/sql/updates/world/2013_06_03_00_world_trinity_string.sql b/sql/updates/world/2013_06_03_00_world_trinity_string.sql
new file mode 100644
index 00000000000..80ad953b3b7
--- /dev/null
+++ b/sql/updates/world/2013_06_03_00_world_trinity_string.sql
@@ -0,0 +1,9 @@
+DELETE FROM `trinity_string` WHERE  `entry`=854 LIMIT 1;
+INSERT INTO `trinity_string` (`entry`, `content_default`, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8) VALUES 
+(854, '└ Mails: %d Read/%u Total', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+DELETE FROM `trinity_string` WHERE  `entry`=871 LIMIT 1;
+INSERT INTO `trinity_string` (`entry`, `content_default`, content_loc1, content_loc2, content_loc3, content_loc4, content_loc5, content_loc6, content_loc7, content_loc8) VALUES 
+(871, '│ Level: %u', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
+
+UPDATE `trinity_string` SET `content_default`='│ Level: %u (%u/%u XP (%u XP left))' WHERE  `entry`=843 LIMIT 1;