diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c08507a21a..1d9fc70fec 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -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 diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index 33f4e5aea4..f26c2aa605 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -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=使用冷却剂 diff --git a/core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java b/core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java index d8a6ffc386..2f7562b82c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/LiquidMixer.java @@ -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 diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java index 8c29ca60ea..0b496688e0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Pump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Pump.java @@ -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 diff --git a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java index 3e39563c9a..46a30bca31 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/SolidPump.java @@ -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); } diff --git a/core/src/io/anuke/mindustry/world/meta/BlockStat.java b/core/src/io/anuke/mindustry/world/meta/BlockStat.java index ac93bacfad..c8b1248628 100644 --- a/core/src/io/anuke/mindustry/world/meta/BlockStat.java +++ b/core/src/io/anuke/mindustry/world/meta/BlockStat.java @@ -18,6 +18,7 @@ public enum BlockStat{ liquidCapacity(StatCategory.liquids), liquidOutput(StatCategory.liquids), + liquidOutputSpeed(StatCategory.liquids), coolant(StatCategory.liquids), coolantUse(StatCategory.liquids),