diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c9907d3140..dee2e48919 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -778,7 +778,7 @@ bar.corereq = Core Base Required bar.drillspeed = Drill Speed: {0}/s bar.pumpspeed = Pump Speed: {0}/s bar.efficiency = Efficiency: {0}% -bar.boost = Boost: {0}% +bar.boost = Boost: +{0}% bar.powerbalance = Power: {0}/s bar.powerstored = Stored: {0}/{1} bar.poweramount = Power: {0} diff --git a/core/assets/bundles/bundle_bg.properties b/core/assets/bundles/bundle_bg.properties index d9c9dbc9f9..9a49d9eb92 100644 --- a/core/assets/bundles/bundle_bg.properties +++ b/core/assets/bundles/bundle_bg.properties @@ -751,7 +751,7 @@ bar.corereq = Необходимо е Ядро за основа bar.drillspeed = Скорост на свредлото: {0}/сек bar.pumpspeed = Скорост на помпата: {0}/сек bar.efficiency = Ефективност: {0}% -bar.boost = Усилване: {0}% +bar.boost = Усилване: +{0}% bar.powerbalance = Електроенергия: {0}/сек bar.powerstored = Съхранена енергия: {0}/{1} bar.poweramount = Електроенергия: {0} diff --git a/core/assets/bundles/bundle_de.properties b/core/assets/bundles/bundle_de.properties index 55f13ee6a1..e88115e724 100644 --- a/core/assets/bundles/bundle_de.properties +++ b/core/assets/bundles/bundle_de.properties @@ -772,7 +772,7 @@ bar.corereq = Kern-Basis erforderlich bar.drillspeed = Bohrgeschwindigkeit: {0}/s bar.pumpspeed = Pumpengeschwindigkeit: {0}/s bar.efficiency = Effizienz: {0}% -bar.boost = Beschleunigung: {0}% +bar.boost = Beschleunigung: +{0}% bar.powerbalance = Strom: {0}/s bar.powerstored = Gespeichert: {0}/{1} bar.poweramount = Strom: {0} @@ -1739,4 +1739,4 @@ lenum.mine = Erz von einer Position abbauen. lenum.build = Einen Block bauen. lenum.getblock = Gibt den Blocktyp an den Koordinaten zurück.\nEinheiten müssen nah genug dran sein.\nFeste nicht-Blöcke sind [accent]@solid[]. lenum.within = Prüft, ob eine Einheit in einem Radius um einen Punkt ist. -lenum.boost = Aktiviert / deaktiviert den Boost. \ No newline at end of file +lenum.boost = Aktiviert / deaktiviert den Boost. diff --git a/core/assets/bundles/bundle_fr.properties b/core/assets/bundles/bundle_fr.properties index 2fb0b33c5c..1ec4031cf6 100644 --- a/core/assets/bundles/bundle_fr.properties +++ b/core/assets/bundles/bundle_fr.properties @@ -773,7 +773,7 @@ bar.corereq = Noyau de base requis bar.drillspeed = Vitesse de Forage: {0}/s bar.pumpspeed = Vitesse de Pompage: {0}/s bar.efficiency = Efficacité: {0}% -bar.boost = Boost: {0}% +bar.boost = Boost: +{0}% bar.powerbalance = Énergie: {0}/s bar.powerstored = Réserves d'Énergie: {0}/{1} bar.poweramount = Énergie: {0} diff --git a/core/assets/bundles/bundle_hu.properties b/core/assets/bundles/bundle_hu.properties index c7cee9bc4e..e2fe343582 100644 --- a/core/assets/bundles/bundle_hu.properties +++ b/core/assets/bundles/bundle_hu.properties @@ -725,7 +725,7 @@ bar.corereq = Core Base Required bar.drillspeed = Kitermelés: {0}/s bar.pumpspeed = Kitermelés: {0}/s bar.efficiency = Hatékonyság: {0}% -bar.boost = Boost: {0}% +bar.boost = Boost: +{0}% bar.powerbalance = Áram: {0}/s bar.powerstored = Tárolt: {0}/{1} bar.poweramount = Áram: {0} diff --git a/core/assets/bundles/bundle_in_ID.properties b/core/assets/bundles/bundle_in_ID.properties index 5c9e031a14..31f14f2df7 100644 --- a/core/assets/bundles/bundle_in_ID.properties +++ b/core/assets/bundles/bundle_in_ID.properties @@ -773,7 +773,7 @@ bar.corereq = Memerlukan Inti Dasar bar.drillspeed = Kecepatan Bor: {0}/s bar.pumpspeed = Kecepatan Pompa: {0}/s bar.efficiency = Daya Guna: {0}% -bar.boost = Percepatan: {0}% +bar.boost = Percepatan: +{0}% bar.powerbalance = Tenaga: {0}/s bar.powerstored = Disimpan: {0}/{1} bar.poweramount = Tenaga: {0} diff --git a/core/assets/bundles/bundle_ja.properties b/core/assets/bundles/bundle_ja.properties index 3449cabe0b..6f4b586f0e 100644 --- a/core/assets/bundles/bundle_ja.properties +++ b/core/assets/bundles/bundle_ja.properties @@ -777,7 +777,7 @@ bar.corereq = コアベースが必要 bar.drillspeed = 採掘速度: {0}/秒 bar.pumpspeed = ポンプの速度: {0}/s bar.efficiency = 効率: {0}% -bar.boost = ブースト: {0}% +bar.boost = ブースト: +{0}% bar.powerbalance = 電力均衡: {0}/秒 bar.powerstored = 総蓄電量: {0}/{1} bar.poweramount = 蓄電量: {0} diff --git a/core/assets/bundles/bundle_ko.properties b/core/assets/bundles/bundle_ko.properties index b544d98907..b764582e5a 100644 --- a/core/assets/bundles/bundle_ko.properties +++ b/core/assets/bundles/bundle_ko.properties @@ -777,7 +777,7 @@ bar.corereq = 기본 코어 필요 bar.drillspeed = 드릴 속도: {0}/s bar.pumpspeed = 펌프 속도: {0}/s bar.efficiency = 효율: {0}% -bar.boost = 가속: {0}% +bar.boost = 가속: +{0}% bar.powerbalance = 전력: {0}/s bar.powerstored = 저장량: {0}/{1} bar.poweramount = 전력: {0} diff --git a/core/assets/bundles/bundle_pl.properties b/core/assets/bundles/bundle_pl.properties index 38d2bfbcbe..8539ca93bf 100644 --- a/core/assets/bundles/bundle_pl.properties +++ b/core/assets/bundles/bundle_pl.properties @@ -762,7 +762,7 @@ bar.corereq = Wymagany Rdzeń bar.drillspeed = Prędkość wiertła: {0}/s bar.pumpspeed = Prędkość pompy: {0}/s bar.efficiency = Efektywność: {0}% -bar.boost = Przyspieszenie: {0}% +bar.boost = Przyspieszenie: +{0}% bar.powerbalance = Moc: {0} bar.powerstored = Zmagazynowano: {0}/{1} bar.poweramount = Moc: {0} diff --git a/core/assets/bundles/bundle_ro.properties b/core/assets/bundles/bundle_ro.properties index 3b327d78ca..88f9784dc1 100644 --- a/core/assets/bundles/bundle_ro.properties +++ b/core/assets/bundles/bundle_ro.properties @@ -778,7 +778,7 @@ bar.corereq = Plasare pe Nucleu Necesară bar.drillspeed = Viteză Minare: {0}/s bar.pumpspeed = Viteză Pompare: {0}/s bar.efficiency = Eficiență: {0}% -bar.boost = Efect Grăbire: {0}% +bar.boost = Efect Grăbire: +{0}% bar.powerbalance = Electricitate: {0}/s bar.powerstored = Stocată: {0}/{1} bar.poweramount = Electricitate: {0} diff --git a/core/assets/bundles/bundle_ru.properties b/core/assets/bundles/bundle_ru.properties index e43c6e1d41..b846e94512 100644 --- a/core/assets/bundles/bundle_ru.properties +++ b/core/assets/bundles/bundle_ru.properties @@ -771,7 +771,7 @@ bar.corereq = Требуется основа ядра bar.drillspeed = Скорость бурения: {0}/с bar.pumpspeed = Скорость выкачивания: {0}/с bar.efficiency = Эффективность: {0}% -bar.boost = Ускорение: {0}% +bar.boost = Ускорение: +{0}% bar.powerbalance = Энергия: {0}/с bar.powerstored = Накоплено: {0}/{1} bar.poweramount = Энергия: {0} diff --git a/core/assets/bundles/bundle_th.properties b/core/assets/bundles/bundle_th.properties index 9e4bf47b7e..7b0728708b 100644 --- a/core/assets/bundles/bundle_th.properties +++ b/core/assets/bundles/bundle_th.properties @@ -778,7 +778,7 @@ bar.corereq = ต้องวางบนแกนกลาง bar.drillspeed = ความเร็วการขุด: {0}/วิ bar.pumpspeed = ความเร็วการปั้ม: {0}/วิ bar.efficiency = ประสิทธิภาพ: {0}% -bar.boost = เปอร์เซ็นการเร่ง: {0}% +bar.boost = เปอร์เซ็นการเร่ง: +{0}% bar.powerbalance = พลังงาน: {0}/วิ bar.powerstored = เก็บแล้ว: {0}/{1} bar.poweramount = พลังงาน: {0} diff --git a/core/assets/bundles/bundle_uk_UA.properties b/core/assets/bundles/bundle_uk_UA.properties index 7639f01bf5..1a2a9db84d 100644 --- a/core/assets/bundles/bundle_uk_UA.properties +++ b/core/assets/bundles/bundle_uk_UA.properties @@ -746,7 +746,7 @@ bar.corereq = Необхідне основне ядро bar.drillspeed = Швидкість буріння: {0} за с. bar.pumpspeed = Швидкість викачування: {0} за с. bar.efficiency = Ефективність: {0}% -bar.boost = Підсилення: {0}% +bar.boost = Підсилення: +{0}% bar.powerbalance = Енергія: {0} за с. bar.powerstored = Зберігає: {0}/{1} bar.poweramount = Енергія: {0} diff --git a/core/assets/bundles/bundle_vi.properties b/core/assets/bundles/bundle_vi.properties index 067d3703d9..53d47d8f21 100644 --- a/core/assets/bundles/bundle_vi.properties +++ b/core/assets/bundles/bundle_vi.properties @@ -770,7 +770,7 @@ bar.corereq = Yêu cầu căn cứ bar.drillspeed = Tốc độ khoan: {0}/giây bar.pumpspeed = Tốc độ bơm: {0}/giây bar.efficiency = Hiệu suất: {0}% -bar.boost = Tăng tốc: {0}% +bar.boost = Tăng tốc: +{0}% bar.powerbalance = Năng lượng: {0}/giây bar.powerstored = Lưu trữ: {0}/{1} bar.poweramount = Năng lượng: {0} diff --git a/core/assets/bundles/bundle_zh_CN.properties b/core/assets/bundles/bundle_zh_CN.properties index e306743ea4..0cb51b1d3d 100644 --- a/core/assets/bundles/bundle_zh_CN.properties +++ b/core/assets/bundles/bundle_zh_CN.properties @@ -772,7 +772,7 @@ bar.corereq = 缺失核心基座 bar.drillspeed = 挖掘速度:{0}/秒 bar.pumpspeed = 泵压速度:{0}/秒 bar.efficiency = 效率:{0}% -bar.boost = 超速:{0}% +bar.boost = 超速:+{0}% bar.powerbalance = 能量:{0}/秒 bar.powerstored = 储能:{0}/{1} bar.poweramount = 能量:{0} diff --git a/core/assets/bundles/bundle_zh_TW.properties b/core/assets/bundles/bundle_zh_TW.properties index 98ae7dbe86..161565aea2 100644 --- a/core/assets/bundles/bundle_zh_TW.properties +++ b/core/assets/bundles/bundle_zh_TW.properties @@ -774,7 +774,7 @@ bar.corereq = 需由核心升級 bar.drillspeed = 鑽頭速度:{0}/秒 bar.pumpspeed = 液體泵送速度:{0}/秒 bar.efficiency = 效率:{0}% -bar.boost = 速度加成:{0}% +bar.boost = 速度加成:+{0}% bar.powerbalance = 能量變化:{0} bar.powerstored = 能量存量:{0}/{1} bar.poweramount = 能量:{0} diff --git a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java index 8611801979..b2c43ab490 100644 --- a/core/src/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/mindustry/world/blocks/defense/OverdriveProjector.java @@ -62,20 +62,20 @@ public class OverdriveProjector extends Block{ stats.timePeriod = useTime; super.setStats(); - stats.add(Stat.speedIncrease, (int)(100f * speedBoost), StatUnit.percent); + stats.add(Stat.speedIncrease, "+" + (int)(speedBoost * 100f - 100) + "%"); stats.add(Stat.range, range / tilesize, StatUnit.blocks); stats.add(Stat.productionTime, useTime / 60f, StatUnit.seconds); if(hasBoost){ - stats.add(Stat.boostEffect, phaseRangeBoost / tilesize, StatUnit.blocks); - stats.add(Stat.boostEffect, (int)((speedBoost + speedBoostPhase) * 100f), StatUnit.percent); + stats.add(Stat.boostEffect, (range + phaseRangeBoost) / tilesize, StatUnit.blocks); + stats.add(Stat.boostEffect, "+" + (int)((speedBoost + speedBoostPhase) * 100f - 100) + "%"); } } - + @Override public void setBars(){ super.setBars(); - bars.add("boost", (OverdriveBuild entity) -> new Bar(() -> Core.bundle.format("bar.boost", (int)(entity.realBoost() * 100)), () -> Pal.accent, () -> entity.realBoost() / (hasBoost ? speedBoost + speedBoostPhase : speedBoost))); + bars.add("boost", (OverdriveBuild entity) -> new Bar(() -> Core.bundle.format("bar.boost", Math.max((int)(entity.realBoost() * 100 - 100), 0)), () -> Pal.accent, () -> entity.realBoost() / (hasBoost ? speedBoost + speedBoostPhase : speedBoost))); } public class OverdriveBuild extends Building implements Ranged{