From 873c555c2ecadcfe646e54e5dd22bf93c2c856b1 Mon Sep 17 00:00:00 2001 From: Sharlotte Date: Mon, 19 Jul 2021 19:45:56 +0900 Subject: [PATCH] clean up --- src/UnitInfo/core/BarInfo.java | 163 +++++++++++++++++++ src/UnitInfo/core/HudUi.java | 282 ++++----------------------------- 2 files changed, 195 insertions(+), 250 deletions(-) create mode 100644 src/UnitInfo/core/BarInfo.java diff --git a/src/UnitInfo/core/BarInfo.java b/src/UnitInfo/core/BarInfo.java new file mode 100644 index 0000000..bee4e39 --- /dev/null +++ b/src/UnitInfo/core/BarInfo.java @@ -0,0 +1,163 @@ +package UnitInfo.core; + +import arc.Core; +import arc.graphics.Color; +import arc.math.Mathf; +import arc.struct.Seq; +import arc.util.Strings; +import arc.util.Time; +import mindustry.ai.types.FormationAI; +import mindustry.core.UI; +import mindustry.ctype.UnlockableContent; +import mindustry.entities.abilities.ForceFieldAbility; +import mindustry.entities.abilities.ShieldRegenFieldAbility; +import mindustry.gen.*; +import mindustry.graphics.Pal; +import mindustry.world.blocks.defense.turrets.*; +import mindustry.world.blocks.storage.*; + + +import static arc.Core.bundle; +import static mindustry.Vars.content; +import static mindustry.Vars.state; + +public class BarInfo { + Seq strings = new Seq<>(); + Seq colors = new Seq<>(); + Seq numbers = new Seq<>(); + + public Seq returnStrings(T target){ + getInfo(target); + return strings; + } + public Seq returnColors(T target){ + getInfo(target); + return colors; + } + public Seq returnNumbers(T target){ + getInfo(target); + return numbers; + } + + public void getInfo(T target){ + for(int i = 0; i < 6; i++) { //init + strings.add("[lightgray][]"); + colors.add(Color.clear); + numbers.add(0f); + } + + + + if(target instanceof Healthc) { + strings.set(0, Core.bundle.format("shar-stat.health", Strings.fixed(((Healthc)target).health(), 1))); + colors.set(0, Pal.health); + numbers.set(0, ((Healthc) target).health()); + } + + + + if(target instanceof BlockUnitUnit && ((BlockUnitUnit)target).tile() instanceof Turret.TurretBuild) { + Turret.TurretBuild turretBuild = ((Turret.TurretBuild)((BlockUnitUnit)target).tile()); + float value = Mathf.clamp(turretBuild.reload / ((Turret)turretBuild.block).reloadTime) * 100f; + strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2)))); + colors.set(1, Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(turretBuild.reload / ((Turret)turretBuild.block).reloadTime))); + numbers.set(1, turretBuild.reload / ((Turret)turretBuild.block).reloadTime); + } + else if(target instanceof Turret.TurretBuild){ + float value = Mathf.clamp(((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime) * 100f; + strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2)))); + colors.set(1, Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime))); + numbers.set(1, ((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime); + } + else if(target instanceof Unit && ((Unit) target).type != null){ + float max1 = ((ShieldRegenFieldAbility)content.units().copy().filter(ut -> ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility) != null).sort(ut -> ((ShieldRegenFieldAbility)ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max).peek().abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max; + float max2 = 0f; + if(((Unit)target).type().abilities.find(abil -> abil instanceof ForceFieldAbility) != null) max2 = ((ForceFieldAbility) ((Unit)target).type().abilities.find(abil -> abil instanceof ForceFieldAbility)).max; + strings.set(1, Core.bundle.format("shar-stat.shield", Strings.fixed(((Shieldc)target).shield(),1))); + colors.set(1, Pal.surge); + numbers.set(1, ((Unit)target).shield() / Math.max(max1, max2)); + } + + + if(target instanceof ItemTurret.ItemTurretBuild || (target instanceof BlockUnitUnit && ((BlockUnitUnit)target).tile() instanceof ItemTurret.ItemTurretBuild)) { + ItemTurret.ItemTurretBuild turretBuild = target instanceof ItemTurret.ItemTurretBuild ? (ItemTurret.ItemTurretBuild) target : (ItemTurret.ItemTurretBuild)((BlockUnitUnit)target).tile(); + strings.set(2, bundle.format("shar-stat.itemAmmo", turretBuild.totalAmmo, ((ItemTurret)turretBuild.block).maxAmmo)); + colors.set(2, turretBuild.hasAmmo() ? ((ItemTurret)turretBuild.block).ammoTypes.findKey(turretBuild.peekAmmo(), true).color : Pal.ammo); + numbers.set(2, turretBuild.totalAmmo / (((ItemTurret)turretBuild.block).maxAmmo * 1f)); + } + else if(target instanceof LiquidTurret.LiquidTurretBuild || (target instanceof BlockUnitUnit && ((BlockUnitUnit)target).tile() instanceof LiquidTurret.LiquidTurretBuild)){ + LiquidTurret.LiquidTurretBuild turretBuild = target instanceof LiquidTurret.LiquidTurretBuild ? (LiquidTurret.LiquidTurretBuild)target : ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)target).tile()); + strings.set(2, bundle.format("shar-stat.liquidAmmo", Strings.fixed(turretBuild.liquids.get(turretBuild.liquids.current()), 1) + " / " + Strings.fixed(turretBuild.block.liquidCapacity, 1))); + colors.set(2, turretBuild.liquids.current().color); + numbers.set(2, turretBuild.liquids.get(turretBuild.liquids.current()) / turretBuild.block.liquidCapacity); + } + else if(target instanceof PowerTurret.PowerTurretBuild || (target instanceof BlockUnitUnit && ((BlockUnitUnit)target).tile() instanceof PowerTurret.PowerTurretBuild)){ + PowerTurret.PowerTurretBuild entity = target instanceof PowerTurret.PowerTurretBuild ? (PowerTurret.PowerTurretBuild)target : ((PowerTurret.PowerTurretBuild)((BlockUnitUnit)target).tile()); + float max = entity.block.consumes.getPower().usage; + float v = entity.power.status * entity.power.graph.getLastScaledPowerIn(); + strings.set(2, bundle.format("shar-stat.power", (int)(Math.min(v,max) * 60), (int)(max * 60))); + colors.set(2, Pal.powerBar); + numbers.set(2, v/max); + } + else if(target instanceof Building && ((Building)target).block.hasItems) { + if(target instanceof CoreBlock.CoreBuild){ + CoreBlock.CoreBuild core = (CoreBlock.CoreBuild)target; + strings.set(2, bundle.format("shar-stat.itemCapacity", UI.formatAmount(((Building) target).items.total()), UI.formatAmount((long) (core.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)))); + numbers.set(2, ((Building)target).items.total() / (core.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); + } + else if(target instanceof StorageBlock.StorageBuild && !((StorageBlock.StorageBuild)target).canPickup()){ + for(int i = 0; i < 4; i++) { + Building build = ((Building) target).nearby(i); + if(build instanceof CoreBlock.CoreBuild){ + strings.set(2, bundle.format("shar-stat.itemCapacity", UI.formatAmount(((Building) target).items.total()), UI.formatAmount((long) (((CoreBlock.CoreBuild) build).storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)))); + numbers.set(2, ((Building)target).items.total() / (((CoreBlock.CoreBuild) build).storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); + break; + } + } + } + else { + strings.set(2, bundle.format("shar-stat.itemCapacity", UI.formatAmount(((Building)target).items.total()), UI.formatAmount(((Building)target).block.itemCapacity))); + numbers.set(2, ((Building)target).items.total() / (((Building)target).block.itemCapacity * 1f)); + } + colors.set(2, Pal.items); + } + else if(target instanceof Unit && ((Unit)target).type() != null) { + strings.set(2, bundle.format("shar-stat.itemCapacity", UI.formatAmount(((Unit)target).stack().amount), UI.formatAmount(((Unit)target).type().itemCapacity))); + colors.set(2, ((Unit)target).stack().item.color.cpy().lerp(Color.white, 0.15f)); + numbers.set(2, ((Unit)target).stack().amount / (((Unit)target).type().itemCapacity * 1f)); + } + + + + if(target instanceof Turret.TurretBuild || (target instanceof BlockUnitUnit && ((BlockUnitUnit) target).tile() instanceof Turret.TurretBuild)){ + Turret turret = target instanceof Turret.TurretBuild ? (Turret)((Turret.TurretBuild)target).block : (Turret)(((BlockUnitUnit) target).tile()).block; + if(turret.chargeTime > 0f) return; + float value = Mathf.clamp(Main.hud.heat2 / turret.chargeTime) * 100f; + strings.set(3, Core.bundle.format("shar-stat.charge", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2)))); + colors.set(3, Pal.surge.cpy().lerp(Pal.accent, Main.hud.heat2 / turret.chargeTime)); + numbers.set(3, Main.hud.heat2 / turret.chargeTime); + } + else if(target instanceof Unit && !(target instanceof BlockUnitUnit) && ((Unit) target).type != null) { + strings.set(3, Core.bundle.format("shar-stat.commandUnits", Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target), ((Unit)target).type().commandLimit)); + colors.set(3, Pal.powerBar.cpy().lerp(Pal.surge.cpy().mul(Pal.lighterOrange), Mathf.absin(Time.time, 7f / (1f + Mathf.clamp(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target) / (((Unit)target).type().commandLimit * 1f))), 1f))); + numbers.set(3, Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target) / (((Unit)target).type().commandLimit * 1f)); + } + + + + if(target instanceof Unit && target instanceof Payloadc && ((Unit) target).type != null){ + strings.set(4, Core.bundle.format("shar-stat.payloadCapacity", Mathf.round(Mathf.sqrt(((Payloadc)target).payloadUsed())), Mathf.round(Mathf.sqrt(((Unit)target).type().payloadCapacity)))); + colors.set(4, Pal.items); + numbers.set(4, ((Payloadc)target).payloadUsed() / ((Unit)target).type().payloadCapacity); + } + + + + if(target instanceof Unit && state.rules.unitAmmo&& ((Unit) target).type != null){ + strings.set(5, Core.bundle.format("shar-stat.ammos", ((Unit)target).ammo(), ((Unit)target).type().ammoCapacity)); + colors.set(5, ((Unit)target).type().ammoType.color); + numbers.set(5, ((Unit)target).ammof()); + } + + } +} diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java index ea5c99b..dbba91c 100644 --- a/src/UnitInfo/core/HudUi.java +++ b/src/UnitInfo/core/HudUi.java @@ -16,11 +16,7 @@ import arc.scene.utils.*; import arc.struct.*; import arc.util.*; import mindustry.*; -import mindustry.ai.types.*; import mindustry.content.*; -import mindustry.core.UI; -import mindustry.ctype.UnlockableContent; -import mindustry.entities.abilities.*; import mindustry.entities.units.*; import mindustry.game.*; import mindustry.gen.*; @@ -62,6 +58,11 @@ public class HudUi { int maxwave; int coreamount; + BarInfo info = new BarInfo(); + Seq strings = new Seq<>(new String[]{"","","","","",""}); + Seq numbers = new Seq<>(new Float[]{0f,0f,0f,0f,0f,0f}); + Seq colors = new Seq<>(new Color[]{Color.clear,Color.clear,Color.clear,Color.clear,Color.clear,Color.clear}); + @SuppressWarnings("unchecked") public T getUnit(){ Seq units = Groups.unit.intersect(Core.input.mouseWorldX(), Core.input.mouseWorldY(), 4, 4); @@ -224,191 +225,22 @@ public class HudUi { public void addBars(){ bars.clear(); bars.add(new SBar( - () -> { - float hp = 0f; - if(getUnit() instanceof Healthc) hp = Mathf.round(((Healthc)getUnit()).health(), 1); - return Core.bundle.format("shar-stat.health", hp); - }, - () -> Pal.health, - () -> { - float hp = 0f; - - if(getUnit() instanceof Healthc) hp = ((Healthc)getUnit()).healthf(); - return Mathf.clamp(hp); - } + () -> strings.get(0), + () -> colors.get(0), + () -> numbers.get(0) )); bars.add(new SBar( - () -> { - if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) { - float value = Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime) * 100f; - return Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))); - } - if(getUnit() instanceof Turret.TurretBuild){ - float value = Mathf.clamp(((Turret.TurretBuild)getUnit()).reload / ((Turret)((Turret.TurretBuild)getUnit()).block).reloadTime) * 100f; - return Core.bundle.format("shar-stat.reload", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))); - } - if(getUnit() instanceof Shieldc) - return Core.bundle.format("shar-stat.shield", Strings.fixed(((Shieldc)getUnit()).shield(),1)); - return "[lightgray][]"; - }, - () ->{ - if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) - return Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime)); - if(getUnit() instanceof Turret.TurretBuild) - return Pal.accent.cpy().lerp(Color.orange, Mathf.clamp(((Turret.TurretBuild)getUnit()).reload / ((Turret)((Turret.TurretBuild)getUnit()).block).reloadTime)); - if(getUnit() instanceof Shieldc) - return Pal.surge; - return Color.clear; - }, - () -> { - if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild) - return Mathf.clamp(((Turret.TurretBuild)((BlockUnitUnit)getUnit()).tile()).reload / ((Turret)((BlockUnitUnit)getUnit()).tile().block).reloadTime); - if(getUnit() instanceof Turret.TurretBuild) - return Mathf.clamp(((Turret.TurretBuild)getUnit()).reload / ((Turret)((Turret.TurretBuild)getUnit()).block).reloadTime); - if(getUnit() instanceof Shieldc) { - float max1 = ((ShieldRegenFieldAbility)content.units().copy().filter(ut -> ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility) != null).sort(ut -> ((ShieldRegenFieldAbility)ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max).peek().abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max; - float max2 = 0f; - if(!(getUnit() instanceof Unit)) return 0f; - if(((Unit)getUnit()).type().abilities.find(abil -> abil instanceof ForceFieldAbility) != null) max2 = ((ForceFieldAbility) ((Unit)getUnit()).type().abilities.find(abil -> abil instanceof ForceFieldAbility)).max; - return Mathf.clamp(((Unit)getUnit()).shield() / Math.max(max1, max2)); - } - return 0f; - } + () -> strings.get(1), + () -> colors.get(1), + () -> numbers.get(1) )); bars.add(new Stack(){{ add(new Table(t -> { t.top().defaults().width(Scl.scl(23 * 8f)).height(Scl.scl(4f * 8f)); t.add(new SBar( - () -> { - if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit)getUnit()).tile() instanceof Turret.TurretBuild){ - if(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) - return bundle.format("shar-stat.itemAmmo", ((ItemTurret.ItemTurretBuild) ((BlockUnitUnit)getUnit()).tile()).totalAmmo, ((ItemTurret)((BlockUnitUnit)getUnit()).tile().block).maxAmmo); - else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){ - LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile()); - return bundle.format("shar-stat.liquidAmmo", entity == null || entity.liquids == null ? 0 : Mathf.round(entity.liquids.get(entity.liquids.current()) * 10) / 10.0 + " / " + Mathf.round(entity.block.liquidCapacity)); - } - else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){ - PowerTurret.PowerTurretBuild entity = ((PowerTurret.PowerTurretBuild)((BlockUnitUnit)getUnit()).tile()); - float max = entity.block.consumes.getPower().usage; - float v = entity.power.status * entity.power.graph.getLastScaledPowerIn(); - - return bundle.format("shar-stat.power", (int)(Math.min(v,max) * 60), (int)(max * 60)); - } - } - if(getUnit() instanceof Turret.TurretBuild){ - if(getUnit() instanceof ItemTurret.ItemTurretBuild) - return bundle.format("shar-stat.itemAmmo", ((ItemTurret.ItemTurretBuild) getUnit()).totalAmmo, ((ItemTurret)((ItemTurret.ItemTurretBuild) getUnit()).block).maxAmmo); - else if(getUnit() instanceof LiquidTurret.LiquidTurretBuild){ - LiquidTurret.LiquidTurretBuild entity = getUnit(); - return bundle.format("shar-stat.liquidAmmo", entity == null || entity.liquids == null ? 0 : Mathf.round(entity.liquids.get(entity.liquids.current()) * 10) / 10.0 + " / " + Mathf.round(entity.block.liquidCapacity)); - } - else if(getUnit() instanceof PowerTurret.PowerTurretBuild){ - PowerTurret.PowerTurretBuild entity = getUnit(); - float max = entity.block.consumes.getPower().usage; - float v = entity.power.status * entity.power.graph.getLastScaledPowerIn(); - return bundle.format("shar-stat.power", (int)(Math.min(v,max) * 60), (int)(max * 60)); - } - } - if(getUnit() instanceof Building && ((Building)getUnit()).block.hasItems) { - if(getUnit() instanceof CoreBlock.CoreBuild || (getUnit() instanceof StorageBlock.StorageBuild && !((StorageBlock.StorageBuild)getUnit()).canPickup())) { - CoreBlock.CoreBuild core = getUnit(); - if(getUnit() instanceof StorageBlock.StorageBuild) for(int i = 0; i < 4; i++) { - Building build = ((StorageBlock.StorageBuild) getUnit()).nearby(i); - if(build instanceof CoreBlock.CoreBuild){ - core = (CoreBlock.CoreBuild) build; - break; - } - } - - return bundle.format("shar-stat.itemCapacity", UI.formatAmount(((Building) getUnit()).items.total()), UI.formatAmount((long) (core.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f))); - } - else return bundle.format("shar-stat.itemCapacity", UI.formatAmount(((Building)getUnit()).items.total()), UI.formatAmount(((Building)getUnit()).block.itemCapacity)); - } - if(getUnit() instanceof Unit) - return bundle.format("shar-stat.itemCapacity", UI.formatAmount(((Unit)getUnit()).stack().amount), UI.formatAmount(((Unit)getUnit()).type().itemCapacity)); - return "[lightgray][]"; - }, - () -> { - if(getUnit() instanceof BlockUnitUnit){ - if(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) { - if(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).hasAmmo()) lastItemColor = ((ItemTurret) ((BlockUnitUnit) getUnit()).tile().block).ammoTypes.findKey(((ItemTurret.ItemTurretBuild)((BlockUnitUnit) getUnit()).tile()).peekAmmo(), true).color; - else lastItemColor = Pal.ammo; - } - else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){ - LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile()); - lastItemColor = entity.liquids.current().color; - } - else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){ - lastItemColor = Pal.powerBar; - } - } - else if(getUnit() instanceof Turret.TurretBuild){ - if(getUnit() instanceof ItemTurret.ItemTurretBuild) { - if(((ItemTurret.ItemTurretBuild)getUnit()).hasAmmo()) lastItemColor = ((ItemTurret) ((ItemTurret.ItemTurretBuild)getUnit()).block).ammoTypes.findKey(((ItemTurret.ItemTurretBuild)getUnit()).peekAmmo(), true).color; - else lastItemColor = Pal.ammo; - } - else if(getUnit() instanceof LiquidTurret.LiquidTurretBuild){ - lastItemColor = ((LiquidTurret.LiquidTurretBuild)getUnit()).liquids.current().color; - } - else if(getUnit() instanceof PowerTurret.PowerTurretBuild){ - lastItemColor = Pal.powerBar; - } - } - else if(getUnit() instanceof Building && ((Building)getUnit()).block.hasItems) - return Pal.items; - else if(getUnit() instanceof Unit && ((Unit)getUnit()).stack().item != null && ((Unit)getUnit()).stack().amount > 0) - lastItemColor = ((Unit)getUnit()).stack().item.color.cpy().lerp(Color.white, 0.15f); - else lastItemColor = Color.clear; - return lastItemColor; - }, - () -> { - if(getUnit() instanceof BlockUnitUnit) { - if(((BlockUnitUnit)getUnit()).tile() instanceof ItemTurret.ItemTurretBuild) { - return ((ItemTurret.ItemTurretBuild) ((BlockUnitUnit) getUnit()).tile()).totalAmmo / (((ItemTurret) ((BlockUnitUnit) getUnit()).tile().block).maxAmmo * 1f); - } - else if(((BlockUnitUnit)getUnit()).tile() instanceof LiquidTurret.LiquidTurretBuild){ - LiquidTurret.LiquidTurretBuild entity = ((LiquidTurret.LiquidTurretBuild)((BlockUnitUnit)getUnit()).tile()); - return entity.liquids.get(entity.liquids.current()) / entity.block.liquidCapacity; - } - else if(((BlockUnitUnit)getUnit()).tile() instanceof PowerTurret.PowerTurretBuild){ - Building entity = ((BlockUnitUnit)getUnit()).tile(); - float max = entity.block.consumes.getPower().usage; - float v = entity.power.status * entity.power.graph.getLastScaledPowerIn(); - return v/max; - } - } - if(getUnit() instanceof Turret.TurretBuild) { - if(getUnit() instanceof ItemTurret.ItemTurretBuild) { - return (((ItemTurret.ItemTurretBuild) getUnit()).totalAmmo / (((ItemTurret) ((ItemTurret.ItemTurretBuild)getUnit()).block).maxAmmo * 1f)); - } - else if(getUnit() instanceof LiquidTurret.LiquidTurretBuild){ - LiquidTurret.LiquidTurretBuild entity = getUnit(); - return entity.liquids.get(entity.liquids.current()) / entity.block.liquidCapacity; - } - else if(getUnit() instanceof PowerTurret.PowerTurretBuild){ - Building entity = getUnit(); - float max = entity.block.consumes.getPower().usage; - float v = entity.power.status * entity.power.graph.getLastScaledPowerIn(); - return v/max; - } - } - if(getUnit() instanceof Building && ((Building)getUnit()).block.hasItems) - if(getUnit() instanceof CoreBlock.CoreBuild || (getUnit() instanceof StorageBlock.StorageBuild && !((StorageBlock.StorageBuild)getUnit()).canPickup())) { - CoreBlock.CoreBuild core = getUnit(); - if(getUnit() instanceof StorageBlock.StorageBuild) for(int i = 0; i < 4; i++) { - Building build = ((StorageBlock.StorageBuild) getUnit()).nearby(i); - if(build instanceof CoreBlock.CoreBuild){ - core = (CoreBlock.CoreBuild) build; - break; - } - } - return Mathf.clamp(((CoreBlock.CoreBuild)getUnit()).items.total() / (core.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); - } - else return Mathf.clamp(((Building)getUnit()).items.total() / (((Building)getUnit()).block.itemCapacity * 1f)); - if(getUnit() instanceof Unit) - return Mathf.clamp(((Unit)getUnit()).stack().amount / (((Unit)getUnit()).type().itemCapacity * 1f)); - return 0f; - } + () -> strings.get(2), + () -> lastItemColor = colors.get(2), + () -> numbers.get(2) )).growX().left(); })); add(new Table(){{ @@ -566,80 +398,27 @@ public class HudUi { t.pack(); })); }}); - bars.add(new SBar( - () -> { - if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild && ((Turret)(((BlockUnitUnit) getUnit()).tile()).block).chargeTime > 0f){ - Turret.TurretBuild entity = ((Turret.TurretBuild)((BlockUnitUnit) getUnit()).tile()); - float value = Mathf.clamp(heat2 / ((Turret)entity.block).chargeTime) * 100f; - return Core.bundle.format("shar-stat.charge", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))); - } - else if(getUnit() instanceof Turret.TurretBuild && ((Turret)((Turret.TurretBuild)getUnit()).block).chargeTime > 0f){ - Turret.TurretBuild entity = getUnit(); - float value = Mathf.clamp(heat2 / ((Turret)entity.block).chargeTime) * 100f; - return Core.bundle.format("shar-stat.charge", Strings.fixed(value, (Math.abs((int)value - value) <= 0.001f ? 0 : Math.abs((int)(value * 10) - value * 10) <= 0.001f ? 1 : 2))); - } - else if(getUnit() instanceof Unit && !(getUnit() instanceof BlockUnitUnit)) - return Core.bundle.format("shar-stat.commandUnits", Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()), ((Unit)getUnit()).type().commandLimit); - return "[lightgray][]"; - }, - () -> { - if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild){ - Turret.TurretBuild entity = ((Turret.TurretBuild)((BlockUnitUnit) getUnit()).tile()); - return Pal.surge.cpy().lerp(Pal.accent, heat2 / ((Turret)entity.block).chargeTime); - } - else if(getUnit() instanceof Turret.TurretBuild){ - return Pal.surge.cpy().lerp(Pal.accent, heat2 / ((Turret)((Turret.TurretBuild)getUnit()).block).chargeTime); - } - else if(getUnit() instanceof Unit) - return Pal.powerBar.cpy().lerp(Pal.surge.cpy().mul(Pal.lighterOrange), Mathf.absin(Time.time, 7f / (1f + Mathf.clamp(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()) / (((Unit)getUnit()).type().commandLimit * 1f))), 1f)); - return Color.clear; - }, - () -> { - if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild){ - return heat2 / ((Turret)(((BlockUnitUnit) getUnit()).tile()).block).chargeTime; - } - else if(getUnit() instanceof Turret.TurretBuild){ - return heat2 / ((Turret)((Turret.TurretBuild)getUnit()).block).chargeTime; - } - else if(getUnit() instanceof Unit) - return Mathf.clamp(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == getUnit()) / (((Unit)getUnit()).type().commandLimit * 1f)); - return 0f; - } - )); bars.add(new SBar( - () -> { - if(getUnit() instanceof Payloadc) return Core.bundle.format("shar-stat.payloadCapacity", Mathf.round(Mathf.sqrt(((Payloadc)getUnit()).payloadUsed())), Mathf.round(Mathf.sqrt(((Unit)getUnit()).type().payloadCapacity))); - else return "[lightgray][]"; - }, - () -> { - if(getUnit() instanceof Payloadc) return Pal.items; - return Color.clear; - }, - () -> { - if(getUnit() instanceof Payloadc) return Mathf.clamp(((Payloadc)getUnit()).payloadUsed() / ((Unit)getUnit()).type().payloadCapacity); - return 0f; - })); + () -> strings.get(3), + () -> colors.get(3), + () -> numbers.get(3) + )); + + bars.add(new SBar( + () -> strings.get(4), + () -> colors.get(4), + () -> numbers.get(4) + )); bars.add(new Stack(){{ add(new Table(t -> { - t.defaults().width(Scl.scl(23 * 8f)); - t.defaults().height(Scl.scl(4f * 8f)); - t.top(); + t.top().defaults().width(Scl.scl(23 * 8f)).height(Scl.scl(4f * 8f)); + t.add(new SBar( - () -> { - if(state.rules.unitAmmo) return Core.bundle.format("shar-stat.ammos", ((Unit)getUnit()).ammo(), ((Unit)getUnit()).type().ammoCapacity); - return "[lightgray][]"; - }, - () -> { - if(getUnit() instanceof Unit) lastAmmoColor = ((Unit)getUnit()).type().ammoType.color; - else lastAmmoColor = Color.clear; - return lastAmmoColor; - }, - () -> { - if(getUnit() instanceof Unit) ((Unit)getUnit()).ammof(); - return 0f; - } + () -> strings.get(5), + () -> lastAmmoColor = colors.get(5), + () -> numbers.get(5) )).growX().left(); })); add(new Table(t -> { @@ -845,6 +624,9 @@ public class HudUi { }).padRight(Scl.scl(24 * 8f)); table.row(); table.update(() -> { + strings = info.returnStrings(getUnit()); + numbers = info.returnNumbers(getUnit()); + colors = info.returnColors(getUnit()); if(getUnit() instanceof BlockUnitUnit && ((BlockUnitUnit) getUnit()).tile() instanceof Turret.TurretBuild){ Turret.TurretBuild entity = ((Turret.TurretBuild)((BlockUnitUnit) getUnit()).tile()); if(entity.charging) heat2 += Time.delta;