From 5abfe27365959b24f6a078d106d0b906f905cd12 Mon Sep 17 00:00:00 2001 From: Malcrom Date: Sat, 25 Dec 2021 07:50:52 -0400 Subject: [PATCH] fix(Script) Quest "Deactivating the Spire" (#9874) * fix(Script) Quest "Deactivating the Spire" * Update go_scripts.cpp * Update go_scripts.cpp Co-authored-by: acidmanifesto --- .../rev_1640365530283717518.sql | 3 +++ src/server/scripts/World/go_scripts.cpp | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 data/sql/updates/pending_db_world/rev_1640365530283717518.sql diff --git a/data/sql/updates/pending_db_world/rev_1640365530283717518.sql b/data/sql/updates/pending_db_world/rev_1640365530283717518.sql new file mode 100644 index 000000000..27c394013 --- /dev/null +++ b/data/sql/updates/pending_db_world/rev_1640365530283717518.sql @@ -0,0 +1,3 @@ +INSERT INTO `version_db_world` (`sql_rev`) VALUES ('1640365530283717518'); + +UPDATE `gameobject_template` SET `ScriptName` = "go_duskwither_spire_power_source" WHERE `entry` IN (180916, 180919, 180920); diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index af65441f3..a61b711e5 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -1928,6 +1928,30 @@ public: } }; +/*######## +#### go_duskwither_spire_power_source +#####*/ + +enum DuskwitherSpirePowersource +{ + NPC_POWER_SOURCE_INVISIBLE_BUNNY = 17984 +}; + +class go_duskwither_spire_power_source : public GameObjectScript +{ +public: + go_duskwither_spire_power_source() : GameObjectScript("go_duskwither_spire_power_source") {} + + bool OnGossipHello(Player* /*player*/, GameObject* go) override + { + if (Creature* bunny = go->FindNearestCreature(NPC_POWER_SOURCE_INVISIBLE_BUNNY, 1.0f)) + { + bunny->DespawnOrUnsummon(0ms, 10s); + } + return false; + } +}; + void AddSC_go_scripts() { // Ours @@ -1943,6 +1967,7 @@ void AddSC_go_scripts() new go_flames(); new go_heat(); new go_bear_trap(); + new go_duskwither_spire_power_source(); // Theirs new go_brewfest_music();