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

Cleanup & control fixes

Browse Source
This commit is contained in:
Anuken
2022-02-09 19:58:08 -05:00
parent e0b3003c95
commit 4278c057b4
10 changed files with 30 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/mindustry/world/blocks/defense/turrets/Turret.java
+3 -2
View File
@@ -103,6 +103,7 @@ public class Turret extends ReloadTurret{
public boolean playerControllable = true;
public boolean displayAmmoMultiplier = true;
public Sortf unitSort = UnitSorts.closest;
public Boolf<Unit> unitFilter = u -> true;
public DrawBlock draw = new DrawTurret();
@@ -419,9 +420,9 @@ public class Turret extends ReloadTurret{
float range = range();
if(targetAir && !targetGround){
target = Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded(), unitSort);
target = Units.bestEnemy(team, x, y, range, e -> !e.dead() && !e.isGrounded() && unitFilter.get(e), unitSort);
}else{
target = Units.bestTarget(team, x, y, range, e -> !e.dead() && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> targetGround, unitSort);
target = Units.bestTarget(team, x, y, range, e -> !e.dead() && unitFilter.get(e) && (e.isGrounded() || targetAir) && (!e.isGrounded() || targetGround), b -> targetGround, unitSort);
if(target == null && canHeal()){
target = Units.findAllyTile(team, x, y, range, b -> b.damaged() && b != this);