From 26ae6df032d6ed67c05384eab4a614773b21adb7 Mon Sep 17 00:00:00 2001 From: Sorikoff <46191832+Sorikoff@users.noreply.github.com> Date: Sat, 11 Apr 2020 20:47:09 +0300 Subject: Scripts/Pets: Mojo (#24431) * Mojo * Update * Rename 9999_99_99_99_world.sql to 2020_04_11_01_world.sql Co-authored-by: Giacomo Pozzoni (cherry picked from commit 194691f7c3992fbea13227a190007f05451d742a) --- src/server/scripts/Pet/pet_generic.cpp | 65 ---------------------------------- 1 file changed, 65 deletions(-) (limited to 'src') diff --git a/src/server/scripts/Pet/pet_generic.cpp b/src/server/scripts/Pet/pet_generic.cpp index 7aeb18a9787..a1afcbb3a06 100644 --- a/src/server/scripts/Pet/pet_generic.cpp +++ b/src/server/scripts/Pet/pet_generic.cpp @@ -27,7 +27,6 @@ #include "ScriptMgr.h" #include "MotionMaster.h" -#include "ObjectAccessor.h" #include "PassiveAI.h" #include "PetDefines.h" #include "Player.h" @@ -124,69 +123,6 @@ public: } }; -enum Mojo -{ - SAY_MOJO = 0, - - SPELL_FEELING_FROGGY = 43906, - SPELL_SEDUCTION_VISUAL = 43919 -}; - -class npc_pet_gen_mojo : public CreatureScript -{ - public: - npc_pet_gen_mojo() : CreatureScript("npc_pet_gen_mojo") { } - - struct npc_pet_gen_mojoAI : public ScriptedAI - { - npc_pet_gen_mojoAI(Creature* creature) : ScriptedAI(creature) - { - } - - void Reset() override - { - _victimGUID.Clear(); - - if (Unit* owner = me->GetOwner()) - me->GetMotionMaster()->MoveFollow(owner, 0.0f, 0.0f); - } - - void JustEngagedWith(Unit* /*who*/) override { } - void UpdateAI(uint32 /*diff*/) override { } - - void ReceiveEmote(Player* player, uint32 emote) override - { - me->HandleEmoteCommand(emote); - Unit* owner = me->GetOwner(); - if (emote != TEXT_EMOTE_KISS || !owner || owner->GetTypeId() != TYPEID_PLAYER || - owner->ToPlayer()->GetTeam() != player->GetTeam()) - { - return; - } - - Talk(SAY_MOJO, player); - - if (!_victimGUID.IsEmpty()) - if (Player* victim = ObjectAccessor::GetPlayer(*me, _victimGUID)) - victim->RemoveAura(SPELL_FEELING_FROGGY); - - _victimGUID = player->GetGUID(); - - DoCast(player, SPELL_FEELING_FROGGY, true); - DoCast(me, SPELL_SEDUCTION_VISUAL, true); - me->GetMotionMaster()->MoveFollow(player, 0.0f, 0.0f); - } - - private: - ObjectGuid _victimGUID; - }; - - CreatureAI* GetAI(Creature* creature) const override - { - return new npc_pet_gen_mojoAI(creature); - } -}; - enum SoulTrader { SAY_SOUL_TRADER_INTRO = 0, @@ -218,6 +154,5 @@ struct npc_pet_gen_soul_trader : public ScriptedAI void AddSC_generic_pet_scripts() { new npc_pet_gen_pandaren_monk(); - new npc_pet_gen_mojo(); RegisterCreatureAI(npc_pet_gen_soul_trader); } -- cgit v1.2.3