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

Fixed various rounding errors in database

Browse Source
This commit is contained in:
Anuken
2021-01-18 18:04:16 -05:00
parent 83a4f56679
commit 82f8e78ec8
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ui/LiquidDisplay.java
View File

@@ -23,10 +23,10 @@ public class LiquidDisplay extends Table{
if(amount != 0){ if(amount != 0){
Table t = new Table().left().bottom(); Table t = new Table().left().bottom();
t.add(Strings.autoFixed(amount, 1)).style(Styles.outlineLabel); t.add(Strings.autoFixed(amount, 2)).style(Styles.outlineLabel);
add(t); add(t);
} }
}}).size(8 * 4).padRight(3 + (amount != 0 && Strings.autoFixed(amount, 1).length() > 2 ? 8 : 0)); }}).size(8 * 4).padRight(3 + (amount != 0 && Strings.autoFixed(amount, 2).length() > 2 ? 8 : 0));
if(perSecond){ if(perSecond){
add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.lightGray).style(Styles.outlineLabel); add(StatUnit.perSecond.localized()).padLeft(2).padRight(5).color(Color.lightGray).style(Styles.outlineLabel);

4
core/src/mindustry/world/meta/values/AmmoListValue.java
View File

@@ -59,11 +59,11 @@ public class AmmoListValue<T extends UnlockableContent> implements StatValue{
} }
if(!Mathf.equal(type.reloadMultiplier, 1f)){ if(!Mathf.equal(type.reloadMultiplier, 1f)){
sep(bt, Core.bundle.format("bullet.reload", Strings.fixed(type.reloadMultiplier, 1))); sep(bt, Core.bundle.format("bullet.reload", Strings.autoFixed(type.reloadMultiplier, 2)));
} }
if(type.knockback > 0){ if(type.knockback > 0){
sep(bt, Core.bundle.format("bullet.knockback", Strings.fixed(type.knockback, 1))); sep(bt, Core.bundle.format("bullet.knockback", Strings.autoFixed(type.knockback, 2)));
} }
if(type.healPercent > 0f){ if(type.healPercent > 0f){

2
core/src/mindustry/world/meta/values/BoosterListValue.java
View File

@@ -40,7 +40,7 @@ public class BoosterListValue implements StatValue{
float reloadRate = (baseReload ? 1f : 0f) + maxUsed * multiplier * liquid.heatCapacity; float reloadRate = (baseReload ? 1f : 0f) + maxUsed * multiplier * liquid.heatCapacity;
float standardReload = baseReload ? reload : reload / (maxUsed * multiplier * 0.4f); float standardReload = baseReload ? reload : reload / (maxUsed * multiplier * 0.4f);
float result = standardReload / (reload / reloadRate); float result = standardReload / (reload / reloadRate);
bt.add(Core.bundle.format("bullet.reload", Strings.fixed(result, 1))); bt.add(Core.bundle.format("bullet.reload", Strings.autoFixed(result, 2)));
}).left().padTop(-9); }).left().padTop(-9);
c.row(); c.row();
} }

2
core/src/mindustry/world/meta/values/WeaponListValue.java
View File

@@ -39,7 +39,7 @@ public class WeaponListValue implements StatValue{
if(weapon.inaccuracy > 0){ if(weapon.inaccuracy > 0){
sep(w, "[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)weapon.inaccuracy + " " + StatUnit.degrees.localized()); sep(w, "[lightgray]" + Stat.inaccuracy.localized() + ": [white]" + (int)weapon.inaccuracy + " " + StatUnit.degrees.localized());
} }
sep(w, "[lightgray]" + Stat.reload.localized() + ": " + (weapon.mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / weapon.reload * weapon.shots, 1)); sep(w, "[lightgray]" + Stat.reload.localized() + ": " + (weapon.mirror ? "2x " : "") + "[white]" + Strings.autoFixed(60f / weapon.reload * weapon.shots, 2));
var bullet = new AmmoListValue<UnitType>(OrderedMap.of(unit, weapon.bullet)); var bullet = new AmmoListValue<UnitType>(OrderedMap.of(unit, weapon.bullet));
bullet.display(w); bullet.display(w);

2
gradle.properties
View File

@@ -1,3 +1,3 @@
org.gradle.daemon=true org.gradle.daemon=true
org.gradle.jvmargs=-Xms256m -Xmx1024m org.gradle.jvmargs=-Xms256m -Xmx1024m
archash=25dcd2f7664f3c5a669447fdf8dffaea7e65fe0d archash=08046a31abc93a2628d02e402e98100f2842c72f