Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP electrolyzer + liquid fixes

Browse Source
This commit is contained in:
Anuken
2021-11-15 14:31:20 -05:00
parent 7103de8454
commit 9663d1153f
30 changed files with 364 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/mindustry/world/consumers/ConsumeLiquid.java
View File

@@ -9,6 +9,7 @@ import mindustry.world.meta.*;
import static mindustry.Vars.*;
//TODO replace with ConsumeLiquids
public class ConsumeLiquid extends ConsumeLiquidBase{
public final Liquid liquid;

4
core/src/mindustry/world/consumers/ConsumeLiquids.java
View File

@@ -2,6 +2,7 @@ package mindustry.world.consumers;
import arc.scene.ui.layout.*;
import arc.struct.*;
import mindustry.*;
import mindustry.gen.*;
import mindustry.type.*;
import mindustry.ui.*;
@@ -38,7 +39,7 @@ public class ConsumeLiquids extends Consume{
int i = 0;
for(var stack : liquids){
c.add(new ReqImage(stack.liquid.uiIcon,
() -> build.liquids != null && build.liquids.get(stack.liquid) >= stack.amount * build.delta())).padRight(8);
() -> build.liquids.get(stack.liquid) >= stack.amount * build.delta())).size(Vars.iconMed).padRight(8);
if(++i % 4 == 0) c.row();
}
}).left();
@@ -63,6 +64,7 @@ public class ConsumeLiquids extends Consume{
@Override
public void display(Stats stats){
//TODO display is wrong
stats.add(booster ? Stat.booster : Stat.input, StatValues.liquids(stats.timePeriod, stats.timePeriod >= 0, liquids));
}