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

Wonder uniques now displayed in cities (thanks Kumārikā Bālā for pointing out the problem!)

Browse Source
This commit is contained in:
Yair Morgenstern 2018-10-28 15:58:46 +02:00
parent 0f4accb5a4
commit 52dc1931cc
3 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/models/gamebasics/Building.kt
View File

@ -111,7 +111,7 @@ class Building : NamedStats(), IConstruction{
stringBuilder.appendln("Requires a $requiredBuildingInAllCities to be built in all cities") stringBuilder.appendln("Requires a $requiredBuildingInAllCities to be built in all cities")
if (providesFreeBuilding != null) if (providesFreeBuilding != null)
stringBuilder.appendln("Provides a free $providesFreeBuilding in this city") stringBuilder.appendln("Provides a free $providesFreeBuilding in this city")
if(uniques.isNotEmpty()) stringBuilder.appendln(uniques.map { it.tr() }.joinToString { "\n" }) if(uniques.isNotEmpty()) stringBuilder.appendln(uniques.asSequence().map { it.tr() }.joinToString("\n"))
if (stats.toString() != "") if (stats.toString() != "")
stringBuilder.appendln(stats) stringBuilder.appendln(stats)
if (this.percentStatBonus != null) { if (this.percentStatBonus != null) {

5
core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
View File

@ -146,9 +146,10 @@ fun String.tr(): String {
return languageSpecificPlaceholder.tr() return languageSpecificPlaceholder.tr()
} }
if(contains("{")){ // sentence if(contains("{")){ // sentence
return Regex("\\{(.*?)\\}").replace(this,{matchResult -> matchResult.groups[1]!!.value.tr() }) return Regex("\\{(.*?)\\}").replace(this) { it.groups[1]!!.value.tr() }
} }
else return GameBasics.Translations.get(this,UnCivGame.Current.settings.language) // single word val translation = GameBasics.Translations.get(this,UnCivGame.Current.settings.language) // single word
return translation
} }

18
core/src/com/unciv/ui/worldscreen/optionstable/WorldScreenDisplayOptionsTable.kt
View File

@ -57,14 +57,16 @@ class WorldScreenDisplayOptionsTable() : PopupTable(){
} }
}) })
add(Label("Missing translations:",CameraStageBaseScreen.skin)).pad(5f).row() if(languageSelectBox.selected.percentComplete!=100) {
val missingTextSelectBox = SelectBox<String>(CameraStageBaseScreen.skin) add(Label("Missing translations:", CameraStageBaseScreen.skin)).pad(5f).row()
val missingTextArray = com.badlogic.gdx.utils.Array<String>() val missingTextSelectBox = SelectBox<String>(CameraStageBaseScreen.skin)
val currentLanguage = UnCivGame.Current.settings.language val missingTextArray = com.badlogic.gdx.utils.Array<String>()
GameBasics.Translations.filter { !it.value.containsKey(currentLanguage) }.forEach{missingTextArray.add(it.key)} val currentLanguage = UnCivGame.Current.settings.language
missingTextSelectBox.items = missingTextArray GameBasics.Translations.filter { !it.value.containsKey(currentLanguage) }.forEach { missingTextArray.add(it.key) }
missingTextSelectBox.selected="Untranslated texts" missingTextSelectBox.items = missingTextArray
add(missingTextSelectBox).pad(10f).width(UnCivGame.Current.worldScreen.stage.width/2).row() missingTextSelectBox.selected = "Untranslated texts"
add(missingTextSelectBox).pad(10f).width(UnCivGame.Current.worldScreen.stage.width / 2).row()
}
val resolutionSelectBox= SelectBox<String>(CameraStageBaseScreen.skin) val resolutionSelectBox= SelectBox<String>(CameraStageBaseScreen.skin)
val resolutionArray = com.badlogic.gdx.utils.Array<String>() val resolutionArray = com.badlogic.gdx.utils.Array<String>()