From abd9d6d9a4b73755491e11c2e751b5a29adf7e05 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Fri, 11 Jan 2019 12:12:19 +0200 Subject: [PATCH] Decreased bombard strength as per Civ V Don't display empty stats in city detail table --- core/src/com/unciv/logic/battle/CityCombatant.kt | 2 +- core/src/com/unciv/ui/cityscreen/BuildingsTable.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/unciv/logic/battle/CityCombatant.kt b/core/src/com/unciv/logic/battle/CityCombatant.kt index 27b785f638..57dcc1353e 100644 --- a/core/src/com/unciv/logic/battle/CityCombatant.kt +++ b/core/src/com/unciv/logic/battle/CityCombatant.kt @@ -22,7 +22,7 @@ class CityCombatant(val city: CityInfo) : ICombatant { } override fun getUnitType(): UnitType = UnitType.City - override fun getAttackingStrength(): Int = getCityStrength() + override fun getAttackingStrength(): Int = getCityStrength()/5 // I remember reading this but I don't recall where override fun getDefendingStrength(): Int{ if(isDefeated()) return 1 return getCityStrength() diff --git a/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt b/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt index 42b44d51d7..e3b0ef8c62 100644 --- a/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt +++ b/core/src/com/unciv/ui/cityscreen/BuildingsTable.kt @@ -103,8 +103,8 @@ class BuildingsTable(private val cityScreen: CityScreen) : Table(CameraStageBase if(stat.value.isNotEmpty()){ expander.innerTable.add(Label("Total".tr(),skin)) expander.innerTable.add(Label(DecimalFormat("0.#").format(stat.value.values.sum()),skin)) + add(expander).row() } - add(expander).row() } }