AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-25 12:54:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

Differentiated between 'Land' as in 'Land unit' and 'Territory' for rankings

Browse Source
This commit is contained in:
Yair Morgenstern 2021-04-13 00:13:17 +03:00
parent 6e9f868cb3
commit 881a885c14
5 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Civ V - Vanilla/Policies.json
View File

@ -127,7 +127,7 @@
}, },
{ {
"name": "Honor Complete", "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"],
} }
] ]
},{ },{

3
android/assets/jsons/translations/template.properties
View File

@ -510,7 +510,7 @@ Culture =
Food = Food =
Crop Yield = Crop Yield =
Land = Territory =
Force = Force =
GOLDEN AGE = GOLDEN AGE =
Golden Age = Golden Age =
@ -882,6 +882,7 @@ Composite Bowman =
Foreign Land = Foreign Land =
Friendly Land = Friendly Land =
Air = Air =
Land =
Wounded = Wounded =
Marine = Marine =
Mobile SAM = Mobile SAM =

4
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -394,10 +394,10 @@ class CivilizationInfo {
fun getStatForRanking(category: RankingType): Int { fun getStatForRanking(category: RankingType): Int {
return when (category) { return when (category) {
RankingType.Population -> cities.sumBy { it.population.population } RankingType.Population -> cities.sumBy { it.population.population }
RankingType.CropYield -> statsForNextTurn.food.roundToInt() RankingType.Crop_Yield -> statsForNextTurn.food.roundToInt()
RankingType.Production -> statsForNextTurn.production.roundToInt() RankingType.Production -> statsForNextTurn.production.roundToInt()
RankingType.Gold -> gold 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.Force -> units.sumBy { it.baseUnit.strength }
RankingType.Happiness -> getHappiness() RankingType.Happiness -> getHappiness()
RankingType.Technologies -> tech.researchedTechnologies.size RankingType.Technologies -> tech.researchedTechnologies.size

20
core/src/com/unciv/ui/victoryscreen/RankingType.kt
View File

@ -1,13 +1,13 @@
package com.unciv.ui.victoryscreen package com.unciv.ui.victoryscreen
enum class RankingType (val value: String) { enum class RankingType {
Population("Population"), Population,
CropYield("Crop Yield"), Crop_Yield,
Production("Production"), Production,
Gold("Gold"), Gold,
Land("Land"), Territory,
Force("Force"), Force,
Happiness("Happiness"), Happiness,
Technologies("Technologies"), Technologies,
Culture("Culture") Culture
} }

2
core/src/com/unciv/ui/victoryscreen/VictoryScreen.kt
View File

@ -247,7 +247,7 @@ class VictoryScreen(val worldScreen: WorldScreen) : PickerScreen() {
for (category in RankingType.values()) { for (category in RankingType.values()) {
val column = Table().apply { defaults().pad(5f) } val column = Table().apply { defaults().pad(5f) }
column.add(category.value.toLabel()).row() column.add(category.name.replace('_',' ').toLabel()).row()
column.addSeparator() column.addSeparator()
for (civ in majorCivs.sortedByDescending { it.getStatForRanking(category) }) { for (civ in majorCivs.sortedByDescending { it.getStatForRanking(category) }) {