From 2326eac4f9e40f34023fcf82d62b8a001b4d2281 Mon Sep 17 00:00:00 2001 From: Rushor Date: Sat, 15 Feb 2020 20:18:58 +0100 Subject: Scripts/Gameobject: Journal of Jandice Barov- Convert script to SAI. (#24157) * Scripts/Gameobject: Journal of Jandice Barov- Convert script to SAI. (Thanks to Sunwell) * Scripts/Gameobject: Journal of Jandice Barov - Update script and move go spawn to bossscript * Update boss_jandice_barov.cpp Co-authored-by: Eridium <6587064+Killyana@users.noreply.github.com> (cherry picked from commit f0bf447cd14315f1fe0bdab7d051691113525762) --- .../Scholomance/boss_jandice_barov.cpp | 4 ++- src/server/scripts/World/go_scripts.cpp | 30 ---------------------- 2 files changed, 3 insertions(+), 31 deletions(-) (limited to 'src/server/scripts') diff --git a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp index fe2150d8d33..68462ee0f27 100644 --- a/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp +++ b/src/server/scripts/EasternKingdoms/Scholomance/boss_jandice_barov.cpp @@ -22,7 +22,8 @@ enum Spells { SPELL_CURSE_OF_BLOOD = 24673, - SPELL_ILLUSION = 17773 + SPELL_ILLUSION = 17773, + SPELL_DROP_JOURNAL = 26096 }; enum Events @@ -67,6 +68,7 @@ public: void JustDied(Unit* /*killer*/) override { Summons.DespawnAll(); + DoCastSelf(SPELL_DROP_JOURNAL, true); } void UpdateAI(uint32 diff) override diff --git a/src/server/scripts/World/go_scripts.cpp b/src/server/scripts/World/go_scripts.cpp index 368202aa83c..5af9c2a5f0a 100644 --- a/src/server/scripts/World/go_scripts.cpp +++ b/src/server/scripts/World/go_scripts.cpp @@ -16,7 +16,6 @@ */ /* ContentData -go_barov_journal go_ethereum_prison go_ethereum_stasis go_shrine_of_the_birds @@ -56,34 +55,6 @@ EndContentData */ #include "WorldSession.h" #include "World.h" -/*###### -## go_barov_journal -######*/ - -class go_barov_journal : public GameObjectScript -{ -public: - go_barov_journal() : GameObjectScript("go_barov_journal") { } - - struct go_barov_journalAI : public GameObjectAI - { - go_barov_journalAI(GameObject* go) : GameObjectAI(go) { } - - bool GossipHello(Player* player) override - { - if (player->HasSkill(SKILL_TAILORING) && player->GetBaseSkillValue(SKILL_TAILORING) >= 280 && !player->HasSpell(26086)) - player->CastSpell(player, 26095, false); - - return true; - } - }; - - GameObjectAI* GetAI(GameObject* go) const override - { - return new go_barov_journalAI(go); - } -}; - /*###### ## go_gilded_brazier (Paladin First Trail quest (9678)) ######*/ @@ -1919,7 +1890,6 @@ public: void AddSC_go_scripts() { - new go_barov_journal(); new go_gilded_brazier(); new go_orb_of_command(); new go_shrine_of_the_birds(); -- cgit v1.2.3