From ee623a4006009e729ed4cfdd36aa9bb1525d72a9 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 19 Oct 2014 20:27:49 +0100 Subject: [PATCH 1/7] DB/Gameobject: Everfrost Chip Additional spawns of http://www.wowhead.com/object=193997 Everfrost Chip on top of the 2 already in db. --- sql/updates/world/2014_10_19_01_world.sql | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 sql/updates/world/2014_10_19_01_world.sql diff --git a/sql/updates/world/2014_10_19_01_world.sql b/sql/updates/world/2014_10_19_01_world.sql new file mode 100644 index 00000000000..a9a53a9afe6 --- /dev/null +++ b/sql/updates/world/2014_10_19_01_world.sql @@ -0,0 +1,10 @@ +DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+7 AND `id`=193997; +INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES +(@OGUID+0, 193997, 571, 1, 1, 7330.436, -2212.682, 800.4834, 4.258607, 0, 0, 0, 1, 120, 255, 1), -- 193997 (Area: 67) +(@OGUID+1, 193997, 571, 1, 1, 7211.499, -2373.856, 781.449, 4.380776, 0, 0, 0, 1, 120, 255, 1), -- 193997 (Area: 67) +(@OGUID+2, 193997, 571, 1, 1, 6973.803, -2096.827, 777.6375, 3.263772, 0, 0, 0, 1, 120, 255, 1), -- 193997 (Area: 67) +(@OGUID+3, 193997, 571, 1, 1, 7310.712, -2812.066, 798.081, 1.570796, 0, 0, 0, 1, 120, 255, 1), -- 193997 (Area: 67) +(@OGUID+4, 193997, 571, 1, 1, 7301.006, -2746.12, 749.5085, 0.157079, 0, 0, 0, 1, 120, 255, 1), -- 193997 (Area: 67) +(@OGUID+5, 193997, 571, 1, 1, 7550.374, -3154.98, 840.1462, 4.415683, 0, 0, 0, 1, 120, 255, 1), -- 193997 (Area: 67) +(@OGUID+6, 193997, 571, 1, 1, 7177.287, -3071.111, 862.2982, 0.6806767, 0, 0, 0, 1, 120, 255, 1), -- 193997 (Area: 67) +(@OGUID+7, 193997, 571, 1, 1, 7694.284, -3154.72, 869.7686, 3.769912, 0, 0, 0, 1, 120, 255, 1); -- 193997 (Area: 67) From 3965ee33efd8751d64da6352227650fb4181fe31 Mon Sep 17 00:00:00 2001 From: Dr-J Date: Sun, 19 Oct 2014 20:29:44 +0100 Subject: [PATCH 2/7] forgot to copy and paste line to set guid --- sql/updates/world/2014_10_19_01_world.sql | 1 + 1 file changed, 1 insertion(+) diff --git a/sql/updates/world/2014_10_19_01_world.sql b/sql/updates/world/2014_10_19_01_world.sql index a9a53a9afe6..b5048704717 100644 --- a/sql/updates/world/2014_10_19_01_world.sql +++ b/sql/updates/world/2014_10_19_01_world.sql @@ -1,3 +1,4 @@ +SET @OGUID := 22305; DELETE FROM `gameobject` WHERE `guid` BETWEEN @OGUID+0 AND @OGUID+7 AND `id`=193997; INSERT INTO `gameobject` (`guid`, `id`, `map`, `spawnMask`, `phaseMask`, `position_x`, `position_y`, `position_z`, `orientation`, `rotation0`, `rotation1`, `rotation2`, `rotation3`, `spawntimesecs`, `animprogress`, `state`) VALUES (@OGUID+0, 193997, 571, 1, 1, 7330.436, -2212.682, 800.4834, 4.258607, 0, 0, 0, 1, 120, 255, 1), -- 193997 (Area: 67) From f4c035554fdc25d286ddc37c24e3ab43c71f1dae Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Mon, 20 Oct 2014 09:43:21 -0200 Subject: [PATCH 3/7] Scripts/Ulduar: Exclude Ignis' main target from the Slag Pot target selector Closes #10516 --- src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp index d4fbf959c53..d3a6bc9b5ff 100644 --- a/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp +++ b/src/server/scripts/Northrend/Ulduar/Ulduar/boss_ignis.cpp @@ -219,7 +219,7 @@ class boss_ignis : public CreatureScript events.ScheduleEvent(EVENT_JET, urand(35000, 40000)); break; case EVENT_SLAG_POT: - if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 0, 100, true)) + if (Unit* target = SelectTarget(SELECT_TARGET_RANDOM, 1, 100, true)) { Talk(SAY_SLAG_POT); _slagPotGUID = target->GetGUID(); From 22f218540bedbe43fd5fefb049561dbeccddc6c5 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Mon, 20 Oct 2014 13:30:57 -0200 Subject: [PATCH 4/7] Scripts/ScarletMonastery: Summon the Headless Horseman once the Call the Headless Horseman is quest complete By @cr4st Closes #13273 --- .../boss_headless_horseman.cpp | 35 ++++++++++--------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp index 58165df48ef..ac7f4c0aad4 100644 --- a/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp +++ b/src/server/scripts/EasternKingdoms/ScarletMonastery/boss_headless_horseman.cpp @@ -882,34 +882,37 @@ public: }; }; +enum LooselyTurnedSoil +{ + QUEST_CALL_THE_HEADLESS_HORSEMAN = 11405 +}; + class go_loosely_turned_soil : public GameObjectScript { public: go_loosely_turned_soil() : GameObjectScript("go_loosely_turned_soil") { } - bool OnGossipHello(Player* player, GameObject* soil) override + bool OnGossipHello(Player* player, GameObject* go) override { - InstanceScript* instance = player->GetInstanceScript(); - if (instance) - { - if (instance->GetBossState(DATA_HORSEMAN_EVENT) != NOT_STARTED) + if (InstanceScript* instance = player->GetInstanceScript()) + if (instance->GetBossState(DATA_HORSEMAN_EVENT) == IN_PROGRESS || player->GetQuestStatus(QUEST_CALL_THE_HEADLESS_HORSEMAN) != QUEST_STATUS_COMPLETE) return true; - instance->SetBossState(DATA_HORSEMAN_EVENT, IN_PROGRESS); - } - /* if (soil->GetGoType() == GAMEOBJECT_TYPE_QUESTGIVER && player->getLevel() > 64) - { - player->PrepareQuestMenu(soil->GetGUID()); - player->SendPreparedQuest(soil->GetGUID()); - } - if (player->GetQuestStatus(11405) == QUEST_STATUS_INCOMPLETE && player->getLevel() > 64) - { */ + + return false; + } + + bool OnQuestReward(Player* player, GameObject* go, Quest const* /*quest*/, uint32 /*opt*/) override + { + if (InstanceScript* instance = go->GetInstanceScript()) + if (instance->GetBossState(DATA_HORSEMAN_EVENT) == IN_PROGRESS) + return false; + player->AreaExploredOrEventHappens(11405); - if (Creature* horseman = soil->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) + if (Creature* horseman = go->SummonCreature(HH_MOUNTED, FlightPoint[20].x, FlightPoint[20].y, FlightPoint[20].z, 0, TEMPSUMMON_MANUAL_DESPAWN, 0)) { ENSURE_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->PlayerGUID = player->GetGUID(); ENSURE_AI(boss_headless_horseman::boss_headless_horsemanAI, horseman->AI())->FlyMode(); } - //} return true; } }; From 8274caeef052ffaf21c9109de13b8c2a5355d9e4 Mon Sep 17 00:00:00 2001 From: Aokromes Date: Mon, 20 Oct 2014 20:32:10 +0200 Subject: [PATCH 5/7] DB/Creature: Fix 2 startup errors --- sql/updates/world/2014_10_20_00_world.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 sql/updates/world/2014_10_20_00_world.sql diff --git a/sql/updates/world/2014_10_20_00_world.sql b/sql/updates/world/2014_10_20_00_world.sql new file mode 100644 index 00000000000..89a6eb089d6 --- /dev/null +++ b/sql/updates/world/2014_10_20_00_world.sql @@ -0,0 +1,2 @@ +-- +UPDATE `creature_template` SET `faction`=1735, `unit_class`=1 WHERE `entry`=35427; From 361d285ba3d42f0b5ec60bbb646d500ef6940488 Mon Sep 17 00:00:00 2001 From: jackpoz Date: Mon, 20 Oct 2014 21:18:39 +0200 Subject: [PATCH 6/7] Core/AHBot: Filter out from AHBot items that can't be looted --- .../AuctionHouseBot/AuctionHouseBotSeller.cpp | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp index 00e1a35973d..513b23afd70 100644 --- a/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp +++ b/src/server/game/AuctionHouseBot/AuctionHouseBotSeller.cpp @@ -76,17 +76,17 @@ bool AuctionBotSeller::Initialize() TC_LOG_DEBUG("ahbot", "Loading loot items for filter.."); QueryResult result = WorldDatabase.PQuery( - "SELECT `item` FROM `creature_loot_template` UNION " - "SELECT `item` FROM `disenchant_loot_template` UNION " - "SELECT `item` FROM `fishing_loot_template` UNION " - "SELECT `item` FROM `gameobject_loot_template` UNION " - "SELECT `item` FROM `item_loot_template` UNION " - "SELECT `item` FROM `milling_loot_template` UNION " - "SELECT `item` FROM `pickpocketing_loot_template` UNION " - "SELECT `item` FROM `prospecting_loot_template` UNION " - "SELECT `item` FROM `reference_loot_template` UNION " - "SELECT `item` FROM `skinning_loot_template` UNION " - "SELECT `item` FROM `spell_loot_template`"); + "SELECT `item` FROM `creature_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `disenchant_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `fishing_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `gameobject_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `item_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `milling_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `pickpocketing_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `prospecting_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `reference_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `skinning_loot_template` WHERE `Reference` = 0 UNION " + "SELECT `item` FROM `spell_loot_template` WHERE `Reference` = 0"); if (result) { From 805be8ebba07c3280089a128f1764d49f6f84ab6 Mon Sep 17 00:00:00 2001 From: Nyeriah Date: Tue, 21 Oct 2014 16:59:22 -0200 Subject: [PATCH 7/7] DB/Achievement: Fix map conditions for achievement "He's not getting any older" 25m used to be awarded in 10m vice-versa --- sql/updates/world/2014_10_21_00_world.sql | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 sql/updates/world/2014_10_21_00_world.sql diff --git a/sql/updates/world/2014_10_21_00_world.sql b/sql/updates/world/2014_10_21_00_world.sql new file mode 100644 index 00000000000..9a8b68bd99c --- /dev/null +++ b/sql/updates/world/2014_10_21_00_world.sql @@ -0,0 +1,3 @@ +-- +UPDATE `achievement_criteria_data` SET `value1`=1 WHERE `criteria_id`=10291 AND `type`=12; +UPDATE `achievement_criteria_data` SET `value1`=0 WHERE `criteria_id`=10292 AND `type`=12;