sindoring/moonwell-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(Script/Dalaran): Minigob Manabonk (#19244)

Browse Source 
* refactor(Script/Dalaran): Minigob Manabonk

* closes https://github.com/azerothcore/azerothcore-wotlk/issues/16841

* Update src/server/scripts/Northrend/zone_dalaran.cpp
This commit is contained in:
Kitzunu
2024-07-04 19:28:10 +02:00
committed by GitHub
parent 6031ae2eb9
commit e8f7d70ee0
1 changed files with 93 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/Northrend/zone_dalaran.cpp
+45 -41
View File
@@ -20,6 +20,7 @@
#include "Player.h" #include "Player.h"
#include "ScriptedCreature.h" #include "ScriptedCreature.h"
#include "ScriptedGossip.h" #include "ScriptedGossip.h"
#include "TaskScheduler.h"
#include "World.h" #include "World.h"
// Ours // Ours
@@ -506,23 +507,20 @@ enum MinigobData
SPELL_IMPROVED_BLINK = 61995, SPELL_IMPROVED_BLINK = 61995,
EVENT_SELECT_TARGET = 1, EVENT_SELECT_TARGET = 1,
EVENT_BLINK = 2, EVENT_POLYMORPH = 2,
EVENT_DESPAWN_VISUAL = 3, EVENT_LAUGH = 3,
EVENT_DESPAWN = 4, EVENT_MOVE = 4,
EVENT_DESPAWN_VISUAL = 5,
EVENT_DESPAWN = 6,
MAIL_MINIGOB_ENTRY = 264, MAIL_MINIGOB_ENTRY = 264,
MAIL_DELIVER_DELAY_MIN = 5 * MINUTE, MAIL_DELIVER_DELAY_MIN = 5 * MINUTE,
MAIL_DELIVER_DELAY_MAX = 15 * MINUTE MAIL_DELIVER_DELAY_MAX = 15 * MINUTE
}; };
class npc_minigob_manabonk : public CreatureScript struct npc_minigob_manabonk : public ScriptedAI
{ {
public: npc_minigob_manabonk(Creature* creature) : ScriptedAI(creature)
npc_minigob_manabonk() : CreatureScript("npc_minigob_manabonk") {}
struct npc_minigob_manabonkAI : public ScriptedAI
{
npc_minigob_manabonkAI(Creature* creature) : ScriptedAI(creature)
{ {
me->setActive(true); me->setActive(true);
} }
@@ -530,23 +528,23 @@ public:
void Reset() override void Reset() override
{ {
me->SetVisible(false); me->SetVisible(false);
events.ScheduleEvent(EVENT_SELECT_TARGET, IN_MILLISECONDS); events.ScheduleEvent(EVENT_SELECT_TARGET, 1s);
} }
Player* SelectTargetInDalaran() Player* SelectTargetInDalaran()
{ {
std::list<Player*> PlayerInDalaranList; std::list<Player*> playerInDalaranList;
PlayerInDalaranList.clear(); playerInDalaranList.clear();
Map::PlayerList const& players = me->GetMap()->GetPlayers(); me->GetMap()->DoForAllPlayers([&](Player* player)
for (Map::PlayerList::const_iterator itr = players.begin(); itr != players.end(); ++itr) {
if (Player* player = itr->GetSource()->ToPlayer())
if (player->GetZoneId() == ZONE_DALARAN && !player->IsFlying() && !player->IsMounted() && !player->IsGameMaster()) if (player->GetZoneId() == ZONE_DALARAN && !player->IsFlying() && !player->IsMounted() && !player->IsGameMaster())
PlayerInDalaranList.push_back(player); playerInDalaranList.push_back(player);
});
if (PlayerInDalaranList.empty()) if (playerInDalaranList.empty())
return nullptr; return nullptr;
return Acore::Containers::SelectRandomContainerElement(PlayerInDalaranList); return Acore::Containers::SelectRandomContainerElement(playerInDalaranList);
} }
void SendMailToPlayer(Player* player) void SendMailToPlayer(Player* player)
@@ -570,26 +568,41 @@ public:
{ {
case EVENT_SELECT_TARGET: case EVENT_SELECT_TARGET:
me->SetVisible(true); me->SetVisible(true);
DoCast(me, SPELL_TELEPORT_VISUAL); DoCastSelf(SPELL_TELEPORT_VISUAL);
if (Player* player = SelectTargetInDalaran()) if (Player* player = SelectTargetInDalaran())
{ {
me->NearTeleportTo(player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), 0.0f); playerGUID = player->GetGUID();
Position pos = player->GetPosition();
me->NearTeleportTo(pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), pos.GetOrientation());
me->GetMotionMaster()->MoveRandom(10);
}
events.ScheduleEvent(EVENT_POLYMORPH, 30s);
break;
case EVENT_POLYMORPH:
if (Player* player = ObjectAccessor::GetPlayer(*me, playerGUID))
{
DoCast(player, SPELL_MANABONKED); DoCast(player, SPELL_MANABONKED);
SendMailToPlayer(player); SendMailToPlayer(player);
} }
events.ScheduleEvent(EVENT_BLINK, 3ms); else
me->DespawnOrUnsummon();
events.ScheduleEvent(EVENT_LAUGH, 2s);
break; break;
case EVENT_BLINK: case EVENT_LAUGH:
me->GetMotionMaster()->MoveIdle();
me->HandleEmoteCommand(EMOTE_ONESHOT_LAUGH_NO_SHEATHE);
events.ScheduleEvent(EVENT_MOVE, 4s);
break;
case EVENT_MOVE:
{ {
DoCast(me, SPELL_IMPROVED_BLINK);
Position pos = me->GetRandomNearPosition((urand(15, 40))); Position pos = me->GetRandomNearPosition((urand(15, 40)));
me->GetMotionMaster()->MovePoint(0, pos.m_positionX, pos.m_positionY, pos.m_positionZ); me->GetMotionMaster()->MovePoint(0, pos.GetPositionX(), pos.GetPositionY(), pos.GetPositionZ(), true);
events.ScheduleEvent(EVENT_DESPAWN, 3ms);
events.ScheduleEvent(EVENT_DESPAWN_VISUAL, 3ms);
break;
} }
events.ScheduleEvent(EVENT_DESPAWN_VISUAL, 3s);
events.ScheduleEvent(EVENT_DESPAWN, 4s);
break;
case EVENT_DESPAWN_VISUAL: case EVENT_DESPAWN_VISUAL:
DoCast(me, SPELL_TELEPORT_VISUAL); DoCastSelf(SPELL_IMPROVED_BLINK);
break; break;
case EVENT_DESPAWN: case EVENT_DESPAWN:
me->DespawnOrUnsummon(); me->DespawnOrUnsummon();
@@ -599,15 +612,8 @@ public:
} }
} }
} }
private:
private: ObjectGuid playerGUID;
EventMap events;
};
CreatureAI* GetAI(Creature* creature) const override
{
return new npc_minigob_manabonkAI(creature);
}
}; };
class npc_dalaran_mage : public CreatureScript class npc_dalaran_mage : public CreatureScript
@@ -861,8 +867,6 @@ void AddSC_dalaran()
new npc_dalaran_mage(); new npc_dalaran_mage();
new npc_dalaran_warrior(); new npc_dalaran_warrior();
RegisterCreatureAI(npc_cosmetic_toy_plane); RegisterCreatureAI(npc_cosmetic_toy_plane);
// theirs
new npc_mageguard_dalaran(); new npc_mageguard_dalaran();
new npc_minigob_manabonk(); RegisterCreatureAI(npc_minigob_manabonk);
} }