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

If a building and unit are found within the line, target the closer one. (#4646)

Browse Source
This commit is contained in:
MEEP of Faith
2021-02-10 06:16:49 -08:00
committed by GitHub
parent 54c406f83d
commit cbf30c599b
1 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/mindustry/entities/Damage.java
View File

@@ -214,10 +214,10 @@ public class Damage{
*/
public static Healthc linecast(Bullet hitter, float x, float y, float angle, float length){
tr.trns(angle, length);
tmpBuilding = null;
if(hitter.type.collidesGround){
tmpBuilding = null;
world.raycastEachWorld(x, y, x + tr.x, y + tr.y, (cx, cy) -> {
Building tile = world.build(cx, cy);
if(tile != null && tile.team != hitter.team){
@@ -226,8 +226,6 @@ public class Damage{
}
return false;
});
if(tmpBuilding != null) return tmpBuilding;
}
rect.setPosition(x, y).setSize(tr.x, tr.y);
@@ -271,6 +269,14 @@ public class Damage{
Units.nearbyEnemies(hitter.team, rect, cons);
if(tmpBuilding != null && tmpUnit != null){
float bDst = Mathf.dst2(x, y, tmpBuilding.getX(), tmpBuilding.getY());
float uDst = Mathf.dst2(x, y, tmpUnit.getX(), tmpUnit.getY());
if(uDst <= bDst) return tmpUnit;
if(bDst > uDst) return tmpBuilding;
}else if(tmpBuilding != null && tmpUnit == null){
return tmpBuilding;
}
return tmpUnit;
}