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{