Inna/CypherCore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed NearestAttackableUnitInObjectRangeCheck to only consider neutral units as targets if they are already in combat with target searching unit

Browse Source
This commit is contained in:
hondacrx
2017-09-20 00:28:17 -04:00
parent 1b9bf99d8c
commit 87e0b1a603
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Game/AI/CoreAI/TotemAI.cs
+1 -1
View File
@@ -58,7 +58,7 @@ namespace Game.AI
me.IsFriendlyTo(victim) || !me.CanSeeOrDetect(victim)) me.IsFriendlyTo(victim) || !me.CanSeeOrDetect(victim))
{ {
victim = null; victim = null;
var u_check = new NearestAttackableUnitInObjectRangeCheck(me, me, max_range); var u_check = new NearestAttackableUnitInObjectRangeCheck(me, me.GetCharmerOrOwnerOrSelf(), max_range);
var checker = new UnitLastSearcher(me, u_check); var checker = new UnitLastSearcher(me, u_check);
Cell.VisitAllObjects(me, checker, max_range); Cell.VisitAllObjects(me, checker, max_range);
victim = checker.GetTarget(); victim = checker.GetTarget();
Game/Maps/GridNotifiers.cs
+6 -2
View File
@@ -1582,7 +1582,7 @@ namespace Game.Maps
public bool Invoke(Unit u) public bool Invoke(Unit u)
{ {
if (u.isTargetableForAttack() && i_obj.IsWithinDistInMap(u, i_range) && if (u.isTargetableForAttack() && i_obj.IsWithinDistInMap(u, i_range) &&
!i_funit.IsFriendlyTo(u) && i_funit.CanSeeOrDetect(u)) (i_funit.IsInCombatWith(u) || i_funit.IsHostileTo(u)) && i_obj.CanSeeOrDetect(u))
{ {
i_range = i_obj.GetDistance(u); // use found unit range as new range limit for next check i_range = i_obj.GetDistance(u); // use found unit range as new range limit for next check
return true; return true;
@@ -1606,7 +1606,11 @@ namespace Game.Maps
i_range = range; i_range = range;
if (_spellInfo == null) if (_spellInfo == null)
_spellInfo = i_obj.ToDynamicObject().GetSpellInfo(); {
DynamicObject dynObj = i_obj.ToDynamicObject();
if (dynObj)
_spellInfo = dynObj.GetSpellInfo();
}
} }
public bool Invoke(Unit u) public bool Invoke(Unit u)