diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index f60a2a6771..7629b67a88 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -141,6 +141,7 @@ public class Blocks{ //units - erekir tankFabricator, shipFabricator, mechFabricator, + //TODO names basicReconstructor, advancedReconstructor, diff --git a/core/src/mindustry/entities/part/DrawPart.java b/core/src/mindustry/entities/part/DrawPart.java index af16cdb6df..8a939ef197 100644 --- a/core/src/mindustry/entities/part/DrawPart.java +++ b/core/src/mindustry/entities/part/DrawPart.java @@ -87,7 +87,6 @@ public abstract class DrawPart{ return p -> Mathf.slope(get(p)); } - default PartProgress clamp(){ return p -> Mathf.clamp(get(p)); } diff --git a/core/src/mindustry/mod/ContentParser.java b/core/src/mindustry/mod/ContentParser.java index 29e1234cb5..678b7dab66 100644 --- a/core/src/mindustry/mod/ContentParser.java +++ b/core/src/mindustry/mod/ContentParser.java @@ -180,8 +180,10 @@ public class ContentParser{ //I have to hard-code this, no easy way of getting parameter names, unfortunately return switch(op){ case "inv" -> base.inv(); + case "slope" -> base.slope(); case "clamp" -> base.clamp(); case "delay" -> base.delay(data.getFloat("amount")); + case "sustain" -> base.sustain(data.getFloat("offset", 0f), data.getFloat("grow", 0f), data.getFloat("sustain")); case "shorten" -> base.shorten(data.getFloat("amount")); case "add" -> base.add(data.getFloat("amount")); case "blend" -> base.blend(parser.readValue(PartProgress.class, data.get("other")), data.getFloat("amount"));