Merge pull request #15459 from ShinDarth/quest_template_backport

DB/World schema backport: updated quest_template table

2 files changed, 31 insertions, 10 deletions

diff --git a/sql/updates/world/2015_09_10_00_world_335.sql b/sql/updates/world/2015_09_10_00_world_335.sql
new file mode 100644
index 00000000000..f3fb517d486
--- /dev/null
+++ b/sql/updates/world/2015_09_10_00_world_335.sql
@@ -0,0 +1,21 @@
+ALTER TABLE `quest_template`
+  CHANGE COLUMN `LimitTime`             `TimeAllowed`         INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `PointOption`,
+  CHANGE COLUMN `RequiredRaces`         `RequiredRaces`       SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `TimeAllowed`,
+  CHANGE COLUMN `NextQuestIdChain`      `RewardNextQuest`     MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `RequiredFactionValue2`,
+  CHANGE COLUMN `RewardXPId`            `RewardXPDifficulty`  TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardNextQuest`,
+  CHANGE COLUMN `RewardOrRequiredMoney` `RewardMoney`         INT(11) NOT NULL DEFAULT '0' AFTER `RewardXPDifficulty`,
+  CHANGE COLUMN `RewardMoneyMaxLevel`   `RewardBonusMoney`    INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardMoney`,
+  CHANGE COLUMN `RewardSpell`           `RewardDisplaySpell`  MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardBonusMoney`,
+  CHANGE COLUMN `RewardSpellCast`       `RewardSpell`         INT(11) NOT NULL DEFAULT '0' AFTER `RewardDisplaySpell`,
+  CHANGE COLUMN `RewardHonorMultiplier` `RewardKillHonor`     FLOAT NOT NULL DEFAULT '0' AFTER `RewardHonor`,
+  CHANGE COLUMN `SourceItemId`          `StartItem`           MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardKillHonor`,
+  CHANGE COLUMN `RewardTitle`           `RewardTitle`         TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemQuantity6`,
+  CHANGE COLUMN `RewardTalents`         `RewardTalents`       TINYINT(3) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardTitle`,
+  CHANGE COLUMN `RewardArenaPoints`     `RewardArenaPoints`   SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardTalents`;
+-- split needed to avoid import errors
+ALTER TABLE `quest_template`
+  CHANGE COLUMN `PointMapId`            `POIContinent`        SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemQuantity6`,
+  CHANGE COLUMN `PointX`                `POIx`                FLOAT NOT NULL DEFAULT '0' AFTER `POIContinent`,
+  CHANGE COLUMN `PointY`                `POIy`                FLOAT NOT NULL DEFAULT '0' AFTER `POIx`,
+  CHANGE COLUMN `PointOption`           `POIPriority`         MEDIUMINT(8) UNSIGNED NOT NULL DEFAULT '0' AFTER `POIy`,
+  CHANGE COLUMN `EndText`               `AreaDescription`     TEXT NULL AFTER `QuestDescription`;
diff --git a/src/server/game/Globals/ObjectMgr.cpp b/src/server/game/Globals/ObjectMgr.cpp
index 71b06c1a308..6eefa9770b3 100644
--- a/src/server/game/Globals/ObjectMgr.cpp
+++ b/src/server/game/Globals/ObjectMgr.cpp
@@ -3966,24 +3966,24 @@ void ObjectMgr::LoadQuests()
     mExclusiveQuestGroups.clear();
 
     QueryResult result = WorldDatabase.Query("SELECT "
-        //0      1           2         3           4            5                6             7            8
-        "ID, QuestType, QuestLevel, MinLevel, QuestSortID, QuestInfoID, SuggestedGroupNum, LimitTime, RequiredRaces,"
+        //0      1           2         3           4            5                6              7            8
+        "ID, QuestType, QuestLevel, MinLevel, QuestSortID, QuestInfoID, SuggestedGroupNum, TimeAllowed, RequiredRaces,"
         //      9                     10                   11                    12
         "RequiredFactionId1, RequiredFactionId2, RequiredFactionValue1, RequiredFactionValue2, "
-        //      13             14               15                    16               17             18             19               20
-        "NextQuestIdChain, RewardXPId, RewardOrRequiredMoney, RewardMoneyMaxLevel, RewardSpell, RewardSpellCast, RewardHonor, RewardHonorMultiplier, "
-        //      21       22        23              24                25               26
-        "SourceItemId, Flags, RewardTitle, RequiredPlayerKills, RewardTalents, RewardArenaPoints, "
+        //     13                 14               15             16                17               18            19            20
+        "RewardNextQuest, RewardXPDifficulty, RewardMoney, RewardBonusMoney, RewardDisplaySpell, RewardSpell, RewardHonor, RewardKillHonor, "
+        //   21       22        23              24                25               26
+        "StartItem, Flags, RewardTitle, RequiredPlayerKills, RewardTalents, RewardArenaPoints, "
         //    27            28            29           30             31            32            33            34
         "RewardItem1, RewardAmount1, RewardItem2, RewardAmount2, RewardItem3, RewardAmount3, RewardItem4, RewardAmount4, "
         //        35                      36                      37                      38                      39                      40                      41                      42                      43                      44                     45                      46
         "RewardChoiceItemID1, RewardChoiceItemQuantity1, RewardChoiceItemID2, RewardChoiceItemQuantity2, RewardChoiceItemID3, RewardChoiceItemQuantity3, RewardChoiceItemID4, RewardChoiceItemQuantity4, RewardChoiceItemID5, RewardChoiceItemQuantity5, RewardChoiceItemID6, RewardChoiceItemQuantity6, "
         //       47                 48                     49                  50                  51                     52                 53                  54                     55                  56                  57                    58                   59                 60                      61
         "RewardFactionID1, RewardFactionValue1, RewardFactionOverride1, RewardFactionID2, RewardFactionValue2, RewardFactionOverride2, RewardFactionID3, RewardFactionValue3, RewardFactionOverride3, RewardFactionID4, RewardFactionValue4, RewardFactionOverride4, RewardFactionID5, RewardFactionValue5,  RewardFactionOverride5,"
-        //   62        63      64        65
-        "PointMapId, PointX, PointY, PointOption, "
-        //   66          67               68           69             70
-        "LogTitle, LogDescription, QuestDescription, EndText, QuestCompletionLog, "
+        //    62        63    64       65
+        "POIContinent, POIx, POIy, POIPriority, "
+        //   66          67               68                69                70
+        "LogTitle, LogDescription, QuestDescription, AreaDescription, QuestCompletionLog, "
         //      71                72                73                74                   75                     76                    77                      78
         "RequiredNpcOrGo1, RequiredNpcOrGo2, RequiredNpcOrGo3, RequiredNpcOrGo4, RequiredNpcOrGoCount1, RequiredNpcOrGoCount2, RequiredNpcOrGoCount3, RequiredNpcOrGoCount4, "
         //         79                     80                    81                     82                        83                       84                        85                        86