more core info

assets/bundles/bundle.properties

@@ -12,8 +12,11 @@ shar-stat.liquidAmmo = Liquid: {0}
 shar-stat.power = Power: {0} / {1}
 
 # Settings
-setting.weaponui.name = Display weapon UI
+setting.coreui.name = Display core info UI
-setting.commandedunitui.name = Display commandUnits UI
+setting.unitui.name = Display unit info UI
+setting.weaponui.name = Display weapon info UI
+setting.commandedunitui.name = Display command info UI
 setting.unithealthui.name = Display Unit Bar
+setting.coreuiopacity.name = Core UI background Opacity
 setting.uiopacity.name = UI background Opacity
 setting.baropacity.name = Health Bar Opacity

assets/bundles/bundle_ko.properties

@@ -12,8 +12,11 @@ shar-stat.liquidAmmo = 액체: {0}
 shar-stat.power = 전력: {0} / {1}
 
 # Settings
-setting.weaponui.name = 무기 UI 표시
+setting.coreui.name = 코어 정보 UI 표시
-setting.commandedunitui.name = 지휘 유닛 UI 표시
+setting.unitui.name = 유닛 정보 UI 표시
+setting.weaponui.name = 무기 정보 UI 표시
+setting.commandedunitui.name = 지휘 정보 UI 표시
 setting.unithealthui.name = 유닛 바 표시
+setting.coreuiopacity.name = 코어 UI 배경 투명도
 setting.uiopacity.name = UI 배경 투명도
 setting.baropacity.name = 유닛 바 투명도

src/UnitInfo/core/HudUi.java

@@ -1,19 +1,19 @@
 package UnitInfo.core;
 
-import UnitInfo.ui.FreeBar;
 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.Mathf;
-import arc.math.geom.Rect;
 import arc.scene.Element;
 import arc.scene.style.TransformDrawable;
 import arc.scene.ui.*;
 import arc.scene.ui.layout.Stack;
 import arc.scene.ui.layout.Table;
 import arc.scene.utils.Elem;
+import arc.struct.ObjectMap;
 import arc.struct.Seq;
 import arc.util.*;
 import mindustry.Vars;
@@ -32,8 +32,10 @@ import mindustry.world.blocks.defense.turrets.LiquidTurret;
 import mindustry.world.blocks.defense.turrets.PowerTurret;
 import mindustry.world.blocks.defense.turrets.Turret;
 import mindustry.world.blocks.power.ConditionalConsumePower;
+import mindustry.world.blocks.storage.CoreBlock;
 import mindustry.world.consumers.ConsumePower;
 import mindustry.world.consumers.ConsumeType;
+import mindustry.game.EventType.*;
 
 import static arc.Core.scene;
 import static arc.Core.settings;
