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

Revert "remove nearGround in favor of !nearLiquid"

Browse Source 
This reverts commit 8751e77876.
This commit is contained in:
LeoDog896
2020-09-30 12:56:43 -04:00
parent 8751e77876
commit 49db761730
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/mindustry/ai/Pathfinder.java
View File

@@ -103,13 +103,15 @@ public class Pathfinder implements Runnable{
/** Packs a tile into its internal representation. */ /** Packs a tile into its internal representation. */
private int packTile(Tile tile){ private int packTile(Tile tile){
boolean nearLiquid = false, nearSolid = false; //TODO nearGround is just the inverse of nearLiquid?
boolean nearLiquid = false, nearSolid = false, nearGround = false;
for(int i = 0; i < 4; i++){ for(int i = 0; i < 4; i++){
Tile other = tile.getNearby(i); Tile other = tile.getNearby(i);
if(other != null){ if(other != null){
if(other.floor().isLiquid) nearLiquid = true; if(other.floor().isLiquid) nearLiquid = true;
if(other.solid()) nearSolid = true; if(other.solid()) nearSolid = true;
if(!other.floor().isLiquid) nearGround = true;
} }
} }
@@ -120,7 +122,7 @@ public class Pathfinder implements Runnable{
tile.floor().isLiquid, tile.floor().isLiquid,
tile.staticDarkness() >= 2, tile.staticDarkness() >= 2,
nearLiquid, nearLiquid,
!nearLiquid, // means its near the ground nearGround,
nearSolid, nearSolid,
tile.floor().isDeep(), tile.floor().isDeep(),
tile.floor().damageTaken > 0.00001f tile.floor().damageTaken > 0.00001f