From 8f5f27755da2cd644171de388b826c86aea5efe3 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 21 Mar 2019 10:16:37 -0400 Subject: [PATCH] Bugfixes / Allow placing blocks in shallow liquids --- core/assets/maps/craters.mmap | Bin 11701 -> 12955 bytes core/assets/maps/ruinousShores.mmap | Bin 18361 -> 18340 bytes .../io/anuke/mindustry/editor/EditorTile.java | 8 ++++++ .../mindustry/editor/WaveInfoDialog.java | 4 +-- core/src/io/anuke/mindustry/io/MapIO.java | 16 ++++++------ .../mindustry/ui/fragments/HudFragment.java | 24 ++++++++---------- core/src/io/anuke/mindustry/world/Build.java | 12 ++++----- core/src/io/anuke/mindustry/world/Tile.java | 4 +-- .../anuke/mindustry/world/blocks/Floor.java | 3 +++ .../anuke/mindustry/server/ServerControl.java | 2 +- 10 files changed, 40 insertions(+), 33 deletions(-) diff --git a/core/assets/maps/craters.mmap b/core/assets/maps/craters.mmap index 92baaff531788b0c67a4a1ff26fe445e8af7f31a..0382c65d8465771bc111f38416c0ae3174bd9b7e 100644 GIT binary patch delta 12710 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 delta 11446 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 Qj$OT<^#9q5z2#X90DMnhI{*Lx diff --git a/core/assets/maps/ruinousShores.mmap b/core/assets/maps/ruinousShores.mmap index 861c13a1f6da4ed9a3b1b9ebcbdebc632a7b3199..8723b5daad051cb785174b904644996e95cd3139 100644 GIT binary patch delta 15906 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 z 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 z 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 W*`)jP&F#g^yUw5gZ|~XeeFy*_&M093 delta 15894 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 diff --git a/core/src/io/anuke/mindustry/editor/EditorTile.java b/core/src/io/anuke/mindustry/editor/EditorTile.java index b35ae191f6..5c9146e188 100644 --- a/core/src/io/anuke/mindustry/editor/EditorTile.java +++ b/core/src/io/anuke/mindustry/editor/EditorTile.java @@ -88,6 +88,14 @@ public class EditorTile extends Tile{ protected void changed(){ entity = null; + if(wall == null){ + wall = Blocks.air; + } + + if(floor == null){ + floor = (Floor)Blocks.air; + } + Block block = block(); if(block.hasEntity()){ diff --git a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java index 45eef72a81..39666616d3 100644 --- a/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java +++ b/core/src/io/anuke/mindustry/editor/WaveInfoDialog.java @@ -166,7 +166,7 @@ public class WaveInfoDialog extends FloatingDialog{ t.table(p -> { p.add("$waves.every").padRight(4); p.addField(group.spacing + "", TextFieldFilter.digitsOnly, text -> { - if(Strings.canParsePostiveInt(text)){ + if(Strings.canParsePostiveInt(text) && Strings.parseInt(text) > 0){ group.spacing = Strings.parseInt(text); updateWaves(); } @@ -228,7 +228,7 @@ public class WaveInfoDialog extends FloatingDialog{ dialog.hide(); buildGroups(); }).pad(2).margin(12f).fillX(); - if(++i % 2 == 0)dialog.cont.row(); + if(++i % 3 == 0)dialog.cont.row(); } dialog.show(); } diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index 6db9e18a2f..1f0e2de7fc 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -69,25 +69,25 @@ public class MapIO{ public static Pixmap generatePreview(Map map) throws IOException{ Time.mark(); - Pixmap floor = new Pixmap(map.width, map.height, Format.RGBA8888); - Pixmap wall = new Pixmap(map.width, map.height, Format.RGBA8888); + Pixmap floors = new Pixmap(map.width, map.height, Format.RGBA8888); + Pixmap walls = new Pixmap(map.width, map.height, Format.RGBA8888); int black = Color.rgba8888(Color.BLACK); CachedTile tile = new CachedTile(){ @Override public void setFloor(Floor type){ - floor.drawPixel(x, floor.getHeight() - 1 - y, colorFor(type, Blocks.air, Blocks.air, getTeam())); + floors.drawPixel(x, floors.getHeight() - 1 - y, colorFor(type, Blocks.air, Blocks.air, getTeam())); } @Override public void setOreByte(byte b){ - if(b != 0) floor.drawPixel(x, floor.getHeight() - 1 - y, colorFor(floor(), Blocks.air, content.block(b), getTeam())); + if(b != 0) floors.drawPixel(x, floors.getHeight() - 1 - y, colorFor(floor(), Blocks.air, content.block(b), getTeam())); } @Override protected void changed(){ super.changed(); int c = colorFor(Blocks.air, block(), Blocks.air, getTeam()); - if(c != black) wall.drawPixel(x, floor.getHeight() - 1 - y, c); + if(c != black) walls.drawPixel(x, floors.getHeight() - 1 - y, c); } }; readTiles(map, (x, y) -> { @@ -95,9 +95,9 @@ public class MapIO{ tile.y = (short)y; return tile; }); - floor.drawPixmap(wall, 0, 0); - wall.dispose(); - return floor; + floors.drawPixmap(walls, 0, 0); + walls.dispose(); + return floors; } public static Pixmap generatePreview(Tile[][] tiles){ diff --git a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java index 2727032970..883985349c 100644 --- a/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java +++ b/core/src/io/anuke/mindustry/ui/fragments/HudFragment.java @@ -16,13 +16,13 @@ import io.anuke.arc.scene.ui.ImageButton; import io.anuke.arc.scene.ui.TextButton; import io.anuke.arc.scene.ui.layout.Stack; import io.anuke.arc.scene.ui.layout.Table; +import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.scene.utils.Elements; import io.anuke.arc.util.Align; import io.anuke.arc.util.Scaling; import io.anuke.arc.util.Time; import io.anuke.arc.util.Tmp; import io.anuke.mindustry.core.GameState.State; -import io.anuke.mindustry.game.EventType.PlayEvent; import io.anuke.mindustry.game.EventType.StateChangeEvent; import io.anuke.mindustry.game.UnlockableContent; import io.anuke.mindustry.gen.Call; @@ -49,16 +49,6 @@ public class HudFragment extends Fragment{ private float coreAttackTime; private float lastCoreHP; private float coreAttackOpacity = 0f; - private Table goshDarnHeckingFlippedTableWhyDoesThisHappen; - - { - Events.on(PlayEvent.class, event -> { - if(goshDarnHeckingFlippedTableWhyDoesThisHappen != null){ - goshDarnHeckingFlippedTableWhyDoesThisHappen.invalidateHierarchy(); - goshDarnHeckingFlippedTableWhyDoesThisHappen.pack(); - } - }); - } public void build(Group parent){ @@ -67,8 +57,13 @@ public class HudFragment extends Fragment{ cont.top().left().visible(() -> !state.is(State.menu)); if(mobile){ - cont.table(select -> { - goshDarnHeckingFlippedTableWhyDoesThisHappen = select; + + { + Table select = new Table(){ + public float getPrefWidth(){ return Unit.dp.scl(dsize*4 + 3); } + public float getPrefHeight(){ return Unit.dp.scl(dsize); } + }; + select.left(); select.defaults().size(dsize).left(); @@ -111,7 +106,8 @@ public class HudFragment extends Fragment{ }).get(); select.addImage("blank").color(Pal.accent).width(3f).fillY(); - }).left(); + cont.add(select).prefSize(dsize*4 + 3, dsize).left(); + } cont.row(); cont.addImage("blank").height(3f).color(Pal.accent).fillX(); diff --git a/core/src/io/anuke/mindustry/world/Build.java b/core/src/io/anuke/mindustry/world/Build.java index 9d77ee82f5..65e056cad5 100644 --- a/core/src/io/anuke/mindustry/world/Build.java +++ b/core/src/io/anuke/mindustry/world/Build.java @@ -153,7 +153,7 @@ public class Build{ Tile other = world.tile(x + dx + offsetx, y + dy + offsety); if(other == null || (other.block() != Blocks.air && !other.block().alwaysReplace) || !other.floor().placeableOn || - (other.floor().isLiquid && !type.floating)){ + (other.floor().isDeep() && !type.floating)){ return false; } } @@ -162,7 +162,7 @@ public class Build{ }else{ return tile.interactable(team) && contactsGround(tile.x, tile.y, type) - && (!tile.floor().isLiquid || type.floating) + && (!tile.floor().isDeep() || type.floating) && tile.floor().placeableOn && ((type.canReplace(tile.block()) && !(type == tile.block() && rotation == tile.getRotation() && type.rotate)) || tile.block().alwaysReplace || tile.block() == Blocks.air) @@ -174,19 +174,19 @@ public class Build{ if(block.isMultiblock()){ for(Point2 point : Edges.getInsideEdges(block.size)){ Tile tile = world.tile(x + point.x, y + point.y); - if(tile != null && !tile.floor().isLiquid) return true; + if(tile != null && !tile.floor().isDeep()) return true; } for(Point2 point : Edges.getEdges(block.size)){ Tile tile = world.tile(x + point.x, y + point.y); - if(tile != null && !tile.floor().isLiquid) return true; + if(tile != null && !tile.floor().isDeep()) return true; } }else{ for(Point2 point : Geometry.d4){ Tile tile = world.tile(x + point.x, y + point.y); - if(tile != null && !tile.floor().isLiquid) return true; + if(tile != null && !tile.floor().isDeep()) return true; } - return world.tile(x, y) != null && !world.tile(x, y).floor().isLiquid; + return world.tile(x, y) != null && !world.tile(x, y).floor().isDeep(); } return false; } diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 6bd1f201a3..6fd2165d67 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -34,8 +34,8 @@ public class Tile implements Position, TargetTrait{ /** Tile entity, usually null. */ public TileEntity entity; public short x, y; - private Block wall; - private Floor floor; + protected Block wall; + protected Floor floor; /** Rotation, 0-3. Also used to store offload location, in which case it can be any number. */ private byte rotation; /** Team ordinal. */ diff --git a/core/src/io/anuke/mindustry/world/blocks/Floor.java b/core/src/io/anuke/mindustry/world/blocks/Floor.java index 023224df81..a6cab7a61d 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Floor.java +++ b/core/src/io/anuke/mindustry/world/blocks/Floor.java @@ -118,6 +118,9 @@ public class Floor extends Block{ } } + public boolean isDeep(){ + return drownTime > 0; + } public void drawNonLayer(Tile tile){ Mathf.random.setSeed(tile.pos()); diff --git a/server/src/io/anuke/mindustry/server/ServerControl.java b/server/src/io/anuke/mindustry/server/ServerControl.java index b93eb19721..ca3d3a68d9 100644 --- a/server/src/io/anuke/mindustry/server/ServerControl.java +++ b/server/src/io/anuke/mindustry/server/ServerControl.java @@ -198,7 +198,7 @@ public class ServerControl implements ApplicationListener{ if(lastTask != null) lastTask.cancel(); - Map result = world.maps.all().find(map -> map.name().equalsIgnoreCase(arg[0])); + Map result = world.maps.all().find(map -> map.name().equalsIgnoreCase(arg[0].replace('_', ' '))); if(result == null){ err("No map with name &y'{0}'&lr found.", arg[0]);