diff --git a/core/assets-raw/sprites/ui/empty-sector.png b/core/assets-raw/sprites/ui/empty-sector.png index 905ec6eea2..347b3bfc8d 100644 Binary files a/core/assets-raw/sprites/ui/empty-sector.png and b/core/assets-raw/sprites/ui/empty-sector.png differ diff --git a/core/assets-raw/sprites/ui/sector-edge.png b/core/assets-raw/sprites/ui/sector-edge.png index bd32c3dfc7..293d9bee79 100644 Binary files a/core/assets-raw/sprites/ui/sector-edge.png and b/core/assets-raw/sprites/ui/sector-edge.png differ diff --git a/core/assets/maps/sandbox.mmap b/core/assets/maps/sandbox.mmap index 3a448b7c1d..14e89ed3b7 100644 Binary files a/core/assets/maps/sandbox.mmap and b/core/assets/maps/sandbox.mmap differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index b17d0e8649..53901c92d1 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/src/io/anuke/mindustry/io/MapIO.java b/core/src/io/anuke/mindustry/io/MapIO.java index c46e9bf6d3..7dea904ef3 100644 --- a/core/src/io/anuke/mindustry/io/MapIO.java +++ b/core/src/io/anuke/mindustry/io/MapIO.java @@ -54,7 +54,7 @@ public class MapIO{ byte elev = y >= data.height() - 1 ? 0 : data.read(x, y + 1, DataPosition.elevation); Block floor = content.block(marker.floor); Block wall = content.block(marker.wall); - int color = ColorMapper.colorFor(floor, wall, Team.all[marker.team], marker.elevation, elev > marker.elevation ? (byte)(1 << 6) : (byte)0); + int color = ColorMapper.colorFor(floor, wall, Team.all[marker.team], marker.elevation + 1, elev > marker.elevation ? (byte)(1 << 6) : (byte)0); pixmap.drawPixel(x, pixmap.getHeight() - 1 - y, color); } } diff --git a/core/src/io/anuke/mindustry/maps/MapMeta.java b/core/src/io/anuke/mindustry/maps/MapMeta.java index c731941297..148ad5a099 100644 --- a/core/src/io/anuke/mindustry/maps/MapMeta.java +++ b/core/src/io/anuke/mindustry/maps/MapMeta.java @@ -2,6 +2,7 @@ package io.anuke.mindustry.maps; import com.badlogic.gdx.utils.IntIntMap; import com.badlogic.gdx.utils.ObjectMap; +import io.anuke.ucore.util.Bundles; public class MapMeta{ public final int version; @@ -18,15 +19,19 @@ public class MapMeta{ } public String author(){ - return tags.get("author", "unknown"); + return tag("author"); } public String description(){ - return tags.get("description", "unknown"); + return tag("description"); } public String name(){ - return tags.get("name", "unknown"); + return tag("name"); + } + + public String tag(String name){ + return tags.containsKey(name) && !tags.get(name).trim().isEmpty() ? tags.get(name): Bundles.get("text.unknown"); } public boolean hasOreGen(){ diff --git a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java index ef58381653..def5cf1e0c 100644 --- a/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java +++ b/core/src/io/anuke/mindustry/maps/generation/FortressGenerator.java @@ -57,6 +57,7 @@ public class FortressGenerator{ void gen(){ gen.setBlock(enemyX, enemyY, StorageBlocks.core, team); + gen.random.nextBoolean(); float difficultyScl = Mathf.clamp(gen.sector.difficulty / 20f + gen.random.range(0.25f), 0f, 0.9999f); float dscl2 = Mathf.clamp(0.5f + gen.sector.difficulty / 20f + gen.random.range(0.1f), 0f, 1.5f); diff --git a/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java b/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java index 7b42129055..1dbb2b81a3 100644 --- a/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java +++ b/core/src/io/anuke/mindustry/maps/missions/MissionWithStartingCore.java @@ -10,8 +10,6 @@ import io.anuke.mindustry.world.Tile; import static io.anuke.mindustry.Vars.state; public abstract class MissionWithStartingCore extends Mission{ - - /** Stores a custom starting location for the core, or null if the default calculation (map center) shall be used. */ private final GridPoint2 customStartingPoint; diff --git a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java index 90a466e023..1ea6ed5d04 100644 --- a/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java +++ b/core/src/io/anuke/mindustry/ui/dialogs/SectorsDialog.java @@ -60,7 +60,7 @@ public class SectorsDialog extends FloatingDialog{ margin(0); getTitleTable().clear(); clear(); - stack(content(), buttons(), container).grow(); + stack(content(), container, buttons()).grow(); shown(this::setup); } @@ -128,7 +128,7 @@ public class SectorsDialog extends FloatingDialog{ class SectorView extends Element{ float lastX, lastY; boolean clicked = false; - float panX = 0, panY = -sectorSize/2f; + float panX = sectorSize/2f, panY = sectorSize/2f; SectorView(){ addListener(new InputListener(){ diff --git a/core/src/io/anuke/mindustry/world/ColorMapper.java b/core/src/io/anuke/mindustry/world/ColorMapper.java index e8a5205267..6d3bdea310 100644 --- a/core/src/io/anuke/mindustry/world/ColorMapper.java +++ b/core/src/io/anuke/mindustry/world/ColorMapper.java @@ -14,11 +14,7 @@ public class ColorMapper implements ContentList{ private static ObjectIntMap colorMap = new ObjectIntMap<>(); private static ThreadLocal tmpColors = new ThreadLocal<>(); - public static Block getByColor(int color){ - return blockMap.get(color); - } - - public static int getBlockColor(Block block){ + private static int getBlockColor(Block block){ return colorMap.get(block, 0); }