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

Fixed turrets ignoring nearby targets with increased tracking range

Browse Source
This commit is contained in:
Anuken
2024-09-24 22:09:46 -04:00
parent d6912b10d1
commit cbc4797f4e
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/mindustry/world/blocks/defense/turrets/Turret.java
View File

@@ -482,13 +482,21 @@ public class Turret extends ReloadTurret{
return targetHealing && hasAmmo() && peekAmmo().collidesTeam && peekAmmo().heals(); return targetHealing && hasAmmo() && peekAmmo().collidesTeam && peekAmmo().heals();
} }
protected void findTarget(){ protected Posc findEnemy(float range){
float range = trackingRange();
if(targetAir && !targetGround){ if(targetAir && !targetGround){
target = Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded() && unitFilter.get(e), unitSort); return Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded() && unitFilter.get(e), unitSort);
}else{ }else{
target = Units.bestTarget(team, x, y, range, e -> !e.dead() && unitFilter.get(e) && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> targetGround && buildingFilter.get(b), unitSort); return Units.bestTarget(team, x, y, range, e -> !e.dead() && unitFilter.get(e) && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> targetGround && buildingFilter.get(b), unitSort);
}
}
protected void findTarget(){
float trackRange = trackingRange(), range = range();
target = findEnemy(trackRange);
//find another target within the tracking range, but only if there's nothing else (always prioritize standard target)
if(!Mathf.equal(trackRange, range) && target == null){
target = findEnemy(trackRange);
} }
if(target == null && canHeal()){ if(target == null && canHeal()){