Core/Quests: Updated Quest System to new Format

All quest requirements are now in quest_objectives table
quest_template table contains _ONLY_ WDB data and must not be modified
Currently supported objectives are MONSTER, GAMEOBJECT, ITEM, TALKTO, CURRENCY, REPUTATION, MONEY, PLAYERKILLS, AREATRIGGER

3 files changed, 227 insertions, 15 deletions

diff --git a/sql/base/characters_database.sql b/sql/base/characters_database.sql
index dff9589e540..a18782f85b9 100644
--- a/sql/base/characters_database.sql
+++ b/sql/base/characters_database.sql
@@ -941,21 +941,11 @@ DROP TABLE IF EXISTS `character_queststatus`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `character_queststatus` (
-  `guid` bigint(20) unsigned NOT NULL DEFAULT '0' COMMENT 'Global Unique Identifier',
-  `quest` int(10) unsigned NOT NULL DEFAULT '0' COMMENT 'Quest Identifier',
-  `status` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `explored` tinyint(3) unsigned NOT NULL DEFAULT '0',
-  `timer` int(10) unsigned NOT NULL DEFAULT '0',
-  `mobcount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `mobcount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `mobcount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `mobcount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `itemcount1` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `itemcount2` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `itemcount3` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `itemcount4` smallint(5) unsigned NOT NULL DEFAULT '0',
-  `playercount` smallint(5) unsigned NOT NULL DEFAULT '0',
-  PRIMARY KEY (`guid`,`quest`)
+  `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
+  `quest` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `status` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  `timer` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`, `quest`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
 /*!40101 SET character_set_client = @saved_cs_client */;
 
@@ -969,6 +959,31 @@ LOCK TABLES `character_queststatus` WRITE;
 UNLOCK TABLES;
 
 --
+-- Table structure for table `character_queststatus_objectives`
+--
+
+DROP TABLE IF EXISTS `character_queststatus_objectives`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `character_queststatus_objectives` (
+  `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
+  `quest` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `objective` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  `data` INT(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`, `quest`, `objective`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `character_queststatus_objectives`
+--
+
+LOCK TABLES `character_queststatus_objectives` WRITE;
+/*!40000 ALTER TABLE `character_queststatus_objectives` DISABLE KEYS */;
+/*!40000 ALTER TABLE `character_queststatus_objectives` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
 -- Table structure for table `character_queststatus_daily`
 --
 
diff --git a/sql/updates/characters/2014_12_28_00_characters.sql b/sql/updates/characters/2014_12_28_00_characters.sql
new file mode 100644
index 00000000000..d6424d676b7
--- /dev/null
+++ b/sql/updates/characters/2014_12_28_00_characters.sql
@@ -0,0 +1,17 @@
+DROP TABLE IF EXISTS `character_queststatus`;
+CREATE TABLE `character_queststatus` (
+  `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
+  `quest` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `status` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  `timer` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`, `quest`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
+
+DROP TABLE IF EXISTS `character_queststatus_objectives`;
+CREATE TABLE `character_queststatus_objectives` (
+  `guid` BIGINT(20) UNSIGNED NOT NULL DEFAULT '0',
+  `quest` INT(10) UNSIGNED NOT NULL DEFAULT '0',
+  `objective` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0',
+  `data` INT(11) NOT NULL DEFAULT '0',
+  PRIMARY KEY (`guid`, `quest`, `objective`)
+) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='Player System';
diff --git a/sql/updates/world/2014_12_28_05_world.sql b/sql/updates/world/2014_12_28_05_world.sql
new file mode 100644
index 00000000000..ef671e03196
--- /dev/null
+++ b/sql/updates/world/2014_12_28_05_world.sql
@@ -0,0 +1,180 @@
+ALTER TABLE `quest_template` CHANGE `Id` `ID` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `Method` `QuestType` TINYINT(3) UNSIGNED NOT NULL DEFAULT '2';
+ALTER TABLE `quest_template` CHANGE `Level` `QuestLevel` INT(11) NOT NULL DEFAULT '-1';
+ALTER TABLE `quest_template` ADD COLUMN `QuestPackageID` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `QuestLevel`;
+ALTER TABLE `quest_template` CHANGE `MinLevel` `MinLevel`  INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` DROP COLUMN `MaxLevel`;
+ALTER TABLE `quest_template` CHANGE `ZoneOrSort` `QuestSortID` SMALLINT(6) NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `Type` `QuestInfoID` SMALLINT(5) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `SuggestedPlayers` `SuggestedGroupNum` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `LimitTime` `TimeAllowed` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `SoundTurnIn`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredClasses`;
+ALTER TABLE `quest_template` CHANGE `RequiredRaces` `AllowableRaces` INT(11) NOT NULL DEFAULT '-1' AFTER `TimeAllowed`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredSkillId`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredSkillPoints`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredFactionId1`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredFactionId2`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredFactionValue1`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredFactionValue2`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredMinRepFaction`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredMaxRepFaction`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredMinRepValue`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredMaxRepValue`;
+ALTER TABLE `quest_template` DROP COLUMN `PrevQuestId`;
+ALTER TABLE `quest_template` DROP COLUMN `NextQuestId`;
+ALTER TABLE `quest_template` DROP COLUMN `ExclusiveGroup`;
+ALTER TABLE `quest_template` CHANGE `NextQuestIdChain` `RewardNextQuest` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardXPId` `RewardXPDifficulty` TINYINT(3) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` ADD COLUMN `Float10` float NOT NULL DEFAULT '1' AFTER `RewardXPDifficulty`;
+ALTER TABLE `quest_template` CHANGE `RewardOrRequiredMoney` `RewardMoney` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` ADD COLUMN `RewardMoneyDifficulty` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardMoney`;
+ALTER TABLE `quest_template` ADD COLUMN `Float13` float NOT NULL DEFAULT '1' AFTER `RewardMoneyDifficulty`;
+ALTER TABLE `quest_template` CHANGE `RewardMoneyMaxLevel` `RewardBonusMoney` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardSpell` `RewardDisplaySpell` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardSpellCast` `RewardSpell` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardHonor` `RewardHonor` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardHonorMultiplier` `RewardKillHonor` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` DROP COLUMN `RewardMailTemplateId`;
+ALTER TABLE `quest_template` DROP COLUMN `RewardMailDelay`;
+ALTER TABLE `quest_template` CHANGE `SourceItemId` `StartItem` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` DROP COLUMN `SourceItemCount`;
+ALTER TABLE `quest_template` DROP COLUMN `SourceSpellId`;
+ALTER TABLE `quest_template` ADD COLUMN `FlagsEx` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `Flags`;
+ALTER TABLE `quest_template` DROP COLUMN `SpecialFlags`;
+ALTER TABLE `quest_template` CHANGE `MinimapTargetMark` `AreaGroupID` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `SoundTurnIn`;
+ALTER TABLE `quest_template` CHANGE `RewardTitleId` `RewardTitle` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `PointOption`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredPlayerKills`;
+ALTER TABLE `quest_template` CHANGE `RewardTalents` `RewardTalents` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardTitle`;
+ALTER TABLE `quest_template` CHANGE `RewardArenaPoints` `RewardArenaPoints` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardTalents`;
+ALTER TABLE `quest_template` CHANGE `RewardSkillId` `RewardSkillLineID` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardArenaPoints`;
+ALTER TABLE `quest_template` CHANGE `RewardSkillPoints` `RewardNumSkillUps` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardSkillLineID`;
+ALTER TABLE `quest_template` CHANGE `QuestGiverPortrait` `PortraitGiver` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardNumSkillUps`;
+ALTER TABLE `quest_template` CHANGE `QuestTurnInPortrait` `PortraitTurnIn` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `PortraitGiver`;
+ALTER TABLE `quest_template` CHANGE `RewardItemId1` `RewardItem1` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardItemId2` `RewardItem2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardItemCount1`;
+ALTER TABLE `quest_template` CHANGE `RewardItemId3` `RewardItem3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardItemCount2`;
+ALTER TABLE `quest_template` CHANGE `RewardItemId4` `RewardItem4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardItemCount3`;
+ALTER TABLE `quest_template` CHANGE `RewardItemCount1` `RewardAmount1` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardItemCount2` `RewardAmount2` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardItemCount3` `RewardAmount3` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardItemCount4` `RewardAmount4` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemId1` `RewardChoiceItemID1` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemId2` `RewardChoiceItemID2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemCount1`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemId3` `RewardChoiceItemID3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemCount2`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemId4` `RewardChoiceItemID4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemCount3`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemId5` `RewardChoiceItemID5` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemCount4`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemId6` `RewardChoiceItemID6` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemCount5`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemCount1` `RewardChoiceItemQuantity1` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` ADD COLUMN `RewardChoiceItemDisplayID1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemQuantity1`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemCount2` `RewardChoiceItemQuantity2` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` ADD COLUMN `RewardChoiceItemDisplayID2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemQuantity2`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemCount3` `RewardChoiceItemQuantity3` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` ADD COLUMN `RewardChoiceItemDisplayID3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemQuantity3`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemCount4` `RewardChoiceItemQuantity4` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` ADD COLUMN `RewardChoiceItemDisplayID4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemQuantity4`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemCount5` `RewardChoiceItemQuantity5` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` ADD COLUMN `RewardChoiceItemDisplayID5` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemQuantity5`;
+ALTER TABLE `quest_template` CHANGE `RewardChoiceItemCount6` `RewardChoiceItemQuantity6` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` ADD COLUMN `RewardChoiceItemDisplayID6` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardChoiceItemQuantity6`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionId1` `RewardFactionID1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `PortraitTurnIn`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionValueId1` `RewardFactionValue1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionID1`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionvalueIdOverride1` `RewardFactionOverride1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionValue1`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionId2` `RewardFactionID2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionOverride1`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionValueId2` `RewardFactionValue2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionID2`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionvalueIdOverride2` `RewardFactionOverride2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionValue2`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionId3` `RewardFactionID3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionOverride2`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionValueId3` `RewardFactionValue3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionID3`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionvalueIdOverride3` `RewardFactionOverride3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionValue3`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionId4` `RewardFactionID4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionOverride3`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionValueId4` `RewardFactionValue4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionID4`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionvalueIdOverride4` `RewardFactionOverride4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionValue4`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionId5` `RewardFactionID5` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionOverride4`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionValueId5` `RewardFactionValue5` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionID5`;
+ALTER TABLE `quest_template` CHANGE `RewardFactionvalueIdOverride5` `RewardFactionOverride5` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionValue5`;
+ALTER TABLE `quest_template` CHANGE `RewardReputationMask` `RewardFactionFlags` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardFactionOverride5`;
+ALTER TABLE `quest_template` CHANGE `PointMapId` `POIContinent` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `PointX` `POIx` float NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `PointY` `POIy` float NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `PointOption` `POIPriority` INT(11) NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `Title` `LogTitle` text AFTER `AllowableRaces`;
+ALTER TABLE `quest_template` CHANGE `Objectives` `LogDescription` text AFTER `LogTitle`;
+ALTER TABLE `quest_template` CHANGE `Details` `QuestDescription` text AFTER `LogDescription`;
+ALTER TABLE `quest_template` CHANGE `EndText` `AreaDescription` text AFTER `QuestDescription`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardText`;
+ALTER TABLE `quest_template` DROP COLUMN `RequestItemsText`;
+ALTER TABLE `quest_template` CHANGE `CompletedText` `QuestCompletionLog` text AFTER `AreaDescription`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredNpcOrGo1`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredNpcOrGo2`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredNpcOrGo3`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredNpcOrGo4`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredNpcOrGoCount1`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredNpcOrGoCount2`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredNpcOrGoCount3`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredNpcOrGoCount4`;
+ALTER TABLE `quest_template` CHANGE `RequiredSourceItemId1` `ItemDrop1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardAmount4`;
+ALTER TABLE `quest_template` CHANGE `RequiredSourceItemCount1` `ItemDropQuantity1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `ItemDrop1`;
+ALTER TABLE `quest_template` CHANGE `RequiredSourceItemId2` `ItemDrop2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `ItemDropQuantity1`;
+ALTER TABLE `quest_template` CHANGE `RequiredSourceItemCount2` `ItemDropQuantity2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `ItemDrop2`;
+ALTER TABLE `quest_template` CHANGE `RequiredSourceItemId3` `ItemDrop3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `ItemDropQuantity2`;
+ALTER TABLE `quest_template` CHANGE `RequiredSourceItemCount3` `ItemDropQuantity3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `ItemDrop3`;
+ALTER TABLE `quest_template` CHANGE `RequiredSourceItemId4` `ItemDrop4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `ItemDropQuantity3`;
+ALTER TABLE `quest_template` CHANGE `RequiredSourceItemCount4` `ItemDropQuantity4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `ItemDrop4`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemId1`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemId2`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemId3`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemId4`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemId5`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemId6`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemCount1`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemCount2`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemCount3`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemCount4`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemCount5`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredItemCount6`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredSpell`;
+ALTER TABLE `quest_template` DROP COLUMN `ObjectiveText1`;
+ALTER TABLE `quest_template` DROP COLUMN `ObjectiveText2`;
+ALTER TABLE `quest_template` DROP COLUMN `ObjectiveText3`;
+ALTER TABLE `quest_template` DROP COLUMN `ObjectiveText4`;
+ALTER TABLE `quest_template` CHANGE `RewardCurrencyId1` `RewardCurrencyID1` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardCurrencyCount1` `RewardCurrencyQty1` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardCurrencyID1`;
+ALTER TABLE `quest_template` CHANGE `RewardCurrencyId2` `RewardCurrencyID2` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardCurrencyCount2` `RewardCurrencyQty2` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardCurrencyID2`;
+ALTER TABLE `quest_template` CHANGE `RewardCurrencyId3` `RewardCurrencyID3` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardCurrencyCount3` `RewardCurrencyQty3` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardCurrencyID3`;
+ALTER TABLE `quest_template` CHANGE `RewardCurrencyId4` `RewardCurrencyID4` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `RewardCurrencyCount4` `RewardCurrencyQty4` INT(10) UNSIGNED NOT NULL DEFAULT '0' AFTER `RewardCurrencyID4`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredCurrencyId1`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredCurrencyId2`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredCurrencyId3`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredCurrencyId4`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredCurrencyCount1`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredCurrencyCount2`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredCurrencyCount3`;
+ALTER TABLE `quest_template` DROP COLUMN `RequiredCurrencyCount4`;
+ALTER TABLE `quest_template` CHANGE `QuestGiverTextWindow` `PortraitGiverText` text AFTER `AreaDescription`;
+ALTER TABLE `quest_template` CHANGE `QuestGiverTargetName` `PortraitGiverName` text AFTER `PortraitGiverText`;
+ALTER TABLE `quest_template` CHANGE `QuestTurnTextWindow` `PortraitTurnInText` text AFTER `PortraitGiverName`;
+ALTER TABLE `quest_template` CHANGE `QuestTurnTargetName` `PortraitTurnInName` text AFTER `PortraitTurnInText`;
+ALTER TABLE `quest_template` CHANGE `SoundAccept` `AcceptedSoundKitID` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` CHANGE `SoundTurnIn` `CompleteSoundKitID` INT(10) UNSIGNED NOT NULL DEFAULT '0';
+ALTER TABLE `quest_template` DROP COLUMN `DetailsEmote1`;
+ALTER TABLE `quest_template` DROP COLUMN `DetailsEmote2`;
+ALTER TABLE `quest_template` DROP COLUMN `DetailsEmote3`;
+ALTER TABLE `quest_template` DROP COLUMN `DetailsEmote4`;
+ALTER TABLE `quest_template` DROP COLUMN `DetailsEmoteDelay1`;
+ALTER TABLE `quest_template` DROP COLUMN `DetailsEmoteDelay2`;
+ALTER TABLE `quest_template` DROP COLUMN `DetailsEmoteDelay3`;
+ALTER TABLE `quest_template` DROP COLUMN `DetailsEmoteDelay4`;
+ALTER TABLE `quest_template` DROP COLUMN `EmoteOnIncomplete`;
+ALTER TABLE `quest_template` DROP COLUMN `EmoteOnComplete`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardEmote1`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardEmote2`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardEmote3`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardEmote4`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardEmoteDelay1`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardEmoteDelay2`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardEmoteDelay3`;
+ALTER TABLE `quest_template` DROP COLUMN `OfferRewardEmoteDelay4`;
+
+UPDATE `quest_template` SET `AllowableRaces` = -1 WHERE `AllowableRaces` = 0;