From 3517da82143177b8e888a115cd18cb4b1b64d62a Mon Sep 17 00:00:00 2001 From: Anuken Date: Wed, 21 Oct 2020 10:37:03 -0400 Subject: [PATCH] Fixed #3049 --- core/assets/maps/mudFlats.msav | Bin 0 -> 28056 bytes core/src/mindustry/ai/types/FlyingAI.java | 2 +- .../mindustry/entities/comp/BuildingComp.java | 4 ++-- core/src/mindustry/maps/Maps.java | 6 ++---- .../blocks/defense/turrets/ItemTurret.java | 8 +++++++- 5 files changed, 12 insertions(+), 8 deletions(-) create mode 100644 core/assets/maps/mudFlats.msav diff --git a/core/assets/maps/mudFlats.msav b/core/assets/maps/mudFlats.msav new file mode 100644 index 0000000000000000000000000000000000000000..0fb8fd21ab5261116888e09b2f1ec4ca949b8dc0 GIT binary patch literal 28056 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 items == null ? 0 : items.total(); case totalLiquids -> liquids == null ? 0 : liquids.total(); case totalPower -> power == null || !block.consumes.hasPower() ? 0 : power.status * (block.consumes.getPower().buffered ? block.consumes.getPower().capacity : 1f); - case itemCapacity -> block.itemCapacity; - case liquidCapacity -> block.liquidCapacity; + case itemCapacity -> block.hasItems ? block.itemCapacity : 0; + case liquidCapacity -> block.hasLiquids ? block.liquidCapacity : 0; case powerCapacity -> block.consumes.hasPower() ? block.consumes.getPower().capacity : 0f; case powerNetIn -> power == null ? 0 : power.graph.getLastScaledPowerIn() * 60; case powerNetOut -> power == null ? 0 : power.graph.getLastScaledPowerOut() * 60; diff --git a/core/src/mindustry/maps/Maps.java b/core/src/mindustry/maps/Maps.java index 7741f0942f..e6fcaff68a 100644 --- a/core/src/mindustry/maps/Maps.java +++ b/core/src/mindustry/maps/Maps.java @@ -29,7 +29,7 @@ import static mindustry.Vars.*; public class Maps{ /** List of all built-in maps. Filenames only. */ - private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "veins", "glacier"}; + private static String[] defaultMapNames = {"maze", "fortress", "labyrinth", "islands", "tendrils", "caldera", "wasteland", "shattered", "fork", "triad", "mudFlats", "veins", "glacier"}; /** Maps tagged as PvP */ static final String[] pvpMaps = {"veins", "glacier"}; /** All maps stored in an ordered array. */ @@ -82,9 +82,7 @@ public class Maps{ } public Maps(){ - Events.on(ClientLoadEvent.class, event -> { - maps.sort(); - }); + Events.on(ClientLoadEvent.class, event -> maps.sort()); if(Core.assets != null){ ((CustomLoader)Core.assets.getLoader(ContentLoader.class)).loaded = this::createAllPreviews; diff --git a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java index e3a9ed97eb..7550f23e79 100644 --- a/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java +++ b/core/src/mindustry/world/blocks/defense/turrets/ItemTurret.java @@ -37,12 +37,16 @@ public class ItemTurret extends Turret{ stats.remove(Stat.itemCapacity); stats.add(Stat.ammo, new AmmoListValue<>(ammoTypes)); + } + + @Override + public void init(){ consumes.add(new ConsumeItemFilter(i -> ammoTypes.containsKey(i)){ @Override public void build(Building tile, Table table){ MultiReqImage image = new MultiReqImage(); content.items().each(i -> filter.get(i) && i.unlockedNow(), item -> image.add(new ReqImage(new ItemImage(item.icon(Cicon.medium)), - () -> tile != null && !((ItemTurretBuild)tile).ammo.isEmpty() && ((ItemEntry)((ItemTurretBuild)tile).ammo.peek()).item == item))); + () -> tile != null && !((ItemTurretBuild)tile).ammo.isEmpty() && ((ItemEntry)((ItemTurretBuild)tile).ammo.peek()).item == item))); table.add(image).size(8 * 4); } @@ -58,6 +62,8 @@ public class ItemTurret extends Turret{ //don't display } }); + + super.init(); } public class ItemTurretBuild extends TurretBuild{