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

refactor(Core/AI): rename FarthestTargetSelector to RangeSelector (#22026)

Browse Source
This commit is contained in:
Tereneckla
2025-06-24 21:09:38 +00:00
committed by GitHub
parent f910147296
commit 0810fa076a
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/server/game/AI/CoreAI/UnitAI.h
+3 -2
View File
@@ -165,9 +165,10 @@ struct PowerUsersSelector : public Acore::unary_function<Unit*, bool>
} }
}; };
struct FarthestTargetSelector : public Acore::unary_function<Unit*, bool> // Simple selector based on range and Los
struct RangeSelector : public Acore::unary_function<Unit*, bool>
{ {
FarthestTargetSelector(Unit const* unit, float maxDist, bool playerOnly, bool inLos, float minDist = 0.f) : _me(unit), _minDist(minDist), _maxDist(maxDist), _playerOnly(playerOnly), _inLos(inLos) {} RangeSelector(Unit const* unit, float maxDist, bool playerOnly, bool inLos, float minDist = 0.f) : _me(unit), _minDist(minDist), _maxDist(maxDist), _playerOnly(playerOnly), _inLos(inLos) {}
bool operator()(Unit const* target) const bool operator()(Unit const* target) const
{ {
src/server/game/AI/SmartScripts/SmartScript.cpp
+1 -1
View File
@@ -3515,7 +3515,7 @@ void SmartScript::GetTargets(ObjectVector& targets, SmartScriptHolder const& e,
case SMART_TARGET_FARTHEST: case SMART_TARGET_FARTHEST:
if (me) if (me)
{ {
if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinDistance, 0, FarthestTargetSelector(me, e.target.farthest.maxDist, e.target.farthest.playerOnly, e.target.farthest.isInLos, e.target.farthest.minDist))) if (Unit* u = me->AI()->SelectTarget(SelectTargetMethod::MinDistance, 0, RangeSelector(me, e.target.farthest.maxDist, e.target.farthest.playerOnly, e.target.farthest.isInLos, e.target.farthest.minDist)))
targets.push_back(u); targets.push_back(u);
} }
break; break;
src/server/scripts/EasternKingdoms/Karazhan/boss_servant_quarters.cpp
+1 -1
View File
@@ -74,7 +74,7 @@ struct boss_servant_quarters : public BossAI
context.Repeat(12s, 18s); context.Repeat(12s, 18s);
}).Schedule(10s, [this](TaskContext context) }).Schedule(10s, [this](TaskContext context)
{ {
if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, FarthestTargetSelector(me, 40.0f, false, true))) if (Unit* target = SelectTarget(SelectTargetMethod::MinDistance, 0, RangeSelector(me, 40.0f, false, true)))
{ {
me->CastSpell(target, SPELL_DIVE); me->CastSpell(target, SPELL_DIVE);
} }
src/server/scripts/EasternKingdoms/SunwellPlateau/boss_muru.cpp
+1 -1
View File
@@ -213,7 +213,7 @@ struct npc_dark_fiend : public ScriptedAI
Unit* target = nullptr; Unit* target = nullptr;
if (InstanceScript* instance = me->GetInstanceScript()) if (InstanceScript* instance = me->GetInstanceScript())
if (Creature* muru = instance->GetCreature(DATA_MURU)) if (Creature* muru = instance->GetCreature(DATA_MURU))
target = muru->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, FarthestTargetSelector(me, 50.0f, true, true)); target = muru->GetAI()->SelectTarget(SelectTargetMethod::Random, 0, RangeSelector(me, 50.0f, true, true));
if (target) if (target)
{ {