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

fix(Scripts/ZulAman): Scout's hut search should ignore the world trigger near Jan'alai (#21113)

Browse Source
This commit is contained in:
Jelle Meeus
2025-01-07 18:06:15 +01:00
committed by GitHub
parent b373df9b3d
commit cbfeb3edbe
1 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/scripts/EasternKingdoms/ZulAman/zulaman.cpp
+14 -18
View File
@@ -682,22 +682,6 @@ private:
SummonList _summons; SummonList _summons;
}; };
struct WorldTriggerHutPred
{
bool operator()(Creature* trigger) const
{
return trigger->GetOrientation() > 2.7f || (trigger->GetOrientation() < 2.7f && 1270.0f < trigger->GetPositionY() && trigger->GetPositionY() < 1280.0f);
}
};
struct WorldTriggerDrumPred
{
bool operator()(Creature* trigger) const
{
return !WorldTriggerHutPred()(trigger);
}
};
enum AmanishiScout enum AmanishiScout
{ {
NPC_WORLD_TRIGGER = 22515, NPC_WORLD_TRIGGER = 22515,
@@ -708,6 +692,18 @@ enum AmanishiScout
SPELL_SHOOT = 16496 SPELL_SHOOT = 16496
}; };
inline bool IsHut(Creature* trigger)
{
return trigger->GetPositionX() < -90.0f // South of Jan'alai area
&& ((trigger->GetOrientation() > 2.7f) || (trigger->GetOrientation() < 2.7f && 1270.0f < trigger->GetPositionY() && trigger->GetPositionY() < 1280.0f));
}
inline bool IsDrum(Creature* trigger)
{
return trigger->GetPositionX() < -90.0f // South of Jan'alai area
&& !IsHut(trigger);
}
struct npc_amanishi_scout : public ScriptedAI struct npc_amanishi_scout : public ScriptedAI
{ {
npc_amanishi_scout(Creature* creature) : ScriptedAI(creature) { } npc_amanishi_scout(Creature* creature) : ScriptedAI(creature) { }
@@ -725,7 +721,7 @@ struct npc_amanishi_scout : public ScriptedAI
// Move to Drum // Move to Drum
std::list<Creature*> triggers; std::list<Creature*> triggers;
GetCreatureListWithEntryInGrid(triggers, me, NPC_WORLD_TRIGGER, 50.0f); GetCreatureListWithEntryInGrid(triggers, me, NPC_WORLD_TRIGGER, 50.0f);
triggers.remove_if(WorldTriggerHutPred()); triggers.remove_if([](Creature* trigger) {return !IsDrum(trigger);});
triggers.sort(Acore::ObjectDistanceOrderPred(me)); triggers.sort(Acore::ObjectDistanceOrderPred(me));
if (!triggers.empty()) if (!triggers.empty())
{ {
@@ -826,7 +822,7 @@ class spell_summon_amanishi_sentries : public SpellScript
{ {
std::list<Creature*> triggers; std::list<Creature*> triggers;
GetCreatureListWithEntryInGrid(triggers, GetHitUnit(), NPC_WORLD_TRIGGER, 50.0f); GetCreatureListWithEntryInGrid(triggers, GetHitUnit(), NPC_WORLD_TRIGGER, 50.0f);
triggers.remove_if(WorldTriggerDrumPred()); triggers.remove_if([](Creature* trigger) {return !IsHut(trigger);});
if (triggers.empty()) if (triggers.empty())
return; return;
Creature* trigger = Acore::Containers::SelectRandomContainerElement(triggers); Creature* trigger = Acore::Containers::SelectRandomContainerElement(triggers);