diff --git a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png index da724496a5..3f0625749b 100644 Binary files a/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png and b/core/assets-raw/sprites/blocks/environment/ore-crystal-thorium1.png differ diff --git a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png index 608da574c0..33cad73f65 100644 Binary files a/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png and b/core/assets-raw/sprites/blocks/props/vibrant-crystal-cluster1.png differ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index e4e9cfdd29..3d70796424 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2705,7 +2705,7 @@ public class UnitTypes{ mineTier = 1; buildSpeed = 0.8f; drag = 0.06f; - speed = 2.5f; + speed = 2.9f; rotateSpeed = 9f; accel = 0.1f; itemCapacity = 40; @@ -2763,7 +2763,7 @@ public class UnitTypes{ mineTier = 2; buildSpeed = 1.4f; drag = 0.06f; - speed = 2.6f; + speed = 2.8f; rotateSpeed = 5f; accel = 0.11f; itemCapacity = 70; diff --git a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java index f4a2b6a4f2..0e1b60514b 100644 --- a/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java +++ b/core/src/mindustry/maps/planet/ErekirPlanetGenerator.java @@ -192,7 +192,6 @@ public class ErekirPlanetGenerator extends PlanetGenerator{ pass((x, y) -> { if(block != Blocks.air){ - //TODO use d4 instead of d8 for no out-of-reach ores? if(nearAir(x, y)){ if(block == Blocks.carbonWall && noise(x + 78, y, 4, 0.7f, 33f, 1f) > 0.52f){ block = Blocks.graphiticWall; diff --git a/core/src/mindustry/ui/fragments/PlacementFragment.java b/core/src/mindustry/ui/fragments/PlacementFragment.java index 6579accef4..68b56afb4b 100644 --- a/core/src/mindustry/ui/fragments/PlacementFragment.java +++ b/core/src/mindustry/ui/fragments/PlacementFragment.java @@ -476,7 +476,7 @@ public class PlacementFragment extends Fragment{ } //if the tile has a drop, display the drop - if(hoverTile.drop() != null || hoverTile.wallDrop() != null){ + if(hoverTile.drop() != null || hoverTile.wallDrop() != null || hoverTile.floor().liquidDrop != null){ return hoverTile; } } diff --git a/core/src/mindustry/world/blocks/environment/Floor.java b/core/src/mindustry/world/blocks/environment/Floor.java index ec07d11326..2127c65e3e 100644 --- a/core/src/mindustry/world/blocks/environment/Floor.java +++ b/core/src/mindustry/world/blocks/environment/Floor.java @@ -129,6 +129,16 @@ public class Floor extends Block{ } } + @Override + public TextureRegion getDisplayIcon(Tile tile){ + return liquidDrop == null ? super.getDisplayIcon(tile) : liquidDrop.uiIcon; + } + + @Override + public String getDisplayName(Tile tile){ + return liquidDrop == null ? super.getDisplayName(tile) : liquidDrop.localizedName; + } + @Override public void createIcons(MultiPacker packer){ super.createIcons(packer);