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
2022-07-03 09:18:40 -04:00
parent 7d67585f9a 40dd80b95a
commit 4c9a3def1d
38 changed files with 302 additions and 290 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/src/mindustry/world/blocks/units/UnitAssembler.java
View File

@@ -275,7 +275,10 @@ public class UnitAssembler extends PayloadBlock{
break;
}
}
currentTier = max;
if(currentTier != max){
progress=0;
currentTier = max;
}
}
public UnitType unit(){

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

@@ -390,7 +390,7 @@ public class StatValues{
}
if(type.status != StatusEffects.none){
sep(bt, (type.status.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName);
sep(bt, (type.status.minfo.mod == null ? type.status.emoji() : "") + "[stat]" + type.status.localizedName + "[] ~ [stat]" + ((int)(type.statusDuration / 60f)) + "[] " + Core.bundle.get("unit.seconds"));
}
if(type.fragBullet != null){