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-11-08 16:52:18 -05:00
parent ddadbab74d 84388dd27f
commit 464feaa80e
8 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -350,11 +350,12 @@ public class StatValues{
}
if(type.buildingDamageMultiplier != 1){
sep(bt, Core.bundle.format("bullet.buildingdamage", (int)(type.buildingDamageMultiplier * 100)));
int val = (int)(type.buildingDamageMultiplier * 100 - 100);
sep(bt, Core.bundle.format("bullet.buildingdamage", ammoStat(val)));
}
if(type.rangeChange != 0 && !compact){
sep(bt, Core.bundle.format("bullet.range", (type.rangeChange > 0 ? "+" : "-") + Strings.autoFixed(type.rangeChange / tilesize, 1)));
sep(bt, Core.bundle.format("bullet.range", ammoStat(type.rangeChange / tilesize)));
}
if(type.splashDamage > 0){
@@ -366,7 +367,8 @@ public class StatValues{
}
if(!compact && !Mathf.equal(type.reloadMultiplier, 1f)){
sep(bt, Core.bundle.format("bullet.reload", Strings.autoFixed(type.reloadMultiplier, 2)));
int val = (int)(type.reloadMultiplier * 100 - 100);
sep(bt, Core.bundle.format("bullet.reload", ammoStat(val)));
}
if(type.knockback > 0){
@@ -424,6 +426,11 @@ public class StatValues{
table.add(text);
}
//for AmmoListValue
private static String ammoStat(float val){
return (val > 0 ? "[stat]+" : "[negstat]") + Strings.autoFixed(val, 1);
}
private static TextureRegion icon(UnlockableContent t){
return t.uiIcon;
}