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

Merge pull request #2725 from LeoDog896/master

Browse Source 
More sort and target options
This commit is contained in:
Anuken
2020-09-26 22:27:05 -04:00
committed by GitHub
parent 7b98628084 35e4f696aa
commit 285f733b61
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/logic/RadarSort.java
View File

@@ -6,6 +6,8 @@ import mindustry.gen.*;
public enum RadarSort{ public enum RadarSort{
distance((pos, other) -> -pos.dst2(other)), distance((pos, other) -> -pos.dst2(other)),
health((pos, other) -> other.health()), health((pos, other) -> other.health()),
shield((pos, other) -> other.shield()),
armor((pos, other) -> other.armor()),
maxHealth((pos, other) -> other.maxHealth()); maxHealth((pos, other) -> other.maxHealth());
public final RadarSortFunc func; public final RadarSortFunc func;
@@ -17,6 +19,6 @@ public enum RadarSort{
} }
public interface RadarSortFunc{ public interface RadarSortFunc{
float get(Position pos, Healthc other); float get(Position pos, Unit other);
} }
} }

1
core/src/mindustry/logic/RadarTarget.java
View File

@@ -8,6 +8,7 @@ public enum RadarTarget{
enemy((team, other) -> team != other.team), enemy((team, other) -> team != other.team),
ally((team, other) -> team == other.team), ally((team, other) -> team == other.team),
player((team, other) -> other.isPlayer()), player((team, other) -> other.isPlayer()),
attacker((pos, other) -> other.canShoot()),
flying((team, other) -> other.isFlying()), flying((team, other) -> other.isFlying()),
boss((team, other) -> other.isBoss()), boss((team, other) -> other.isBoss()),
ground((team, other) -> other.isGrounded()); ground((team, other) -> other.isGrounded());