diff --git a/android/assets/jsons/Civ V - Vanilla/Policies.json b/android/assets/jsons/Civ V - Vanilla/Policies.json index 6c8146498f..56b721a696 100644 --- a/android/assets/jsons/Civ V - Vanilla/Policies.json +++ b/android/assets/jsons/Civ V - Vanilla/Policies.json @@ -127,7 +127,7 @@ }, { "name": "Honor Complete", - "uniques": ["Earn [10]% of [military] opponent's [Cost] as [Gold] for kills"], + "uniques": ["Earn [10]% of [Military] opponent's [Cost] as [Gold] for kills"], } ] },{ diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index 3a3fdd6462..e3f51a57cf 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -510,7 +510,7 @@ Culture = Food = Crop Yield = -Land = +Territory = Force = GOLDEN AGE = Golden Age = @@ -882,6 +882,7 @@ Composite Bowman = Foreign Land = Friendly Land = Air = +Land = Wounded = Marine = Mobile SAM = diff --git a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt index d5da52fd48..3f9e129ab5 100644 --- a/core/src/com/unciv/logic/civilization/CivilizationInfo.kt +++ b/core/src/com/unciv/logic/civilization/CivilizationInfo.kt @@ -394,10 +394,10 @@ class CivilizationInfo { fun getStatForRanking(category: RankingType): Int { return when (category) { RankingType.Population -> cities.sumBy { it.population.population } - RankingType.CropYield -> statsForNextTurn.food.roundToInt() + RankingType.Crop_Yield -> statsForNextTurn.food.roundToInt() RankingType.Production -> statsForNextTurn.production.roundToInt() RankingType.Gold -> gold - RankingType.Land -> cities.sumBy { it.tiles.size } + RankingType.Territory -> cities.sumBy { it.tiles.size } RankingType.Force -> units.sumBy { it.baseUnit.strength } RankingType.Happiness -> getHappiness() RankingType.Technologies -> tech.researchedTechnologies.size diff --git a/core/src/com/unciv/ui/victoryscreen/RankingType.kt b/core/src/com/unciv/ui/victoryscreen/RankingType.kt index 94a4c4d621..943f939d32 100644 --- a/core/src/com/unciv/ui/victoryscreen/RankingType.kt +++ b/core/src/com/unciv/ui/victoryscreen/RankingType.kt @@ -1,13 +1,13 @@ package com.unciv.ui.victoryscreen -enum class RankingType (val value: String) { - Population("Population"), - CropYield("Crop Yield"), - Production("Production"), - Gold("Gold"), - Land("Land"), - Force("Force"), - Happiness("Happiness"), - Technologies("Technologies"), - Culture("Culture") +enum class RankingType { + Population, + Crop_Yield, + Production, + Gold, + Territory, + Force, + Happiness, + Technologies, + Culture } \ No newline at end of file diff --git a/core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt b/core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt index 6cd03ee165..720546df8b 100644 --- a/core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt +++ b/core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt @@ -247,7 +247,7 @@ class VictoryScreen(val worldScreen: WorldScreen) : PickerScreen() { for (category in RankingType.values()) { val column = Table().apply { defaults().pad(5f) } - column.add(category.value.toLabel()).row() + column.add(category.name.replace('_',' ').toLabel()).row() column.addSeparator() for (civ in majorCivs.sortedByDescending { it.getStatForRanking(category) }) {