mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-02-26 06:27:22 +07:00
Code Issues Packages Projects Releases Wiki Activity

Docs

Browse Source
This commit is contained in:
Anuken 2022-05-05 20:30:37 -04:00
parent 429e07adec
commit 4d680ec91d
3 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/content/Blocks.java
View File

@ -141,6 +141,7 @@ public class Blocks{
//units - erekir //units - erekir
tankFabricator, shipFabricator, mechFabricator, tankFabricator, shipFabricator, mechFabricator,
//TODO names
basicReconstructor, basicReconstructor,
advancedReconstructor, advancedReconstructor,

1
core/src/mindustry/entities/part/DrawPart.java
View File

@ -87,7 +87,6 @@ public abstract class DrawPart{
return p -> Mathf.slope(get(p)); return p -> Mathf.slope(get(p));
} }
default PartProgress clamp(){ default PartProgress clamp(){
return p -> Mathf.clamp(get(p)); return p -> Mathf.clamp(get(p));
} }

2
core/src/mindustry/mod/ContentParser.java
View File

@ -180,8 +180,10 @@ public class ContentParser{
//I have to hard-code this, no easy way of getting parameter names, unfortunately //I have to hard-code this, no easy way of getting parameter names, unfortunately
return switch(op){ return switch(op){
case "inv" -> base.inv(); case "inv" -> base.inv();
case "slope" -> base.slope();
case "clamp" -> base.clamp(); case "clamp" -> base.clamp();
case "delay" -> base.delay(data.getFloat("amount")); 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 "shorten" -> base.shorten(data.getFloat("amount"));
case "add" -> base.add(data.getFloat("amount")); case "add" -> base.add(data.getFloat("amount"));
case "blend" -> base.blend(parser.readValue(PartProgress.class, data.get("other")), data.getFloat("amount")); case "blend" -> base.blend(parser.readValue(PartProgress.class, data.get("other")), data.getFloat("amount"));