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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2018-10-18 21:57:19 -04:00
parent a9ccf6ca42 fd7b829e70
commit 948c48ea23
9 changed files with 536 additions and 484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java
View File

@@ -8,6 +8,7 @@ import io.anuke.mindustry.world.blocks.LiquidBlock;
import io.anuke.mindustry.world.consumers.ConsumeLiquid;
import io.anuke.mindustry.world.meta.BlockBar;
import io.anuke.mindustry.world.meta.BlockStat;
import io.anuke.mindustry.world.meta.StatUnit;
import io.anuke.mindustry.world.modules.LiquidModule;
import io.anuke.ucore.graphics.Draw;
@@ -35,6 +36,7 @@ public class LiquidMixer extends LiquidBlock{
super.setStats();
stats.add(BlockStat.liquidOutput, outputLiquid);
stats.add(BlockStat.liquidOutputSpeed, 60f * consumes.get(ConsumeLiquid.class).used(), StatUnit.liquidSecond);
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/production/Pump.java
View File

@@ -41,7 +41,7 @@ public class Pump extends LiquidBlock{
@Override
public void setStats(){
super.setStats();
stats.add(BlockStat.liquidOutput, 60f * pumpAmount, StatUnit.liquidSecond);
stats.add(BlockStat.liquidOutputSpeed, 60f * pumpAmount, StatUnit.liquidSecond);
}
@Override

2
core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java
View File

@@ -37,7 +37,7 @@ public class SolidPump extends Pump{
public void setStats(){
super.setStats();
stats.remove(BlockStat.liquidOutput);
// stats.remove(BlockStat.liquidOutput);
stats.add(BlockStat.liquidOutput, result);
}

1
core/src/io/anuke/mindustry/world/meta/BlockStat.java
View File

@@ -18,6 +18,7 @@ public enum BlockStat{
liquidCapacity(StatCategory.liquids),
liquidOutput(StatCategory.liquids),
liquidOutputSpeed(StatCategory.liquids),
coolant(StatCategory.liquids),
coolantUse(StatCategory.liquids),