mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-03-13 19:39:04 +07:00
Code Issues 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
commit 9b6c44757a
2 changed files with 3 additions and 1 deletions
core/src/mindustry/world
Block.java
meta
Stat.java

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

@ -375,6 +375,8 @@ public class Block extends UnlockableContent{
if(hasItems && configurable){
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){

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

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