From 9a71940ae7177dd5364787d189b2e28a1c26cd70 Mon Sep 17 00:00:00 2001
From: sharlottes <60801210+sharlottes@users.noreply.github.com>
Date: Fri, 28 May 2021 09:32:58 +0900
Subject: [PATCH] improve readability on wave info

---
 assets/bundles/bundle.properties |  2 +-
 src/UnitInfo/core/HudUi.java     | 28 ++++++++++++++++++----------
 src/UnitInfo/core/Main.java      |  2 +-
 3 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties
index fff8b7e..c67d1ba 100644
--- a/assets/bundles/bundle.properties
+++ b/assets/bundles/bundle.properties
@@ -38,4 +38,4 @@ warning = displayed wave amount is too high! it may cause lags.
 hud.unit = Unit Info
 hud.wave = Wave Info
 hud.core = Core Info
-hud.cancel = Cancelled
\ No newline at end of file
+hud.cancel = Hidden
\ No newline at end of file
diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java
index 2498807..b4c32aa 100644
--- a/src/UnitInfo/core/HudUi.java
+++ b/src/UnitInfo/core/HudUi.java
@@ -2,11 +2,9 @@ package UnitInfo.core;
 
 import UnitInfo.ui.SBar;
 import arc.Core;
-import arc.Events;
 import arc.func.Func;
 import arc.graphics.Color;
 import arc.graphics.g2d.*;
-import arc.math.Angles;
 import arc.math.Mathf;
 import arc.scene.Element;
 import arc.scene.style.TransformDrawable;
@@ -15,6 +13,7 @@ import arc.scene.ui.layout.Scl;
 import arc.scene.ui.layout.Stack;
 import arc.scene.ui.layout.Table;
 import arc.scene.utils.Elem;
+import arc.struct.ObjectIntMap;
 import arc.struct.Seq;
 import arc.util.*;
 import mindustry.Vars;
@@ -25,7 +24,6 @@ import mindustry.content.StatusEffects;
 import mindustry.entities.abilities.ForceFieldAbility;
 import mindustry.entities.abilities.ShieldRegenFieldAbility;
 import mindustry.entities.units.WeaponMount;
-import mindustry.game.EventType;
 import mindustry.game.SpawnGroup;
 import mindustry.gen.*;
 import mindustry.graphics.Pal;
@@ -66,11 +64,8 @@ public class HudUi {
     float waveScrollPos;
     int maxwave;
     int coreamount;
-    float unitFade;
     float a;
 
-    Unit unit2;
-
     boolean panFix = false;
 
     public Unit getUnit(){
@@ -855,15 +850,28 @@ public class HudUi {
             if(state.rules.spawns.find(g -> g.getSpawned(j) > 0) != null) table.table(Tex.underline, t -> {
                 t.add(new Table(tt -> {
                     tt.left();
-                    Label label = new Label(() -> "[#" + Pal.accent.toString() + "]" + (j + 1) + "[]");
+                    Label label = new Label(() -> "[#" + Pal.accent.toString() + "]" + j + "[]");
                     label.setFontScale(Scl.scl() * (settings.getInt("uiscaling") / 100f));
                     tt.add(label);
                 })).width(Scl.scl(32f * (settings.getInt("uiscaling") / 100f)));
 
                 t.table(tx -> {
                     int row = 0;
-                    for(SpawnGroup group : state.rules.spawns){
+                    ObjectIntMap<SpawnGroup> groups = new ObjectIntMap<>();
+
+                    for(SpawnGroup group : state.rules.spawns) {
                         if(group.getSpawned(j) <= 0) continue;
+                        SpawnGroup sameTypeKey = groups.keys().toArray().find(g -> g.type == group.type && g.effect != StatusEffects.boss);
+                        if(sameTypeKey != null) groups.increment(sameTypeKey, sameTypeKey.getSpawned(j));
+                        else groups.put(group, group.getSpawned(j));
+                    }
+                    Seq<SpawnGroup> groupSorted = groups.keys().toArray().copy().sort(g -> Vars.content.units().size - g.type.id);
+                    ObjectIntMap<SpawnGroup> groupsTmp = new ObjectIntMap<>();
+                    groupSorted.each(g -> groupsTmp.put(g, groups.get(g)));
+
+                    for(SpawnGroup group : groupsTmp.keys()){
+                        int amount = groupsTmp.get(group);
+                        if(amount <= 0) continue; //is this even possible?
                         row ++;
                         tx.add(new Table(tt -> {
                             tt.right();
@@ -876,7 +884,7 @@ public class HudUi {
 
                                 add(new Table(ttt -> {
                                     ttt.bottom().left();
-                                    Label label = new Label(() -> group.getSpawned(j) + "");
+                                    Label label = new Label(() -> amount + "");
                                     label.setFontScale(Scl.scl() * (settings.getInt("uiscaling") / 100f));
                                     ttt.add(label);
                                     ttt.pack();
@@ -887,7 +895,7 @@ public class HudUi {
                                     Image image = new Image(Icon.warning.getRegion()).setScaling(Scaling.fit);
                                     image.update(() -> image.setColor(Tmp.c2.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f))));
                                     ttt.add(image).size(Scl.scl(12f * (settings.getInt("uiscaling") / 100f)));
-                                    ttt.visible(() -> group.effect == StatusEffects.boss && group.getSpawned(j) > 0);
+                                    ttt.visible(() -> group.effect == StatusEffects.boss);
                                     ttt.pack();
                                 }));
                             }});
diff --git a/src/UnitInfo/core/Main.java b/src/UnitInfo/core/Main.java
index 57f84e5..0a11b34 100644
--- a/src/UnitInfo/core/Main.java
+++ b/src/UnitInfo/core/Main.java
@@ -67,7 +67,7 @@ public class Main extends Mod {
 
                 Draw.reset();
             }
-            if(!mobile){
+            if(!mobile && !Vars.state.isPaused()){
                 Fx.mine.at(Core.input.mouseWorldX(), Core.input.mouseWorldY(), Tmp.c2.set(Color.red).shiftHue(Time.time * 1.5f));
             }
         });