Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions 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
parent b611726c3e cc024a0bac
commit ee7bdbf44e
6 changed files with 4 additions and 21 deletions
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
public void setStats(){
if(consumes.has(ConsumeType.liquid)){
ConsumeLiquidBase cons = consumes.get(ConsumeType.liquid);
cons.timePeriod = craftTime;
}
super.setStats();
stats.add(Stat.productionTime, craftTime / 60f, StatUnit.seconds);
@@ -50,7 +45,7 @@ public class GenericCrafter extends Block{
}
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(){
super.setStats();
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{

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

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