diff --git a/core/assets-raw/sprites/blocks/logic/logic-display.png b/core/assets-raw/sprites/blocks/logic/logic-display.png index e9441e179f..274d5a0f52 100644 Binary files a/core/assets-raw/sprites/blocks/logic/logic-display.png and b/core/assets-raw/sprites/blocks/logic/logic-display.png differ diff --git a/core/assets/sprites/block_colors.png b/core/assets/sprites/block_colors.png index 3255514474..70532a72de 100644 Binary files a/core/assets/sprites/block_colors.png and b/core/assets/sprites/block_colors.png differ diff --git a/core/assets/sprites/fallback/sprites2.png b/core/assets/sprites/fallback/sprites2.png index 5da35b565b..b2f798dd69 100644 Binary files a/core/assets/sprites/fallback/sprites2.png and b/core/assets/sprites/fallback/sprites2.png differ diff --git a/core/assets/sprites/fallback/sprites4.png b/core/assets/sprites/fallback/sprites4.png index 86b95c04e4..eeebe8e635 100644 Binary files a/core/assets/sprites/fallback/sprites4.png and b/core/assets/sprites/fallback/sprites4.png differ diff --git a/core/assets/sprites/fallback/sprites6.png b/core/assets/sprites/fallback/sprites6.png index 59d4c49cc3..c165f371bc 100644 Binary files a/core/assets/sprites/fallback/sprites6.png and b/core/assets/sprites/fallback/sprites6.png differ diff --git a/core/assets/sprites/fallback/sprites7.png b/core/assets/sprites/fallback/sprites7.png index 56a25b9a6e..6529f48f8b 100644 Binary files a/core/assets/sprites/fallback/sprites7.png and b/core/assets/sprites/fallback/sprites7.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 17bca86130..7b7bf59f04 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/sprites/sprites2.png b/core/assets/sprites/sprites2.png index a2b5e48d6f..ebad8f05ed 100644 Binary files a/core/assets/sprites/sprites2.png and b/core/assets/sprites/sprites2.png differ diff --git a/core/assets/sprites/sprites4.png b/core/assets/sprites/sprites4.png index a8aa1be195..94eb399814 100644 Binary files a/core/assets/sprites/sprites4.png and b/core/assets/sprites/sprites4.png differ diff --git a/core/assets/sprites/sprites5.png b/core/assets/sprites/sprites5.png index b151e7da19..9c3117e92c 100644 Binary files a/core/assets/sprites/sprites5.png and b/core/assets/sprites/sprites5.png differ diff --git a/core/src/mindustry/entities/comp/BuildingComp.java b/core/src/mindustry/entities/comp/BuildingComp.java index b3aebb9adc..e78dfe0888 100644 --- a/core/src/mindustry/entities/comp/BuildingComp.java +++ b/core/src/mindustry/entities/comp/BuildingComp.java @@ -1177,6 +1177,7 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc, if(sensor == LSensor.powerNetIn && power != null) return power.graph.getPowerProduced(); if(sensor == LSensor.powerNetOut && power != null) return power.graph.getPowerNeeded(); if(sensor == LSensor.powerNetStored && power != null) return power.graph.getLastPowerStored(); + if(sensor == LSensor.powerNetCapacity && power != null) return power.graph.getBatteryCapacity(); return 0; } diff --git a/core/src/mindustry/logic/LAssembler.java b/core/src/mindustry/logic/LAssembler.java index b85b110f46..733a5ff760 100644 --- a/core/src/mindustry/logic/LAssembler.java +++ b/core/src/mindustry/logic/LAssembler.java @@ -68,7 +68,7 @@ public class LAssembler{ String[] lines = data.split("[;\n]+"); for(String line : lines){ //comments - //if(line.startsWith("#")) continue; + if(line.startsWith("#")) continue; String[] tokens = line.split(" "); LStatement st = LogicIO.read(tokens); diff --git a/core/src/mindustry/logic/LSensor.java b/core/src/mindustry/logic/LSensor.java index 2551ad1254..a6a89da806 100644 --- a/core/src/mindustry/logic/LSensor.java +++ b/core/src/mindustry/logic/LSensor.java @@ -5,6 +5,7 @@ public enum LSensor{ totalLiquids, totalPower, powerNetStored, + powerNetCapacity, powerNetIn, powerNetOut, health, diff --git a/core/src/mindustry/logic/LStatement.java b/core/src/mindustry/logic/LStatement.java index e26761926e..985fbc4da9 100644 --- a/core/src/mindustry/logic/LStatement.java +++ b/core/src/mindustry/logic/LStatement.java @@ -24,11 +24,12 @@ public abstract class LStatement{ public abstract LCategory category(); public abstract LInstruction build(LAssembler builder); - //TODO doesn't work with modded stuff public LStatement copy(){ StringBuilder build = new StringBuilder(); write(build); - return LogicIO.read(build.toString().split(" ")); + String[] split = build.toString().split(" "); + LStatement result = LogicIO.read(split); + return result == null && LAssembler.customParsers.containsKey(split[0]) ? LAssembler.customParsers.get(split[0]).get(split) : result; } //protected methods are only for internal UI layout utilities