diff --git a/sql/base/dev/world_database.sql b/sql/base/dev/world_database.sql index d3672f1a8b..03d79b2522 100644 --- a/sql/base/dev/world_database.sql +++ b/sql/base/dev/world_database.sql @@ -2909,14 +2909,14 @@ DROP TABLE IF EXISTS `quest_template`; /*!40101 SET @saved_cs_client = @@character_set_client */; /*!40101 SET character_set_client = utf8 */; CREATE TABLE `quest_template` ( - `Id` mediumint(8) unsigned NOT NULL DEFAULT '0', + `ID` mediumint(8) unsigned NOT NULL DEFAULT '0', `Method` tinyint(3) unsigned NOT NULL DEFAULT '2', - `Level` smallint(3) NOT NULL DEFAULT '1', + `QuestLevel` smallint(3) NOT NULL DEFAULT '1', `MinLevel` smallint(6) NOT NULL DEFAULT '0', `MaxLevel` smallint(6) NOT NULL DEFAULT '0', - `ZoneOrSort` smallint(6) NOT NULL DEFAULT '0', - `Type` smallint(5) unsigned NOT NULL DEFAULT '0', - `SuggestedPlayers` tinyint(3) unsigned NOT NULL DEFAULT '0', + `QuestSortID` smallint(6) NOT NULL DEFAULT '0', + `QuestType` smallint(5) unsigned NOT NULL DEFAULT '0', + `SuggestedGroupNum` tinyint(3) unsigned NOT NULL DEFAULT '0', `LimitTime` int(10) unsigned NOT NULL DEFAULT '0', `RequiredClasses` smallint(5) unsigned NOT NULL DEFAULT '0', `RequiredRaces` mediumint(8) unsigned NOT NULL DEFAULT '0', @@ -2949,7 +2949,7 @@ CREATE TABLE `quest_template` ( `Flags` int(10) unsigned NOT NULL DEFAULT '0', `SpecialFlags` tinyint(3) unsigned NOT NULL DEFAULT '0', `MinimapTargetMark` tinyint(3) unsigned NOT NULL DEFAULT '0', - `RewardTitleId` tinyint(3) unsigned NOT NULL DEFAULT '0', + `RewardTitle` tinyint(3) unsigned NOT NULL DEFAULT '0', `RequiredPlayerKills` tinyint(3) unsigned NOT NULL DEFAULT '0', `RewardTalents` tinyint(3) unsigned NOT NULL DEFAULT '0', `RewardArenaPoints` smallint(5) unsigned NOT NULL DEFAULT '0', @@ -2958,52 +2958,52 @@ CREATE TABLE `quest_template` ( `RewardReputationMask` tinyint(3) unsigned NOT NULL DEFAULT '0', `QuestGiverPortrait` mediumint(8) unsigned NOT NULL DEFAULT '0', `QuestTurnInPortrait` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemId1` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemId2` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemId3` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemId4` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemId5` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemId6` mediumint(8) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemCount1` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemCount2` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemCount3` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemCount4` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemCount5` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardChoiceItemCount6` smallint(5) unsigned NOT NULL DEFAULT '0', - `RewardFactionId1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', - `RewardFactionId2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', - `RewardFactionId3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', - `RewardFactionId4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', - `RewardFactionId5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', - `RewardFactionValueId1` mediumint(8) NOT NULL DEFAULT '0', - `RewardFactionValueId2` mediumint(8) NOT NULL DEFAULT '0', - `RewardFactionValueId3` mediumint(8) NOT NULL DEFAULT '0', - `RewardFactionValueId4` mediumint(8) NOT NULL DEFAULT '0', - `RewardFactionValueId5` mediumint(8) NOT NULL DEFAULT '0', - `RewardFactionValueIdOverride1` int(11) NOT NULL DEFAULT '0', - `RewardFactionValueIdOverride2` int(11) NOT NULL DEFAULT '0', - `RewardFactionValueIdOverride3` int(11) NOT NULL DEFAULT '0', - `RewardFactionValueIdOverride4` int(11) NOT NULL DEFAULT '0', - `RewardFactionValueIdOverride5` int(11) NOT NULL DEFAULT '0', + `RewardItem1` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardItem2` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardItem3` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardItem4` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardAmount1` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardAmount2` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardAmount3` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardAmount4` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemID1` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemID2` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemID3` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemID4` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemID5` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemID6` mediumint(8) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemQuantity1` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemQuantity2` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemQuantity3` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemQuantity4` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemQuantity5` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardChoiceItemQuantity6` smallint(5) unsigned NOT NULL DEFAULT '0', + `RewardFactionID1` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', + `RewardFactionID2` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', + `RewardFactionID3` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', + `RewardFactionID4` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', + `RewardFactionID5` smallint(5) unsigned NOT NULL DEFAULT '0' COMMENT 'faction id from Faction.dbc in this case', + `RewardFactionValue1` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionValue2` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionValue3` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionValue4` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionValue5` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionOverride1` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionOverride2` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionOverride3` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionOverride4` mediumint(8) NOT NULL DEFAULT '0', + `RewardFactionOverride5` mediumint(8) NOT NULL DEFAULT '0', `PointMapId` smallint(5) unsigned NOT NULL DEFAULT '0', `PointX` float NOT NULL DEFAULT '0', `PointY` float NOT NULL DEFAULT '0', `PointOption` mediumint(8) unsigned NOT NULL DEFAULT '0', - `Title` text, - `Objectives` text, - `Details` text, + `LogTitle` text, + `LogDescription` text, + `QuestDescription` text, `EndText` text, `OfferRewardText` text, `RequestItemsText` text, - `CompletedText` text, + `QuestCompletionLog` text, `RequiredNpcOrGo1` mediumint(8) NOT NULL DEFAULT '0', `RequiredNpcOrGo2` mediumint(8) NOT NULL DEFAULT '0', `RequiredNpcOrGo3` mediumint(8) NOT NULL DEFAULT '0', @@ -3078,7 +3078,7 @@ CREATE TABLE `quest_template` ( `OfferRewardEmoteDelay3` int(10) unsigned NOT NULL DEFAULT '0', `OfferRewardEmoteDelay4` int(10) unsigned NOT NULL DEFAULT '0', `VerifiedBuild` smallint(5) DEFAULT '0', - PRIMARY KEY (`Id`) + PRIMARY KEY (`ID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8 COMMENT='Quest System'; /*!40101 SET character_set_client = @saved_cs_client */; diff --git a/sql/updates/world/2015_09_11_55_world.sql b/sql/updates/world/2015_09_11_55_world.sql new file mode 100644 index 0000000000..ae692eabfc --- /dev/null +++ b/sql/updates/world/2015_09_11_55_world.sql @@ -0,0 +1,5 @@ +-- +UPDATE `smart_scripts` SET `action_param1`= 371 WHERE `entryorguid`=30134 AND `source_type`=0 AND `id` =16; +UPDATE `smart_scripts` SET `action_param1`= 371 WHERE `entryorguid`=3038200 AND `source_type`=9 AND `id` =2; +UPDATE `creature_addon` SET `mount`=14332 WHERE `guid`=370861; +UPDATE `creature_addon` SET `mount`=0 WHERE `guid`=370857; diff --git a/sql/updates/world/2015_09_13_00_world.sql b/sql/updates/world/2015_09_13_00_world.sql new file mode 100644 index 0000000000..04c939a7d8 --- /dev/null +++ b/sql/updates/world/2015_09_13_00_world.sql @@ -0,0 +1,3 @@ +-- +-- http://www.wowhead.com/achievement=2904/conqueror-of-ulduar#comments:id=1193849:reply=197478 +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (10042, 10342, 10340, 10341, 10598, 10348, 10351, 10439, 10403, 10582, 10347, 10349, 10350,10352, 10355, 10353, 10354, 10599, 10357, 10363, 10719, 10404, 10583, 10361, 10362, 10364, 10321, 10322, 10323, 10324, 10325, 10326, 10568, 10570); diff --git a/sql/updates/world/2015_09_15_xx_world.sql b/sql/updates/world/2015_09_15_00_world.sql similarity index 100% rename from sql/updates/world/2015_09_15_xx_world.sql rename to sql/updates/world/2015_09_15_00_world.sql