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-04 08:59:29 -04:00
parent 9f0a1d863e 36a7e98f86
commit 07a1c6c2c4
36 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/mindustry/ui/fragments/PlacementFragment.java
View File

@@ -370,10 +370,10 @@ public class PlacementFragment{
line.add(stack.item.localizedName).maxWidth(140f).fillX().color(Color.lightGray).padLeft(2).left().get().setEllipsis(true);
line.labelWrap(() -> {
Building core = player.core();
if(core == null || state.rules.infiniteResources) return "*/*";
int stackamount = Math.round(stack.amount * state.rules.buildCostMultiplier);
if(core == null || state.rules.infiniteResources) return "*/" + stackamount;
int amount = core.items.get(stack.item);
int stackamount = Math.round(stack.amount * state.rules.buildCostMultiplier);
String color = (amount < stackamount / 2f ? "[scarlet]" : amount < stackamount ? "[accent]" : "[white]");
return color + UI.formatAmount(amount) + "[white]/" + stackamount;

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

@@ -35,8 +35,7 @@ public class StatValues{
}
public static String fixValue(float value){
int precision = Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2;
return Strings.fixed(value, precision);
return Strings.autoFixed(value, 2);
}
public static StatValue squared(float value, StatUnit unit){