@@ -42,6 +44,7 @@ import static mindustry.Vars.*;
 public class HudUi {
     Seq<Element> bars = new Seq<>();
     Table weapon = new Table();
+    Table core = new Table();
     @Nullable UnitType type;
     @Nullable Unit unit;
     Element image;
@@ -49,6 +52,12 @@ public class HudUi {
     float heat;
     float heat2;
 
+    float notifDuration = 4 * 60f;
+    float[] coreAttackTime = {0};
+    float[] coreAttackOpacity = {0};
+
+    ObjectMap<Building, Boolean> cores = new ObjectMap<>();
+
     public Unit getUnit(){
         Seq<Unit> units = Groups.unit.intersect(Core.input.mouseWorldX(), Core.input.mouseWorldY(), 4, 4);
         if(units.size <= 0) return player.unit();
@@ -57,15 +66,6 @@ public class HudUi {
         else return unit;
     }
 
-    public void reset(Table table){
-        table.remove();
-        table.reset();
-        type = getUnit().type;
-        unit = getUnit();
-        addTable();
-        //addWeapon();
-    }
-
     public void addBars(){
         bars.clear();
         bars.add(
@@ -228,8 +228,7 @@ public class HudUi {
                             float amount = (float) (((Math.round(entity.power.status * v * 10) / 10.0) * 60) / max);
                             //float amount = Mathf.zero(cons.requestedPower(entity)) && entity.power.graph.getPowerProduced() + entity.power.graph.getBatteryStored() > 0f ? 1f : entity.power.status;
 
-                            float finalAmount = amount;
+                            imaget = new PrograssedReqImage(Icon.power.getRegion(), () -> amount >= 0.99f, amount);
-                            imaget = new PrograssedReqImage(Icon.power.getRegion(), () -> finalAmount >= 0.99f, amount);
                             if(amount >= 0.999f) imaget = new Image(Icon.power.getRegion());
                         }
 
@@ -252,9 +251,7 @@ public class HudUi {
                 t.left();
 
                 t.add(new Image(){{
-                    update(() -> {
+                    update(() -> setDrawable(getUnit().stack.item == null || getUnit().stack.amount <= 0 ? Core.atlas.find("clear") : getUnit().stack.item.icon(Cicon.small)));
-                        setDrawable(getUnit().stack.item == null || getUnit().stack.amount <= 0 ? Core.atlas.find("clear") : getUnit().stack.item.icon(Cicon.small));
-                    });
                 }
 
                     @Override
@@ -384,11 +381,11 @@ public class HudUi {
                                             add(new Table(t -> {
                                                 t.left();
                                                 t.add(new Stack(){{
-                                                    add(new Table(tt -> {
+                                                    add(new Table(tt ->
                                                         tt.add(new Image(){{
                                                             update(() -> setDrawable(unit.stack.item == null || unit.stack.amount <= 0 ? Core.atlas.find("clear") : unit.stack.item.icon(Cicon.small)));
-                                                        }}).size(2.5f * 8f).scaling(Scaling.bounded).padBottom(4 * 8f).padLeft(2 * 8f);
+                                                        }}).size(2.5f * 8f).scaling(Scaling.bounded).padBottom(4 * 8f).padLeft(2 * 8f)
-                                                    }));
+                                                    ));
                                                     Table table = new Table(tt -> {
                                                         Label label = new Label(() -> unit.stack.item == null || unit.stack.amount <= 0 ? "" : unit.stack.amount + "");
 
@@ -505,16 +502,14 @@ public class HudUi {
 
                 t.table(Tex.underline2, tt -> {
                     Stack stack = new Stack(){{
-                        add(new Table(ttt -> {
+                        add(new Table(ttt -> ttt.add(new Image(){{
-                            ttt.add(new Image(){{
+                            update(() -> {
-                                update(() -> {
+                                TextureRegion region = Core.atlas.find("clear");
-                                    TextureRegion region = Core.atlas.find("clear");
+                                if(getUnit() instanceof BlockUnitUnit && getUnit().type != null) region = ((BlockUnitUnit)getUnit()).tile().block.icon(Cicon.large);
-                                    if(getUnit() instanceof BlockUnitUnit && getUnit().type != null) region = ((BlockUnitUnit)getUnit()).tile().block.icon(Cicon.large);
+                                else if(getUnit() != null && getUnit().type != null) region = getUnit().type.icon(Cicon.large);
-                                    else if(getUnit() != null && getUnit().type != null) region = getUnit().type.icon(Cicon.large);
+                                setDrawable(region);
-                                    setDrawable(region);
+                            });
-                                });
+                        }})));
-                            }});
-                        }));
                         add(new Table(ttt -> {
                             ttt.top().left();
                             ttt.add(new Stack(){{
@@ -599,7 +594,7 @@ public class HudUi {
                     else heat2 = 0f;
                 }
                 heat += Time.delta;
-                if (heat >= 16 && unittemp != getUnit()) {
+                if (heat >= 6 && unittemp != getUnit()) {
                     heat = 0f;
                     type = getUnit().type;
                     unit = getUnit();
@@ -614,11 +609,140 @@ public class HudUi {
             });
 
             table.fillParent = true;
-            table.visibility = () ->
+            table.visibility = () -> Core.settings.getBool("unitui") && (
                     ui.hudfrag.shown && !ui.minimapfrag.shown()
                             && (!Vars.mobile ||
                             !(getUnit().isBuilding() || Vars.control.input.block != null || !Vars.control.input.selectRequests.isEmpty()
-                                    && !(Vars.control.input.lastSchematic != null && !Vars.control.input.selectRequests.isEmpty())));
+                                    && !(Vars.control.input.lastSchematic != null && !Vars.control.input.selectRequests.isEmpty()))));
+        }));
+    }
+
+    public void addCore(){
+        core = new Table(tx -> {
+            tx.update(() -> {
+                Groups.build.each(b -> {
+                    if(b instanceof CoreBlock.CoreBuild && player != null && player.team() == b.team()) cores.put(b, false);
+                });
+            });
+            //tx.defaults().minSize(12 * 8f);
+            tx.left();
+            tx.add(new Table(tt -> {
+                tt.defaults().minWidth(24/3f * 8f).maxWidth(24/3f * 8f * 3f).height(12/3f * 8f).left().top();
+
+                int amount = 0;
+                int row = 0;
+                if(Vars.player.unit() != null) amount = Vars.player.unit().team().cores().size;
+                for(int r = 0; r < amount; r++){
+                    CoreBlock.CoreBuild core = Vars.player.unit().team().cores().get(r);
+                    TextureRegion region = core.block.icon(Cicon.full);
+
+                    if(amount > 1 && r % 4 == 0) {
+                        tt.row();
+                        row++;
+                    }
+                    else if(r % 4 == 0){
+                        tt.row();
+                        row++;
+                    }
+                    tt.table(coretable -> {
+                        coretable.center();
+                        coretable.add(new Stack(){{
+                            add(new Table(o -> {
+                                o.left();
+                                o.add(new Image(region)).size(6 * 8f).scaling(Scaling.bounded);
+                            }));
+
+                            add(new Table(h -> {
+                                h.add(new Stack(){{
+                                    add(new Table(e -> {
+                                        e.defaults().growX().height(9).width(6f * 8f).padTop(6 * 8f);
+                                        Bar healthBar = new Bar(
+                                                () -> "",
+                                                () -> Pal.health,
+                                                core::healthf);
+                                        e.add(healthBar);
+                                        e.pack();
+                                    }));
+
+                                    add(new Table(e -> {
+                                        e.defaults().growX().height(9).width(6f * 8f).padLeft(4 * 8f).padBottom(6 * 8f).top().right();
+                                        e.add(new Image(Icon.warning.getRegion())).size(2.5f * 8f).scaling(Scaling.bounded).top().right().color(Tmp.c1.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f)));
+
+                                        Events.run(Trigger.teamCoreDamage, () -> {
+                                            coreAttackTime[0] = notifDuration;
+                                        });
+
+                                        e.top().visible(() -> {
+                                            if(state.isMenu() || !state.teams.get(player.team()).hasCore()){
+                                                coreAttackTime[0] = 0f;
+                                                return false;
+                                            }
+
+                                            e.color.a = coreAttackOpacity[0];
+                                            if(coreAttackTime[0] > 0){
+                                                coreAttackOpacity[0] = Mathf.lerpDelta(coreAttackOpacity[0], 1f, 0.1f);
+                                            }else{
+                                                coreAttackOpacity[0] = Mathf.lerpDelta(coreAttackOpacity[0], 0f, 0.1f);
+                                            }
+
+                                            coreAttackTime[0] -= Time.delta;
+                                            return coreAttackOpacity[0] > 0;
+                                        });
+                                        e.pack();
+                                    }));
+                                }});
+                                h.pack();
+                            }));
+                        }}).center();
+                        coretable.row();
+                        coretable.center();
+                        coretable.label(() -> "(" + (int)core.x / 8 + ", " + (int)core.y / 8 + ")");
+                    }).left().padTop(36f * row);
+                    tt.center();
+                }
+            }){
+                @Override
+                protected void drawBackground(float x, float y) {
+                    if(getBackground() == null) return;
+                    Color color = this.color;
+                    Draw.color(color.r, color.g, color.b, (settings.getInt("coreuiopacity") / 100f) * this.parentAlpha);
+                    getBackground().draw(x, y, width, height);
+                }
+            }).padRight(36 * 8f);
+            tx.setColor(tx.color.cpy().a(1f));
+        });
+    }
+
+
+    public void addCoreTable(){
+        ui.hudGroup.addChild(new Table(table -> {
+            table.top().left();
+
+            table.add(new Table(scene.getStyle(Button.ButtonStyle.class).up, t -> {
+                t.defaults().minSize(10 * 8f);
+
+                t.update(() -> {
+                        t.clearChildren();
+                        addCore();
+                        t.add(core);
+
+                });
+            }){
+                @Override
+                protected void drawBackground(float x, float y) {
+                    if(getBackground() == null) return;
+                    Color color = this.color;
+                    Draw.color(color.r, color.g, color.b, (settings.getInt("coreuiopacity") / 100f) * this.parentAlpha);
+                    getBackground().draw(x, y, width, height);
+                }
+            }).padLeft(48 * 8f);
+
+            table.fillParent = true;
+            table.visibility = () -> Core.settings.getBool("coreui") && (
+                    ui.hudfrag.shown && !ui.minimapfrag.shown()
+                            && (!Vars.mobile ||
+                            !(Vars.control.input.block != null || !Vars.control.input.selectRequests.isEmpty()
+                                    && !(Vars.control.input.lastSchematic != null && !Vars.control.input.selectRequests.isEmpty()))));
         }));
     }
 }

src/UnitInfo/core/Main.java

@@ -3,7 +3,13 @@ package UnitInfo.core;
 import UnitInfo.ui.FreeBar;
 import arc.Core;
 import arc.Events;
-import arc.math.geom.Rect;
+import arc.graphics.Color;
+import arc.graphics.g2d.Draw;
+import arc.math.Angles;
+import arc.math.Mathf;
+import arc.util.Time;
+import arc.util.Tmp;
+import mindustry.Vars;
 import mindustry.game.EventType.*;
 import mindustry.gen.Groups;
 import mindustry.mod.Mod;
@@ -12,20 +18,35 @@ public class Main extends Mod {
     public static Setting settingAdder = new Setting();
 
     public Main(){
+        float[] unitFade = {0};
+
         Events.on(ClientLoadEvent.class, e -> {
             settingAdder.init();
             HudUi hud = new HudUi();
             hud.addTable();
+            hud.addCoreTable();
         });
 
         Events.on(WorldLoadEvent.class, e -> {
             HudUi hud = new HudUi();
             hud.addTable();
+            hud.addCoreTable();
         });
         Events.run(Trigger.draw, () -> {
             if(Core.settings.getBool("unithealthui"))
                 Groups.unit.each(unit -> new FreeBar().draw(unit));
         });
+
+        Events.run(Trigger.teamCoreDamage, () -> {
+            unitFade[0] = Mathf.lerpDelta(unitFade[0], Mathf.num( Vars.player.unit() != null), 0.1f);
+            for(int i = 0; i < 4; i++){
+                float rot = i * 90f + 45f + (-Time.time) % 360f;
+                float length = Vars.player.unit().hitSize() * 1.5f + (unitFade[0] * 2.5f);
+                Draw.color(Tmp.c1.set(Color.orange).lerp(Color.scarlet, Mathf.absin(Time.time, 2f, 1f)));
+                Draw.rect("select-arrow", Vars.player.unit().x + Angles.trnsx(rot, length), Vars.player.unit().y + Angles.trnsy(rot, length), length / 1.9f, length / 1.9f, rot - 135f);
+                Draw.reset();
+            }
+        });
     }
 
     @Override

src/UnitInfo/core/Setting.java

@@ -12,12 +12,17 @@ public class Setting {
         boolean tmp = Core.settings.getBool("uiscalechanged", false);
         Core.settings.put("uiscalechanged", false);
 
+        addGraphicSetting("coreui");
+        addGraphicSetting("unitui");
         addGraphicSetting("weaponui");
         addGraphicSetting("commandedunitui");
         addGraphicSetting("unithealthui");
+        Vars.ui.settings.graphics.sliderPref("coreuiopacity", 25, 0, 100, 5, s -> s + "%");
         Vars.ui.settings.graphics.sliderPref("uiopacity", 50, 0, 100, 5, s -> s + "%");
         Vars.ui.settings.graphics.sliderPref("baropacity", 50, 0, 100, 5, s -> s + "%");
 
+        Core.settings.defaults("coreui", true);
+        Core.settings.defaults("unitui", true);
         Core.settings.defaults("weaponui", true);
         Core.settings.defaults("commandedunitui", true);
         Core.settings.defaults("unithealthui", true);