Avoid ambiguity (#5809)
* Avoid ambiguity
When you see 'boost: 150%'
It can be 'increase the speed to 150%' or 'increase the speed to 250%'.
Maybe you will say that the colon has already avoided this ambiguity.
But you know there's always someone who ignores those things, and also translating 'boost' is hard with no 'x' to avoid ambiguity.
With a 'x', it will show 'Boost: x150%', which will never be thought as 250%.
* Update OverdriveProjector.java
When power is low, show 'low power: -{0}%';
When power is high, show 'boost: +{0}%'.
* Update bundle.properties
* Update bundle.properties
* Update OverdriveProjector.java
bugfix(perhaps)
* Update OverdriveProjector.java
what if
* Update OverdriveProjector.java
InTeReStInG
* Update OverdriveProjector.java
back to the past
* Update OverdriveProjector.java
Now using Math.max.
* Update bundle_bg.properties
* Update bundle_de.properties
* Update bundle_fr.properties
* Update bundle_hu.properties
* Update bundle_in_ID.properties
* Update bundle_ja.properties
* Update bundle_ko.properties
* Update bundle_pl.properties
* Update bundle_ro.properties
* Update bundle_ru.properties
* Update bundle_th.properties
* Update bundle_uk_UA.properties
* Update bundle_vi.properties
* Update bundle_zh_CN.properties
* Update bundle_zh_TW.properties
* Update OverdriveProjector.java
Maybe this is necessary.
* Update OverdriveProjector.java
The stats are '+50%' ,etc. now.
* Update OverdriveProjector.java
Necessary, because the previous one is strange.
2.5 does not make sense. 12.5 does.
This commit is contained in:
@@ -778,7 +778,7 @@ bar.corereq = Core Base Required
|
|||||||
bar.drillspeed = Drill Speed: {0}/s
|
bar.drillspeed = Drill Speed: {0}/s
|
||||||
bar.pumpspeed = Pump Speed: {0}/s
|
bar.pumpspeed = Pump Speed: {0}/s
|
||||||
bar.efficiency = Efficiency: {0}%
|
bar.efficiency = Efficiency: {0}%
|
||||||
bar.boost = Boost: {0}%
|
bar.boost = Boost: +{0}%
|
||||||
bar.powerbalance = Power: {0}/s
|
bar.powerbalance = Power: {0}/s
|
||||||
bar.powerstored = Stored: {0}/{1}
|
bar.powerstored = Stored: {0}/{1}
|
||||||
bar.poweramount = Power: {0}
|
bar.poweramount = Power: {0}
|
||||||
|
|||||||
@@ -751,7 +751,7 @@ bar.corereq = Необходимо е Ядро за основа
|
|||||||
bar.drillspeed = Скорост на свредлото: {0}/сек
|
bar.drillspeed = Скорост на свредлото: {0}/сек
|
||||||
bar.pumpspeed = Скорост на помпата: {0}/сек
|
bar.pumpspeed = Скорост на помпата: {0}/сек
|
||||||
bar.efficiency = Ефективност: {0}%
|
bar.efficiency = Ефективност: {0}%
|
||||||
bar.boost = Усилване: {0}%
|
bar.boost = Усилване: +{0}%
|
||||||
bar.powerbalance = Електроенергия: {0}/сек
|
bar.powerbalance = Електроенергия: {0}/сек
|
||||||
bar.powerstored = Съхранена енергия: {0}/{1}
|
bar.powerstored = Съхранена енергия: {0}/{1}
|
||||||
bar.poweramount = Електроенергия: {0}
|
bar.poweramount = Електроенергия: {0}
|
||||||
|
|||||||
@@ -772,7 +772,7 @@ bar.corereq = Kern-Basis erforderlich
|
|||||||
bar.drillspeed = Bohrgeschwindigkeit: {0}/s
|
bar.drillspeed = Bohrgeschwindigkeit: {0}/s
|
||||||
bar.pumpspeed = Pumpengeschwindigkeit: {0}/s
|
bar.pumpspeed = Pumpengeschwindigkeit: {0}/s
|
||||||
bar.efficiency = Effizienz: {0}%
|
bar.efficiency = Effizienz: {0}%
|
||||||
bar.boost = Beschleunigung: {0}%
|
bar.boost = Beschleunigung: +{0}%
|
||||||
bar.powerbalance = Strom: {0}/s
|
bar.powerbalance = Strom: {0}/s
|
||||||
bar.powerstored = Gespeichert: {0}/{1}
|
bar.powerstored = Gespeichert: {0}/{1}
|
||||||
bar.poweramount = Strom: {0}
|
bar.poweramount = Strom: {0}
|
||||||
|
|||||||
@@ -773,7 +773,7 @@ bar.corereq = Noyau de base requis
|
|||||||
bar.drillspeed = Vitesse de Forage: {0}/s
|
bar.drillspeed = Vitesse de Forage: {0}/s
|
||||||
bar.pumpspeed = Vitesse de Pompage: {0}/s
|
bar.pumpspeed = Vitesse de Pompage: {0}/s
|
||||||
bar.efficiency = Efficacité: {0}%
|
bar.efficiency = Efficacité: {0}%
|
||||||
bar.boost = Boost: {0}%
|
bar.boost = Boost: +{0}%
|
||||||
bar.powerbalance = Énergie: {0}/s
|
bar.powerbalance = Énergie: {0}/s
|
||||||
bar.powerstored = Réserves d'Énergie: {0}/{1}
|
bar.powerstored = Réserves d'Énergie: {0}/{1}
|
||||||
bar.poweramount = Énergie: {0}
|
bar.poweramount = Énergie: {0}
|
||||||
|
|||||||
@@ -725,7 +725,7 @@ bar.corereq = Core Base Required
|
|||||||
bar.drillspeed = Kitermelés: {0}/s
|
bar.drillspeed = Kitermelés: {0}/s
|
||||||
bar.pumpspeed = Kitermelés: {0}/s
|
bar.pumpspeed = Kitermelés: {0}/s
|
||||||
bar.efficiency = Hatékonyság: {0}%
|
bar.efficiency = Hatékonyság: {0}%
|
||||||
bar.boost = Boost: {0}%
|
bar.boost = Boost: +{0}%
|
||||||
bar.powerbalance = Áram: {0}/s
|
bar.powerbalance = Áram: {0}/s
|
||||||
bar.powerstored = Tárolt: {0}/{1}
|
bar.powerstored = Tárolt: {0}/{1}
|
||||||
bar.poweramount = Áram: {0}
|
bar.poweramount = Áram: {0}
|
||||||
|
|||||||
@@ -773,7 +773,7 @@ bar.corereq = Memerlukan Inti Dasar
|
|||||||
bar.drillspeed = Kecepatan Bor: {0}/s
|
bar.drillspeed = Kecepatan Bor: {0}/s
|
||||||
bar.pumpspeed = Kecepatan Pompa: {0}/s
|
bar.pumpspeed = Kecepatan Pompa: {0}/s
|
||||||
bar.efficiency = Daya Guna: {0}%
|
bar.efficiency = Daya Guna: {0}%
|
||||||
bar.boost = Percepatan: {0}%
|
bar.boost = Percepatan: +{0}%
|
||||||
bar.powerbalance = Tenaga: {0}/s
|
bar.powerbalance = Tenaga: {0}/s
|
||||||
bar.powerstored = Disimpan: {0}/{1}
|
bar.powerstored = Disimpan: {0}/{1}
|
||||||
bar.poweramount = Tenaga: {0}
|
bar.poweramount = Tenaga: {0}
|
||||||
|
|||||||
@@ -777,7 +777,7 @@ bar.corereq = コアベースが必要
|
|||||||
bar.drillspeed = 採掘速度: {0}/秒
|
bar.drillspeed = 採掘速度: {0}/秒
|
||||||
bar.pumpspeed = ポンプの速度: {0}/s
|
bar.pumpspeed = ポンプの速度: {0}/s
|
||||||
bar.efficiency = 効率: {0}%
|
bar.efficiency = 効率: {0}%
|
||||||
bar.boost = ブースト: {0}%
|
bar.boost = ブースト: +{0}%
|
||||||
bar.powerbalance = 電力均衡: {0}/秒
|
bar.powerbalance = 電力均衡: {0}/秒
|
||||||
bar.powerstored = 総蓄電量: {0}/{1}
|
bar.powerstored = 総蓄電量: {0}/{1}
|
||||||
bar.poweramount = 蓄電量: {0}
|
bar.poweramount = 蓄電量: {0}
|
||||||
|
|||||||
@@ -777,7 +777,7 @@ bar.corereq = 기본 코어 필요
|
|||||||
bar.drillspeed = 드릴 속도: {0}/s
|
bar.drillspeed = 드릴 속도: {0}/s
|
||||||
bar.pumpspeed = 펌프 속도: {0}/s
|
bar.pumpspeed = 펌프 속도: {0}/s
|
||||||
bar.efficiency = 효율: {0}%
|
bar.efficiency = 효율: {0}%
|
||||||
bar.boost = 가속: {0}%
|
bar.boost = 가속: +{0}%
|
||||||
bar.powerbalance = 전력: {0}/s
|
bar.powerbalance = 전력: {0}/s
|
||||||
bar.powerstored = 저장량: {0}/{1}
|
bar.powerstored = 저장량: {0}/{1}
|
||||||
bar.poweramount = 전력: {0}
|
bar.poweramount = 전력: {0}
|
||||||
|
|||||||
@@ -762,7 +762,7 @@ bar.corereq = Wymagany Rdzeń
|
|||||||
bar.drillspeed = Prędkość wiertła: {0}/s
|
bar.drillspeed = Prędkość wiertła: {0}/s
|
||||||
bar.pumpspeed = Prędkość pompy: {0}/s
|
bar.pumpspeed = Prędkość pompy: {0}/s
|
||||||
bar.efficiency = Efektywność: {0}%
|
bar.efficiency = Efektywność: {0}%
|
||||||
bar.boost = Przyspieszenie: {0}%
|
bar.boost = Przyspieszenie: +{0}%
|
||||||
bar.powerbalance = Moc: {0}
|
bar.powerbalance = Moc: {0}
|
||||||
bar.powerstored = Zmagazynowano: {0}/{1}
|
bar.powerstored = Zmagazynowano: {0}/{1}
|
||||||
bar.poweramount = Moc: {0}
|
bar.poweramount = Moc: {0}
|
||||||
|
|||||||
@@ -778,7 +778,7 @@ bar.corereq = Plasare pe Nucleu Necesară
|
|||||||
bar.drillspeed = Viteză Minare: {0}/s
|
bar.drillspeed = Viteză Minare: {0}/s
|
||||||
bar.pumpspeed = Viteză Pompare: {0}/s
|
bar.pumpspeed = Viteză Pompare: {0}/s
|
||||||
bar.efficiency = Eficiență: {0}%
|
bar.efficiency = Eficiență: {0}%
|
||||||
bar.boost = Efect Grăbire: {0}%
|
bar.boost = Efect Grăbire: +{0}%
|
||||||
bar.powerbalance = Electricitate: {0}/s
|
bar.powerbalance = Electricitate: {0}/s
|
||||||
bar.powerstored = Stocată: {0}/{1}
|
bar.powerstored = Stocată: {0}/{1}
|
||||||
bar.poweramount = Electricitate: {0}
|
bar.poweramount = Electricitate: {0}
|
||||||
|
|||||||
@@ -771,7 +771,7 @@ bar.corereq = Требуется основа ядра
|
|||||||
bar.drillspeed = Скорость бурения: {0}/с
|
bar.drillspeed = Скорость бурения: {0}/с
|
||||||
bar.pumpspeed = Скорость выкачивания: {0}/с
|
bar.pumpspeed = Скорость выкачивания: {0}/с
|
||||||
bar.efficiency = Эффективность: {0}%
|
bar.efficiency = Эффективность: {0}%
|
||||||
bar.boost = Ускорение: {0}%
|
bar.boost = Ускорение: +{0}%
|
||||||
bar.powerbalance = Энергия: {0}/с
|
bar.powerbalance = Энергия: {0}/с
|
||||||
bar.powerstored = Накоплено: {0}/{1}
|
bar.powerstored = Накоплено: {0}/{1}
|
||||||
bar.poweramount = Энергия: {0}
|
bar.poweramount = Энергия: {0}
|
||||||
|
|||||||
@@ -778,7 +778,7 @@ bar.corereq = ต้องวางบนแกนกลาง
|
|||||||
bar.drillspeed = ความเร็วการขุด: {0}/วิ
|
bar.drillspeed = ความเร็วการขุด: {0}/วิ
|
||||||
bar.pumpspeed = ความเร็วการปั้ม: {0}/วิ
|
bar.pumpspeed = ความเร็วการปั้ม: {0}/วิ
|
||||||
bar.efficiency = ประสิทธิภาพ: {0}%
|
bar.efficiency = ประสิทธิภาพ: {0}%
|
||||||
bar.boost = เปอร์เซ็นการเร่ง: {0}%
|
bar.boost = เปอร์เซ็นการเร่ง: +{0}%
|
||||||
bar.powerbalance = พลังงาน: {0}/วิ
|
bar.powerbalance = พลังงาน: {0}/วิ
|
||||||
bar.powerstored = เก็บแล้ว: {0}/{1}
|
bar.powerstored = เก็บแล้ว: {0}/{1}
|
||||||
bar.poweramount = พลังงาน: {0}
|
bar.poweramount = พลังงาน: {0}
|
||||||
|
|||||||
@@ -746,7 +746,7 @@ bar.corereq = Необхідне основне ядро
|
|||||||
bar.drillspeed = Швидкість буріння: {0} за с.
|
bar.drillspeed = Швидкість буріння: {0} за с.
|
||||||
bar.pumpspeed = Швидкість викачування: {0} за с.
|
bar.pumpspeed = Швидкість викачування: {0} за с.
|
||||||
bar.efficiency = Ефективність: {0}%
|
bar.efficiency = Ефективність: {0}%
|
||||||
bar.boost = Підсилення: {0}%
|
bar.boost = Підсилення: +{0}%
|
||||||
bar.powerbalance = Енергія: {0} за с.
|
bar.powerbalance = Енергія: {0} за с.
|
||||||
bar.powerstored = Зберігає: {0}/{1}
|
bar.powerstored = Зберігає: {0}/{1}
|
||||||
bar.poweramount = Енергія: {0}
|
bar.poweramount = Енергія: {0}
|
||||||
|
|||||||
@@ -770,7 +770,7 @@ bar.corereq = Yêu cầu căn cứ
|
|||||||
bar.drillspeed = Tốc độ khoan: {0}/giây
|
bar.drillspeed = Tốc độ khoan: {0}/giây
|
||||||
bar.pumpspeed = Tốc độ bơm: {0}/giây
|
bar.pumpspeed = Tốc độ bơm: {0}/giây
|
||||||
bar.efficiency = Hiệu suất: {0}%
|
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.powerbalance = Năng lượng: {0}/giây
|
||||||
bar.powerstored = Lưu trữ: {0}/{1}
|
bar.powerstored = Lưu trữ: {0}/{1}
|
||||||
bar.poweramount = Năng lượng: {0}
|
bar.poweramount = Năng lượng: {0}
|
||||||
|
|||||||
@@ -772,7 +772,7 @@ bar.corereq = 缺失核心基座
|
|||||||
bar.drillspeed = 挖掘速度:{0}/秒
|
bar.drillspeed = 挖掘速度:{0}/秒
|
||||||
bar.pumpspeed = 泵压速度:{0}/秒
|
bar.pumpspeed = 泵压速度:{0}/秒
|
||||||
bar.efficiency = 效率:{0}%
|
bar.efficiency = 效率:{0}%
|
||||||
bar.boost = 超速:{0}%
|
bar.boost = 超速:+{0}%
|
||||||
bar.powerbalance = 能量:{0}/秒
|
bar.powerbalance = 能量:{0}/秒
|
||||||
bar.powerstored = 储能:{0}/{1}
|
bar.powerstored = 储能:{0}/{1}
|
||||||
bar.poweramount = 能量:{0}
|
bar.poweramount = 能量:{0}
|
||||||
|
|||||||
@@ -774,7 +774,7 @@ bar.corereq = 需由核心升級
|
|||||||
bar.drillspeed = 鑽頭速度:{0}/秒
|
bar.drillspeed = 鑽頭速度:{0}/秒
|
||||||
bar.pumpspeed = 液體泵送速度:{0}/秒
|
bar.pumpspeed = 液體泵送速度:{0}/秒
|
||||||
bar.efficiency = 效率:{0}%
|
bar.efficiency = 效率:{0}%
|
||||||
bar.boost = 速度加成:{0}%
|
bar.boost = 速度加成:+{0}%
|
||||||
bar.powerbalance = 能量變化:{0}
|
bar.powerbalance = 能量變化:{0}
|
||||||
bar.powerstored = 能量存量:{0}/{1}
|
bar.powerstored = 能量存量:{0}/{1}
|
||||||
bar.poweramount = 能量:{0}
|
bar.poweramount = 能量:{0}
|
||||||
|
|||||||
@@ -62,20 +62,20 @@ public class OverdriveProjector extends Block{
|
|||||||
stats.timePeriod = useTime;
|
stats.timePeriod = useTime;
|
||||||
super.setStats();
|
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.range, range / tilesize, StatUnit.blocks);
|
||||||
stats.add(Stat.productionTime, useTime / 60f, StatUnit.seconds);
|
stats.add(Stat.productionTime, useTime / 60f, StatUnit.seconds);
|
||||||
|
|
||||||
if(hasBoost){
|
if(hasBoost){
|
||||||
stats.add(Stat.boostEffect, phaseRangeBoost / tilesize, StatUnit.blocks);
|
stats.add(Stat.boostEffect, (range + phaseRangeBoost) / tilesize, StatUnit.blocks);
|
||||||
stats.add(Stat.boostEffect, (int)((speedBoost + speedBoostPhase) * 100f), StatUnit.percent);
|
stats.add(Stat.boostEffect, "+" + (int)((speedBoost + speedBoostPhase) * 100f - 100) + "%");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void setBars(){
|
public void setBars(){
|
||||||
super.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{
|
public class OverdriveBuild extends Building implements Ranged{
|
||||||
|
|||||||
Reference in New Issue
Block a user