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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Anuken
2021-01-11 16:07:55 -05:00
parent 0cbc4c0cc5 e83cfe6cab
commit 9b6c44757a
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/mindustry/world/Block.java
View File

@@ -375,6 +375,8 @@ public class Block extends UnlockableContent{
if(hasItems && configurable){ if(hasItems && configurable){
bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity)); bars.add("items", entity -> new Bar(() -> Core.bundle.format("bar.items", entity.items.total()), () -> Pal.items, () -> (float)entity.items.total() / itemCapacity));
} }
if(flags.contains(BlockFlag.unitModifier)) stats.add(Stat.maxUnits, (unitCapModifier < 0 ? "-" : "+") + Math.abs(unitCapModifier));
} }
public boolean canReplace(Block other){ public boolean canReplace(Block other){

2
core/src/mindustry/world/meta/Stat.java
View File

@@ -30,6 +30,7 @@ public enum Stat{
lightningDamage, lightningDamage,
abilities, abilities,
canBoost, canBoost,
maxUnits,
itemCapacity(StatCat.items), itemCapacity(StatCat.items),
itemsMoved(StatCat.items), itemsMoved(StatCat.items),
@@ -51,7 +52,6 @@ public enum Stat{
productionTime(StatCat.crafting), productionTime(StatCat.crafting),
drillTier(StatCat.crafting), drillTier(StatCat.crafting),
drillSpeed(StatCat.crafting), drillSpeed(StatCat.crafting),
maxUnits(StatCat.crafting),
linkRange(StatCat.crafting), linkRange(StatCat.crafting),
instructions(StatCat.crafting), instructions(StatCat.crafting),