From 768d67a8aebda08f889b343f9083fee2f4e898a7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 26 Apr 2019 23:23:45 -0400 Subject: [PATCH] Updated desolate rift / Spawning fixes --- core/assets/maps/desolateRift.mmap | Bin 8831 -> 9239 bytes .../src/io/anuke/mindustry/content/Zones.java | 8 ++++---- .../mindustry/editor/MapGenerateDialog.java | 4 +++- .../io/anuke/mindustry/game/SpawnGroup.java | 4 +--- core/src/io/anuke/mindustry/maps/Maps.java | 4 ---- core/src/io/anuke/mindustry/world/Block.java | 2 +- 6 files changed, 9 insertions(+), 13 deletions(-) diff --git a/core/assets/maps/desolateRift.mmap b/core/assets/maps/desolateRift.mmap index 0e4f0474e59778523d98158eab1ee604d978363b..b09e8e279c0daa17e3c9f99327a84a9fa0348191 100644 GIT binary patch literal 9239 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 new Rules(){{ waves = true; waveTimer = true; - waveSpacing = 60 * 60 * 1.3f; + waveSpacing = 60 * 60 * 2.5f; }}; }}; diff --git a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java index 32e74f59d2..e34a139e9e 100644 --- a/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java +++ b/core/src/io/anuke/mindustry/editor/MapGenerateDialog.java @@ -79,7 +79,9 @@ public class MapGenerateDialog extends FloatingDialog{ cont.clear(); cont.table("flat", t -> { t.margin(8f); - t.stack(new BorderImage(texture), new Stack(){{ + t.stack(new BorderImage(texture){{ + setScaling(Scaling.fit); + }}, new Stack(){{ add(new Image("loadDim")); add(new Image("icon-refresh"){{ setScaling(Scaling.none); diff --git a/core/src/io/anuke/mindustry/game/SpawnGroup.java b/core/src/io/anuke/mindustry/game/SpawnGroup.java index d6cc11f243..4637ba4bfd 100644 --- a/core/src/io/anuke/mindustry/game/SpawnGroup.java +++ b/core/src/io/anuke/mindustry/game/SpawnGroup.java @@ -48,9 +48,7 @@ public class SpawnGroup implements Serializable{ if(wave < begin || wave > end || (wave - begin) % spacing != 0){ return 0; } - float scaling = this.unitScaling; - - return Math.min(unitAmount - 1 + Math.max((int)(((wave - begin + 1) / spacing) / scaling), 1), max); + return Math.min(unitAmount + (int)(((wave - begin) / spacing) / unitScaling), max); } /** diff --git a/core/src/io/anuke/mindustry/maps/Maps.java b/core/src/io/anuke/mindustry/maps/Maps.java index 72ecba7c64..015b994174 100644 --- a/core/src/io/anuke/mindustry/maps/Maps.java +++ b/core/src/io/anuke/mindustry/maps/Maps.java @@ -25,10 +25,6 @@ public class Maps implements Disposable{ /** Serializer for meta. */ private Json json = new Json(); - public Maps(){ - - } - /** Returns a list of all maps, including custom ones. */ public Array all(){ return maps; diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 513b4caf5f..f3d37565c4 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -436,7 +436,7 @@ public class Block extends BlockStorage{ float capacity = consumes.getPower().powerCapacity; bars.add("power", entity -> new Bar(() -> buffered ? Core.bundle.format("bar.poweramount", Float.isNaN(entity.power.satisfaction * capacity) ? "" : (int)(entity.power.satisfaction * capacity)) : - Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> entity.power.satisfaction)); + Core.bundle.get("bar.power"), () -> Pal.powerBar, () -> entity.power.satisfaction)); } if(hasItems && configurable){