diff --git a/core/assets/maps/desolateRift.mmap b/core/assets/maps/desolateRift.mmap index 0e4f0474e5..b09e8e279c 100644 Binary files a/core/assets/maps/desolateRift.mmap and b/core/assets/maps/desolateRift.mmap differ diff --git a/core/src/io/anuke/mindustry/content/Zones.java b/core/src/io/anuke/mindustry/content/Zones.java index 39dcdd1d66..9f5bb80536 100644 --- a/core/src/io/anuke/mindustry/content/Zones.java +++ b/core/src/io/anuke/mindustry/content/Zones.java @@ -168,15 +168,15 @@ public class Zones implements ContentList{ loadout = Loadouts.basicNucleus; baseLaunchCost = ItemStack.with(); startingItems = ItemStack.list(Items.copper, 1500); - conditionWave = 10; - launchPeriod = 20; + conditionWave = 3; + launchPeriod = 1; zoneRequirements = ZoneRequirement.with(tarFields, 20); blockRequirements = new Block[]{Blocks.thermalGenerator}; - resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand}; + resources = new Item[]{Items.copper, Items.scrap, Items.lead, Items.coal, Items.titanium, Items.sand, Items.thorium}; rules = () -> 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){