Improve research button item display

mindustry-antigrief · Dec 23, 2023 · 58f8cbe · 58f8cbe
1 parent 1de51ca
commit 58f8cbe
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/core/src/mindustry/core/UI.java b/core/src/mindustry/core/UI.java
@@ -688,6 +688,10 @@ public void hideFollowUpMenu(int menuId) {
     }
 
     public static String formatAmount(long number){
+        return formatAmount(number, false);
+    }
+
+    public static String formatAmount(long number, boolean extraDP){
         //prevent things like bars displaying erroneous representations of casted infinities
         if(number == Long.MAX_VALUE) return "∞";
         if(number == Long.MIN_VALUE) return "-∞";
@@ -698,7 +702,7 @@ public static String formatAmount(long number){
             return sign + Strings.fixed(mag / 1_000_000_000f, 1) + "[gray]" + billions + "[]";
         }else if(mag >= 1_000_000){
             return sign + Strings.fixed(mag / 1_000_000f, 1) + "[gray]" + millions + "[]";
-        }else if(mag >= 10_000){
+        }else if(mag >= (extraDP ? 100_000 : 10_000)){
             return number / 1000 + "[gray]" + thousands + "[]";
         }else if(mag >= 1000){
             return sign + Strings.fixed(mag / 1000f, 1) + "[gray]" + thousands + "[]";

diff --git a/core/src/mindustry/ui/dialogs/ResearchDialog.java b/core/src/mindustry/ui/dialogs/ResearchDialog.java
@@ -660,10 +660,15 @@ public void rebuild(@Nullable boolean[] shine){
                                         list.image(req.item.uiIcon).size(8 * 3).padRight(3);
                                         list.add(req.item.localizedName).color(Color.lightGray);
                                         Label label = list.label(() -> " " +
-                                                UI.formatAmount(Math.min(items.get(req.item), reqAmount)) + " / "
-                                            + UI.formatAmount(reqAmount)).get();
-
-                                        Color targetColor = items.has(req.item) ? Color.lightGray : Color.scarlet;
+                                                UI.formatAmount(items.get(req.item), true) + " / "
+                                            + UI.formatAmount(reqAmount, true)).get();
+
+                                        float fraction = (float)items.get(req.item) / reqAmount;
+                                        Color targetColor = 
+                                            fraction > 1.8 ? Color.green :
+                                            fraction >= 1 ? Color.lime :
+                                            fraction >= 0.5 ? Color.salmon :
+                                            Color.red;
 
                                         if(shiny){
                                             label.setColor(Pal.accent);