From e52965d0391d3703525195992a5fe5324c39fa22 Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 10 Jul 2019 09:55:31 -0400 Subject: [PATCH] Bugfixes --- .../sprites/mechs/ships/dart-ship.png | Bin 5585 -> 5622 bytes core/assets/maps/islands.msav | Bin 12710 -> 13084 bytes .../mindustry/editor/MapEditorDialog.java | 2 +- core/src/io/anuke/mindustry/io/MapIO.java | 22 ++++++++------ core/src/io/anuke/mindustry/maps/Maps.java | 27 ++++++++++++++++++ .../mindustry/ui/dialogs/FileChooser.java | 9 +++--- core/src/io/anuke/mindustry/world/Tile.java | 16 +---------- 7 files changed, 46 insertions(+), 30 deletions(-) diff --git a/core/assets-raw/sprites/mechs/ships/dart-ship.png b/core/assets-raw/sprites/mechs/ships/dart-ship.png index 47ac3ef5cce3d29fafce66121216428c3a4f3702..e9567d8ecd13d338a260e89d965d014b8fd6a516 100644 GIT binary patch delta 5572 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 diff --git a/core/assets/maps/islands.msav b/core/assets/maps/islands.msav index ce9a3baedc1dc1db37301498638bfcf70899ece0..c7fdff1001e6aab3cf4fcb745462dd50b397e8b8 100644 GIT binary patch literal 13084 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 literal 12710 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 diff --git a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java index af2f80a176..9e4bb3d46a 100644 --- a/core/src/io/anuke/mindustry/editor/MapEditorDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapEditorDialog.java @@ -383,9 +383,9 @@ public class MapEditorDialog extends Dialog implements Disposable{ Table tools = new Table().top(); ButtonGroup group = new ButtonGroup<>(); + Table[] lastTable = {null}; Consumer addTool = tool -> { - Table[] lastTable = {null}; ImageButton button = new ImageButton("icon-" + tool.name() + "-small", "clear-toggle"); button.clicked(() -> { diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index 8daf1a7e2a..8546f419bb 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -1,5 +1,6 @@ package io.anuke.mindustry.io; +import io.anuke.arc.collection.IntSet; import io.anuke.arc.collection.StringMap; import io.anuke.arc.files.FileHandle; import io.anuke.arc.graphics.Color; @@ -78,6 +79,7 @@ public class MapIO{ Pixmap walls = new Pixmap(map.width, map.height, Format.RGBA8888); int black = Color.rgba8888(Color.BLACK); int shade = Color.rgba8888(0f, 0f, 0f, 0.5f); + IntSet teams = new IntSet(); CachedTile tile = new CachedTile(){ @Override public void setBlock(Block type){ @@ -93,15 +95,7 @@ public class MapIO{ public void setTeam(Team team){ super.setTeam(team); if(block instanceof CoreBlock){ - if(team != defaultTeam){ - //map must have other team's cores - map.tags.put("othercore", "true"); - } - - if(team == waveTeam){ - //map must have default enemy team's core - map.tags.put("enemycore", "true"); - } + teams.add(team.ordinal()); } } }; @@ -131,6 +125,16 @@ public class MapIO{ } })); + if(teams.size > 1){ + //map must have other team's cores + map.tags.put("othercore", "true"); + } + + if(teams.contains(waveTeam.ordinal())){ + //map must have default enemy team's core + map.tags.put("enemycore", "true"); + } + floors.drawPixmap(walls, 0, 0); walls.dispose(); return floors; diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index 4a47e20f38..646f961bdb 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -10,6 +10,8 @@ import io.anuke.arc.util.serialization.Json; import io.anuke.mindustry.game.SpawnGroup; import io.anuke.mindustry.io.LegacyMapIO; import io.anuke.mindustry.io.MapIO; +import io.anuke.mindustry.world.Tile; +import io.anuke.mindustry.world.blocks.storage.CoreBlock; import java.io.IOException; import java.io.StringWriter; @@ -108,6 +110,31 @@ public class Maps implements Disposable{ MapIO.writeMap(file, map); if(!headless){ + //by default, it does not have an enemy core or any other cores + map.tags.put("enemycore", "false"); + map.tags.put("othercore", "false"); + IntSet teams = new IntSet(); + + for(int x = 0; x < map.width; x++){ + for(int y = 0; y < map.height; y++){ + Tile tile = world.getTiles()[x][y]; + + if(tile.block() instanceof CoreBlock){ + teams.add(tile.getTeamID()); + } + } + } + + if(teams.size > 1){ + //map must have other team's cores + map.tags.put("othercore", "true"); + } + + if(teams.contains(waveTeam.ordinal())){ + //map must have default enemy team's core + map.tags.put("enemycore", "true"); + } + map.texture = new Texture(MapIO.generatePreview(world.getTiles())); } maps.add(map); diff --git a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java index be730d028e..d76a25a981 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/FileChooser.java @@ -12,12 +12,11 @@ import io.anuke.arc.scene.ui.layout.Table; import io.anuke.arc.scene.ui.layout.Unit; import io.anuke.arc.util.*; import io.anuke.arc.util.pooling.Pools; -import io.anuke.mindustry.Vars; import io.anuke.mindustry.core.Platform; import java.util.Arrays; -import static io.anuke.mindustry.Vars.iconsize; +import static io.anuke.mindustry.Vars.*; public class FileChooser extends FloatingDialog{ private static final FileHandle homeDirectory = Core.files.absolute(OS.isMac ? OS.getProperty("user.home") + "/Downloads/" : Core.files.getExternalStoragePath()); @@ -35,9 +34,9 @@ public class FileChooser extends FloatingDialog{ private int lastWidth = Core.graphics.getWidth(), lastHeight = Core.graphics.getHeight(); public static final Predicate pngFiles = str -> str.equals("png"); - public static final Predicate anyMapFiles = str -> str.equals(Vars.oldMapExtension) || str.equals(Vars.mapExtension); - public static final Predicate mapFiles = str -> str.equals(Vars.mapExtension); - public static final Predicate saveFiles = str -> str.equals(Vars.saveExtension); + public static final Predicate anyMapFiles = str -> str.equals(oldMapExtension) || str.equals(mapExtension); + public static final Predicate mapFiles = str -> str.equals(mapExtension); + public static final Predicate saveFiles = str -> str.equals(saveExtension); public FileChooser(String title, Predicate filter, boolean open, Consumer result){ super(title); diff --git a/core/src/io/anuke/mindustry/world/Tile.java b/core/src/io/anuke/mindustry/world/Tile.java index 618d3cfc97..5d158a8237 100644 --- a/core/src/io/anuke/mindustry/world/Tile.java +++ b/core/src/io/anuke/mindustry/world/Tile.java @@ -279,20 +279,6 @@ public class Tile implements Position, TargetTrait{ return tmpArray; } - /** Returns the block the multiblock is linked to, or null if it is not linked to any block. - public Tile getLinked(){ - if(!isLinked()){ - return null; - }else{ - return world.tile(x + linkX(rotation), y + linkY(rotation)); - } - } - - public Tile target(){ - Tile link = getLinked(); - return link == null ? this : link; - }*/ - public Rectangle getHitbox(Rectangle rect){ return rect.setSize(block().size * tilesize).setCenter(drawx(), drawy()); } @@ -346,7 +332,7 @@ public class Tile implements Position, TargetTrait{ //+26 - if(link().synthetic()){ + if(link().synthetic() && link().solid()){ cost += Mathf.clamp(link().block.health / 10f, 0, 20); }