diff --git a/core/assets/maps/onset.msav b/core/assets/maps/onset.msav index fc1a2f37c5..6043b496ec 100644 Binary files a/core/assets/maps/onset.msav and b/core/assets/maps/onset.msav differ diff --git a/core/src/mindustry/content/UnitTypes.java b/core/src/mindustry/content/UnitTypes.java index c80d59aa17..b771aea1c2 100644 --- a/core/src/mindustry/content/UnitTypes.java +++ b/core/src/mindustry/content/UnitTypes.java @@ -2710,7 +2710,7 @@ public class UnitTypes{ speed = 2.9f; rotateSpeed = 9f; accel = 0.1f; - itemCapacity = 40; + itemCapacity = 60; health = 300f; armor = 1f; hitSize = 9f; @@ -2770,7 +2770,7 @@ public class UnitTypes{ speed = 2.8f; rotateSpeed = 5f; accel = 0.11f; - itemCapacity = 70; + itemCapacity = 90; health = 600f; armor = 2f; hitSize = 18f; diff --git a/core/src/mindustry/world/blocks/environment/StaticCoralWall.java b/core/src/mindustry/world/blocks/environment/StaticCoralWall.java deleted file mode 100644 index 47ece65eca..0000000000 --- a/core/src/mindustry/world/blocks/environment/StaticCoralWall.java +++ /dev/null @@ -1,25 +0,0 @@ -package mindustry.world.blocks.environment; - -import arc.graphics.g2d.*; -import arc.math.*; -import mindustry.annotations.Annotations.*; -import mindustry.world.*; - -public class StaticCoralWall extends StaticWall{ - public @Load(value = "@-cluster#", length = 1) TextureRegion[] clusters; - - public StaticCoralWall(String name){ - super(name); - variants = 1; - } - - @Override - public void drawBase(Tile tile){ - super.drawBase(tile); - - if(Mathf.randomSeed(tile.pos(), 10) < 2){ - Draw.rect(clusters[0], tile.worldx(), tile.worldy(), Mathf.randomSeedRange(tile.pos() + 1, 180f)); - } - } - -} diff --git a/core/src/mindustry/world/blocks/power/ThermalGenerator.java b/core/src/mindustry/world/blocks/power/ThermalGenerator.java index 422093d700..cd58f569d6 100644 --- a/core/src/mindustry/world/blocks/power/ThermalGenerator.java +++ b/core/src/mindustry/world/blocks/power/ThermalGenerator.java @@ -100,7 +100,7 @@ public class ThermalGenerator extends PowerGenerator{ super.draw(); if(spinners){ - Drawf.spinSprite(blurRegion.found() ? blurRegion : rotatorRegion, x, y, spinRotation); + Drawf.spinSprite(blurRegion.found() && enabled && productionEfficiency > 0 ? blurRegion : rotatorRegion, x, y, spinRotation); } } diff --git a/core/src/mindustry/world/modules/ItemModule.java b/core/src/mindustry/world/modules/ItemModule.java index 6c7c404f3a..18a12f2ba2 100644 --- a/core/src/mindustry/world/modules/ItemModule.java +++ b/core/src/mindustry/world/modules/ItemModule.java @@ -348,4 +348,22 @@ public class ItemModule extends BlockModule{ public interface ItemCalculator{ float get(Item item, int amount); } + + @Override + public String toString(){ + var res = new StringBuilder(); + res.append("ItemModule{"); + boolean any = false; + for(int i = 0; i < items.length; i++){ + if(items[i] != 0){ + res.append(content.items().get(i).name).append(":").append(items[i]).append(","); + any = true; + } + } + if(any){ + res.setLength(res.length() - 1); + } + res.append("}"); + return res.toString(); + } }