5 files changed, 133 insertions, 90 deletions
diff --git a/sql/base/auth_database.sql b/sql/base/auth_database.sql
index 1fd7696bdc7..a5916565ddb 100644
--- a/sql/base/auth_database.sql
+++ b/sql/base/auth_database.sql
@@ -1105,6 +1105,7 @@ INSERT INTO `rbac_linked_permissions` VALUES
 (196,840),
 (196,842),
 (196,843),
+(196,869),
 (197,232),
 (197,236),
 (197,237),
@@ -2024,7 +2025,8 @@ INSERT INTO `rbac_permissions` VALUES
 (852,'Command: go offset'),
 (853,'Command: .reload conversation_template'),
 (854,'Command: .debug conversation'),
-(868,'Command: modify power');
+(868,'Command: modify power'),
+(869,'Command: debug send playerchoice');
 /*!40000 ALTER TABLE `rbac_permissions` ENABLE KEYS */;
 UNLOCK TABLES;
 
@@ -2225,7 +2227,8 @@ INSERT INTO `updates` VALUES
 ('2017_09_22_00_auth.sql','9313CCE80A18212E6F0C78D83316DE8582AE8084','RELEASED','2017-09-22 18:05:17',0),
 ('2017_11_11_01_auth.sql','0D6EDB6B2FC8B9FBDF11ECD79B4B8E943328B6A9','RELEASED','2017-11-11 18:49:45',0),
 ('2017_12_30_00_auth.sql','F360E9555AC68E28834E3FF807E4E37A090EF363','RELEASED','2017-12-30 00:23:32',0),
-('2017_12_30_01_auth.sql','1E11C78BA6D1D8E8CED7423DF92D1D197D6061EE','RELEASED','2017-12-30 23:00:00',0);
+('2017_12_30_01_auth.sql','1E11C78BA6D1D8E8CED7423DF92D1D197D6061EE','RELEASED','2017-12-30 23:00:00',0),
+('2017_12_31_00_auth.sql','1721ACBD35EB95FAE33B9E95F8C4E4B1FB70A5E4','RELEASED','2017-12-31 20:15:23',0);
 /*!40000 ALTER TABLE `updates` ENABLE KEYS */;
 UNLOCK TABLES;
 
