From ca8027de298951177703f2c2534908242d8b05cd Mon Sep 17 00:00:00 2001 From: sharlotte Date: Mon, 23 Aug 2021 17:14:16 +0900 Subject: [PATCH] improved info bar --- assets/bundles/bundle.properties | 2 + assets/bundles/bundle_ko.properties | 2 + src/UnitInfo/SUtils.java | 2 +- src/UnitInfo/core/BarInfo.java | 112 +++++++++++++++++++++------- src/UnitInfo/ui/FreeBar.java | 5 +- 5 files changed, 92 insertions(+), 31 deletions(-) diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 73e48fd..3f7c4d7 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -18,6 +18,8 @@ shar-stat-waveAmount = [lightgray]Amount:[] {0} shar-stat-waveShield = [lightgray]Shield:[] {0} shar-stat.waveStatus = [lightgray]Status:[] shar-stat.waveItem = [lightgray]Item:[] +shar-stat.powerIn = Power Income: {0}/s +shar-stat.powerOut = Power Outcome: {0}/s #Settings setting.unitlinelimit.name = UnitLines limit diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index ce1543a..7713999 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -18,6 +18,8 @@ shar-stat-waveAmount = [lightgray]유닛 수:[] {0} shar-stat-waveShield = [lightgray]방어막:[] {0} shar-stat.waveStatus = [lightgray]상태이상:[] shar-stat.waveItem = [lightgray]아이템:[] +shar-stat.powerIn = 전력 생산량: {0}/s +shar-stat.powerOut = 전력 소모량: {0}/s # Settings setting.unitlinelimit.name = 유닛선 제한 diff --git a/src/UnitInfo/SUtils.java b/src/UnitInfo/SUtils.java index fc9fccb..a2c7002 100644 --- a/src/UnitInfo/SUtils.java +++ b/src/UnitInfo/SUtils.java @@ -20,7 +20,7 @@ public class SUtils { public static String floatFormat(float number){ if(number >= 1000) return UI.formatAmount((long)number); if(String.valueOf(number).split("[.]")[1].matches("0")) return String.valueOf(number).split("[.]")[0]; - return Strings.fixed(number, 1); + return Strings.fixed(number, 2); } diff --git a/src/UnitInfo/core/BarInfo.java b/src/UnitInfo/core/BarInfo.java index 1d89873..758d056 100644 --- a/src/UnitInfo/core/BarInfo.java +++ b/src/UnitInfo/core/BarInfo.java @@ -18,7 +18,11 @@ import mindustry.ui.*; import mindustry.world.blocks.*; import mindustry.world.blocks.defense.*; import mindustry.world.blocks.defense.turrets.*; +import mindustry.world.blocks.distribution.MassDriver; import mindustry.world.blocks.environment.*; +import mindustry.world.blocks.power.PowerGenerator; +import mindustry.world.blocks.power.PowerNode; +import mindustry.world.blocks.power.ThermalGenerator; import mindustry.world.blocks.production.*; import mindustry.world.blocks.storage.*; import mindustry.world.blocks.units.*; @@ -56,50 +60,55 @@ public class BarInfo { if(target instanceof Healthc healthc){ - strings.set(0, Core.bundle.format("shar-stat.health", Strings.fixed(healthc.health(), 1))); + strings.set(0, bundle.format("shar-stat.health", floatFormat(healthc.health()))); colors.set(0, Pal.health); numbers.set(0, healthc.healthf()); } if(target instanceof Turret.TurretBuild turret){ - strings.set(1, Core.bundle.format("shar-stat.reload", Strings.fixed((turret.reload / ((Turret)turret.block).reloadTime) * 100f, 1))); + strings.set(1, bundle.format("shar-stat.reload", floatFormat((turret.reload / ((Turret)turret.block).reloadTime) * 100f))); colors.set(1, Pal.accent.cpy().lerp(Color.orange, Mathf.clamp((turret.reload / ((Turret)turret.block).reloadTime)))); numbers.set(1, turret.reload / ((Turret)turret.block).reloadTime); } + else if(target instanceof MassDriver.MassDriverBuild mass){ + strings.set(1, bundle.format("shar-stat.reload", floatFormat(mass.reload * 100f))); + colors.set(1, Pal.accent.cpy().lerp(Color.orange, mass.reload)); + numbers.set(1, mass.reload); + } else if(target instanceof Unit unit && unit.type != null){ float max1 = ((ShieldRegenFieldAbility)content.units().copy().filter(ut -> ut.abilities.contains(abil -> abil instanceof ShieldRegenFieldAbility)).sort(ut -> ((ShieldRegenFieldAbility)ut.abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max).peek().abilities.find(abil -> abil instanceof ShieldRegenFieldAbility)).max; float max2 = 0f; ForceFieldAbility ffa; if((ffa = (ForceFieldAbility) unit.type().abilities.find(abil -> abil instanceof ForceFieldAbility)) != null) max2 = ffa.max; - strings.set(1, Core.bundle.format("shar-stat.shield", floatFormat(unit.shield()))); + strings.set(1, bundle.format("shar-stat.shield", floatFormat(unit.shield()))); colors.set(1, Pal.surge); numbers.set(1, unit.shield() / Math.max(max1, max2)); } else if(target instanceof ForceProjector.ForceBuild force){ ForceProjector forceBlock = (ForceProjector) force.block; float max = forceBlock.shieldHealth + forceBlock.phaseShieldBoost * force.phaseHeat; - strings.set(1, Core.bundle.format("shar-stat.shield", floatFormat(max-force.buildup), floatFormat(max))); + strings.set(1, bundle.format("shar-stat.shield", floatFormat(max-force.buildup), floatFormat(max))); colors.set(1, Pal.shield); numbers.set(1, (max-force.buildup)/max); } else if(target instanceof ConstructBlock.ConstructBuild build){ - strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(build.progress * 100, 2))); + strings.set(1, bundle.format("shar-stat.progress", floatFormat(build.progress * 100))); colors.set(1, Pal.darkerMetal); numbers.set(1, build.progress); } else if(target instanceof UnitFactory.UnitFactoryBuild build){ - strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(build.fraction() * 100f, 2))); + strings.set(1, bundle.format("shar-stat.progress", floatFormat(build.fraction() * 100f))); colors.set(1, Pal.darkerMetal); numbers.set(1, build.fraction()); } else if(target instanceof Reconstructor.ReconstructorBuild reconstruct){ - strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(reconstruct.fraction() * 100, 2))); + strings.set(1, bundle.format("shar-stat.progress", floatFormat(reconstruct.fraction() * 100))); colors.set(1, Pal.darkerMetal); numbers.set(1, reconstruct.fraction()); } else if(target instanceof MendProjector.MendBuild mend){ - strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed((float) mend.sense(LAccess.progress) * 100f, 2))); + strings.set(1, bundle.format("shar-stat.progress", floatFormat((float) mend.sense(LAccess.progress) * 100f))); colors.set(1, Pal.heal); numbers.set(1, (float) mend.sense(LAccess.progress)); } @@ -107,12 +116,12 @@ public class BarInfo { Field ohno = OverdriveProjector.OverdriveBuild.class.getDeclaredField("charge"); ohno.setAccessible(true); float charge = (float) ohno.get(over); - strings.set(1, Core.bundle.format("shar-stat.progress", Strings.fixed(Mathf.clamp(charge/((OverdriveProjector)over.block).reload) * 100f, 2))); + strings.set(1, bundle.format("shar-stat.progress", floatFormat(Mathf.clamp(charge/((OverdriveProjector)over.block).reload) * 100f))); colors.set(1, Color.valueOf("feb380")); numbers.set(1, Mathf.clamp(charge/((OverdriveProjector)over.block).reload)); } else if(target instanceof Drill.DrillBuild drill){ - strings.set(1, bundle.format("shar-stat.progress", Strings.fixed((float) drill.sense(LAccess.progress) * 100f, 2))); + strings.set(1, bundle.format("shar-stat.progress", floatFormat((float) drill.sense(LAccess.progress) * 100f))); colors.set(1, drill.dominantItem == null ? Pal.items : drill.dominantItem.color); numbers.set(1, (float) drill.sense(LAccess.progress)); } @@ -121,11 +130,20 @@ public class BarInfo { if(block.outputItem != null) Tmp.c1.set(block.outputItem.item.color); else if(block.outputLiquid != null) Tmp.c1.set(block.outputLiquid.liquid.color); else Tmp.c1.set(Pal.items); - strings.set(1, bundle.format("shar-stat.progress", Strings.fixed((float) crafter.sense(LAccess.progress) * 100f, 2))); + strings.set(1, bundle.format("shar-stat.progress", floatFormat((float) crafter.sense(LAccess.progress) * 100f))); colors.set(1, Tmp.c1); numbers.set(1, (float) crafter.sense(LAccess.progress)); } - + else if(target instanceof PowerNode.PowerNodeBuild node){ + strings.set(1, bundle.format("bar.powerstored", floatFormat(node.power.graph.getLastPowerStored()), floatFormat(node.power.graph.getLastCapacity()))); + colors.set(1, Pal.powerBar); + numbers.set(1, node.power.graph.getLastPowerStored() / node.power.graph.getLastCapacity()); + } + else if(target instanceof PowerGenerator.GeneratorBuild generator){ + strings.set(1, bundle.format("bar.poweroutput", floatFormat(generator.getPowerProduction() * generator.timeScale() * 60f))); + colors.set(1, Pal.powerBar); + numbers.set(1, generator.productionEfficiency); + } if(target instanceof ItemTurret.ItemTurretBuild turret) { ItemTurret block = (ItemTurret)turret.block; @@ -165,28 +183,34 @@ public class BarInfo { if(unit.stack.amount > 0 && unit.stack().item != null) colors.set(2, unit.stack.item.color.cpy().lerp(Color.white, 0.15f)); numbers.set(2, unit.stack.amount / (unit.type.itemCapacity * 1f)); } + else if(target instanceof PowerNode.PowerNodeBuild node){ + strings.set(2, bundle.format("bar.powerlines", node.power.links.size, ((PowerNode)node.block).maxNodes)); + colors.set(2, Pal.items); + numbers.set(2, (float)node.power.links.size / (float)((PowerNode)node.block).maxNodes); + } + if(target instanceof Unit unit && unit.type != null) { - strings.set(3, Core.bundle.format("shar-stat.commandUnits", floatFormat(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target)), floatFormat(unit.type().commandLimit))); + strings.set(3, bundle.format("shar-stat.commandUnits", floatFormat(Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target)), floatFormat(unit.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.type().commandLimit * 1f))), 1f))); numbers.set(3, Groups.unit.count(u -> u.controller() instanceof FormationAI && ((FormationAI)u.controller()).leader == target) / (unit.type().commandLimit * 1f)); } else if(target instanceof UnitFactory.UnitFactoryBuild factory){ strings.set(3, factory.unit() == null ? "[lightgray]" + Iconc.cancel : - Core.bundle.format("bar.unitcap", Fonts.getUnicodeStr(factory.unit().name), floatFormat(factory.team.data().countType(factory.unit())), floatFormat(Units.getCap(factory.team)))); + bundle.format("bar.unitcap", Fonts.getUnicodeStr(factory.unit().name), floatFormat(factory.team.data().countType(factory.unit())), floatFormat(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)); } else if(target instanceof Reconstructor.ReconstructorBuild reconstruct){ strings.set(3, reconstruct.unit() == null ? "[lightgray]" + Iconc.cancel : - Core.bundle.format("bar.unitcap", Fonts.getUnicodeStr(reconstruct.unit().name), floatFormat(reconstruct.team.data().countType(reconstruct.unit())), floatFormat(Units.getCap(reconstruct.team)))); + bundle.format("bar.unitcap", Fonts.getUnicodeStr(reconstruct.unit().name), floatFormat(reconstruct.team.data().countType(reconstruct.unit())), floatFormat(Units.getCap(reconstruct.team)))); colors.set(3, Pal.power); numbers.set(3, reconstruct.unit() == null ? 0f : (float)reconstruct.team.data().countType(reconstruct.unit()) / Units.getCap(reconstruct.team)); } else if(target instanceof Drill.DrillBuild e){ - strings.set(3, bundle.format("bar.drillspeed", Strings.fixed(e.lastDrillSpeed * 60 * e.timeScale, 2))); + strings.set(3, bundle.format("bar.drillspeed", floatFormat(e.lastDrillSpeed * 60 * e.timeScale))); colors.set(3, Pal.ammo); numbers.set(3, e.warmup); } @@ -205,31 +229,63 @@ public class BarInfo { colors.set(3, Pal.ammo); numbers.set(3, fraction / max); } + else if(target instanceof ThermalGenerator.ThermalGeneratorBuild thermal){ + ThermalGenerator block = (ThermalGenerator) thermal.block; + float max = content.blocks().max(b -> b instanceof Floor f && f.attributes != null ? f.attributes.get(block.attribute) : 0).asFloor().attributes.get(block.attribute); + strings.set(3, bundle.format("shar-stat.attr", block.sumAttribute(block.attribute, thermal.tileX(), thermal.tileY()) * 100)); + colors.set(3, Pal.ammo); + numbers.set(3, block.sumAttribute(block.attribute, thermal.tileX(), thermal.tileY()) / block.size / block.size / max); + } + else if(target instanceof PowerNode.PowerNodeBuild node){ + strings.set(3, bundle.format("bar.powerbalance", (node.power.graph.getPowerBalance() >= 0 ? "+" : "") + floatFormat(node.power.graph.getPowerBalance() * 60))); + colors.set(3, Pal.powerBar); + numbers.set(3, node.power.graph.getLastPowerProduced() / node.power.graph.getLastPowerNeeded()); + } + else if(target instanceof OverdriveProjector.OverdriveBuild over){ + OverdriveProjector block = (OverdriveProjector)over.block; + strings.set(3, bundle.format("bar.boost", (int)(over.realBoost() * 100))); + colors.set(3, Pal.accent); + numbers.set(3, over.realBoost() / (block.hasBoost ? block.speedBoost + block.speedBoostPhase : block.speedBoost)); + } if(target instanceof Unit unit && target instanceof Payloadc pay && unit.type != null){ - strings.set(4, Core.bundle.format("shar-stat.payloadCapacity", floatFormat(Mathf.round(Mathf.sqrt(pay.payloadUsed()))), floatFormat(Mathf.round(Mathf.sqrt(unit.type().payloadCapacity))))); + strings.set(4, bundle.format("shar-stat.payloadCapacity", floatFormat(Mathf.round(Mathf.sqrt(pay.payloadUsed()))), floatFormat(Mathf.round(Mathf.sqrt(unit.type().payloadCapacity))))); colors.set(4, Pal.items); numbers.set(4, pay.payloadUsed() / unit.type().payloadCapacity); } - else if(target instanceof Building build && build.block.hasLiquids){ - strings.set(4, Core.bundle.format("shar-stat.liquidCapacity", floatFormat(build.liquids.currentAmount()), floatFormat(build.block.liquidCapacity))); - colors.set(4, build.liquids.current().color); - numbers.set(4, build.liquids.currentAmount()/build.block.liquidCapacity); + else if(target instanceof Building build){ + if(target instanceof PowerNode.PowerNodeBuild node){ + strings.set(4, bundle.format("shar-stat.powerOut", floatFormat(node.power.graph.getLastScaledPowerOut() * 60f))); + colors.set(4, Pal.powerBar); + numbers.set(4, node.power.graph.getLastScaledPowerOut() / node.power.graph.getLastScaledPowerIn()); + } + else if(build.block.hasLiquids) { + strings.set(4, bundle.format("shar-stat.liquidCapacity", floatFormat(build.liquids.currentAmount()), floatFormat(build.block.liquidCapacity))); + colors.set(4, build.liquids.current().color); + numbers.set(4, build.liquids.currentAmount() / build.block.liquidCapacity); + } } if(target instanceof Unit unit && state.rules.unitAmmo && unit.type != null){ - strings.set(5, Core.bundle.format("shar-stat.ammos", floatFormat(unit.ammo()), floatFormat(unit.type().ammoCapacity))); + strings.set(5, bundle.format("shar-stat.ammos", floatFormat(unit.ammo()), floatFormat(unit.type().ammoCapacity))); colors.set(5, unit.type().ammoType.color()); numbers.set(5, unit.ammof()); } - else if(target instanceof Building build && build.block.hasPower && build.block.consumes.hasPower()){ - ConsumePower cons = build.block.consumes.getPower(); - if(cons.buffered) strings.set(5, Core.bundle.format("shar-stat.powerCapacity", floatFormat(build.power.status * cons.capacity * 60f), floatFormat(cons.capacity * 60f))); - else strings.set(5, Core.bundle.format("shar-stat.powerUsage", floatFormat(build.power.status * cons.usage * 60f), floatFormat(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); + else if(target instanceof Building build && build.block.hasPower){ + if(target instanceof PowerNode.PowerNodeBuild node){ + strings.set(5, bundle.format("shar-stat.powerIn", floatFormat(node.power.graph.getLastScaledPowerIn() * 60f))); + colors.set(5, Pal.powerBar); + numbers.set(5, node.power.graph.getLastScaledPowerIn() / node.power.graph.getLastScaledPowerOut()); + } + else if(build.block.consumes.hasPower()){ + ConsumePower cons = build.block.consumes.getPower(); + if(cons.buffered) strings.set(5, bundle.format("shar-stat.powerCapacity", floatFormat(build.power.status * cons.capacity * 60f), floatFormat(cons.capacity * 60f))); + else strings.set(5, bundle.format("shar-stat.powerUsage", floatFormat(build.power.status * cons.usage * 60f), floatFormat(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/ui/FreeBar.java b/src/UnitInfo/ui/FreeBar.java index 5afad2a..2235925 100644 --- a/src/UnitInfo/ui/FreeBar.java +++ b/src/UnitInfo/ui/FreeBar.java @@ -51,10 +51,11 @@ public class FreeBar { Bits applied = unit.statusBits(); if(!statuses.equals(applied) && applied != null){ int i = 0; + int row = 0; for(StatusEffect effect : content.statusEffects()){ if(applied.get(effect.id) && !effect.isHidden()){ - new TextureRegionDrawable(effect.uiIcon).draw(unit.x - (unit.type.hitSize + 4)/2 + i * 3, unit.y - 6, 4,4); - i++; + new TextureRegionDrawable(effect.uiIcon).draw(unit.x - (unit.type.hitSize + 4)/2 + i * 4, unit.y - 6 + 4 * row, 4,4); + if(++i > 2 * (unit.type.hitSize + 4)) row++; } } statuses.set(applied);