This commit is contained in:
YueR 2019-09-08 02:46:14 +08:00
parent 6db7858edc
commit 62e64af210
5 changed files with 23 additions and 20 deletions

View file

@ -133,7 +133,7 @@
German:"Stärke"
Dutch:"Kracht"
Spanish:"Fuerza"
Simplified_Chinese:"近战攻击"
Simplified_Chinese:"战斗力"
Portuguese:"Força"
Japanese:"強さ"
}
@ -146,7 +146,7 @@
German:"Fernkampf-Stärke"
Dutch:"Kracht op afstand"
Spanish:"Fuerza a distancia"
Simplified_Chinese:"远程攻击"
Simplified_Chinese:"远程战斗力"
Portuguese:"Força a distancia"
Japanese:"範囲の強さ"
}
@ -260,7 +260,7 @@
German:"Befestigung"
Dutch:"Versterking"
Spanish:"Fortificación"
Simplified_Chinese:"驻守防御力+"
Simplified_Chinese:"驻守防御力加成"
Portuguese:"Fortficação"
Japanese:"要塞"
}
@ -638,6 +638,7 @@
"Community":{
Italian:"Community"
Simplified_Chinese:"开发者社区"
}
@ -1113,6 +1114,11 @@
Russian:"Национальное чудо"
}
"National Wonders":{
Italian:"Meraviglie Nazionali"
Simplified_Chinese:"国家奇观"
}
"Wonders enabled":{
Italian:"Meraviglie sbloccate"
Russian:"Новые чудеса"
@ -1243,6 +1249,14 @@
Portuguese:"Ataque"
}
"Captured!":{
Simplified_Chinese:"可被俘虏!"
}
"defence vs ranged":{
Simplified_Chinese:"对方攻击类型为远程"
}
"[percentage] to unit defence":{ // e.g. +25% to unit defence
Italian:"[percentage] di difesa dell'unità"
Spanish:"[percentage] A la defensa"
@ -1415,11 +1429,7 @@
Simplified_Chinese:"奇观"
Portuguese:"Maravilhas"
}
/*
"National Wonders":{ // already here at line 1099
Italian:"Meraviglie Nazionali"
}
*/
"Specialist Buildings":{
Italian:"Edifici specialisti"
Romanian:"Clădiri specializate"

View file

@ -128,7 +128,7 @@
Russian:"Юниты в городах содержаться бесплатно, гарнизонный город + 50% силы атаки"
Romanian:"Unitățile din orașe nu necesită costuri de întreținere, orașul înarmat + 50% atac"
Spanish:"Unidades en las ciudades no cuestan mantenimiento, y +50% de fuerza de ataque"
Simplified_Chinese:"镇守城市的单位无需维护费,有单位镇守的城市+50%远程攻击力"
Simplified_Chinese:"镇守城市的单位无需维护费,有单位镇守的城市+50%远程战斗力"
Portuguese:"Unidades em cidades não custam manutenção, +50% de força de ataque"
German:"Einheiten in Städten Kosten keinen Unterhalt, +50% Angriffsstärke"
French:"Les unités en garnison n'ont plus de coût d'entretien, +50% de la force d'attaque"

View file

@ -476,13 +476,6 @@
Portuguese:"Pode se mover após atacar"
}
"Penalty vs City 33%":{
Italian:"+33% Malus contro Città"
Simplified_Chinese:"攻击城市时-33%战斗力"
French:"Pénalité contre les villes -33%"
Russian:"Штраф против Города: 33%"
}
"Companion Cavalry":{
Italian:"Cavalleria dei Compagni"
Russian:"Сопутствующая кавалерия"

View file

@ -62,7 +62,7 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu
AlertType.CityConquered -> {
addGoodSizedLabel("What would you like to do with the city?").row()
add(getCloseButton("Annex")).row()
add(TextButton("Raze", skin).onClick {
add(TextButton("Raze".tr(), skin).onClick {
worldScreen.viewingCiv.cities.first { it.name==popupAlert.value }.isBeingRazed=true
worldScreen.shouldUpdate=true
close()

View file

@ -80,7 +80,7 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
add(attackerNameWrapper)
val defenderNameWrapper = Table()
val defenderLabel = Label(defender.getName(), skin)
val defenderLabel = Label(defender.getName().tr(), skin)
if(defender is MapUnitCombatant)
defenderNameWrapper.add(UnitGroup(defender.unit,25f)).padRight(5f)
defenderNameWrapper.add(defenderLabel)
@ -91,9 +91,9 @@ class BattleTable(val worldScreen: WorldScreen): Table() {
add("{Strength}: ".tr()+attacker.getAttackingStrength())
add("{Strength}: ".tr()+defender.getDefendingStrength()).row()
val attackerModifiers = BattleDamage().getAttackModifiers(attacker,defender) .map { it.key+": "+(if(it.value>0)"+" else "")+(it.value*100).toInt()+"%" }
val attackerModifiers = BattleDamage().getAttackModifiers(attacker,defender) .map { it.key.tr()+": "+(if(it.value>0)"+" else "")+(it.value*100).toInt()+"%" }
val defenderModifiers = if (defender is MapUnitCombatant)
BattleDamage().getDefenceModifiers(attacker, defender).map { it.key+": "+(if(it.value>0)"+" else "")+(it.value*100).toInt()+"%" }
BattleDamage().getDefenceModifiers(attacker, defender).map { it.key.tr()+": "+(if(it.value>0)"+" else "")+(it.value*100).toInt()+"%" }
else listOf()
for(i in 0..max(attackerModifiers.size,defenderModifiers.size)){