diff options
19 files changed, 1279 insertions, 75 deletions
diff --git a/sql/updates/world/2012_08_04_00_world_disables.sql b/sql/updates/world/2012_08_04_00_world_disables.sql new file mode 100644 index 00000000000..f3f197ba23a --- /dev/null +++ b/sql/updates/world/2012_08_04_00_world_disables.sql @@ -0,0 +1,219 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (73,108,241,242,259,326,327,352,390,406,462,490,497,534,548,612,636,740,774,796,797,798,799,800,801,802,803,810,811,814,820,839,856,859,904,946,987,988,989,1128,1129,1155,1156,1157,1158,1161,1162,1163,1165,1263,1272,1277,1278,1279,1280,1281,1283,1289,1290,1291,1292,1293,1294,1295,1296,1297,1298,1299,1300,1390,1397,1441,1443,1460,1461,1533,1537,1538,1659,1660,1662,1663,1664,2020,2971,3023,3064,3241,3383,3401,3403,3404,3405,3422,3423,3424,3425,3515,3516,3529,3530,3531,3622,3623,3624,3885,3910,4323,4541,4905,5053,5205,5207,5208,5209,5303,5304,5506,5512,5516,5520,5523,5532,5653,5659,5664,5665,5666,5667,5668,5669,5670,5671,5681,5682,5683,5684,5685,5686,5687,5688,5689,5690,5691,5692,5693,5694,5695,5696,5697,5698,5699,5700,5701,5702,5703,5704,5705,5706,5707,5708,5709,5710,5711,5712,6003,6165,6202,6702,6703,6704,6705,6706,6707,6708,6709,6710,6711,6841,6842,7069,7904,8002,8244,8245,8247,8248,8337,8339,8340,8444,8445,8448,8449,8450,8451,8452,8453,8454,8458,8459,8571,9031,9306,9307,9445,9596,9597,9599,9679,9745,10370,10402,10616,10743,10890,11127); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,73,0,'','','Deprecated quest: <TXT> No Reward'), +(1,108,0,'','','Deprecated quest: <TXT> Mystery Reward'), +(1,241,0,'','','Deprecated quest: <TEST> HEY MISTER WILSON!'), +(1,242,0,'','','Deprecated quest: <UNUSED>'), +(1,259,0,'','','Deprecated quest: <UNUSED>'), +(1,326,0,'','','Deprecated quest: <UNUSED>'), +(1,327,0,'','','Deprecated quest: <UNUSED>'), +(1,352,0,'','','Deprecated quest: <UNUSED>'), +(1,390,0,'','','Deprecated quest: <UNUSED>'), +(1,406,0,'','','Deprecated quest: <UNUSED>'), +(1,462,0,'','','Deprecated quest: <UNUSED>'), +(1,490,0,'','','Deprecated quest: <UNUSED>'), +(1,497,0,'','','Deprecated quest: <UNUSED>'), +(1,534,0,'','','Deprecated quest: <UNUSED>'), +(1,548,0,'','','Deprecated quest: <NYI> <TXT> Bloodstone Pendant'), +(1,612,0,'','','Deprecated quest: <UNUSED>'), +(1,636,0,'','','Deprecated quest: Legends of the Earth <NYI>'), +(1,740,0,'','','Deprecated quest: <UNUSED>'), +(1,774,0,'','','Deprecated quest: <UNUSED>'), +(1,796,0,'','','Deprecated quest: <UNUSED>'), +(1,797,0,'','','Deprecated quest: <UNUSED>'), +(1,798,0,'','','Deprecated quest: <UNUSED>'), +(1,799,0,'','','Deprecated quest: <UNUSED>'), +(1,800,0,'','','Deprecated quest: <UNUSED>'), +(1,801,0,'','','Deprecated quest: <UNUSED>'), +(1,802,0,'','','Deprecated quest: <UNUSED>'), +(1,803,0,'','','Deprecated quest: <UNUSED>'), +(1,810,0,'','','Deprecated quest: <UNUSED>'), +(1,811,0,'','','Deprecated quest: <UNUSED>'), +(1,814,0,'','','Deprecated quest: <UNUSED>'), +(1,820,0,'','','Deprecated quest: <UNUSED>'), +(1,839,0,'','','Deprecated quest: <UNUSED>'), +(1,856,0,'','','Deprecated quest: <UNUSED>'), +(1,859,0,'','','Deprecated quest: <UNUSED>'), +(1,904,0,'','','Deprecated quest: <UNUSED>'), +(1,946,0,'','','Deprecated quest: <UNUSED>'), +(1,987,0,'','','Deprecated quest: <UNUSED>'), +(1,988,0,'','','Deprecated quest: <UNUSED>'), +(1,989,0,'','','Deprecated quest: <UNUSED>'), +(1,1128,0,'','','Deprecated quest: <NYI> The Gnome Pit Crew is Thirsty'), +(1,1129,0,'','','Deprecated quest: <NYI> The Goblin Pit Crew is Thirsty'), +(1,1155,0,'','','Deprecated quest: <NYI> <TXT> bug crystal side quest'), +(1,1156,0,'','','Deprecated quest: <NYI> <TXT> speak to alchemist pestlezugg'), +(1,1157,0,'','','Deprecated quest: <NYI> <TXT> pestlezugg needs items'), +(1,1158,0,'','','Deprecated quest: <NYI> <TXT> speak to rabine saturna'), +(1,1161,0,'','','Deprecated quest: <NYI> <TXT> gossip shade of ambermoon'), +(1,1162,0,'','','Deprecated quest: <NYI> <TXT> speak to hamuul runetotem'), +(1,1163,0,'','','Deprecated quest: <NYI> <TXT> speak to tyrande whisperwind'), +(1,1165,0,'','','Deprecated quest: <NYI> Ore for the Races'), +(1,1263,0,'','','Deprecated quest: The Burning Inn <CHANGE TO GOSSIP>'), +(1,1272,0,'','','Deprecated quest: Finding Reethe <CHANGE INTO GOSSIP>'), +(1,1277,0,'','','Deprecated quest: <nyi> <TXT> The Centaur Hoofprints'), +(1,1278,0,'','','Deprecated quest: <nyi> <TXT> The Grim Totem Clan'), +(1,1279,0,'','','Deprecated quest: <nyi> <TXT>The Centaur Hoofprints'), +(1,1280,0,'','','Deprecated quest: <nyi> <TXT>The Centaur Hoofprints'), +(1,1281,0,'','','Deprecated quest: Jim''s Song <CHANGE TO GOSSIP>'), +(1,1283,0,'','','Deprecated quest: Fire at the Shady Rest <CHANGE TO GOSSIP>'), +(1,1289,0,'','','Deprecated quest: <nyi> Vimes''s Report'), +(1,1290,0,'','','Deprecated quest: <nyi> Investigating Mosarn'), +(1,1291,0,'','','Deprecated quest: <nyi> <TXT> Centaur Hoofprints'), +(1,1292,0,'','','Deprecated quest: <nyi><TXT> Centaur Hoofprints'), +(1,1293,0,'','','Deprecated quest: <nyi> <TXT> Centaur Hoofprints'), +(1,1294,0,'','','Deprecated quest: <nyi> <TXT>Centaur Sympathies'), +(1,1295,0,'','','Deprecated quest: <nyi> <TXT> Course of Action'), +(1,1296,0,'','','Deprecated quest: <nyi> <TXT> Course of Action'), +(1,1297,0,'','','Deprecated quest: <nyi> <TXT> Course of Action'), +(1,1298,0,'','','Deprecated quest: <nyi> <TXT> Thrall''s Dirty Work'), +(1,1299,0,'','','Deprecated quest: <nyi> <TXT> Thrall''s Dirty Work'), +(1,1300,0,'','','Deprecated quest: <nyi> <TXT> Lorn Grim Totem'), +(1,1390,0,'','','Deprecated quest: <nyi> Oops, We Killed Them Again.'), +(1,1397,0,'','','Deprecated quest: <nyi> Saved!'), +(1,1441,0,'','','Deprecated quest: <UNUSED>'), +(1,1443,0,'','','Deprecated quest: <nyi> The Shakedown'), +(1,1460,0,'','','Deprecated quest: <UNUSED>'), +(1,1461,0,'','','Deprecated quest: <UNUSED>'), +(1,1533,0,'','','Deprecated quest: <NYI> Call of Air'), +(1,1537,0,'','','Deprecated quest: <NYI> Call of Air'), +(1,1538,0,'','','Deprecated quest: <NYI> Call of Air'), +(1,1659,0,'','','Deprecated quest: <UNUSED>'), +(1,1660,0,'','','Deprecated quest: <UNUSED>'), +(1,1662,0,'','','Deprecated quest: <UNUSED>'), +(1,1663,0,'','','Deprecated quest: <UNUSED>'), +(1,1664,0,'','','Deprecated quest: <UNUSED>'), +(1,2020,0,'','','Deprecated quest: <UNUSED>'), +(1,2971,0,'','','Deprecated quest: <UNUSED>'), +(1,3023,0,'','','Deprecated quest: <UNUSED>'), +(1,3064,0,'','','Deprecated quest: <NYI> <TXT> Pirate Hats'), +(1,3241,0,'','','Deprecated quest: <NYI> <TXT><redux> Dreadmist Peak'), +(1,3383,0,'','','Deprecated quest: <UNUSED>'), +(1,3401,0,'','','Deprecated quest: <UNUSED>'), +(1,3403,0,'','','Deprecated quest: <UNUSED>'), +(1,3404,0,'','','Deprecated quest: <UNUSED>'), +(1,3405,0,'','','Deprecated quest: <UNUSED>'), +(1,3422,0,'','','Deprecated quest: <UNUSED>'), +(1,3423,0,'','','Deprecated quest: <UNUSED>'), +(1,3424,0,'','','Deprecated quest: <UNUSED>'), +(1,3425,0,'','','Deprecated quest: <UNUSED>'), +(1,3515,0,'','','Deprecated quest: <UNUSED>'), +(1,3516,0,'','','Deprecated quest: <UNUSED>'), +(1,3529,0,'','','Deprecated quest: <UNUSED>'), +(1,3530,0,'','','Deprecated quest: <UNUSED>'), +(1,3531,0,'','','Deprecated quest: <UNUSED>'), +(1,3622,0,'','','Deprecated quest: <UNUSED>'), +(1,3623,0,'','','Deprecated quest: <UNUSED>'), +(1,3624,0,'','','Deprecated quest: <UNUSED>'), +(1,3885,0,'','','Deprecated quest: <NYI> <TXT> The Gadgetzan Run'), +(1,3910,0,'','','Deprecated quest: <NYI> <TXT> The Un''Goro Run'), +(1,4323,0,'','','Deprecated quest: <NYI> <TXT> Get those Hyenas!!!'), +(1,4541,0,'','','Deprecated quest: <NYI> <TXT>'), +(1,4905,0,'','','Deprecated quest: <UNUSED>'), +(1,5053,0,'','','Deprecated quest: <UNUSED>'), +(1,5205,0,'','','Deprecated quest: <UNUSED>'), +(1,5207,0,'','','Deprecated quest: <NYI> <TXT> The True Summoner'), +(1,5208,0,'','','Deprecated quest: <NYI> <TXT> The Blessing of Evil'), +(1,5209,0,'','','Deprecated quest: <UNUSED>'), +(1,5303,0,'','','Deprecated quest: <UNUSED>'), +(1,5304,0,'','','Deprecated quest: <UNUSED>'), +(1,5506,0,'','','Deprecated quest: <UNUSED>'), +(1,5512,0,'','','Deprecated quest: <UNUSED>'), +(1,5516,0,'','','Deprecated quest: <UNUSED>'), +(1,5520,0,'','','Deprecated quest: <UNUSED>'), +(1,5523,0,'','','Deprecated quest: <UNUSED>'), +(1,5532,0,'','','Deprecated quest: <NYI> <TXT> Ring of the Dawn'), +(1,5653,0,'','','Deprecated quest: <NYI> Hex of Weakness'), +(1,5659,0,'','','Deprecated quest: <NYI> Touch of Weakness'), +(1,5664,0,'','','Deprecated quest: <UNUSED>'), +(1,5665,0,'','','Deprecated quest: <UNUSED>'), +(1,5666,0,'','','Deprecated quest: <UNUSED>'), +(1,5667,0,'','','Deprecated quest: <UNUSED>'), +(1,5668,0,'','','Deprecated quest: <NYI> A Blessing of Light'), +(1,5669,0,'','','Deprecated quest: <NYI> A Blessing of Light'), +(1,5670,0,'','','Deprecated quest: <NYI> A Blessing of Light'), +(1,5671,0,'','','Deprecated quest: <NYI> A Blessing of Light'), +(1,5681,0,'','','Deprecated quest: <UNUSED>'), +(1,5682,0,'','','Deprecated quest: <UNUSED>'), +(1,5683,0,'','','Deprecated quest: <UNUSED>'), +(1,5684,0,'','','Deprecated quest: <UNUSED>'), +(1,5685,0,'','','Deprecated quest: <NYI> <TXT> The Light Protects You'), +(1,5686,0,'','','Deprecated quest: <NYI> The Light Protects You'), +(1,5687,0,'','','Deprecated quest: <NYI> The Light Protects You'), +(1,5688,0,'','','Deprecated quest: <NYI> <TXT> A Touch of Voodoo'), +(1,5689,0,'','','Deprecated quest: <NYI> A Touch of Voodoo'), +(1,5690,0,'','','Deprecated quest: <NYI> <TXT> A Touch of Voodoo'), +(1,5691,0,'','','Deprecated quest: <NYI> <TXT> In the Dark it was Created'), +(1,5692,0,'','','Deprecated quest: <NYI> In the Dark It was Created'), +(1,5693,0,'','','Deprecated quest: <NYI> In the Dark It was Created'), +(1,5694,0,'','','Deprecated quest: <UNUSED>'), +(1,5695,0,'','','Deprecated quest: <UNUSED>'), +(1,5696,0,'','','Deprecated quest: <UNUSED>'), +(1,5697,0,'','','Deprecated quest: <UNUSED>'), +(1,5698,0,'','','Deprecated quest: <NYI> <TXT> A Small Amount of Hope'), +(1,5699,0,'','','Deprecated quest: <NYI> A Small Amount of Hope'), +(1,5700,0,'','','Deprecated quest: <NYI> A Small Amount of Hope'), +(1,5701,0,'','','Deprecated quest: <NYI> <TXT> The Rites of Old'), +(1,5702,0,'','','Deprecated quest: <NYI> The Rites of Old'), +(1,5703,0,'','','Deprecated quest: <NYI> The Rites of Old'), +(1,5704,0,'','','Deprecated quest: <NYI> <TXT> Undead Priest Robe'), +(1,5705,0,'','','Deprecated quest: <NYI> No Longer a Shadow'), +(1,5706,0,'','','Deprecated quest: <NYI> No Longer a Shadow'), +(1,5707,0,'','','Deprecated quest: <NYI> <TXT> Flirting With Darkness'), +(1,5708,0,'','','Deprecated quest: <NYI> Flirting With Darkness'), +(1,5709,0,'','','Deprecated quest: <NYI> Flirting With Darkness'), +(1,5710,0,'','','Deprecated quest: <NYI> <TXT> Troll Priest Robe'), +(1,5711,0,'','','Deprecated quest: <NYI> The Lost Ways'), +(1,5712,0,'','','Deprecated quest: <NYI> The Lost Ways'), +(1,6003,0,'','','Deprecated quest: <nyi> <txt> Green With Envy'), +(1,6165,0,'','','Deprecated quest: <NYI> <TXT> Archmage Timolain''s Remains'), +(1,6202,0,'','','Deprecated quest: <UNUSED> Good and Evil'), +(1,6702,0,'','','Deprecated quest: <TXT> SF,RFK,GNOMER,BF'), +(1,6703,0,'','','Deprecated quest: <TXT> SF,RFK,GNOMER,BF - Repeatable'), +(1,6704,0,'','','Deprecated quest: <TXT> SM,RFD,ULD'), +(1,6705,0,'','','Deprecated quest: <TXT> SM,RFD,ULD - Repeatable'), +(1,6706,0,'','','Deprecated quest: <TXT> ZUL,ST,MAR'), +(1,6707,0,'','','Deprecated quest: <TXT> ZUL,ST,MAR - Repeatable'), +(1,6708,0,'','','Deprecated quest: <TXT> BRD,DM,BRS'), +(1,6709,0,'','','Deprecated quest: <TXT> BRD,DM,BRS - Repeatable'), +(1,6710,0,'','','Deprecated quest: <TXT> UBRS,STRATH,SCHOL'), +(1,6711,0,'','','Deprecated quest: <TXT> UBRS,STRATH,SCHOL - Repeatable'), +(1,6841,0,'','','Deprecated quest: <UNUSED>'), +(1,6842,0,'','','Deprecated quest: <UNUSED>'), +(1,7069,0,'','','Deprecated quest: <UNUSED>'), +(1,7904,0,'','','Deprecated quest: <UNUSED>'), +(1,8002,0,'','','Deprecated quest: Silverwing Sentinels <NYI> <TXT>'), +(1,8244,0,'','','Deprecated quest: <UNUSED>'), +(1,8245,0,'','','Deprecated quest: <UNUSED>'), +(1,8247,0,'','','Deprecated quest: <UNUSED>'), +(1,8248,0,'','','Deprecated quest: <UNUSED>'), +(1,8337,0,'','','Deprecated quest: <UNUSED>'), +(1,8339,0,'','','Deprecated quest: Royalty of the Council <NYI> <TXT> UNUSED'), +(1,8340,0,'','','Deprecated quest: Twilight Signet Ring <NYI> <TXT>'), +(1,8444,0,'','','Deprecated quest: <NYI> <TXT> gossip shade of ambermoon'), +(1,8445,0,'','','Deprecated quest: <NYI> <TXT> gossip shade of ambermoon'), +(1,8448,0,'','','Deprecated quest: <TXT> Mystery Reward'), +(1,8449,0,'','','Deprecated quest: <TXT> Mystery Reward'), +(1,8450,0,'','','Deprecated quest: <TXT> Mystery Reward'), +(1,8451,0,'','','Deprecated quest: <TXT> Mystery Reward'), +(1,8452,0,'','','Deprecated quest: <TXT> Mystery Reward'), +(1,8453,0,'','','Deprecated quest: <TXT> Mystery Reward'), +(1,8454,0,'','','Deprecated quest: <TXT> Mystery Reward'), +(1,8458,0,'','','Deprecated quest: <UNUSED>'), +(1,8459,0,'','','Deprecated quest: <UNUSED>'), +(1,8571,0,'','','Deprecated quest: <UNUSED> Armor Kits'), +(1,9031,0,'','','Deprecated quest: <TXT>Anthion''s Parting Words'), +(1,9306,0,'','','Deprecated quest: <DEPRECATED>Speak with Vindicator Aldar'), +(1,9307,0,'','','Deprecated quest: <DEPRECATED>Compassion'), +(1,9445,0,'','','Deprecated quest: <NYI><TXT>Placeholder: A Worthy Offering'), +(1,9596,0,'','','Deprecated quest: <DEPRECATED>Control'), +(1,9597,0,'','','Deprecated quest: <UNUSED>'), +(1,9599,0,'','','Deprecated quest: <UNUSED>'), +(1,9679,0,'','','Deprecated quest: <NYI>Return to Knight-Lord Bloodvalor'), +(1,9745,0,'','','Deprecated quest: <DEPRECATED>Suppressing the Flame'), +(1,10370,0,'','','Deprecated quest: Nazgrel''s Command <TXT>'), +(1,10402,0,'','','Deprecated quest: <TXT>'), +(1,10616,0,'','','Deprecated quest: <nyi>Breadcrumb'), +(1,10743,0,'','','Deprecated quest: [DEPRECATED]<txt>Hero of the Mok''Nathal'), +(1,10890,0,'','','Deprecated quest: [UNUSED] <NYI> '), +(1,11127,0,'','','Deprecated quest: <NYI>Thunderbrew Secrets'); diff --git a/sql/updates/world/2012_08_04_01_world_disables.sql b/sql/updates/world/2012_08_04_01_world_disables.sql new file mode 100644 index 00000000000..ca9f62564d5 --- /dev/null +++ b/sql/updates/world/2012_08_04_01_world_disables.sql @@ -0,0 +1,50 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (3631,4487,4488,4489,4490,4183,4184,4185,4186,4223,4224,402,550,620,785,908,909,9662,11179,11461,12087,12103,12108,12156,12426,12682,12764,12765,24222,24227,10452,10453,11125,11179,11437,11438,11444,11445,11974,12179,12228,12233,12590,14119,14147,14148,14149,14150); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1, 402,0,'','','Deprecated quest: Sirra is Busy'), +(1, 550,0,'','','Deprecated quest: Battle of Hillsbrad'), +(1, 620,0,'','','Deprecated quest: The Monogrammed Sash'), +(1, 785,0,'','','Deprecated quest: A Strategic Alliance'), +(1, 908,0,'','','Deprecated quest: A Strategic Alliance'), +(1, 909,0,'','','Deprecated quest: A Strategic Alliance'), +(1,3631,0,'','','Deprecated quest: Summon Felsteed'), +(1,4487,0,'','','Deprecated quest: Summon Felsteed'), +(1,4488,0,'','','Deprecated quest: Summon Felsteed'), +(1,4489,0,'','','Deprecated quest: Summon Felsteed'), +(1,4490,0,'','','Deprecated quest: Summon Felsteed'), +(1,4183,0,'','','Deprecated quest: The True Masters'), +(1,4184,0,'','','Deprecated quest: The True Masters'), +(1,4185,0,'','','Deprecated quest: The True Masters'), +(1,4186,0,'','','Deprecated quest: The True Masters'), +(1,4223,0,'','','Deprecated quest: The True Masters'), +(1,4224,0,'','','Deprecated quest: The True Masters'), +-- some random ones: +(1, 9662,0,'','','Deprecated quest:Deprecated: Keanna''s Freedom'), +(1,11179,0,'','','Deprecated quest:[Temporarily Deprecated Awaiting a New Mob]Finlay Is Gutless'), +(1,11461,0,'','','Deprecated quest:DEPRECATED'), +(1,12087,0,'','','Deprecated quest:A Little Help Here? DEPRECATED'), +(1,12103,0,'','','Deprecated quest:DEPRECATED'), +(1,12108,0,'','','Deprecated quest:DEPRECATED'), +(1,12156,0,'','','Deprecated quest:DEPRECAED'), +(1,12426,0,'','','Deprecated quest:DEPRECATED'), +(1,12682,0,'','','Deprecated quest:Uncharted Territory (DEPRECATED)'), +(1,12764,0,'','','Deprecated quest:The Secret to Kungaloosh (DEPRECATED)'), +(1,12765,0,'','','Deprecated quest:Kungaloosh (DEPRECATED)'), +(1,24222,0,'','','Deprecated quest:Call to Arms: Eye of the Storm DEPRECATED'), +(1,24227,0,'','','Deprecated quest:DEPRECATED'), +(1,10452,0,'','','Deprecated quest:DON''T USE [PH] Fel Orc 1'), +(1,10453,0,'','','Deprecated quest:DON''T USE [PH] Fel Orc bread'), +(1,11125,0,'','','Deprecated quest:[PH] New Hinterlands Quest'), +(1,11437,0,'','','Deprecated quest:[PH] Beer Garden A'), +(1,11438,0,'','','Deprecated quest:[PH] Beer Garden B'), +(1,11444,0,'','','Deprecated quest:[PH] Beer Garden A'), +(1,11445,0,'','','Deprecated quest:[PH] Beer Garden B'), +(1,11974,0,'','','Deprecated quest:[ph] Now, When I Grow Up...'), +(1,12179,0,'','','Deprecated quest:Specialization 1 [PH]'), +(1,12228,0,'','','Deprecated quest:Reacquiring the Magic [PH]'), +(1,12233,0,'','','Deprecated quest:[Depricated]Sewing Your Seed'), +(1,12590,0,'','','Deprecated quest:Blahblah[PH]'), +(1,14119,0,'','','Deprecated quest:Blank [PH]'), +(1,14147,0,'','','Deprecated quest:Blank [PH]'), +(1,14148,0,'','','Deprecated quest:Blank [PH]'), +(1,14149,0,'','','Deprecated quest:Blank [PH]'), +(1,14150,0,'','','Deprecated quest:Blank [PH]'); diff --git a/sql/updates/world/2012_08_04_02_world_disables.sql b/sql/updates/world/2012_08_04_02_world_disables.sql new file mode 100644 index 00000000000..cccc7141d68 --- /dev/null +++ b/sql/updates/world/2012_08_04_02_world_disables.sql @@ -0,0 +1,23 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (7790,8152,8237,8971,8972,8973,8974,8975,8976,9296,9750,10145,10207,10549,11493,11588,11589,11997,12313,13840,24797); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,7790,0,'','','Deprecated quest: REUSE'), +(1,8152,0,'','','Deprecated quest: REUSE'), +(1,8237,0,'','','Deprecated quest: REUSE'), +(1,8971,0,'','','Deprecated quest: REUSE'), +(1,8972,0,'','','Deprecated quest: REUSE'), +(1,8973,0,'','','Deprecated quest: REUSE'), +(1,8974,0,'','','Deprecated quest: REUSE'), +(1,8975,0,'','','Deprecated quest: REUSE'), +(1,8976,0,'','','Deprecated quest: REUSE'), +(1,9296,0,'','','Deprecated quest: reuse'), +(1,9750,0,'','','Deprecated quest: UNUSED Urgent Delivery'), +(1,10145,0,'','','Deprecated quest: Mission: Sever the Tie UNUSED'), +(1,10207,0,'','','Deprecated quest: Forward Base: Reaver''s Fall REUSE'), +(1,10549,0,'','','Deprecated quest: REUSE'), +(1,11493,0,'','','Deprecated quest: UNUSED'), +(1,11588,0,'','','Deprecated quest: REUSE'), +(1,11589,0,'','','Deprecated quest: REUSE'), +(1,11997,0,'','','Deprecated quest: REUSE'), +(1,12313,0,'','','Deprecated quest: UNUSED Save Brewfest!'), +(1,13840,0,'','','Deprecated quest: REUSE'), +(1,24797,0,'','','Deprecated quest: REUSE'); diff --git a/sql/updates/world/2012_08_04_03_world_disables.sql b/sql/updates/world/2012_08_04_03_world_disables.sql new file mode 100644 index 00000000000..21b55a3e930 --- /dev/null +++ b/sql/updates/world/2012_08_04_03_world_disables.sql @@ -0,0 +1,38 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (9754,9755,10215,11522,12445,12731,12923,13541); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,9754,0,'','','Deprecated quest: '), +(1,9755,0,'','','Deprecated quest: '), +(1,10215,0,'','','Deprecated quest: '), +(1,11522,0,'','','Deprecated quest: '), +(1,12445,0,'','','Deprecated quest: '), +(1,12731,0,'','','Deprecated quest: '), +(1,12923,0,'','','Deprecated quest: '), +(1,13541,0,'','','Deprecated quest: '), +-- some others that contain a - +(1,7797,0,'','','Deprecated quest: Dimensional Ripper - Everlook'), +(1,7869,0,'','','Deprecated quest: test quest - do not use'), +(1,7870,0,'','','Deprecated quest: test quest2 - do not use'), +(1,7906,0,'','','Deprecated quest: Darkmoon Cards - Beasts'), +(1,9378,0,'','','Deprecated quest: DND FLAG The Dread Citadel - Naxxramas'), +(1,9611,0,'','','Deprecated quest: Azuremyst: aa - A - Quest Flag 000'), +(1,9880,0,'','','Deprecated quest: Hellfire Penninsula: -pn - A - ToWoW - Hellfire Turnin Cap'), +(1,9881,0,'','','Deprecated quest: Hellfire Penninsula: -pn - H - ToWoW - Hellfire Turnin Cap'), +(1,9908,0,'','','Deprecated quest: Hellfire Penninsula: -pn - A - ToWoW - Hellfire Turnin'), +(1,9909,0,'','','Deprecated quest: Hellfire Penninsula: -pn - H - ToWoW - Hellfire Turnin'), +(1,9949,0,'','','Deprecated quest: A Bird''s-Eye View'), +(1,9950,0,'','','Deprecated quest: A Bird''s-Eye View'), +(1,10088,0,'','','Deprecated quest: When This Mine''s a-Rockin'''), +(1,10181,0,'','','Deprecated quest: Collector''s Edition: -pn - E - FLAG'), +(1,10214,0,'','','Deprecated quest: When This Mine''s a-Rockin'''), +(1,10454,0,'','','Deprecated quest: FLAG - OFF THE RAILS'), +(1,11197,0,'','','Deprecated quest: ZZOLD Upper Deck Promo - Ghost Wolf Mount OLD'), +(1,11226,0,'','','Deprecated quest: Upper Deck Promo - Spectral Tiger Mount'), +(1,11577,0,'','','Deprecated quest: WoW Collector''s Edition: - DEM - E - FLAG'), +(1,11874,0,'','','Deprecated quest: Upper Deck Promo - Rocket Mount'), +(1,11937,0,'','','Deprecated quest: FLAG - all torch return quests are complete'), +(1,12485,0,'','','Deprecated quest: Howling Fjord: aa - A - LK FLAG'), +(1,12600,0,'','','Deprecated quest: Upper Deck Promo - Bear Mount'), +(1,13123,0,'','','Deprecated quest: WotLK Collector''s Edition: - DEM - E - FLAG'), +(1,13210,0,'','','Deprecated quest: Blizzard Account: - DEM - E - FLAG'), +(1,13317,0,'','','Deprecated quest: ----'), +(1,13990,0,'','','Deprecated quest: Upper Deck Promo - Chicken Mount'); diff --git a/sql/updates/world/2012_08_04_04_world_disables.sql b/sql/updates/world/2012_08_04_04_world_disables.sql new file mode 100644 index 00000000000..14a0d6f94aa --- /dev/null +++ b/sql/updates/world/2012_08_04_04_world_disables.sql @@ -0,0 +1,34 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (11335,11336,11337,11338,11339,11340,11341,11342,13405,13407,13427,13428,14163,14164,14178,14179,14180,14181,14182,14183,24216,24217,24218,24219,24220,24221,24223,24224,24225,24226,24426,24427); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,11335,0,'','','Deprecated quest: Call to Arms: Arathi Basin'), +(1,11336,0,'','','Deprecated quest: Call to Arms: Alterac Valley'), +(1,11337,0,'','','Deprecated quest: Call to Arms: Eye of the Storm'), +(1,11338,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,11339,0,'','','Deprecated quest: Call to Arms: Arathi Basin'), +(1,11340,0,'','','Deprecated quest: Call to Arms: Alterac Valley'), +(1,11341,0,'','','Deprecated quest: Call to Arms: Eye of the Storm'), +(1,11342,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,13405,0,'','','Deprecated quest: Call to Arms: Strand of the Ancients'), +(1,13407,0,'','','Deprecated quest: Call to Arms: Strand of the Ancients'), +(1,13427,0,'','','Deprecated quest: Call to Arms: Alterac Valley'), +(1,13428,0,'','','Deprecated quest: Call to Arms: Alterac Valley'), +(1,14163,0,'','','Deprecated quest: Call to Arms: Isle of Conquest'), +(1,14164,0,'','','Deprecated quest: Call to Arms: Isle of Conquest'), +(1,14178,0,'','','Deprecated quest: Call to Arms: Arathi Basin'), +(1,14179,0,'','','Deprecated quest: Call to Arms: Eye of the Storm'), +(1,14180,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,14181,0,'','','Deprecated quest: Call to Arms: Arathi Basin'), +(1,14182,0,'','','Deprecated quest: Call to Arms: Eye of the Storm'), +(1,14183,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,24216,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,24217,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,24218,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,24219,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,24220,0,'','','Deprecated quest: Call to Arms: Arathi Basin'), +(1,24221,0,'','','Deprecated quest: Call to Arms: Arathi Basin'), +(1,24223,0,'','','Deprecated quest: Call to Arms: Arathi Basin'), +(1,24224,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,24225,0,'','','Deprecated quest: Call to Arms: Warsong Gulch'), +(1,24226,0,'','','Deprecated quest: Call to Arms: Arathi Basin'), +(1,24426,0,'','','Deprecated quest: Call to Arms: Alterac Valley'), +(1,24427,0,'','','Deprecated quest: Call to Arms: Alterac Valley'); diff --git a/sql/updates/world/2012_08_04_05_world_disables.sql b/sql/updates/world/2012_08_04_05_world_disables.sql new file mode 100644 index 00000000000..ce123e4e5be --- /dev/null +++ b/sql/updates/world/2012_08_04_05_world_disables.sql @@ -0,0 +1,28 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (8384,8386,8389,8390,8391,8392,8397,8398,8404,8405,8406,8407,8408,8431,8432,8433,8434,8435,8440,8441,8442,8443,8567,8568,8569,8570); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,8384,0,'','','Deprecated quest: Claiming Arathi Basin'), +(1,8386,0,'','','Deprecated quest: Fight for Warsong Gulch'), +(1,8389,0,'','','Deprecated quest: Battle of Warsong Gulch'), +(1,8390,0,'','','Deprecated quest: Conquering Arathi Basin'), +(1,8391,0,'','','Deprecated quest: Claiming Arathi Basin'), +(1,8392,0,'','','Deprecated quest: Claiming Arathi Basin'), +(1,8397,0,'','','Deprecated quest: Claiming Arathi Basin'), +(1,8398,0,'','','Deprecated quest: Claiming Arathi Basin'), +(1,8404,0,'','','Deprecated quest: Fight for Warsong Gulch'), +(1,8405,0,'','','Deprecated quest: Fight for Warsong Gulch'), +(1,8406,0,'','','Deprecated quest: Fight for Warsong Gulch'), +(1,8407,0,'','','Deprecated quest: Fight for Warsong Gulch'), +(1,8408,0,'','','Deprecated quest: Fight for Warsong Gulch'), +(1,8431,0,'','','Deprecated quest: Battle of Warsong Gulch'), +(1,8432,0,'','','Deprecated quest: Battle of Warsong Gulch'), +(1,8433,0,'','','Deprecated quest: Battle of Warsong Gulch'), +(1,8434,0,'','','Deprecated quest: Battle of Warsong Gulch'), +(1,8435,0,'','','Deprecated quest: Battle of Warsong Gulch'), +(1,8440,0,'','','Deprecated quest: Conquering Arathi Basin'), +(1,8441,0,'','','Deprecated quest: Conquering Arathi Basin'), +(1,8442,0,'','','Deprecated quest: Conquering Arathi Basin'), +(1,8443,0,'','','Deprecated quest: Conquering Arathi Basin'), +(1,8567,0,'','','Deprecated quest: Past Victories in Warsong Gulch'), +(1,8568,0,'','','Deprecated quest: Past Victories in Warsong Gulch'), +(1,8569,0,'','','Deprecated quest: Past Efforts in Warsong Gulch'), +(1,8570,0,'','','Deprecated quest: Past Efforts in Warsong Gulch'); diff --git a/sql/updates/world/2012_08_04_06_world_quest_template.sql b/sql/updates/world/2012_08_04_06_world_quest_template.sql new file mode 100644 index 00000000000..fe48c887ae0 --- /dev/null +++ b/sql/updates/world/2012_08_04_06_world_quest_template.sql @@ -0,0 +1,10 @@ +UPDATE `quest_template` SET `specialflags`= `specialflags`|8 WHERE `id` IN ( +24889, -- Classic Random 5-15 (Nth) +24890, -- Classic Random 15-25 (Nth) +24891, -- Classic Random 24-34 (Nth) +24892, -- Classic Random 35-45 (Nth) +24893, -- Classic Random 46-55 (Nth) +24894, -- Classic Random 56-60 (Nth) +24895, -- Classic Random 60-64 (Nth) +24896); -- Classic Random 65-70 (Nth) + diff --git a/sql/updates/world/2012_08_04_07_world_game_event_creature_quest.sql b/sql/updates/world/2012_08_04_07_world_game_event_creature_quest.sql new file mode 100644 index 00000000000..b72f8edd46d --- /dev/null +++ b/sql/updates/world/2012_08_04_07_world_game_event_creature_quest.sql @@ -0,0 +1,110 @@ +-- Hordes's Honor the Flame +-- Add missing creature_quesrelation and involvedrealation that were blocking quests +DELETE FROM `game_event_creature_quest` WHERE `quest` IN (11846,11845,11852,11839,11859,11841,11851,11855,11835,11858,11863,13500,13493,13494,13495,13496,13497,13498,13499,11850,11848,11853,11857,11837,11844,11860,11584,11862,11842,11840); +INSERT INTO `game_event_creature_quest` (`eventEntry`,`id`, `quest`) VALUES +-- Flame Keeper of Eastern Kingdom? {Achievement=1025} +(1,25933, 11850), -- Ghostland +(1,25931, 11848), -- Eversong woods +(1,25935, 11853), -- Hillsbrad Foothills +(1,25941, 11857), -- Swamp of sorrows +(1,25920, 11837), -- Cape of Stranglethorn +(1,25927, 11844), -- Burning Steppes +(1,25944, 11860), -- The Hinterlands +(1,25939, 11584), -- Silverpine Forest +(1,25946, 11862), -- Tirisfal Glades +(1,25925, 11842), -- Badlands +(1,25923, 11840), -- Arathi Highlands +-- The Flame Keeper of Kalimdore - {Achievement=1026} +(1,25929, 11846), -- Durotar +(1,25928, 11845), -- Desolace +(1,25936, 11852), -- Mulgore +(1,25922, 11839), -- Winterspring +(1,25943, 11859), -- Barrens +(1,25884, 11841), -- Ashenvale +-- The Flame Keeper of Outland - {Achievement=1027} +(1,25934, 11851), -- Hellfire Peninsula +(1,25938, 11855), -- Shadowmoon Valley +(1,25918, 11835), -- Netherstorm +(1,25942, 11858), -- Terokkar +(1,25947, 11863), -- Terokkar +-- Flame Keeper of Northrend - {Achievement=6009} +(1,32816, 13500), -- Zul'Drak +(1,32809, 13493), -- Borean Tundra +(1,32810, 13494), -- Sholazar Basin +(1,32811, 13495), -- Dragonblight +(1,32815, 13499), -- Crystalsong Forest +(1,32814, 13498), -- Storm Peaks +(1,32813, 13497), -- Grizzly Hills +(1,32812, 13496); -- Howling Fjords +-- add missing quest-involved relations +DELETE FROM `creature_involvedrelation` WHERE `quest` IN (11846,11845,11852,11839,11859,11841,11851,11855,11835,11858,11863,13500,13493,13494,13495,13496,13497,13498,13499,11850,11848,11853,11857,11837,11844,11860,11584,11862,11842,11840); +INSERT INTO `creature_involvedrelation` (`id`, `quest`) VALUES +(25929, 11846), -- Durotar +(25928, 11845), -- Desolace +(25936, 11852), -- Mulgore +(25922, 11839), -- Winterspring +(25943, 11859), -- Barrens +(25884, 11841), -- Ashenvale +(25934, 11851), -- Hellfire Peninsula +(25938, 11855), -- Shadowmoon Valley +(25918, 11835), -- Netherstorm +(25942, 11858), -- Terokkar +(25947, 11863), -- Terokkar +(32816, 13500), -- Zul'Drak +(32809, 13493), -- Borean Tundra +(32810, 13494), -- Sholazar Basin +(32811, 13495), -- Dragonblight +(32815, 13499), -- Crystalsong Forest +(32814, 13498), -- Storm Peaks +(32813, 13497), -- Grizzly Hills +(32812, 13496), -- Howling Fjords +(25933, 11850), -- Ghostland +(25931, 11848), -- Eversong woods +(25935, 11853), -- Hillsbrad Foothills +(25941, 11857), -- Swamp of sorrows +(25920, 11837), -- Cape of Stranglethorn +(25927, 11844), -- Burning Steppes +(25944, 11860), -- The Hinterlands +(25939, 11584), -- Silverpine Forest +(25946, 11862), -- Tirisfal Glades +(25925, 11842), -- Badlands +(25923, 11840); -- Arathi Highlands +-- update quest texts and rewardcash +UPDATE `quest_template` SET `RewardOrRequiredMoney`=37000,`RewardMoneyMaxLevel`=66300, `OfferRewardText`='Honor the Durotar flame!' WHERE `Id`=11846; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Mulgore flame!' WHERE `Id`=11852; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Barrens flame!',`RewardOrRequiredMoney`=37000, `RewardMoneyMaxLevel`=66300 WHERE `Id`=11859; -- Barrens +UPDATE `quest_template` SET `OfferRewardText`='Honor the Tanaris flame!',`RequestItemsText`='' WHERE `Id`=11838 LIMIT 1; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Ashenvale flame!' WHERE `Id`=11841; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Winterspring flame!' WHERE `Id`=11839; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Desolace flame!' WHERE `Id`=11845; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Thousand Needles flame!' WHERE `Id`=11861; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Feralas flame!' WHERE `Id`=11849; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Dustwallow Marsh flame!' WHERE `Id`=11847; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Silithus flame!' WHERE `Id`=11836; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Stonetalon Mountains flame!' WHERE `Id`=11856; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Hellfire Peninsula flame!' WHERE `Id`=11851; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Shadowmoon Valley flame!' WHERE `Id`=11855; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Nagrand flame!', `RequestItemsText`='' WHERE `Id`=11821; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Netherstorm flame!' WHERE `Id`=11835; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Blades Edge Mountains flame! ', `RequestItemsText`='' WHERE `Id`=11843; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Terokkar flame!' WHERE `Id`=11858; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Zangarmarsh flame!' WHERE `Id`=11863; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Zul''Drak flame!' WHERE `Id`=13500; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Borean Tundra flame!' WHERE `Id`=13493; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Sholazar Basin flame!' WHERE `Id`=13494; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Dragonblight flame!' WHERE `Id`=13495; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Crystalsong Forest flame!' WHERE `Id`=13499; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Storm Peaks flame!' WHERE `Id`=13498; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Grizzly Hills flame!' WHERE `Id`=13497; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Howling Fjords flame!' WHERE `Id`=13496; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Ghostland flame!' WHERE `Id`=11850; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Eversong woods flame!' WHERE `Id`=11848; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Hillsbrad Foothills flame!' WHERE `Id`=11853; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Swamp of sorrows flame!' WHERE `Id`=11857; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Cape of Stranglethorn flame!' WHERE `Id`=11837; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Burning Steppes flame!' WHERE `Id`=11844; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Hinterlands flame!' WHERE `Id`=11860; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Silverpine Forest flame!' WHERE `Id`=11584; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Tirisfal Glades flame!' WHERE `Id`=11862; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Badlands flame!' WHERE `Id`=11842; +UPDATE `quest_template` SET `OfferRewardText`='Honor the Arathi Highlands flame!' WHERE `Id`=11840; diff --git a/sql/updates/world/2012_08_04_08_world_disables.sql b/sql/updates/world/2012_08_04_08_world_disables.sql new file mode 100644 index 00000000000..6944c45f1f4 --- /dev/null +++ b/sql/updates/world/2012_08_04_08_world_disables.sql @@ -0,0 +1,65 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (9034,9036,9037,9038,9039,9040,9041,9042,9043,9044,9046,9047,9048,9049,9050,9054,9055,9056,9057,9058,9059,9060,9061,9068,9069,9070,9071,9072,9073,9074,9075,9077,9078,9079,9080,9081,9082,9083,9084,9086,9087,9088,9089,9090,9091,9092,9093,9095,9096,9097,9098,9099,9100,9101,9102,9103,9104,9105,9106,9107,9108,9109,9110); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,9034,0,'','','Deprecated quest: Dreadnaught Breastplate'), +(1,9036,0,'','','Deprecated quest: Dreadnaught Legplates'), +(1,9037,0,'','','Deprecated quest: Dreadnaught Helmet'), +(1,9038,0,'','','Deprecated quest: Dreadnaught Pauldrons'), +(1,9039,0,'','','Deprecated quest: Dreadnaught Sabatons'), +(1,9040,0,'','','Deprecated quest: Dreadnaught Gauntlets'), +(1,9041,0,'','','Deprecated quest: Dreadnaught Waistguard'), +(1,9042,0,'','','Deprecated quest: Dreadnaught Bracers'), +(1,9043,0,'','','Deprecated quest: Redemption Tunic'), +(1,9044,0,'','','Deprecated quest: Redemption Legguards'), +(1,9046,0,'','','Deprecated quest: Redemption Spaulders'), +(1,9047,0,'','','Deprecated quest: Redemption Boots'), +(1,9048,0,'','','Deprecated quest: Redemption Handguards'), +(1,9049,0,'','','Deprecated quest: Redemption Girdle'), +(1,9050,0,'','','Deprecated quest: Redemption Wristguards'), +(1,9054,0,'','','Deprecated quest: Cryptstalker Tunic'), +(1,9055,0,'','','Deprecated quest: Cryptstalker Legguards'), +(1,9056,0,'','','Deprecated quest: Cryptstalker Headpiece'), +(1,9057,0,'','','Deprecated quest: Cryptstalker Spaulders'), +(1,9058,0,'','','Deprecated quest: Cryptstalker Boots'), +(1,9059,0,'','','Deprecated quest: Cryptstalker Handguards'), +(1,9060,0,'','','Deprecated quest: Cryptstalker Girdle'), +(1,9061,0,'','','Deprecated quest: Cryptstalker Wristguards'), +(1,9068,0,'','','Deprecated quest: Earthshatter Tunic'), +(1,9069,0,'','','Deprecated quest: Earthshatter Legguards'), +(1,9070,0,'','','Deprecated quest: Earthshatter Headpiece'), +(1,9071,0,'','','Deprecated quest: Earthshatter Spaulders'), +(1,9072,0,'','','Deprecated quest: Earthshatter Boots'), +(1,9073,0,'','','Deprecated quest: Earthshatter Handguards'), +(1,9074,0,'','','Deprecated quest: Earthshatter Girdle'), +(1,9075,0,'','','Deprecated quest: Earthshatter Wristguards'), +(1,9077,0,'','','Deprecated quest: Bonescythe Breastplate'), +(1,9078,0,'','','Deprecated quest: Bonescythe Legplates'), +(1,9079,0,'','','Deprecated quest: Bonescythe Helmet'), +(1,9080,0,'','','Deprecated quest: Bonescythe Pauldrons'), +(1,9081,0,'','','Deprecated quest: Bonescythe Sabatons'), +(1,9082,0,'','','Deprecated quest: Bonescythe Gauntlets'), +(1,9083,0,'','','Deprecated quest: Bonescythe Waistguard'), +(1,9084,0,'','','Deprecated quest: Bonescythe Bracers'), +(1,9086,0,'','','Deprecated quest: Dreamwalker Tunic'), +(1,9087,0,'','','Deprecated quest: Dreamwalker Legguards'), +(1,9088,0,'','','Deprecated quest: Dreamwalker Headpiece'), +(1,9089,0,'','','Deprecated quest: Dreamwalker Spaulders'), +(1,9090,0,'','','Deprecated quest: Dreamwalker Boots'), +(1,9091,0,'','','Deprecated quest: Dreamwalker Handguards'), +(1,9092,0,'','','Deprecated quest: Dreamwalker Girdle'), +(1,9093,0,'','','Deprecated quest: Dreamwalker Wristguards'), +(1,9095,0,'','','Deprecated quest: Frostfire Robe'), +(1,9096,0,'','','Deprecated quest: Frostfire Leggings'), +(1,9097,0,'','','Deprecated quest: Frostfire Circlet'), +(1,9098,0,'','','Deprecated quest: Frostfire Shoulderpads'), +(1,9099,0,'','','Deprecated quest: Frostfire Sandals'), +(1,9100,0,'','','Deprecated quest: Frostfire Gloves'), +(1,9101,0,'','','Deprecated quest: Frostfire Belt'), +(1,9102,0,'','','Deprecated quest: Frostfire Bindings'), +(1,9103,0,'','','Deprecated quest: Plagueheart Robe'), +(1,9104,0,'','','Deprecated quest: Plagueheart Leggings'), +(1,9105,0,'','','Deprecated quest: Plagueheart Circlet'), +(1,9106,0,'','','Deprecated quest: Plagueheart Shoulderpads'), +(1,9107,0,'','','Deprecated quest: Plagueheart Sandals'), +(1,9108,0,'','','Deprecated quest: Plagueheart Gloves'), +(1,9109,0,'','','Deprecated quest: Plagueheart Belt'), +(1,9110,0,'','','Deprecated quest: Plagueheart Bindings'); diff --git a/sql/updates/world/2012_08_04_09_world_disables.sql b/sql/updates/world/2012_08_04_09_world_disables.sql new file mode 100644 index 00000000000..3023625410e --- /dev/null +++ b/sql/updates/world/2012_08_04_09_world_disables.sql @@ -0,0 +1,10 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (9111,9112,9113,9114,9115,9116,9117,9118); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +(1,9111,0,'','','Deprecated quest: Robe of Faith'), +(1,9112,0,'','','Deprecated quest: Leggings of Faith'), +(1,9113,0,'','','Deprecated quest: Circlet of Faith'), +(1,9114,0,'','','Deprecated quest: Shoulderpads of Faith'), +(1,9115,0,'','','Deprecated quest: Sandals of Faith'), +(1,9116,0,'','','Deprecated quest: Gloves of Faith'), +(1,9117,0,'','','Deprecated quest: Belt of Faith'), +(1,9118,0,'','','Deprecated quest: Bindings of Faith'); diff --git a/sql/updates/world/2012_08_04_10_world_disables.sql b/sql/updates/world/2012_08_04_10_world_disables.sql new file mode 100644 index 00000000000..1d991eafef5 --- /dev/null +++ b/sql/updates/world/2012_08_04_10_world_disables.sql @@ -0,0 +1,43 @@ +DELETE FROM `disables` WHERE `sourceType`=1 AND `entry` IN (2018,5101,7681,7682,8230,8270,8274,9284,9285,9286,9577,9583,11121,11994,12015,12493,12911,13649,14106,9713,9926,11087,11115,11116,11353,11518,12186,12187,12494,12845,13807,14185,14186,14187,24808,24809,24810,24811,25238); +INSERT INTO `disables` (`sourceType`,`entry`,`flags`,`params_0`,`params_1`,`comment`) VALUES +-- containing "test" +(1,2018,0,'','','Deprecated quest: Rokar''s Test'), +(1,5101,0,'','','Deprecated quest: Lee''s Ultimate Test Quest... of Doom!'), +(1,7681,0,'','','Deprecated quest: Hunter test quest'), +(1,7682,0,'','','Deprecated quest: Hunter test quest2'), +(1,8230,0,'','','Deprecated quest: Collin''s Test Quest'), +(1,8270,0,'','','Deprecated quest: test copy quest'), +(1,8274,0,'','','Deprecated quest: Test Kill Quest'), +(1,9284,0,'','','Deprecated quest: Aldor Faction Test'), +(1,9285,0,'','','Deprecated quest: Consortium Faction Test'), +(1,9286,0,'','','Deprecated quest: Scryers Faction Test'), +(1,9577,0,'','','Deprecated quest: DAILY TEST QUEST (PVP)'), +(1,9583,0,'','','Deprecated quest: Omar''s Test Quest'), +(1,11121,0,'','','Deprecated quest: DAILY TEST QUEST (RAID)'), +(1,11994,0,'','','Deprecated quest: Juno''s Flag Tester'), +(1,12015,0,'','','Deprecated quest: Test Quest for Craig'), +(1,12493,0,'','','Deprecated quest: PvP Test'), +(1,12911,0,'','','Deprecated quest: Kill Credit Test'), +(1,13649,0,'','','Deprecated quest: Justin''s Fun Test'), +(1,14106,0,'','','Deprecated quest: Na Kada''s Quest Test'), +-- containing "flag" +(1,9713,0,'','','Deprecated quest: Glowcap Harvesting Enabling Flag'), +(1,9926,0,'','','Deprecated quest: FLAG Shadow Council/Warmaul Questline'), +(1,11087,0,'','','Deprecated quest: HYJAL FLAG'), +(1,11115,0,'','','Deprecated quest: The Mark of Vashj (FLAG ONLY)'), +(1,11116,0,'','','Deprecated quest: Trial of the Naaru: (QUEST FLAG)'), +(1,11353,0,'','','Deprecated quest: FLAG: Got the work shirt'), +(1,11518,0,'','','Deprecated quest: Sunwell Daily Portal Flag'), +(1,12186,0,'','','Deprecated quest: FLAG: Winner'), +(1,12187,0,'','','Deprecated quest: FLAG: Participant'), +(1,12494,0,'','','Deprecated quest: FLAG: Riding Trainer Advertisement (20)'), +(1,12845,0,'','','Deprecated quest: Dalaran Teleport Crystal Flag'), +(1,13807,0,'','','Deprecated quest: FLAG: Tournament Invitation'), +(1,14185,0,'','','Deprecated quest: FLAG: Riding Trainer Advertisement (40)'), +(1,14186,0,'','','Deprecated quest: FLAG: Riding Trainer Advertisement (60)'), +(1,14187,0,'','','Deprecated quest: FLAG: Riding Trainer Advertisement (70)'), +(1,24808,0,'','','Deprecated quest: Tank Ring Flag'), +(1,24809,0,'','','Deprecated quest: Healer Ring Flag'), +(1,24810,0,'','','Deprecated quest: Melee Ring Flag'), +(1,24811,0,'','','Deprecated quest: Caster Ring Flag'), +(1,25238,0,'','','Deprecated quest: Strength Ring Flag'); diff --git a/sql/updates/world/2012_08_04_11_world_game_event_creature_quest.sql b/sql/updates/world/2012_08_04_11_world_game_event_creature_quest.sql new file mode 100644 index 00000000000..224749c7e10 --- /dev/null +++ b/sql/updates/world/2012_08_04_11_world_game_event_creature_quest.sql @@ -0,0 +1,365 @@ +-- Add all quests connected with Midsummer Fire Festival that are to be reseted on each next year to game_event_seasonal_questrelation, so players can complete them on and on... /as of different festivals/. +DELETE FROM `game_event_seasonal_questrelation` WHERE `questId` IN (11846,11845,11852,11839,11859,11841,11849,11861,11847,11836,11838,11856,11850,11848,11853,11857,11837,11844,11860,11584,11862,11842,11840,11851,11855,11835,11858,11863,11821,11854,11843,13500,13493,13494,13495,13496,13497,13498,13499,11805,11812,11815,11834,11833,11831,11817,11811,11806,11809,11826,11824,11826,11827,11819,11583,11828,11816,11810,11808,11804,11832,11813,11814,11820,11822,11823,11821,11830,11818,11825,11807,11829,13485,13487,13489,13488,13490,13486,13491,13492,11770,11769,11777,11803,11783,11773,11765,11771,11785,11800,11780,11802,11774,11772,11776,11781,11801,11768,11784,11580,11786,11766,11764,11775,11779,11799,11782,11787,11767,11778,13458,13441,13450,13451,13457,13455,13454,13453,11734,11741,11744,11763,11762,11760,11746,11740,11735,11738,11753,11755,11756,11748,11581,11757,11745,11739,11737,11732,11761,11742,11743,11749,11751,11752,11750,11759,11747,11754,11736,11758,13440,13443,13445,13444,13449,13446,13442,13447,13431,9324,11935,9326,9325,9332,9331,9330,11933,11972); +INSERT INTO `game_event_seasonal_questrelation` (`questId`, `eventEntry`) VALUES +(11846,1), -- Durotar // Honor the Flame (Horde) - Kalimdor +(11845,1), -- Desolace +(11852,1), -- Mulgore +(11839,1), -- Winterspring +(11859,1), -- Barrens +(11849,1), -- Feralas +(11841,1), -- Ashenvale +(11847,1), -- Dustwallow marsh +(11861,1), -- Thousand Needles +(11856,1), -- Stonetalon Mountains +(11836,1), -- Silithus +(11838,1), -- Tanaris +(11850,1), -- Ghostland // Honor the Flame (Horde) - Eeastern Kingdoms +(11848,1), -- Eversong woods +(11853,1), -- Hillsbrad Foothills +(11857,1), -- Swamp of sorrows +(11837,1), -- Cape of Stranglethorn +(11844,1), -- Burning Steppes +(11860,1), -- The Hinterlands +(11584,1), -- Silverpine Forest +(11862,1), -- Tirisfal Glades +(11842,1), -- Badlands +(11840,1), -- Arathi Highlands +(11851,1), -- Hellfire Peninsula // Honor the Flame (Horde) - Outland +(11855,1), -- Shadowmoon Valley +(11835,1), -- Netherstorm +(11858,1), -- Terokkar +(11863,1), -- Zangarmarsh +(11854,1), -- Nagrand +(11843,1), -- Blade''s Edge Mountains +(13500,1), -- Zul'Drak // Honor the Flame (Horde) - Northrend +(13493,1), -- Borean Tundra +(13494,1), -- Sholazar Basin +(13495,1), -- Dragonblight +(13499,1), -- Crystalsong Forest +(13498,1), -- Storm Peaks +(13497,1), -- Grizzly Hills +(13496,1), -- Howling Fjords +(11805,1), -- Ashenvale // Honor the Flame (Alliance) - Kalimdor +(11812,1), -- Desolace +(11815,1), -- Dustwallow Marsh +(11834,1), -- Winterspring +(11833,1), -- Tanaris +(11831,1), -- Silithus +(11817,1), -- Feralas +(11811,1), -- Darkshore +(11806,1), -- Azuremyst Isle +(11809,1), -- Bloodmyst Isle +(11824,1), -- Teldrassil +(11826,1), -- The Hinterlands // Honor the Flame (Alliance) - Eeastern Kingdoms +(11827,1), -- The Western Plaguelands +(11819,1), -- Hillsbrad Foothills +(11583,1), -- Westfall +(11828,1), -- Wetlands +(11816,1), -- Elwynn Forest +(11810,1), -- Burning Steppes +(11808,1), -- Blasted Lands +(11804,1), -- Arathi Highlands +(11832,1), -- Cape of Stranglethorn +(11813,1), -- Dun Morogh +(11814,1), -- Duskwood +(11820,1), -- Loch Modan +(11822,1), -- Redridge Mountains +(11823,1), -- Shadowmoon Valley // Honor the Flame (Alliance) - Outland +(11821,1), -- Nagrand +(11830,1), -- Netherstorm +(11818,1), -- Hellfire Peninsula +(11825,1), -- Terokkar +(11807,1), -- Blade's Edge +(11829,1), -- Zangarmarsh +(13485,1), -- Borean Tundra // Honor the Flame (Alliance) - Northrend +(13487,1), -- Dragonblight +(13489,1), -- Grizzly Hills +(13488,1), -- Howling Fjord +(13492,1), -- Zul'Drak +(13490,1), -- The Storm Peaks +(13486,1), -- Sholazar Basin +(13491,1), -- Crystalsong Forest +(11770,1), -- Durotar // Desecrate the Flame (Alliance) - Kalimdor +(11769,1), -- Desolace +(11777,1), -- Mulgore +(11803,1), -- Winterspring +(11783,1), -- Barrens +(11773,1), -- Feralas +(11765,1), -- Ashenvale +(11771,1), -- Dustwallow marsh +(11785,1), -- Thousand Needles +(11800,1), -- Silithus +(11780,1), -- Stonetalon Mountains +(11802,1), -- Tanaris +(11774,1), -- Ghostland // Desecrate the Flame (Alliance) - Eastern Kingdoms +(11772,1), -- Eversong woods +(11776,1), -- Hillsbrad Foothills +(11781,1), -- Swamp of sorrows +(11801,1), -- Cape of Stranglethorn +(11768,1), -- Burning Steppes +(11784,1), -- The Hinterlands +(11580,1), -- Silverpine Forest +(11786,1), -- Tirisfal Glades +(11766,1), -- Badlands +(11764,1), -- Arathi Highlands +(11775,1), -- Hellfire Peninsula // Desecrate the Flame (Alliance) - Outland +(11779,1), -- Shadowmoon Valley +(11799,1), -- Netherstorm +(11782,1), -- Terokkar +(11787,1), -- Zangarmarsh +(11767,1), -- Blade' Edge +(11778,1), -- Nagrand +(13458,1), -- Zul'Drak // Desecrate the Flame (Alliance) - Northrend +(13441,1), -- Borean Tundra +(13450,1), -- Sholazar Basin +(13451,1), -- Dragonblight +(13457,1), -- Crystalsong Forest +(13455,1), -- Storm Peaks +(13454,1), -- Grizzly Hills +(13453,1), -- Howling Fjords +(11734,1), -- Ashenvale // Desecrate the Flame (Horde) - Kalimdor +(11741,1), -- Desolace +(11744,1), -- Dustwallow Marsh +(11763,1), -- Winterspring +(11762,1), -- Tanaris +(11760,1), -- Silithus +(11746,1), -- Feralas +(11740,1), -- Darkshore +(11735,1), -- Azuremyst Isle +(11738,1), -- Bloodmyst Isle +(11753,1), -- Teldrassil +(11755,1), -- The Hinterlands // Desecrate the Flame (Horde) - Eastern Kingdoms +(11756,1), -- The Western Plaguelands +(11748,1), -- Hillsbrad Foothills +(11581,1), -- Westfall +(11757,1), -- Wetlands +(11745,1), -- Elwynn Forest +(11739,1), -- Burning Steppes +(11737,1), -- Blasted Lands +(11732,1), -- Arathi Highlands +(11761,1), -- Cape of Stranglethorn +(11742,1), -- Dun Morogh +(11743,1), -- Duskwood +(11749,1), -- Loch Modan +(11751,1), -- Redridge Mountains +(11752,1), -- Shadowmoon Valley // Desecrate the Flame (Horde) - Outland +(11750,1), -- Nagrand +(11759,1), -- Netherstorm +(11747,1), -- Hellfire Peninsula +(11754,1), -- Terokkar +(11736,1), -- Blade's Edge +(11758,1), -- Zangarmarsh +(13440,1), -- Borean Tundra // Desecrate the Flame (Horde) - Northrend +(13443,1), -- Dragonblight +(13445,1), -- Grizzly +(13444,1), -- Howling Fjord +(13449,1), -- Zul'Drak +(13446,1), -- The Storm Peaks +(13442,1), -- Sholazar Basin +(13447,1), -- Crystalsong Forest +(11972,1), -- Shards of Ahune +(9324,1), -- Stealing Orgrimmar''s Flame +(11935,1), -- Stealing Silvermoon''s Flame +(9326,1), -- Stealing the Undercity''s Flame +(9325,1), -- Stealing Thunder Bluff''s Flame +(9332,1), -- Stealing Darnassus''s Flame +(9331,1), -- Stealing Ironforge''s Flame +(9330,1), -- Stealing Stormwind''s Flame +(11933,1); -- Stealing the Exodar''s Flame +-- Add quest relations to game_event_gameobject_quest and game_event_creature_quest +DELETE FROM `game_event_creature_quest` WHERE `quest` IN (11846,11845,11852,11839,11859,11841,11849,11861,11847,11836,11838,11856,11850,11848,11853,11857,11837,11844,11860,11584,11862,11842,11840,11851,11855,11835,11858,11863,11821,11854,11843,13500,13493,13494,13495,13496,13497,13498,13499,11805,11812,11815,11834,11833,11831,11817,11811,11806,11809,11826,11824,11826,11827,11819,11583,11828,11816,11810,11808,11804,11832,11813,11814,11820,11822,11823,11821,11830,11818,11825,11807,11829,13485,13487,13489,13488,13490,13486,13491,13492,11805,11812,11815,11834,11833,11831,11817,11811,11806,11809,11824,11826,11827,11819,11583,11828,11816,11810,11808,11804,11832,11813,11814,11820,11822,13485,13487,13489,13488,13490,13486,13491,13490,11823,11821,11830,11818,11825,11807,11829,11775,11917,11947,11948,11952,11953,11954,11886,11891,12012,11955,11696,11691,11971,11970,11966,11964,11922,11923,11926,11925,11731,11657,11921,11924,9339,9365); +INSERT INTO `game_event_creature_quest` (`eventEntry`,`id`, `quest`) VALUES +(1,25929, 11846), -- Durotar // Honor the Flame (Horde) - Kalimdor +(1,25928, 11845), -- Desolace +(1,25936, 11852), -- Mulgore +(1,25922, 11839), -- Winterspring +(1,25943, 11859), -- Barrens +(1,25932, 11849), -- Feralas +(1,25884, 11841), -- Ashenvale +(1,25930, 11847), -- Dustwallow marsh +(1,25945, 11861), -- Thousand Needles +(1,25919, 11836), -- Silithus +(1,25921, 11838), -- Tanaris +(1,25940, 11856), -- Stonetalon Mountains +(1,25934, 11851), -- Hellfire Peninsula // Honor the Flame (Horde) - Outland +(1,25938, 11855), -- Shadowmoon Valley +(1,25918, 11835), -- Netherstorm +(1,25942, 11858), -- Terokkar +(1,25947, 11863), -- Zangarmarsh +(1,25937, 11854), -- Nagrand +(1,25926, 11843), -- Blade''s Edge Mountains +(1,32816, 13500), -- Zul'Drak // Honor the Flame (Horde) - Northrend +(1,32809, 13493), -- Borean Tundra +(1,32810, 13494), -- Sholazar Basin +(1,32811, 13495), -- Dragonblight +(1,32815, 13499), -- Crystalsong Forest +(1,32814, 13498), -- Storm Peaks +(1,32813, 13497), -- Grizzly Hills +(1,32812, 13496), -- Howling Fjords +(1,25933, 11850), -- Ghostland // Honor the Flame (Horde) - Eastern Kingdoms +(1,25931, 11848), -- Eversong woods +(1,25935, 11853), -- Hillsbrad Foothills +(1,25941, 11857), -- Swamp of sorrows +(1,25920, 11837), -- Cape of Stranglethorn +(1,25927, 11844), -- Burning Steppes +(1,25944, 11860), -- The Hinterlands +(1,25939, 11584), -- Silverpine Forest +(1,25946, 11862), -- Tirisfal Glades +(1,25925, 11842), -- Badlands +(1,25923, 11840), -- Arathi Highlands +(1,25883, 11805), -- Ashenvale // Honor the Flame (Alliance) - Kalimdor +(1,25894, 11812), -- Desolace +(1,25897, 11815), -- Dustwallow Marsh +(1,25917, 11834), -- Winterspring +(1,25916, 11833), -- Tanaris +(1,25914, 11831), -- Silithus +(1,25899, 11817), -- Feralas +(1,25893, 11811), -- Darkshore +(1,25888, 11806), -- Azuremyst Isle +(1,25891, 11809), -- Bloodmyst Isle +(1,25906, 11824), -- Teldrassil +(1,25908, 11826), -- The Hinterlands // Honor the Flame (Alliance) - Eeastern Kingdoms +(1,25909, 11827), -- The Western Plaguelands +(1,25901, 11819), -- Hillsbrad Foothills +(1,25910, 11583), -- Westfall +(1,25911, 11828), -- Wetlands +(1,25898, 11816), -- Elwynn Forest +(1,25892, 11810), -- Burning Steppes +(1,25890, 11808), -- Blasted Lands +(1,25887, 11804), -- Arathi Highlands +(1,25915, 11832), -- Cape of Stranglethorn +(1,25895, 11813), -- Dun Morogh +(1,25896, 11814), -- Duskwood +(1,25902, 11820), -- Loch Modan +(1,25904, 11822), -- Redridge Mountains +(1,32801, 13485), -- Borean Tundra // Honor the Flame (Alliance) - Northrend +(1,32803, 13487), -- Dragonblight +(1,32805, 13489), -- Grizzly +(1,32804, 13488), -- Howling Fjord +(1,32808, 13492), -- Zul'Drak +(1,32806, 13490), -- The Storm Peaks +(1,32802, 13486), -- Sholazar Basin +(1,32807, 13491), -- Crystalsong Forest +(1,25905, 11823), -- Shadowmoon Valley // Honor the Flame (Alliance) - Outland +(1,25903, 11821), -- Nagrand +(1,25913, 11830), -- Netherstorm +(1,25900, 11818), -- Hellfire Peninsula +(1,25907, 11825), -- Terokkar +(1,25889, 11807), -- Blade's Edge +(1,25912, 11829), -- Zangarmarsh +(1,26221, 11917), -- Striking Back +(1,26221, 11947), -- Striking Back +(1,26221, 11948), -- Striking Back +(1,26221, 11952), -- Striking Back +(1,26221, 11953), -- Striking Back +(1,26221, 11954), -- Striking Back +(1,26221, 11886), -- Unusual Activity +(1,25324, 11891), -- An Innocent Disguise +(1,25324, 12012), -- Inform the Elder +(1,26221, 11955), -- Ahune, the Frost Lord +(1,25710, 11696), -- Ahune is Here! +(1,25697, 11691), -- Summon Ahune +(1,19169, 11971), -- The Spinner of Summer Tales /Horde/ +(1,19178, 11971), -- The Spinner of Summer Tales +(1,19175, 11971), -- The Spinner of Summer Tales +(1,19176, 11971), -- The Spinner of Summer Tales +(1,19177, 11971), -- The Spinner of Summer Tales +(1,20102, 11971), -- The Spinner of Summer Tales +(1,19171, 11970), -- The Master of Summer Lore /Alliance/ +(1,19148, 11970), -- The Master of Summer Lore +(1,19172, 11970), -- The Master of Summer Lore +(1,18927, 11970), -- The Master of Summer Lore +(1,19173, 11970), -- The Master of Summer Lore +(1,20102, 11970), -- The Master of Summer Lore +(1,16818, 11966), -- Incense for the Festival Scorchlings +(1,16817, 11964), -- Incense for the Summer Scorchlings +(1,26113, 11922), -- Torch Tossing /H/ +(1,26113, 11923), -- Torch Catching /H/ +(1,26113, 11926), -- More Torch Tossing /H/ +(1,26113, 11925), -- More Torch Catching /H/ +(1,25975, 11731), -- Torch Tossing /A/ +(1,25975, 11657), -- Torch Catching /A/ +(1,25975, 11921), -- More Torch Tossing /A/ +(1,25975, 11924), -- More Torch Catching /A/ +(1,16818, 9339), -- A Thief''s Reward /H/ +(1,16817, 9365); -- A Thief''s Reward /A/ +DELETE FROM `game_event_gameobject_quest` WHERE `quest` IN (11767,11778,11787,11782,11799,11779,11775,11734,11741,11744,11763,11762,11760,11746,11740,11735,11738,11753,11755,11756,11748,11581,11757,11745,11739,11737,11732,11761,11742,11743,11749,11751,13440,13443,13445,13444,13449,13446,13442,13447,11752,11750,11759,11747,11754,11736,11758,11770,11769,11777,11803,11783,11773,11765,11771,11785,11800,11780,11802,11774,11772,11776,11781,11801,11768,11784,11580,11786,11766,11764,13458,13441,13450,13451,13457,13455,13454,13453); +INSERT INTO `game_event_gameobject_quest` (`eventEntry`,`id`, `quest`) VALUES +(1,187916, 11734), -- Ashenvale // Desecrate the Flame (Horde) - Kalimdor +(1,187924, 11741), -- Desolace +(1,187927, 11744), -- Dustwallow Marsh +(1,187946, 11763), -- Winterspring +(1,187945, 11762), -- Tanaris +(1,187943, 11760), -- Silithus +(1,187929, 11746), -- Feralas +(1,187923, 11740), -- Darkshore +(1,187917, 11735), -- Azuremyst Isle +(1,187921, 11738), -- Bloodmyst Isle +(1,187936, 11753), -- Teldrassil +(1,187938, 11755), -- The Hinterlands // Desecrate the Flame (Horde) - Eeastern Kingdoms +(1,187939, 11756), -- The Western Plaguelands +(1,187931, 11748), -- Hillsbrad Foothills +(1,187564, 11581), -- Westfall +(1,187940, 11757), -- Wetlands +(1,187928, 11745), -- Elwynn Forest +(1,187922, 11739), -- Burning Steppes +(1,187920, 11737), -- Blasted Lands +(1,187914, 11732), -- Arathi Highlands +(1,187944, 11761), -- Cape of Stranglethorn +(1,187925, 11742), -- Dun Morogh +(1,187926, 11743), -- Duskwood +(1,187932, 11749), -- Loch Modan +(1,187934, 11751), -- Redridge Mountains +(1,194032, 13440), -- Borean Tundra // Desecrate the Flame (Horde) - Northrend +(1,194036, 13443), -- Dragonblight +(1,194040, 13445), -- Grizzly +(1,194038, 13444), -- Howling Fjord +(1,194049, 13449), -- Zul'Drak +(1,194044, 13446), -- The Storm Peaks +(1,194035, 13442), -- Sholazar Basin +(1,194045, 13447), -- Crystalsong Forest +(1,187935, 11752), -- Shadowmoon Valley // Desecrate the Flame (Horde) - Outland +(1,187933, 11750), -- Nagrand +(1,187942, 11759), -- Netherstorm +(1,187930, 11747), -- Hellfire Peninsula +(1,187937, 11754), -- Terokkar +(1,187919, 11736), -- Blade's Edge +(1,187941, 11758), -- Zangarmarsh +(1,187958, 11770), -- Durotar // Desecrate the Flame (Alliance) - Kalimdor +(1,187957, 11769), -- Desolace +(1,187965, 11777), -- Mulgore +(1,187953, 11803), -- Winterspring +(1,187971, 11783), -- Barrens +(1,187961, 11773), -- Feralas +(1,187948, 11765), -- Ashenvale +(1,187959, 11771), -- Dustwallow marsh +(1,187973, 11785), -- Thousand Needles +(1,187950, 11800), -- Silithus +(1,187968, 11780), -- Stonetalon Mountains +(1,187952, 11802), -- Tanaris +(1,187962, 11774), -- Ghostland // Desecrate the Flame (Alliance) - Eeastern Kingdoms +(1,187960, 11772), -- Eversong woods +(1,187964, 11776), -- Hillsbrad Foothills +(1,187969, 11781), -- Swamp of sorrows +(1,187951, 11801), -- Cape of Stranglethorn +(1,187956, 11768), -- Burning Steppes +(1,187972, 11784), -- The Hinterlands +(1,187559, 11580), -- Silverpine Forest +(1,187974, 11786), -- Tirisfal Glades +(1,187954, 11766), -- Badlands +(1,187947, 11764), -- Arathi Highlands +(1,187963, 11775), -- Hellfire Peninsula // Desecrate the Flame (Alliance) - Outland +(1,187967, 11779), -- Shadowmoon Valley +(1,187949, 11799), -- Netherstorm +(1,187970, 11782), -- Terokkar +(1,187975, 11787), -- Zangarmarsh +(1,187955, 11767), -- Blade' Edge +(1,187966, 11778), -- Nagrand +(1,194048, 13458), -- Zul'Drak // Desecrate the Flame (Alliance) - Northend +(1,194033, 13441), -- Borean Tundra +(1,194034, 13450), -- Sholazar Basin +(1,194037, 13451), -- Dragonblight +(1,194046, 13457), -- Crystalsong Forest +(1,194043, 13455), -- Storm Peaks +(1,194042, 13454), -- Grizzly Hills +(1,194039, 13453); -- Howling Fjords diff --git a/sql/updates/world/2012_08_05_00_world_trinity_string.sql b/sql/updates/world/2012_08_05_00_world_trinity_string.sql new file mode 100644 index 00000000000..e432f598c02 --- /dev/null +++ b/sql/updates/world/2012_08_05_00_world_trinity_string.sql @@ -0,0 +1,5 @@ +DELETE FROM `trinity_string` WHERE `entry` IN (5032,5033,5034); +INSERT INTO `trinity_string` (`entry`,`content_default`,`content_loc1`,`content_loc2`,`content_loc3`,`content_loc4`,`content_loc5`,`content_loc6`,`content_loc7`,`content_loc8`) VALUES +(5032,'No battleground found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5033,'No achievement criteria found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL), +(5034,'No outdoor PvP found!',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL); diff --git a/sql/updates/world/2012_08_05_01_world_command.sql b/sql/updates/world/2012_08_05_01_world_command.sql new file mode 100644 index 00000000000..f19bfe1c0d0 --- /dev/null +++ b/sql/updates/world/2012_08_05_01_world_command.sql @@ -0,0 +1,19 @@ +DELETE FROM `command` WHERE `name` IN ( +'disable add quest','disable add map','disable add battleground','disable add achievement_criteria','disable add spell','disable add outdoorpvp','disable add vmap', +'disable remove quest','disable remove map','disable remove battleground','disable remove achievement_criteria','disable remove spell','disable remove outdoorpvp','disable remove vmap' +); +INSERT INTO `command` (`name`,`security`,`help`) VALUES +('disable add quest',3,'Syntax: .disable add quest $entry $flag $comment'), +('disable add map',3,'Syntax: .disable add map $entry $flag $comment'), +('disable add battleground',3,'Syntax: .disable add battleground $entry $flag $comment'), +('disable add achievement_criteria',3,'Syntax: .disable add achievement_criteria $entry $flag $comment'), +('disable add spell',3,'Syntax: .disable add spell $entry $flag $comment'), +('disable add outdoorpvp',3,'Syntax: .disable add outdoorpvp $entry $flag $comment'), +('disable add vmap',3,'Syntax: .disable add vmap $entry $flag $comment'), +('disable remove quest',3,'Syntax: .disable remove quest $entry'), +('disable remove map',3,'Syntax: .disable remove map $entry'), +('disable remove battleground',3,'Syntax: .disable remove battleground $entry'), +('disable remove achievement_criteria',3,'Syntax: .disable remove achievement_criteria $entry'), +('disable remove spell',3,'Syntax: .disable remove spell $entry'), +('disable remove outdoorpvp',3,'Syntax: .disable remove outdoorpvp $entry'), +('disable remove vmap',3,'Syntax: .disable remove vmap $entry'); diff --git a/src/server/game/Miscellaneous/Language.h b/src/server/game/Miscellaneous/Language.h index aec72835d86..a766108dbb0 100755 --- a/src/server/game/Miscellaneous/Language.h +++ b/src/server/game/Miscellaneous/Language.h @@ -957,7 +957,10 @@ enum TrinityStrings LANG_COMMAND_LOOKUP_MAX_RESULTS = 5029, LANG_FLEE = 5030, LANG_NPCINFO_AIINFO = 5031, - // Room for more Trinity strings 5032-9999 + LANG_COMMAND_NO_BATTLEGROUND_FOUND = 5032, + LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND = 5033, + LANG_COMMAND_NO_OUTDOOR_PVP_FORUND = 5034, + // Room for more Trinity strings 5035-9999 // Level requirement notifications LANG_SAY_REQ = 6604, diff --git a/src/server/scripts/Commands/cs_disable.cpp b/src/server/scripts/Commands/cs_disable.cpp index e7f33885036..a2a80edd43b 100644 --- a/src/server/scripts/Commands/cs_disable.cpp +++ b/src/server/scripts/Commands/cs_disable.cpp @@ -26,6 +26,7 @@ EndScriptData */ #include "ObjectMgr.h" #include "Chat.h" #include "DisableMgr.h" +#include "OutdoorPvP.h" class disable_commandscript : public CommandScript { @@ -34,56 +35,230 @@ public: ChatCommand* GetCommands() const { - - static ChatCommand disableCommandTable[] = + static ChatCommand removeDisableCommandTable[] = { - { "spell", SEC_GAMEMASTER, false, &HandleDisableSpellCommand, "", NULL }, - { "map", SEC_GAMEMASTER, false, &HandleDisableMapCommand, "", NULL }, - { "battleground", SEC_GAMEMASTER, false, &HandleDisableBattlegroundCommand, "", NULL }, - { "achievement_criteria", SEC_GAMEMASTER, false, &HandleDisableAchievementCriteriaCommand, "", NULL }, - { "outdoorpvp", SEC_GAMEMASTER, false, &HandleDisableOutdoorPvPCommand, "", NULL }, - { "vmap", SEC_GAMEMASTER, false, &HandleDisableVmapCommand, "", NULL }, - { NULL, 0, false, NULL, "", NULL } + { "spell", SEC_ADMINISTRATOR, true, &HandleRemoveDisableSpellCommand, "", NULL }, + { "quest", SEC_ADMINISTRATOR, true, &HandleRemoveDisableQuestCommand, "", NULL }, + { "map", SEC_ADMINISTRATOR, true, &HandleRemoveDisableMapCommand, "", NULL }, + { "battleground", SEC_ADMINISTRATOR, true, &HandleRemoveDisableBattlegroundCommand, "", NULL }, + { "achievement_criteria", SEC_ADMINISTRATOR, true, &HandleRemoveDisableAchievementCriteriaCommand, "", NULL }, + { "outdoorpvp", SEC_ADMINISTRATOR, true, &HandleRemoveDisableOutdoorPvPCommand, "", NULL }, + { "vmap", SEC_ADMINISTRATOR, true, &HandleRemoveDisableVmapCommand, "", NULL }, + { NULL, 0, false, NULL, "", NULL } }; - + static ChatCommand addDisableCommandTable[] = + { + { "spell", SEC_ADMINISTRATOR, true, &HandleAddDisableSpellCommand, "", NULL }, + { "quest", SEC_ADMINISTRATOR, true, &HandleAddDisableQuestCommand, "", NULL }, + { "map", SEC_ADMINISTRATOR, true, &HandleAddDisableMapCommand, "", NULL }, + { "battleground", SEC_ADMINISTRATOR, true, &HandleAddDisableBattlegroundCommand, "", NULL }, + { "achievement_criteria", SEC_ADMINISTRATOR, true, &HandleAddDisableAchievementCriteriaCommand, "", NULL }, + { "outdoorpvp", SEC_ADMINISTRATOR, true, &HandleAddDisableOutdoorPvPCommand, "", NULL }, + { "vmap", SEC_ADMINISTRATOR, true, &HandleAddDisableVmapCommand, "", NULL }, + { NULL, 0, false, NULL, "", NULL } + }; + static ChatCommand disableCommandTable[] = + { + { "add", SEC_ADMINISTRATOR, true, NULL, "", addDisableCommandTable }, + { "remove", SEC_ADMINISTRATOR, true, NULL, "", removeDisableCommandTable }, + { NULL, 0, false, NULL, "", NULL } + }; static ChatCommand commandTable[] = { - { "disable", SEC_GAMEMASTER, false, NULL, "", disableCommandTable }, - { NULL, 0, false, NULL, "", NULL } + { "disable", SEC_ADMINISTRATOR, false, NULL, "", disableCommandTable }, + { NULL, 0, false, NULL, "", NULL } }; return commandTable; } - - static void HandleDisables(ChatHandler* handler, char const* args, uint8 disableType) + static bool HandleAddDisables(ChatHandler* handler, char const* args, uint8 disableType) { - char* cEntry = strtok((char*)args, " "); - if (!cEntry || !atoi(cEntry)) - { - handler->SendSysMessage("No entry specified."); - return; - } + char* entryStr = strtok((char*)args, " "); + if (!entryStr || !atoi(entryStr)) + return false; + + char* flagsStr = strtok(NULL, " "); + uint8 flags = flagsStr ? uint8(atoi(flagsStr)) : 0; + + char* commentStr = strtok(NULL, ""); + if (!commentStr) + return false; - char* cFlags = strtok(NULL, " "); - if (!cFlags || !atoi(cFlags)) + std::string disableComment = commentStr; + uint32 entry = uint32(atoi(entryStr)); + + std::string disableTypeStr = ""; + + switch (disableType) { - handler->SendSysMessage("No flags specified."); - return; + case DISABLE_TYPE_SPELL: + { + if (!sSpellMgr->GetSpellInfo(entry)) + { + handler->PSendSysMessage(LANG_COMMAND_NOSPELLFOUND); + handler->SetSentErrorMessage(true); + return false; + } + disableTypeStr = "spell"; + break; + } + case DISABLE_TYPE_QUEST: + { + if (!sObjectMgr->GetQuestTemplate(entry)) + { + handler->PSendSysMessage(LANG_COMMAND_QUEST_NOTFOUND, entry); + handler->SetSentErrorMessage(true); + return false; + } + disableTypeStr = "quest"; + break; + } + case DISABLE_TYPE_MAP: + { + if (!sMapStore.LookupEntry(entry)) + { + handler->PSendSysMessage(LANG_COMMAND_NOMAPFOUND); + handler->SetSentErrorMessage(true); + return false; + } + disableTypeStr = "map"; + break; + } + case DISABLE_TYPE_BATTLEGROUND: + { + if (!sBattlemasterListStore.LookupEntry(entry)) + { + handler->PSendSysMessage(LANG_COMMAND_NO_BATTLEGROUND_FOUND); + handler->SetSentErrorMessage(true); + return false; + } + disableTypeStr = "battleground"; + break; + } + case DISABLE_TYPE_ACHIEVEMENT_CRITERIA: + { + if (!sAchievementCriteriaStore.LookupEntry(entry)) + { + handler->PSendSysMessage(LANG_COMMAND_NO_ACHIEVEMENT_CRITERIA_FOUND); + handler->SetSentErrorMessage(true); + return false; + } + disableTypeStr = "achievement criteria"; + break; + } + case DISABLE_TYPE_OUTDOORPVP: + { + if (entry > MAX_OUTDOORPVP_TYPES) + { + handler->PSendSysMessage(LANG_COMMAND_NO_OUTDOOR_PVP_FORUND); + handler->SetSentErrorMessage(true); + return false; + } + disableTypeStr = "outdoorpvp"; + break; + } + case DISABLE_TYPE_VMAP: + { + if (!sMapStore.LookupEntry(entry)) + { + handler->PSendSysMessage(LANG_COMMAND_NOMAPFOUND); + handler->SetSentErrorMessage(true); + return false; + } + disableTypeStr = "vmap"; + break; + } + default: + break; } - - char* cComment = strtok(NULL, ""); - if (!cComment) + + PreparedStatement* stmt = NULL; + stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES); + stmt->setUInt32(0, entry); + stmt->setUInt8(1, disableType); + PreparedQueryResult result = WorldDatabase.Query(stmt); + if (result) { - handler->SendSysMessage("No comment specified."); - return; + handler->PSendSysMessage("This %s (Id: %u) is already disabled.", disableTypeStr.c_str(), entry); + handler->SetSentErrorMessage(true); + return false; } - std::string entryStr = cEntry; - std::string disableComment = cComment; - uint32 entry = (uint32)atoi(cEntry); - uint8 flags = atoi(cFlags); + stmt = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES); + stmt->setUInt32(0, entry); + stmt->setUInt8(1, disableType); + stmt->setUInt16(2, flags); + stmt->setString(3, disableComment); + WorldDatabase.Execute(stmt); + + handler->PSendSysMessage("Add Disabled %s (Id: %u) for reason %s", disableTypeStr.c_str(), entry, disableComment.c_str()); + return true; + } + + static bool HandleAddDisableSpellCommand(ChatHandler* handler, char const* args) + { + if (!*args) + return false; + + return HandleAddDisables(handler, args, DISABLE_TYPE_SPELL); + } + + static bool HandleAddDisableQuestCommand(ChatHandler* handler, char const* args) + { + if (!*args) + return false; + + return HandleAddDisables(handler, args, DISABLE_TYPE_QUEST); + } + + static bool HandleAddDisableMapCommand(ChatHandler* handler, char const* args) + { + if (!*args) + return false; + + return HandleAddDisables(handler, args, DISABLE_TYPE_MAP); + } + + static bool HandleAddDisableBattlegroundCommand(ChatHandler* handler, char const* args) + { + if (!*args) + return false; + + return HandleAddDisables(handler, args, DISABLE_TYPE_BATTLEGROUND); + } + + static bool HandleAddDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args) + { + if (!*args) + return false; + + return HandleAddDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA); + } + + static bool HandleAddDisableOutdoorPvPCommand(ChatHandler* handler, char const* args) + { + if (!*args) + return false; + + HandleAddDisables(handler, args, DISABLE_TYPE_OUTDOORPVP); + return true; + } + + static bool HandleAddDisableVmapCommand(ChatHandler* handler, char const* args) + { + if (!*args) + return false; + return HandleAddDisables(handler, args, DISABLE_TYPE_VMAP); + } + + static bool HandleRemoveDisables(ChatHandler* handler, char const* args, uint8 disableType) + { + char* entryStr = strtok((char*)args, " "); + if (!entryStr || !atoi(entryStr)) + return false; + uint32 entry = uint32(atoi(entryStr)); std::string disableTypeStr = ""; @@ -92,6 +267,9 @@ public: case DISABLE_TYPE_SPELL: disableTypeStr = "spell"; break; + case DISABLE_TYPE_QUEST: + disableTypeStr = "quest"; + break; case DISABLE_TYPE_MAP: disableTypeStr = "map"; break; @@ -109,87 +287,85 @@ public: break; } - PreparedStatement* stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES); + PreparedStatement* stmt = NULL; + stmt = WorldDatabase.GetPreparedStatement(WORLD_SEL_DISABLES); stmt->setUInt32(0, entry); - stmt->setUInt8(1, disableType); - PreparedQueryResult result = WorldDatabase.Query(stmt); - - - if (result) + stmt->setUInt8(1, disableType); + PreparedQueryResult result = WorldDatabase.Query(stmt); + if (!result) { - handler->PSendSysMessage("This %s (id %u) is already disabled.", disableTypeStr.c_str(), entry); - return; + handler->PSendSysMessage("This %s (Id: %u) is not disabled.", disableTypeStr.c_str(), entry); + handler->SetSentErrorMessage(true); + return false; } - PreparedStatement* stmt2 = WorldDatabase.GetPreparedStatement(WORLD_INS_DISABLES); - stmt2->setUInt32(0, entry); - stmt2->setUInt8(1, disableType); - stmt2->setUInt16(2, flags); - stmt2->setString(3, disableComment); - WorldDatabase.Execute(stmt2); - - handler->PSendSysMessage("Disabled %s %u for reason %s", disableTypeStr.c_str(), entry, disableComment.c_str()); - return; + stmt = WorldDatabase.GetPreparedStatement(WORLD_DEL_DISABLES); + stmt->setUInt32(0, entry); + stmt->setUInt8(1, disableType); + WorldDatabase.Execute(stmt); + handler->PSendSysMessage("Remove Disabled %s (Id: %u)", disableTypeStr.c_str(), entry); + return true; } - static bool HandleDisableSpellCommand(ChatHandler* handler, char const* args) + static bool HandleRemoveDisableSpellCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - HandleDisables(handler, args, DISABLE_TYPE_SPELL); - return true; + return HandleRemoveDisables(handler, args, DISABLE_TYPE_SPELL); } - static bool HandleDisableMapCommand(ChatHandler* handler, char const* args) + static bool HandleRemoveDisableQuestCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - HandleDisables(handler, args, DISABLE_TYPE_MAP); - return true; + return HandleRemoveDisables(handler, args, DISABLE_TYPE_QUEST); } - static bool HandleDisableBattlegroundCommand(ChatHandler* handler, char const* args) + static bool HandleRemoveDisableMapCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - HandleDisables(handler, args, DISABLE_TYPE_BATTLEGROUND); - return true; + return HandleAddDisables(handler, args, DISABLE_TYPE_MAP); } - static bool HandleDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args) + static bool HandleRemoveDisableBattlegroundCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - HandleDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA); - return true; + return HandleRemoveDisables(handler, args, DISABLE_TYPE_BATTLEGROUND); } - static bool HandleDisableOutdoorPvPCommand(ChatHandler* handler, char const* args) + static bool HandleRemoveDisableAchievementCriteriaCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - HandleDisables(handler, args, DISABLE_TYPE_OUTDOORPVP); - return true; + return HandleRemoveDisables(handler, args, DISABLE_TYPE_ACHIEVEMENT_CRITERIA); } - static bool HandleDisableVmapCommand(ChatHandler* handler, char const* args) + static bool HandleRemoveDisableOutdoorPvPCommand(ChatHandler* handler, char const* args) { if (!*args) return false; - HandleDisables(handler, args, DISABLE_TYPE_VMAP); - return true; + return HandleRemoveDisables(handler, args, DISABLE_TYPE_OUTDOORPVP); } + static bool HandleRemoveDisableVmapCommand(ChatHandler* handler, char const* args) + { + if (!*args) + return false; + + return HandleRemoveDisables(handler, args, DISABLE_TYPE_VMAP); + } }; void AddSC_disable_commandscript() { new disable_commandscript(); -}
\ No newline at end of file +} diff --git a/src/server/shared/Database/Implementation/WorldDatabase.cpp b/src/server/shared/Database/Implementation/WorldDatabase.cpp index 3b59f283ddb..872d9ec415c 100755 --- a/src/server/shared/Database/Implementation/WorldDatabase.cpp +++ b/src/server/shared/Database/Implementation/WorldDatabase.cpp @@ -89,5 +89,6 @@ void WorldDatabaseConnection::DoPrepareStatements() PREPARE_STATEMENT(WORLD_DEL_GAME_EVENT_MODEL_EQUIP, "DELETE FROM game_event_model_equip WHERE guid = ?", CONNECTION_ASYNC); PREPARE_STATEMENT(WORLD_INS_GAMEOBJECT, "INSERT INTO gameobject (guid, id, map, spawnMask, phaseMask, position_x, position_y, position_z, orientation, rotation0, rotation1, rotation2, rotation3, spawntimesecs, animprogress, state) VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)", CONNECTION_ASYNC); PREPARE_STATEMENT(WORLD_INS_DISABLES, "INSERT INTO disables (entry, sourceType, flags, comment) VALUES (?, ?, ?, ?)", CONNECTION_ASYNC); - PREPARE_STATEMENT(WORLD_SEL_DISABLES, "SELECT entry FROM disables WHERE entry = ? AND sourceType = ? AND flags > 0", CONNECTION_SYNCH); + PREPARE_STATEMENT(WORLD_SEL_DISABLES, "SELECT entry FROM disables WHERE entry = ? AND sourceType = ?", CONNECTION_SYNCH); + PREPARE_STATEMENT(WORLD_DEL_DISABLES, "DELETE FROM disables WHERE entry = ? AND sourceType = ?", CONNECTION_ASYNC); } diff --git a/src/server/shared/Database/Implementation/WorldDatabase.h b/src/server/shared/Database/Implementation/WorldDatabase.h index 10163d33c83..6d7df87cc80 100755 --- a/src/server/shared/Database/Implementation/WorldDatabase.h +++ b/src/server/shared/Database/Implementation/WorldDatabase.h @@ -111,6 +111,7 @@ enum WorldDatabaseStatements WORLD_INS_GAMEOBJECT, WORLD_SEL_DISABLES, WORLD_INS_DISABLES, + WORLD_DEL_DISABLES, MAX_WORLDDATABASE_STATEMENTS, }; diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h index 045c5fd91c8..760fcfd48d9 100755 --- a/src/server/shared/Packets/ByteBuffer.h +++ b/src/server/shared/Packets/ByteBuffer.h @@ -50,8 +50,10 @@ class ByteBufferPositionException : public ByteBufferException protected: void PrintError() const { - sLog->outError(LOG_FILTER_GENERAL, "Attempted to %s value with size: "SIZEFMTD" in ByteBuffer (pos: " SIZEFMTD " size: "SIZEFMTD") " , - (_add ? "put" : "get"), ValueSize, Pos, Size); + ACE_Stack_Trace trace; + + sLog->outError(LOG_FILTER_GENERAL, "Attempted to %s value with size: "SIZEFMTD" in ByteBuffer (pos: " SIZEFMTD " size: "SIZEFMTD")\n[Stacktrace: %s]" , + (_add ? "put" : "get"), ValueSize, Pos, Size, trace.c_str()); } private: @@ -70,8 +72,10 @@ class ByteBufferSourceException : public ByteBufferException protected: void PrintError() const { - sLog->outError(LOG_FILTER_GENERAL, "Attempted to put a %s in ByteBuffer (pos: "SIZEFMTD" size: "SIZEFMTD")", - (ValueSize > 0 ? "NULL-pointer" : "zero-sized value"), Pos, Size); + ACE_Stack_Trace trace; + + sLog->outError(LOG_FILTER_GENERAL, "Attempted to put a %s in ByteBuffer (pos: "SIZEFMTD" size: "SIZEFMTD")\n[Stacktrace: %s]", + (ValueSize > 0 ? "NULL-pointer" : "zero-sized value"), Pos, Size, trace.c_str()); } }; |