Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Decal cleanup

Browse Source
This commit is contained in:
Anuken
2020-02-04 09:39:12 -05:00
parent a07e275e11
commit 006004fd70
9 changed files with 31 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/world/blocks/BuildBlock.java
View File

@@ -228,7 +228,7 @@ public class BuildBlock extends Block{
setConstruct(previous, cblock);
}
float maxProgress = core == null ? amount : checkRequired(core.items, amount, false);
float maxProgress = core == null ? amount : checkRequired(core.getItems(), amount, false);
for(int i = 0; i < cblock.requirements.length; i++){
int reqamount = Math.round(state.rules.buildCostMultiplier * cblock.requirements[i].amount);
@@ -236,7 +236,7 @@ public class BuildBlock extends Block{
totalAccumulator[i] = Math.min(totalAccumulator[i] + reqamount * maxProgress, reqamount);
}
maxProgress = core == null ? maxProgress : checkRequired(core.items, maxProgress, true);
maxProgress = core == null ? maxProgress : checkRequired(core.getItems(), maxProgress, true);
progress = Mathf.clamp(progress + maxProgress);
builderID = builder.getId();