Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed some commanded units not shooting

Browse Source
This commit is contained in:
Anuken
2022-09-30 11:22:52 -04:00
parent aace39955b
commit 8ae00e69cb
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/mindustry/ai/types/CommandAI.java
View File

@@ -78,7 +78,7 @@ public class CommandAI extends AIController{
updateVisuals(); updateVisuals();
//only autotarget if the unit supports it //only autotarget if the unit supports it
if(targetPos == null || unit.type.autoFindTarget){ if((targetPos == null || nearAttackTarget(unit.x, unit.y, unit.range())) || unit.type.autoFindTarget){
updateTargeting(); updateTargeting();
}else if(attackTarget == null){ }else if(attackTarget == null){
//if the unit does not have an attack target, is currently moving, and does not have autotargeting, stop attacking stuff //if the unit does not have an attack target, is currently moving, and does not have autotargeting, stop attacking stuff
@@ -205,7 +205,11 @@ public class CommandAI extends AIController{
@Override @Override
public Teamc findTarget(float x, float y, float range, boolean air, boolean ground){ public Teamc findTarget(float x, float y, float range, boolean air, boolean ground){
return attackTarget == null || !attackTarget.within(x, y, range + 3f + (attackTarget instanceof Sized s ? s.hitSize()/2f : 0f)) ? super.findTarget(x, y, range, air, ground) : attackTarget; return !nearAttackTarget(x, y, range) ? super.findTarget(x, y, range, air, ground) : attackTarget;
}
public boolean nearAttackTarget(float x, float y, float range){
return attackTarget != null && attackTarget.within(x, y, range + 3f + (attackTarget instanceof Sized s ? s.hitSize()/2f : 0f));
} }
@Override @Override