diff options
4 files changed, 245 insertions, 2 deletions
diff --git a/sql/updates/characters/2012_01_23_00_characters_character_queststatus_rewarded.sql b/sql/updates/characters/2012_01_23_00_characters_character_queststatus_rewarded.sql new file mode 100644 index 00000000000..d81cf3a6617 --- /dev/null +++ b/sql/updates/characters/2012_01_23_00_characters_character_queststatus_rewarded.sql @@ -0,0 +1 @@ +DELETE FROM `character_queststatus_rewarded` WHERE `quest` IN (8619,8635,8636,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8670,8671,8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8688,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725,8726,8727,8862,8863,8864,8865,8866,8867,8870,8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,13012,13013,13014,13015,13016,13017,13018,13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,13030,13031,13032,13033,13065,13066,13067,11120,11431,11442,11409,11318,11117,11400,11419,11118,11122,11293,11294,11321,11407,11408,11412,11413,11441,11446,11454,11486,11487,12020,12022,12318,12193,12062,12491,11447,12191,12492,12194,12192,12278,12306,12420,12421,13932,13649,13931,11127,11320,11347,11437,11438,11444,11445,9319,9322,9323,9324,9325,9326,9330,9331,9332,9339,9365,9367,9368,9386,9388,9389,11657,11691,11731,11882,11883,11886,11891,11915,11917,11921,11922,11923,11924,11925,11926,11933,11935,11947,11948,11952,11953,11954,11955,11964,11966,11970,11971,11972,12012,14022,114023,114024,114028,114030,114033,114036,114037,114040,114041,114043,114044,114064,114065,114035,114047,114048,114051,114053,114054,114055,114058,114059,114060,114061,114062,114488,24597,24609,24656,24657,24745,24848,24849,24666,24792,24804,24611,24536,24612,24635,24636,24655,24610,24629,24614,24576,24613,24615,24638,24645,24647,24648,24649,24650,24651,24652,24658,24659,24660,24662,24663,24664,24665,24793,24805,24850,24851,24541,14483,24661,1657,1658,6961,6962,6963,6964,6983,6984,7021,7022,7023,7024,7025,7042,7043,7045,7061,7062,7063,8149,8150,8311,8312,8322,8353,8354,8355,8356,8357,8358,8359,8360,8373,8409,8744,8746,8762,8763,8767,8768,8769,8788,8799,8803,8827,8828,8860,8861,8868,8897,8898,8899,8900,8901,8902,8903,8904,8971,8972,8973,8974,8975,8976,8979,8980,8981,8982,8983,8984,8993,9024,9025,9026,9027,9028,11131,11135,11219,11220,11242,11356,11357,11360,11361,11392,11401,11403,11404,11405,11435,11439,11440,11449,11450,11528,11558,11580,11581,11583,11584,11696,11732,11734,11735,11736,11737,11738,11739,11740,11741,11742,11743,11744,11745,11746,11747,11748,11749,11750,11751,11752,11753,11754,11755,11756,11757,11758,11759,11760,11761,11762,11763,11764,11765,11766,11767,11768,11769,11770,11771,11772,11773,11774,11775,11776,11777,11778,11779,11780,11781,11782,11783,11784,11785,11786,11787,11799,11800,11801,11802,11803,11804,11805,11806,11807,11808,11809,11810,11811,11812,11813,11814,11815,11816,11817,11818,11819,11820,11821,11822,11823,11824,11825,11826,11827,11828,11829,11830,11831,11832,11833,11834,11835,11836,11837,11838,11839,11840,11841,11842,11843,11844,11845,11846,11847,11848,11849,11850,11851,11852,11853,11854,11855,11856,11857,11858,11859,11860,11861,11862,11863,11937,11976,12133,12135,12139,12155,12286,12313,12331,12332,12333,12334,12335,12336,12337,12338,12339,12340,12341,12342,12343,12344,12345,12346,12347,12348,12349,12350,12351,12352,12353,12354,12355,12356,12357,12358,12359,12360,12361,12362,12363,12364,12365,12366,12367,12368,12369,12370,12371,12373,12374,12375,12376,12377,12378,12379,12380,12381,12382,12383,12384,12385,12386,12387,12388,12389,12390,12391,12392,12393,12394,12395,12396,12397,12398,12399,12400,12401,12402,12403,12404,12405,12406,12407,12408,12409,12410,12940,12941,12944,12945,12946,12947,12950,13203,13433,13434,13435,13436,13437,13438,13439,13440,13441,13442,13443,13444,13445,13446,13447,13448,13449,13450,13451,13452,13453,13454,13455,13456,13457,13458,13459,13460,13461,13462,13463,13464,13465,13466,13467,13468,13469,13470,13471,13472,13473,13474,13485,13486,13487,13488,13489,13490,13491,13492,13493,13494,13495,13496,13497,13498,13499,13500,13501,13548,13966); diff --git a/sql/updates/world/2012_01_23_00_world_game_event_seasonal_questrelation.sql b/sql/updates/world/2012_01_23_00_world_game_event_seasonal_questrelation.sql new file mode 100644 index 00000000000..0bf0b4bb1e5 --- /dev/null +++ b/sql/updates/world/2012_01_23_00_world_game_event_seasonal_questrelation.sql @@ -0,0 +1,239 @@ +DELETE FROM `game_event_seasonal_questrelation` WHERE `questId` IN (8619,8635,8636,8642,8643,8644,8645,8646,8647,8648,8649,8650,8651,8652,8653,8654,8670,8671,8672,8673,8674,8675,8676,8677,8678,8679,8680,8681,8682,8683,8684,8685,8686,8688,8713,8714,8715,8716,8717,8718,8719,8720,8721,8722,8723,8724,8725,8726,8727,8862,8863,8864,8865,8866,8867,8870,8871,8872,8873,8874,8875,8876,8877,8878,8879,8880,8881,8882,8883,13012,13013,13014,13015,13016,13017,13018,13019,13020,13021,13022,13023,13024,13025,13026,13027,13028,13029,13030,13031,13032,13033,13065,13066,13067,11120,11431,11442,11409,11318,11117,11400,11419,11118,11122,11293,11294,11321,11407,11408,11412,11413,11441,11446,11454,11486,11487,12020,12022,12318,12193,12062,12491,11447,12191,12492,12194,12192,12278,12306,12420,12421,13932,13649,13931,11127,11320,11347,11437,11438,11444,11445,9319,9322,9323,9324,9325,9326,9330,9331,9332,9339,9365,9367,9368,9386,9388,9389,11657,11691,11731,11882,11883,11886,11891,11915,11917,11921,11922,11923,11924,11925,11926,11933,11935,11947,11948,11952,11953,11954,11955,11964,11966,11970,11971,11972,12012,14488,24597,24609,24656,24657,24745,24848,24849,24666,24792,24804,24611,24536,24612,24635,24636,24655,24610,24629,24614,24576,24613,24615,24638,24645,24647,24648,24649,24650,24651,24652,24658,24659,24660,24662,24663,24664,24665,24793,24805,24850,24851,24541,14483,24661); +INSERT INTO `game_event_seasonal_questrelation` (`questId`,`eventEntry`) VALUES +(8619,7), +(8635,7), +(8636,7), +(8642,7), +(8643,7), +(8644,7), +(8645,7), +(8646,7), +(8647,7), +(8648,7), +(8649,7), +(8650,7), +(8651,7), +(8652,7), +(8653,7), +(8654,7), +(8670,7), +(8671,7), +(8672,7), +(8673,7), +(8674,7), +(8675,7), +(8676,7), +(8677,7), +(8678,7), +(8679,7), +(8680,7), +(8681,7), +(8682,7), +(8683,7), +(8684,7), +(8685,7), +(8686,7), +(8688,7), +(8713,7), +(8714,7), +(8715,7), +(8716,7), +(8717,7), +(8718,7), +(8719,7), +(8720,7), +(8721,7), +(8722,7), +(8723,7), +(8724,7), +(8725,7), +(8726,7), +(8727,7), +(8862,7), +(8863,7), +(8864,7), +(8865,7), +(8866,7), +(8867,7), +(8870,7), +(8871,7), +(8872,7), +(8873,7), +(8874,7), +(8875,7), +(8876,7), +(8877,7), +(8878,7), +(8879,7), +(8880,7), +(8881,7), +(8882,7), +(8883,7), +(13012,7), +(13013,7), +(13014,7), +(13015,7), +(13016,7), +(13017,7), +(13018,7), +(13019,7), +(13020,7), +(13021,7), +(13022,7), +(13023,7), +(13024,7), +(13025,7), +(13026,7), +(13027,7), +(13028,7), +(13029,7), +(13030,7), +(13031,7), +(13032,7), +(13033,7), +(13065,7), +(13066,7), +(13067,7), +(11120,24), +(11431,24), +(11442,24), +(11409,24), +(11318,24), +(11117,24), +(11400,24), +(11419,24), +(11118,24), +(11122,24), +(11293,24), +(11294,24), +(11321,24), +(11407,24), +(11408,24), +(11412,24), +(11413,24), +(11441,24), +(11446,24), +(11454,24), +(11486,24), +(11487,24), +(12020,24), +(12022,24), +(12318,24), +(12193,24), +(12062,24), +(12491,24), +(11447,24), +(12191,24), +(12492,24), +(12194,24), +(12192,24), +(12278,24), +(12306,24), +(12420,24), +(12421,24), +(13932,24), +(13649,24), +(13931,24), +(11127,24), +(11320,24), +(11347,24), +(11437,24), +(11438,24), +(11444,24), +(11445,24), +(9319,1), +(9322,1), +(9323,1), +(9324,1), +(9325,1), +(9326,1), +(9330,1), +(9331,1), +(9332,1), +(9339,1), +(9365,1), +(9367,1), +(9368,1), +(9386,1), +(9388,1), +(9389,1), +(11657,1), +(11691,1), +(11731,1), +(11882,1), +(11883,1), +(11886,1), +(11891,1), +(11915,1), +(11917,1), +(11921,1), +(11922,1), +(11923,1), +(11924,1), +(11925,1), +(11926,1), +(11933,1), +(11935,1), +(11947,1), +(11948,1), +(11952,1), +(11953,1), +(11954,1), +(11955,1), +(11964,1), +(11966,1), +(11970,1), +(11971,1), +(11972,1), +(12012,1), +(13479,9), +(13480,9), +(13483,9), +(13484,9), +(13502,9), +(13503,9), +(14488,8), +(24597,8), +(24609,8), +(24656,8), +(24657,8), +(24745,8), +(24848,8), +(24849,8), +(24666,8), +(24792,8), +(24804,8), +(24611,8), +(24536,8), +(24612,8), +(24635,8), +(24636,8), +(24655,8), +(24610,8), +(24629,8), +(24614,8), +(24576,8), +(24613,8), +(24615,8), +(24638,8), +(24645,8), +(24647,8), +(24648,8), +(24649,8), +(24650,8), +(24651,8), +(24652,8), +(24658,8), +(24659,8), +(24660,8), +(24662,8), +(24663,8), +(24664,8), +(24665,8), +(24793,8), +(24805,8), +(24850,8), +(24851,8), +(24541,8), +(14483,8), +(24661,8); diff --git a/src/server/game/Miscellaneous/SharedDefines.h b/src/server/game/Miscellaneous/SharedDefines.h index 53f70096cbd..81b1b14d27d 100755 --- a/src/server/game/Miscellaneous/SharedDefines.h +++ b/src/server/game/Miscellaneous/SharedDefines.h @@ -2398,7 +2398,10 @@ enum QuestSort QUEST_SORT_BREWFEST = 370, QUEST_SORT_INSCRIPTION = 371, QUEST_SORT_DEATH_KNIGHT = 372, - QUEST_SORT_JEWELCRAFTING = 373 + QUEST_SORT_JEWELCRAFTING = 373, + QUEST_SORT_NOBLEGARDEN = 374, + QUEST_SORT_PILGRIMS_BOUNTY = 375, + QUEST_SORT_LOVE_IS_IN_THE_AIR = 376, }; inline uint8 ClassByQuestSort(int32 QuestSort) diff --git a/src/server/game/Quests/QuestDef.h b/src/server/game/Quests/QuestDef.h index 3e142e1d84c..973735b84da 100755 --- a/src/server/game/Quests/QuestDef.h +++ b/src/server/game/Quests/QuestDef.h @@ -251,7 +251,7 @@ class Quest uint32 GetFlags() const { return Flags; } bool IsDaily() const { return Flags & QUEST_FLAGS_DAILY; } bool IsWeekly() const { return Flags & QUEST_FLAGS_WEEKLY; } - bool IsSeasonal() const { return ZoneOrSort == -QUEST_SORT_SEASONAL; } + bool IsSeasonal() const { return (ZoneOrSort == -QUEST_SORT_SEASONAL || ZoneOrSort == -QUEST_SORT_SPECIAL || ZoneOrSort == -QUEST_SORT_LUNAR_FESTIVAL || ZoneOrSort == -QUEST_SORT_MIDSUMMER || ZoneOrSort == -QUEST_SORT_BREWFEST || ZoneOrSort == -QUEST_SORT_LOVE_IS_IN_THE_AIR || ZoneOrSort == -QUEST_SORT_NOBLEGARDEN); } bool IsDailyOrWeekly() const { return Flags & (QUEST_FLAGS_DAILY | QUEST_FLAGS_WEEKLY); } bool IsAutoAccept() const { return Flags & QUEST_FLAGS_AUTO_ACCEPT; } bool IsRaidQuest() const { return Type == QUEST_TYPE_RAID || Type == QUEST_TYPE_RAID_10 || Type == QUEST_TYPE_RAID_25; } |