From cc5dbec832d1d0a6706916ea1b7100040c8e6418 Mon Sep 17 00:00:00 2001 From: Sharlotte Date: Sun, 25 Jul 2021 15:11:50 +0900 Subject: [PATCH] all bar strings are formatted --- assets/bundles/bundle.properties | 2 +- assets/bundles/bundle_ko.properties | 2 +- src/UnitInfo/core/BarInfo.java | 42 ++++++++++++++++------------- src/UnitInfo/core/HudUi.java | 2 +- 4 files changed, 26 insertions(+), 22 deletions(-) diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index ddce691..42f9da1 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -11,7 +11,7 @@ shar-stat.commandUnits = Commands: {0} / {1} shar-stat.reload = Reload: {0}% shar-stat.charge = Charge: {0}% shar-stat.itemAmmo = Ammo: {0} / {1} -shar-stat.liquidAmmo = Liquid: {0} +shar-stat.liquidAmmo = Liquid: {0} / {1} shar-stat.power = Power: {0} / {1} shar-stat.progress = Progress: {0}% shar-stat-waveAmount = [lightgray]Amount:[] {0} diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index 704a465..d2800ae 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -11,7 +11,7 @@ shar-stat.commandUnits = 지휘 유닛: {0} / {1} shar-stat.reload = 재장전: {0}% shar-stat.charge = 충전: {0}% shar-stat.itemAmmo = 탄약 : {0} / {1} -shar-stat.liquidAmmo = 액체: {0} +shar-stat.liquidAmmo = 액체: {0} / {1} shar-stat.power = 전력: {0} / {1} shar-stat.progress = 진행도: {0}% shar-stat-waveAmount = [lightgray]유닛 수:[] {0} diff --git a/src/UnitInfo/core/BarInfo.java b/src/UnitInfo/core/BarInfo.java index c6a394f..8e24146 100644 --- a/src/UnitInfo/core/BarInfo.java +++ b/src/UnitInfo/core/BarInfo.java @@ -46,6 +46,12 @@ public class BarInfo { return numbers; } + public static String format(float number){ + if(number >= 10000) return UI.formatAmount((long)number); + if(String.valueOf(number).split("[.]")[1].matches("0")) return String.valueOf(number).split("[.]")[0]; + return Strings.fixed(number, 1); + } + public static void getInfo(T target){ for(int i = 0; i < 6; i++) { //init strings.set(i, "[lightgray][]"); @@ -62,8 +68,7 @@ public class BarInfo { 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)))); + strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed((((Turret.TurretBuild)target).reload / ((Turret)((Turret.TurretBuild)target).block).reloadTime) * 100f, 1))); 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); } @@ -71,7 +76,7 @@ public class BarInfo { 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))); + strings.set(1, Core.bundle.format("shar-stat.shield", format(((Shieldc)target).shield()))); colors.set(1, Pal.surge); numbers.set(1, ((Unit)target).shield() / Math.max(max1, max2)); } @@ -96,13 +101,13 @@ public class BarInfo { if(target instanceof ItemTurret.ItemTurretBuild) { ItemTurret.ItemTurretBuild turretBuild = (ItemTurret.ItemTurretBuild) target; - strings.set(2, bundle.format("shar-stat.itemAmmo", turretBuild.totalAmmo, ((ItemTurret)turretBuild.block).maxAmmo)); + strings.set(2, bundle.format("shar-stat.itemAmmo", format(turretBuild.totalAmmo), format(((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){ LiquidTurret.LiquidTurretBuild turretBuild = (LiquidTurret.LiquidTurretBuild)target; - strings.set(2, bundle.format("shar-stat.liquidAmmo", Strings.fixed(turretBuild.liquids.get(turretBuild.liquids.current()), 1) + " / " + Strings.fixed(turretBuild.block.liquidCapacity, 1))); + strings.set(2, bundle.format("shar-stat.liquidAmmo", format(turretBuild.liquids.get(turretBuild.liquids.current())), format(turretBuild.block.liquidCapacity))); colors.set(2, turretBuild.liquids.current().color); numbers.set(2, turretBuild.liquids.get(turretBuild.liquids.current()) / turretBuild.block.liquidCapacity); } @@ -110,34 +115,34 @@ public class BarInfo { PowerTurret.PowerTurretBuild entity = (PowerTurret.PowerTurretBuild)target; 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))); + strings.set(2, bundle.format("shar-stat.power", format(Math.min(v,max) * 60), format(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)))); + strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building) target).items.total()), format(core.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); 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)))); + strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building) target).items.total()), format(((CoreBlock.CoreBuild) build).storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); 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))); + strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Building)target).items.total()), format(((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))); + strings.set(2, bundle.format("shar-stat.itemCapacity", format(((Unit)target).stack().amount), format(((Unit)target).type().itemCapacity))); if(((Unit)target).stack().amount > 0 && ((Unit)target).stack().item != null) 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)); } @@ -146,48 +151,47 @@ public class BarInfo { if(target instanceof Turret.TurretBuild){ Turret turret = (Turret)((Turret.TurretBuild)target).block; if(turret.chargeTime > 0f) { - float value = Mathf.clamp(SVars.hud.charge / 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)))); + strings.set(3, Core.bundle.format("shar-stat.charge", format((SVars.hud.charge / turret.chargeTime) * 100))); colors.set(3, Pal.surge.cpy().lerp(Pal.accent, SVars.hud.charge / turret.chargeTime)); numbers.set(3, SVars.hud.charge / turret.chargeTime); } } else if(target instanceof Unit && ((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)); + strings.set(3, Core.bundle.format("shar-stat.commandUnits", format(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target)), format(((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)); } else if(target instanceof UnitFactory.UnitFactoryBuild){ UnitFactory.UnitFactoryBuild factory = (UnitFactory.UnitFactoryBuild) target; strings.set(3, factory.unit() == null ? "[lightgray]" + Iconc.cancel : - Core.bundle.format("bar.unitcap", Fonts.getUnicodeStr(factory.unit().name), factory.team.data().countType(factory.unit()), Units.getCap(factory.team))); + Core.bundle.format("bar.unitcap", Fonts.getUnicodeStr(factory.unit().name), format(factory.team.data().countType(factory.unit())), format(Units.getCap(factory.team)))); colors.set(3, Pal.power); numbers.set(3, factory.unit() == null ? 0f : (float)factory.team.data().countType(factory.unit()) / Units.getCap(factory.team)); } 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)))); + strings.set(4, Core.bundle.format("shar-stat.payloadCapacity", format(Mathf.round(Mathf.sqrt(((Payloadc)target).payloadUsed()))), format(Mathf.round(Mathf.sqrt(((Unit)target).type().payloadCapacity))))); colors.set(4, Pal.items); numbers.set(4, ((Payloadc)target).payloadUsed() / ((Unit)target).type().payloadCapacity); } else if(target instanceof Building && ((Building) target).block.hasLiquids){ Building build = (Building) target; - strings.set(4, Core.bundle.format("shar-stat.liquidCapacity", Strings.fixed(build.liquids.currentAmount(),1), Strings.fixed(build.block.liquidCapacity,1))); + strings.set(4, Core.bundle.format("shar-stat.liquidCapacity", format(build.liquids.currentAmount()), format(build.block.liquidCapacity))); colors.set(4, build.liquids.current().color); numbers.set(4, build.liquids.currentAmount()/build.block.liquidCapacity); } 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)); + strings.set(5, Core.bundle.format("shar-stat.ammos", format(((Unit)target).ammo()), format(((Unit)target).type().ammoCapacity))); colors.set(5, ((Unit)target).type().ammoType.color); numbers.set(5, ((Unit)target).ammof()); } else if(target instanceof Building && ((Building) target).block.hasPower && ((Building) target).block.consumes.hasPower()){ Building build = (Building) target; ConsumePower cons = build.block.consumes.getPower(); - if(cons.buffered) strings.set(5, Core.bundle.format("shar-stat.powerCapacity", Strings.fixed(build.power.status * cons.capacity * 60f, 1), Strings.fixed(cons.capacity * 60f, 1))); - else strings.set(5, Core.bundle.format("shar-stat.powerUsage", Strings.fixed(build.power.status * cons.usage * 60f, 1), Strings.fixed(cons.usage * 60f, 1))); + if(cons.buffered) strings.set(5, Core.bundle.format("shar-stat.powerCapacity", format(build.power.status * cons.capacity * 60f), format(cons.capacity * 60f))); + else strings.set(5, Core.bundle.format("shar-stat.powerUsage", format(build.power.status * cons.usage * 60f), format(cons.usage * 60f))); colors.set(5,Pal.powerBar); numbers.set(5, Mathf.zero(cons.requestedPower(build)) && build.power.graph.getPowerProduced() + build.power.graph.getBatteryStored() > 0f ? 1f : build.power.status); } diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java index 152cb85..8076c96 100644 --- a/src/UnitInfo/core/HudUi.java +++ b/src/UnitInfo/core/HudUi.java @@ -491,7 +491,7 @@ public class HudUi { add(new Table(temp -> temp.add(new Image(){{ update(()->{ TextureRegion region = atlas.find("clear"); - if(getTarget() instanceof Unit && !((Unit) getTarget()).dead) region = Icon.defenseSmall.getRegion(); + if(getTarget() instanceof Unit) region = Icon.defenseSmall.getRegion(); setDrawable(region); }); }}.setScaling(Scaling.fit))));