diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index ba4a2059fb..350cc8cc15 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -342,6 +342,7 @@ public class Blocks implements ContentList{ sandWall = new StaticWall("sand-wall"){{ variants = 2; + sandWater.asFloor().wall = this; }}; saltWall = new StaticWall("salt-wall"); diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index dd68cf2990..d258fdfed7 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -38,6 +38,9 @@ public class UnitTypes implements ContentList{ //air + building + mining + payload public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType mega; + //air + building + payload TODO implement + public static @EntityDef({Unitc.class, Builderc.class, Minerc.class, Payloadc.class}) UnitType quad, oct; + //air + building + mining public static @EntityDef({Unitc.class, Builderc.class, Minerc.class}) UnitType alpha, beta, gamma; diff --git a/core/src/mindustry/world/Tile.java b/core/src/mindustry/world/Tile.java index 1eb8d8a729..f3b4526ad8 100644 --- a/core/src/mindustry/world/Tile.java +++ b/core/src/mindustry/world/Tile.java @@ -8,7 +8,6 @@ import arc.scene.ui.*; import arc.scene.ui.layout.*; import arc.struct.*; import arc.util.ArcAnnotate.*; -import arc.util.*; import mindustry.annotations.Annotations.*; import mindustry.content.*; import mindustry.game.*; @@ -92,7 +91,6 @@ public class Tile implements Position, QuadTreeObject, Displayable{ if(y >= cy + 1) return 3; } }else{ //need offsets here - Log.info(""); if(Math.abs(x - cx + 0.5f) > Math.abs(y - cy + 0.5f)){ if(x+0.5f <= cx - 1) return 0; if(x+0.5f >= cx + 1) return 2;