More branch merging

2021-10-14 20:58:03 -04:00
parent ad1c75d050
commit 6b59c1cd83
108 changed files with 1018 additions and 380 deletions
@@ -50,6 +50,7 @@ public class Pathfinder implements Runnable{

        //legs
        (team, tile) -> PathTile.legSolid(tile) ? impassable : 1 +
+            (PathTile.deep(tile) ? 6000 : 0) + //leg units can now drown
            (PathTile.solid(tile) ? 5 : 0),

        //water