mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-15 02:09:21 +07:00
Code Issues Packages Projects Releases Wiki Activity

Small changes to city screen (#4902)

Browse Source
This commit is contained in:
SomeTroglodyte
2021-08-19 08:51:26 +02:00
committed by GitHub
parent ef5483e9d5
commit 0f5f3366ed
3 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
core/src/com/unciv/models/ruleset/Building.kt
View File

@ -75,10 +75,10 @@ class Building : NamedStats(), INonPerpetualConstruction, ICivilopediaText {
override var civilopediaText = listOf<FormattedLine>() override var civilopediaText = listOf<FormattedLine>()
/** Used for AlertType.WonderBuilt, and as sub-text in Nation and Tech descriptions */
fun getShortDescription(ruleset: Ruleset): String { // should fit in one line fun getShortDescription(ruleset: Ruleset): String { // should fit in one line
val infoList = mutableListOf<String>() val infoList = mutableListOf<String>()
val str = getStats(null).toString() getStats(null).toString().also { if (it.isNotEmpty()) infoList += it }
if (str.isNotEmpty()) infoList += str
for (stat in getStatPercentageBonuses(null).toHashMap()) for (stat in getStatPercentageBonuses(null).toHashMap())
if (stat.value != 0f) infoList += "+${stat.value.toInt()}% ${stat.key.name.tr()}" if (stat.value != 0f) infoList += "+${stat.value.toInt()}% ${stat.key.name.tr()}"
@ -114,13 +114,18 @@ class Building : NamedStats(), INonPerpetualConstruction, ICivilopediaText {
)) ))
} }
private fun getUniquesStringsWithoutDisablers() = getUniquesStrings() private fun getUniquesStringsWithoutDisablers() = getUniquesStrings()
.filterNot { it.startsWith("Hidden ") && it.endsWith(" disabled") || it == "Unbuildable" } .filterNot {
it.startsWith("Hidden ") && it.endsWith(" disabled") ||
it == "Unbuildable" ||
it == "Will not be displayed in Civilopedia"
}
/** used in CityScreen (CityInfoTable and ConstructionInfoTable) */ /** used in CityScreen (CityInfoTable and ConstructionInfoTable) */
fun getDescription(cityInfo: CityInfo?, ruleset: Ruleset): String { fun getDescription(cityInfo: CityInfo?, ruleset: Ruleset): String {
val stats = getStats(cityInfo) val stats = getStats(cityInfo)
val lines = ArrayList<String>() val lines = ArrayList<String>()
if (uniqueTo != null) lines += "Unique to [$uniqueTo], replaces [$replaces]" if (uniqueTo != null) lines += if (replaces == null) "Unique to [$uniqueTo]"
else "Unique to [$uniqueTo], replaces [$replaces]"
if (isWonder) lines += "Wonder" if (isWonder) lines += "Wonder"
if (isNationalWonder) lines += "National Wonder" if (isNationalWonder) lines += "National Wonder"
for ((resource, amount) in getResourceRequirements()) { for ((resource, amount) in getResourceRequirements()) {

3
core/src/com/unciv/ui/cityscreen/CityInfoTable.kt
View File

@ -5,6 +5,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table
import com.badlogic.gdx.utils.Align import com.badlogic.gdx.utils.Align
import com.unciv.UncivGame import com.unciv.UncivGame
import com.unciv.logic.city.CityInfo import com.unciv.logic.city.CityInfo
import com.unciv.models.UncivSound
import com.unciv.models.ruleset.Building import com.unciv.models.ruleset.Building
import com.unciv.models.stats.Stat import com.unciv.models.stats.Stat
import com.unciv.models.translations.tr import com.unciv.models.translations.tr
@ -71,7 +72,7 @@ class CityInfoTable(private val cityScreen: CityScreen) : Table(CameraStageBaseS
val sellBuildingButton = "Sell for [$sellAmount] gold".toTextButton() val sellBuildingButton = "Sell for [$sellAmount] gold".toTextButton()
it.add(sellBuildingButton).pad(5f).row() it.add(sellBuildingButton).pad(5f).row()
sellBuildingButton.onClick { sellBuildingButton.onClick(UncivSound.Coin) {
sellBuildingButton.disable() sellBuildingButton.disable()
cityScreen.closeAllPopups() cityScreen.closeAllPopups()

2
core/src/com/unciv/ui/cityscreen/CityStatsTable.kt
View File

@ -90,6 +90,6 @@ class CityStatsTable(val cityScreen: CityScreen): Table() {
innerTable.addSeparator() innerTable.addSeparator()
val label = cityInfo.religion.getMajorityReligion() val label = cityInfo.religion.getMajorityReligion()
?: "None" ?: "None"
innerTable.add("Majority Religion: [$label]".toLabel()) innerTable.add("Majority Religion: [$label]".toLabel()).padTop(5f)
} }
} }