From 09e5c4bc9ec4a96d886b9050eafa1669e187d1c4 Mon Sep 17 00:00:00 2001 From: sharlotte Date: Thu, 26 Aug 2021 09:25:12 +0900 Subject: [PATCH] hhh --- assets/bundles/bundle.properties | 5 +---- assets/bundles/bundle_ko.properties | 4 ---- assets/bundles/bundle_tr.properties | 6 ------ assets/bundles/bundle_zh_CN.properties | 3 --- src/UnitInfo/SUtils.java | 8 ++++++-- src/UnitInfo/core/BarInfo.java | 18 +++++++++--------- src/UnitInfo/core/HudUi.java | 8 ++++---- src/UnitInfo/ui/CoresItemsDisplay.java | 4 ++-- 8 files changed, 22 insertions(+), 34 deletions(-) diff --git a/assets/bundles/bundle.properties b/assets/bundles/bundle.properties index 662fdec..29da84a 100644 --- a/assets/bundles/bundle.properties +++ b/assets/bundles/bundle.properties @@ -2,14 +2,11 @@ shar-stat.health = Health: {0} shar-stat.shield = Shield: {0} shar-stat.payloadCapacity = Payloads: {0}² / {1}² -shar-stat.itemCapacity = Items: {0} / {1} -shar-stat.liquidCapacity = Liquid: {0} / {1} +shar-stat.capacity = {0}: {1} / {2} shar-stat.power = Power: {0} / {1} shar-stat.powerIn = Power Income: {0}/s shar-stat.powerOut = Power Outcome: {0}/s shar-stat.ammos = Ammo: {0} / {1} -shar-stat.itemAmmo = Ammo: {0} / {1} -shar-stat.liquidAmmo = Liquid: {0} / {1} shar-stat.commandUnits = Commands: {0} / {1} shar-stat.reload = Reload: {0}% shar-stat.progress = Progress: {0}% diff --git a/assets/bundles/bundle_ko.properties b/assets/bundles/bundle_ko.properties index f02e8f8..6e6d149 100644 --- a/assets/bundles/bundle_ko.properties +++ b/assets/bundles/bundle_ko.properties @@ -2,14 +2,10 @@ shar-stat.health = 체력: {0} shar-stat.shield = 방어막: {0} shar-stat.payloadCapacity = 화물: {0}² / {1}² -shar-stat.itemCapacity = 아이템: {0} / {1} -shar-stat.liquidCapacity = 액체: {0} / {1} shar-stat.power = 전력: {0} / {1} shar-stat.powerIn = 전력 생산량: {0}/s shar-stat.powerOut = 전력 소모량: {0}/s shar-stat.ammos = 탄약: {0} / {1} -shar-stat.itemAmmo = 탄약 : {0} / {1} -shar-stat.liquidAmmo = 액체: {0} / {1} shar-stat.commandUnits = 지휘 유닛: {0} / {1} shar-stat.reload = 재장전: {0}% shar-stat.progress = 진행도: {0}% diff --git a/assets/bundles/bundle_tr.properties b/assets/bundles/bundle_tr.properties index cb8e794..5c7e5ea 100644 --- a/assets/bundles/bundle_tr.properties +++ b/assets/bundles/bundle_tr.properties @@ -2,15 +2,9 @@ shar-stat.health = Can: {0} shar-stat.shield = Kalkan: {0} shar-stat.payloadCapacity = Yük: {0}² / {1}² -shar-stat.itemCapacity = Eşyalar: {0} / {1} -shar-stat.liquidCapacity = Sıvı: {0} / {1} -shar-stat.powerCapacity = Güç: {0} / {1} -shar-stat.powerUsage = Güç: {0} / {1} shar-stat.ammos = Mermi: {0} / {1} shar-stat.commandUnits = Komutlar: {0} / {1} shar-stat.reload = Yeniden Yükleme: {0}% -shar-stat.itemAmmo = Mermi: {0} / {1} -shar-stat.liquidAmmo = Liquid: {0} / {1} shar-stat.power = Güç: {0} / {1} shar-stat.progress = İlerleme: {0}% shar-stat.attr = Bağlanma: x{0} diff --git a/assets/bundles/bundle_zh_CN.properties b/assets/bundles/bundle_zh_CN.properties index addba01..930f700 100644 --- a/assets/bundles/bundle_zh_CN.properties +++ b/assets/bundles/bundle_zh_CN.properties @@ -2,12 +2,9 @@ shar-stat.health = 血量: {0} shar-stat.shield = 盾量: {0} shar-stat.payloadCapacity = 有效载荷: {0}² / {1}² -shar-stat.itemCapacity = 装载物品: {0} / {1} shar-stat.ammos = 子弹量: {0} / {1} shar-stat.commandUnits = 控制单位: {0} / {1} shar-stat.reload = 冷却: {0}% -shar-stat.itemAmmo = 弹药 : {0} / {1} -shar-stat.liquidAmmo = 液体量: {0} shar-stat.power = 可控制数？: {0} / {1} # Settings diff --git a/src/UnitInfo/SUtils.java b/src/UnitInfo/SUtils.java index a3a4473..c439123 100644 --- a/src/UnitInfo/SUtils.java +++ b/src/UnitInfo/SUtils.java @@ -19,8 +19,12 @@ public class SUtils { public static String floatFormat(float number){ if(number >= 1000) return UI.formatAmount((long)number); - if(String.valueOf(number).length() > 2 && String.valueOf(number).split("[.]")[1].matches("0")) return String.valueOf(number).split("[.]")[0]; - return Strings.fixed(number, 2); + return Strings.fixed(number, 1); + } + + public static String floatFormat(int number){ + if(number >= 1000) return UI.formatAmount(number); + return String.valueOf(number); } public static Object invoke(Object ut, String fieldName) throws IllegalAccessException, NoSuchFieldException { diff --git a/src/UnitInfo/core/BarInfo.java b/src/UnitInfo/core/BarInfo.java index a0f3f80..cdb76c6 100644 --- a/src/UnitInfo/core/BarInfo.java +++ b/src/UnitInfo/core/BarInfo.java @@ -135,24 +135,24 @@ public class BarInfo { numbers.set(1, (float) crafter.sense(LAccess.progress)); } else if(target instanceof PowerNode.PowerNodeBuild node){ - strings.set(1, bundle.format("bar.power", floatFormat(node.power.graph.getLastPowerStored()), floatFormat(node.power.graph.getLastCapacity()))); + strings.set(1, bundle.format("shar-stat.power", 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.power", floatFormat(generator.getPowerProduction() * generator.timeScale() * 60f))); + strings.set(1, bundle.format("shar-stat.power", 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; - strings.set(2, bundle.format("shar-stat.itemAmmo", floatFormat(turret.totalAmmo), floatFormat(block.maxAmmo))); + strings.set(2, bundle.format("shar-stat.capacity", turret.hasAmmo() ? block.ammoTypes.findKey(turret.peekAmmo(), true).localizedName : bundle.get("stat.ammo"), floatFormat(turret.totalAmmo), floatFormat(block.maxAmmo))); colors.set(2, turret.hasAmmo() ? block.ammoTypes.findKey(turret.peekAmmo(), true).color : Pal.ammo); numbers.set(2, turret.totalAmmo / (float)block.maxAmmo); } else if(target instanceof LiquidTurret.LiquidTurretBuild turret){ - strings.set(2, bundle.format("shar-stat.liquidAmmo", floatFormat(turret.liquids.get(turret.liquids.current())), floatFormat(turret.block.liquidCapacity))); + strings.set(2, bundle.format("shar-stat.capacity", turret.liquids.currentAmount() < 0.01f ? turret.liquids.current().localizedName : bundle.get("stat.ammo"), floatFormat(turret.liquids.get(turret.liquids.current())), floatFormat(turret.block.liquidCapacity))); colors.set(2, turret.liquids.current().color); numbers.set(2, turret.liquids.get(turret.liquids.current()) / turret.block.liquidCapacity); } @@ -165,21 +165,21 @@ public class BarInfo { } else if(target instanceof Building b && b.block.hasItems) { if(target instanceof CoreBlock.CoreBuild cb){ - strings.set(2, bundle.format("shar-stat.itemCapacity", floatFormat(b.items.total()), floatFormat(cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); + strings.set(2, bundle.format("shar-stat.capacity", bundle.get("category.items"), floatFormat(b.items.total()), floatFormat(cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); numbers.set(2, cb.items.total() / (cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); } else if(target instanceof StorageBlock.StorageBuild sb && !sb.canPickup() && sb.linkedCore instanceof CoreBlock.CoreBuild cb){ - strings.set(2, bundle.format("shar-stat.itemCapacity", floatFormat(sb.items.total()), floatFormat(cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); + strings.set(2, bundle.format("shar-stat.capacity", bundle.get("category.items"), floatFormat(sb.items.total()), floatFormat(cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow)))); numbers.set(2, sb.items.total() / (cb.storageCapacity * content.items().count(UnlockableContent::unlockedNow) * 1f)); } else { - strings.set(2, bundle.format("shar-stat.itemCapacity", floatFormat(b.items.total()), floatFormat(b.block.itemCapacity))); + strings.set(2, bundle.format("shar-stat.capacity", bundle.get("category.items"), floatFormat(b.items.total()), floatFormat(b.block.itemCapacity))); numbers.set(2, b.items.total() / (float) b.block.itemCapacity); } colors.set(2, Pal.items); } else if(target instanceof Unit unit && unit.type != null) { - strings.set(2, bundle.format("shar-stat.itemCapacity", floatFormat(unit.stack.amount), floatFormat(unit.type.itemCapacity))); + strings.set(2, bundle.format("shar-stat.capacity", unit.stack.item.localizedName, floatFormat(unit.stack.amount), floatFormat(unit.type.itemCapacity))); 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)); } @@ -261,7 +261,7 @@ public class BarInfo { 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))); + strings.set(4, bundle.format("shar-stat.capacity", build.liquids.currentAmount() < 0.01f ? build.liquids.current().localizedName : bundle.get("bar.liquid"), floatFormat(build.liquids.currentAmount()), floatFormat(build.block.liquidCapacity))); colors.set(4, build.liquids.current().color); numbers.set(4, build.liquids.currentAmount() / build.block.liquidCapacity); } diff --git a/src/UnitInfo/core/HudUi.java b/src/UnitInfo/core/HudUi.java index 3c82467..4aaf366 100644 --- a/src/UnitInfo/core/HudUi.java +++ b/src/UnitInfo/core/HudUi.java @@ -448,19 +448,19 @@ public class HudUi { Button unitBtn = new ImageButton(new ScaledNinePatchDrawable(new NinePatch(Icon.grid.getRegion()), 0.5f), Styles.clearToggleTransi); Button logicBtn = new ImageButton(new ScaledNinePatchDrawable(new NinePatch(Icon.grid.getRegion()), 0.5f), Styles.clearToggleTransi); - pathBtn.addListener(new Tooltip(l -> l.label(() -> "PathLine " + (pathLine ? "[accent]Enabled[]" : "[gray]Disabled[]"))){{allowMobile = true;}}); + pathBtn.addListener(new Tooltip(l -> l.label(() -> "PathLine " + (pathLine ? "[accent]Enabled[]" : "[gray]Disabled[]")))); pathBtn.clicked(() -> { pathLine = !pathLine; pathBtn.setChecked(pathLine); }); - unitBtn.addListener(new Tooltip(l -> l.label(() -> "UnitLine " + (unitLine ? "[accent]Enabled[]" : "[gray]Disabled[]"))){{allowMobile = true;}}); + unitBtn.addListener(new Tooltip(l -> l.label(() -> "UnitLine " + (unitLine ? "[accent]Enabled[]" : "[gray]Disabled[]")))); unitBtn.clicked(() -> { unitLine = !unitLine; unitBtn.setChecked(unitLine); }); - logicBtn.addListener(new Tooltip(l -> l.label(() -> "LogicLine " + (logicLine ? "[accent]Enabled[]" : "[gray]Disabled[]"))){{allowMobile = true;}}); + logicBtn.addListener(new Tooltip(l -> l.label(() -> "LogicLine " + (logicLine ? "[accent]Enabled[]" : "[gray]Disabled[]")))); logicBtn.clicked(() -> { logicLine = !logicLine; logicBtn.setChecked(logicLine); @@ -1024,7 +1024,7 @@ public class HudUi { }).size(iconMed * Scl.scl(modUiScale)); to.row(); } - })){{allowMobile = true;}}); + }))); }); if(++row % 4 == 0) tx.row(); } diff --git a/src/UnitInfo/ui/CoresItemsDisplay.java b/src/UnitInfo/ui/CoresItemsDisplay.java index 4eaed9b..554f76a 100644 --- a/src/UnitInfo/ui/CoresItemsDisplay.java +++ b/src/UnitInfo/ui/CoresItemsDisplay.java @@ -47,7 +47,7 @@ public class CoresItemsDisplay { updateItems.clear(); prevItems.clear(); coreAmount.clear(); - teams = new Seq(Team.all).addAll(Team.baseTeams).filter(t -> t.cores().any()).toArray(); + teams = Team.baseTeams; for(Team team : teams) { usedItems.put(team, new ObjectSet<>()); usedUnits.put(team, new ObjectSet<>()); @@ -148,7 +148,7 @@ public class CoresItemsDisplay { new Table(ttt -> { ttt.bottom().right(); Label label = new Label(() -> { - int amount = updateItems.get(team).get(item.id).amount / (settings.getInt("coreItemCheckRate") / 60); + int amount = (int)(updateItems.get(team).get(item.id).amount / ((settings.getInt("coreItemCheckRate") * 1f) / 60f)); return (amount > 0 ? "[green]+" : amount == 0 ? "[orange]" : "[red]") + amount + "/s[]"; }); label.setFontScale(0.65f * modUiScale);