diff --git a/sql/updates/auth/master/2017_12_31_00_auth.sql b/sql/updates/auth/master/2017_12_31_00_auth.sql
new file mode 100644
index 00000000000..7348c426b5f
--- /dev/null
+++ b/sql/updates/auth/master/2017_12_31_00_auth.sql
@@ -0,0 +1,7 @@
+DELETE FROM `rbac_permissions` WHERE `id`=869;
+INSERT INTO `rbac_permissions` (`id`,`name`) VALUES
+(869,'Command: debug send playerchoice');
+
+DELETE FROM `rbac_linked_permissions` WHERE `linkedId`=869;
+INSERT INTO `rbac_linked_permissions` (`id`,`linkedId`) VALUES
+(196,869);
diff --git a/sql/updates/auth/master/9999_99_99_99_auth.sql b/sql/updates/auth/master/9999_99_99_99_auth.sql
deleted file mode 100644
index f673ceae849..00000000000
--- a/sql/updates/auth/master/9999_99_99_99_auth.sql
+++ /dev/null
@@ -1,5 +0,0 @@
-INSERT INTO `rbac_permissions` (id, NAME) VALUES
-(869, "Command: debug send playerchoice");
-
-INSERT INTO `rbac_linked_permissions` (id, linkedId) VALUES
-(192, 869);
diff --git a/sql/updates/world/master/2017_12_31_00_world.sql b/sql/updates/world/master/2017_12_31_00_world.sql
new file mode 100644
index 00000000000..7e9aab77d82
--- /dev/null
+++ b/sql/updates/world/master/2017_12_31_00_world.sql
@@ -0,0 +1,121 @@
+DELETE FROM `command` WHERE `name` IN ('debug send playerchoice');
+INSERT INTO `command` (`name`,`permission`,`help`) VALUES
+('debug send playerchoice', 869, 'Syntax: .debug send playerchoice $choiceId\r\nSend given choice to player.');
+
+--
+-- Table structure for table `playerchoice`
+--
+DROP TABLE IF EXISTS `playerchoice`;
+CREATE TABLE `playerchoice` (
+  `ChoiceId` int(11) NOT NULL,
+  `Question` varchar(255),
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `playerchoice_locale`
+--
+DROP TABLE IF EXISTS `playerchoice_locale`;
+CREATE TABLE `playerchoice_locale` (
+  `ChoiceId` int(11) NOT NULL,
+  `locale` varchar(4) NOT NULL,
+  `Question` varchar(255),
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `playerchoice_response`
+--
+DROP TABLE IF EXISTS `playerchoice_response`;
+CREATE TABLE `playerchoice_response` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) UNSIGNED NOT NULL,
+  `ChoiceArtFileId` int(11) NOT NULL DEFAULT '0',
+  `Header` varchar(511) NOT NULL,
+  `Answer` varchar(511) NOT NULL,
+  `Description` varchar(2047) NOT NULL,
+  `Confirmation` varchar(127) NOT NULL,
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`,`ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `playerchoice_response_locale`
+--
+DROP TABLE IF EXISTS `playerchoice_response_locale`;
+CREATE TABLE `playerchoice_response_locale` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `locale` varchar(4) NOT NULL,
+  `Header` varchar(511) NOT NULL DEFAULT '',
+  `Answer` varchar(511) NOT NULL DEFAULT '',
+  `Description` varchar(2047) NOT NULL DEFAULT '',
+  `Confirmation` varchar(127) NOT NULL DEFAULT '',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceID`,`ResponseID`,`locale`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `playerchoice_response_reward`
+--
+DROP TABLE IF EXISTS `playerchoice_response_reward`;
+CREATE TABLE `playerchoice_response_reward` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `TitleId` int(11) NOT NULL DEFAULT '0',
+  `PackageId` int(11) NOT NULL DEFAULT '0',
+  `SkillLineId` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `SkillPointCount` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `ArenaPointCount` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `HonorPointCount` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `Money` bigint(20) UNSIGNED NOT NULL DEFAULT '0',
+  `Xp` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`, `ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `playerchoice_response_reward_currency`
+--
+DROP TABLE IF EXISTS `playerchoice_response_reward_currency`;
+CREATE TABLE `playerchoice_response_reward_currency` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) UNSIGNED NOT NULL,
+  `CurrencyId` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `Quantity` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`, `ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `playerchoice_response_reward_faction`
+--
+DROP TABLE IF EXISTS `playerchoice_response_reward_faction`;
+CREATE TABLE `playerchoice_response_reward_faction` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) UNSIGNED NOT NULL,
+  `FactionId` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `Quantity` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`, `ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Table structure for table `playerchoice_response_reward_item`
+--
+DROP TABLE IF EXISTS `playerchoice_response_reward_item`;
+CREATE TABLE `playerchoice_response_reward_item` (
+  `ChoiceId` int(11) NOT NULL,
+  `ResponseId` int(11) NOT NULL,
+  `Index` int(10) UNSIGNED NOT NULL,
+  `ItemId` int(10) UNSIGNED NOT NULL DEFAULT '0',
+  `BonusListIDs` text,
+  `Quantity` int(11) NOT NULL DEFAULT '0',
+  `VerifiedBuild` smallint(6) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`ChoiceId`, `ResponseId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/sql/updates/world/master/9999_99_99_99_playerchoice.sql b/sql/updates/world/master/9999_99_99_99_playerchoice.sql
deleted file mode 100644
index 4e4611428db..00000000000
--- a/sql/updates/world/master/9999_99_99_99_playerchoice.sql
+++ /dev/null
@@ -1,83 +0,0 @@
-DELETE FROM `command` WHERE `name` IN ('debug send playerchoice');
-INSERT INTO `command` (`name`, `permission`, `help`) VALUES
-('debug send playerchoice', 869, 'Syntax: .debug send playerchoice $choiceId\r\nSend given choice to player.');
-
-DROP TABLE IF EXISTS `playerchoice`;
-CREATE TABLE `playerchoice` (
-  `ChoiceID` INT (10) NOT NULL,
-  `Question` VARCHAR (255),
-  PRIMARY KEY (`ChoiceID`)
-);
-
-INSERT INTO playerchoice VALUES (231, "TODO");
-
-DROP TABLE IF EXISTS `playerchoice_locale`;
-CREATE TABLE `playerchoice_locale` (
-  `ChoiceID` INT (10) NOT NULL,
-  `locale` VARCHAR (4) NOT NULL,
-  `Question` VARCHAR (255),
-  PRIMARY KEY (`ChoiceID`, `locale`)
-);
-
-INSERT INTO playerchoice_locale VALUES (231, "frFR", "Quelle spécialisation de chasseur de démons voulez-vous apprendre ?");
-
-DROP TABLE IF EXISTS `playerchoice_response`;
-CREATE TABLE `playerchoice_response` (
-  `ChoiceID` INT (10) NOT NULL,
-  `ResponseID` INT (10) NOT NULL,
-  `ChoiceArtFileID` INT (10),
-  `Header` TEXT,
-  `Answer` TEXT,
-  `Description` TEXT,
-  `Confirmation` TEXT,
-  PRIMARY KEY (`ChoiceID`, `ResponseID`)
-);
-
-INSERT INTO playerchoice_response VALUES
-(231, 478, 1274664, "TODO", "TODO", "TODO", ""),
-(231, 479, 1274665, "TODO", "TODO", "TODO", "");
-
-DROP TABLE IF EXISTS `playerchoice_response_locale`;
-CREATE TABLE `playerchoice_response_locale` (
-  `ChoiceID` INT (10) NOT NULL,
-  `ResponseID` INT (10) NOT NULL,
-  `locale` VARCHAR (4) NOT NULL,
-  `Header` TEXT,
-  `Answer` TEXT,
-  `Description` TEXT,
-  `Confirmation` TEXT,
-  PRIMARY KEY (`ChoiceID`, `ResponseID`, `locale`)
-);
-
-INSERT INTO playerchoice_response_locale VALUES
-(231, 478, "frFR", "Dévastation", "Dévastation", "Conserver votre spécialisation : Dévastation.
-
-Les chasseurs de démons Dévastation peuvent utiliser Métamorphose pour se transformer en démons ailés. Ils se concentrent sur les dégâts en mêlée.
-
-Choisir Dévastation confère |cFFFF0000|Hspell:162264|h[Métamorphose]|h|r et |cFFFF0000|Hspell:185164|h[Maîtrise : Présence démoniaque]|h|r.", ""),
-(231, 479, "frFR", "Vengeance", "Vengeance", "Changer de spécialisation : Vengeance.
-
-Les chasseurs de démons Vengeance peuvent utiliser Métamorphose pour se transformer en démons couverts de pointes. Ils se concentrent sur le rôle de tank.
-
-Choisir Vengeance confère |cFFFF0000|Hspell:187827|h[Métamorphose]|h|r et |cFFFF0000|Hspell:203747|h[Maîtrise : Gangresang]|h|r.
-
-Votre technique |cFFFF0000|Hspell:193921|h[Rayon accablant]|h|r est remplacée par |cFFFF0000|Hspell:203720|h[Pointes démoniaques]|h|r.", "");
-
-DROP TABLE IF EXISTS `playerchoice_response_reward`;
-CREATE TABLE `playerchoice_response_reward` (
-  `ChoiceID` INT (10) NOT NULL,
-  `ResponseID` INT (10) NOT NULL,
-  `TitleID` INT (10),
-  `PackageID` INT (10),
-  `SkillLineID` INT (10) UNSIGNED,
-  `SkillPointCount` INT (10) UNSIGNED,
-  `ArenaPointCount` INT (10) UNSIGNED,
-  `HonorPointCount` INT (10) UNSIGNED,
-  `Money` BIGINT (20) UNSIGNED,
-  `Xp` INT (10) UNSIGNED,
-  PRIMARY KEY (`ChoiceID`, `ResponseID`)
-);
-
-INSERT INTO playerchoice_response_reward VALUES
-(231, 478, 0, 0, 0, 0, 0, 0, 0, 0),
-(231, 479, 0, 0, 0, 0, 0, 0, 0, 0);