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

add liquid out speed display (#250)

Browse Source
This commit is contained in:
LQ 2018-10-19 09:56:35 +08:00 committed by Anuken
parent 2f8b5e53bb
commit 87a7cc6289
6 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/assets/bundles/bundle.properties
View File

@ -326,6 +326,7 @@ text.blocks.outputitem=Output Item
text.blocks.drilltier=Drillables
text.blocks.drillspeed=Base Drill Speed
text.blocks.liquidoutput=Liquid Output
text.blocks.liquidoutputspeed=Liquid Output Speed
text.blocks.liquiduse=Liquid Use
text.blocks.coolant=Coolant
text.blocks.coolantuse=Coolant Use

3
core/assets/bundles/bundle_zh_CN.properties
View File

@ -267,7 +267,8 @@ text.blocks.inputitems=输入物品
text.blocks.outputitem=输出物品
text.blocks.drilltier=可钻探矿物
text.blocks.drillspeed=基础钻探速度
text.blocks.liquidoutput=液体输出速度
text.blocks.liquidoutput=液体输出
text.blocks.liquidoutputspeed=液体输出速度
text.blocks.liquiduse=使用液体
text.blocks.coolant=冷却剂
text.blocks.coolantuse=使用冷却剂

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),