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

Fixed shouldConsume checking

Browse Source
This commit is contained in:
Anuken
2022-03-02 14:44:08 -05:00
parent 544df52730
commit 804fce06e7
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
core/src/mindustry/entities/comp/BuildingComp.java
View File

@ -1657,25 +1657,31 @@ abstract class BuildingComp implements Posc, Teamc, Healthc, Buildingc, Timerc,
//TODO why check for old state? //TODO why check for old state?
boolean prevValid = efficiency > 0, update = shouldConsume() && productionValid(); boolean prevValid = efficiency > 0, update = shouldConsume() && productionValid();
float minEfficiency = 1f;
//assume efficiency is 1 for the calculations below if(update){
efficiency = optionalEfficiency = 1f; float minEfficiency = 1f;
//first pass: get the minimum efficiency of any consumer //assume efficiency is 1 for the calculations below
for(var cons : block.nonOptionalConsumers){ efficiency = optionalEfficiency = 1f;
minEfficiency = Math.min(minEfficiency, cons.efficiency(self()));
//first pass: get the minimum efficiency of any consumer
for(var cons : block.nonOptionalConsumers){
minEfficiency = Math.min(minEfficiency, cons.efficiency(self()));
}
//same for optionals
for(var cons : block.optionalConsumers){
optionalEfficiency = Math.min(optionalEfficiency, cons.efficiency(self()));
}
//efficiency is now this minimum value
efficiency = minEfficiency;
optionalEfficiency = Math.min(optionalEfficiency, minEfficiency);
}else{
//should not consume, efficiency now zero
efficiency = optionalEfficiency = 0f;
} }
//same for optionals
for(var cons : block.optionalConsumers){
optionalEfficiency = Math.min(optionalEfficiency, cons.efficiency(self()));
}
//efficiency is now this minimum value
efficiency = minEfficiency;
optionalEfficiency = Math.min(optionalEfficiency, minEfficiency);
updateEfficiencyMultiplier(); updateEfficiencyMultiplier();
//second pass: update every consumer based on efficiency //second pass: update every consumer based on efficiency