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

Merge pull request #3081 from genNAowl/standardize-liquid-stats

Browse Source 
Remove timePeriod in LiquidBaseValue
This commit is contained in:
Anuken 2020-10-24 15:18:47 -04:00 committed by GitHub
commit ee7bdbf44e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/mindustry/world/blocks/production/GenericCrafter.java
View File

@ -37,11 +37,6 @@ public class GenericCrafter extends Block{
@Override @Override
public void setStats(){ public void setStats(){
if(consumes.has(ConsumeType.liquid)){
ConsumeLiquidBase cons = consumes.get(ConsumeType.liquid);
cons.timePeriod = craftTime;
}
super.setStats(); super.setStats();
stats.add(Stat.productionTime, craftTime / 60f, StatUnit.seconds); stats.add(Stat.productionTime, craftTime / 60f, StatUnit.seconds);
@ -50,7 +45,7 @@ public class GenericCrafter extends Block{
} }
if(outputLiquid != null){ if(outputLiquid != null){
stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount, false); stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount * (60f / craftTime), true);
} }
} }

2
core/src/mindustry/world/blocks/production/LiquidConverter.java
View File

@ -27,7 +27,7 @@ public class LiquidConverter extends GenericCrafter{
public void setStats(){ public void setStats(){
super.setStats(); super.setStats();
stats.remove(Stat.output); stats.remove(Stat.output);
stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount * craftTime, false); stats.add(Stat.output, outputLiquid.liquid, outputLiquid.amount * 60f, true);
} }
public class LiquidConverterBuild extends GenericCrafterBuild{ public class LiquidConverterBuild extends GenericCrafterBuild{

5
core/src/mindustry/world/blocks/production/Separator.java
View File

@ -34,11 +34,6 @@ public class Separator extends Block{
@Override @Override
public void setStats(){ public void setStats(){
if(consumes.has(ConsumeType.liquid)){
ConsumeLiquidBase cons = consumes.get(ConsumeType.liquid);
cons.timePeriod = craftTime;
}
super.setStats(); super.setStats();
stats.add(Stat.output, new ItemFilterValue(item -> { stats.add(Stat.output, new ItemFilterValue(item -> {

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

@ -46,6 +46,6 @@ public class ConsumeLiquid extends ConsumeLiquidBase{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, liquid, amount * timePeriod, timePeriod == 60); stats.add(booster ? Stat.booster : Stat.input, liquid, amount * 60f, true);
} }
} }

7
core/src/mindustry/world/consumers/ConsumeLiquidBase.java
View File

@ -5,13 +5,6 @@ import mindustry.gen.*;
public abstract class ConsumeLiquidBase extends Consume{ public abstract class ConsumeLiquidBase extends Consume{
/** amount used per frame */ /** amount used per frame */
public final float amount; public final float amount;
/**
* How much time is taken to use this liquid, in ticks. Used only for visual purposes.
* Example: a normal ConsumeLiquid with 10/s and a 10 second timePeriod would display as "100 seconds".
* Without a time override, it would display as "10 liquid/second".
* This is used for generic crafters.
*/
public float timePeriod = 60;
public ConsumeLiquidBase(float amount){ public ConsumeLiquidBase(float amount){
this.amount = amount; this.amount = amount;

2
core/src/mindustry/world/consumers/ConsumeLiquidFilter.java
View File

@ -50,6 +50,6 @@ public class ConsumeLiquidFilter extends ConsumeLiquidBase{
@Override @Override
public void display(Stats stats){ public void display(Stats stats){
stats.add(booster ? Stat.booster : Stat.input, new LiquidFilterValue(filter, amount * timePeriod, timePeriod == 60f)); stats.add(booster ? Stat.booster : Stat.input, new LiquidFilterValue(filter, amount * 60f, true));
} }
} }