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

Fix perpetual constructions info (#8207) (#8222)

Browse Source 
Co-authored-by: tunerzinc@gmail.com <vfylfhby>
This commit is contained in:
vegeta1k95
2022-12-24 23:07:26 +01:00
committed by GitHub
parent b7b6bbd3f3
commit d3b6100047
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/ui/cityscreen/ConstructionInfoTable.kt
View File

@ -23,6 +23,7 @@ import com.unciv.ui.utils.extensions.darken
import com.unciv.ui.utils.extensions.disable import com.unciv.ui.utils.extensions.disable
import com.unciv.ui.utils.extensions.onClick import com.unciv.ui.utils.extensions.onClick
import com.unciv.ui.utils.extensions.toTextButton import com.unciv.ui.utils.extensions.toTextButton
import com.unciv.utils.Log
class ConstructionInfoTable(val cityScreen: CityScreen): Table() { class ConstructionInfoTable(val cityScreen: CityScreen): Table() {
private val selectedConstructionTable = Table() private val selectedConstructionTable = Table()
@ -62,8 +63,8 @@ class ConstructionInfoTable(val cityScreen: CityScreen): Table() {
pad(10f) pad(10f)
add(ImageGetter.getPortraitImage(construction.name, 50f).apply { add(ImageGetter.getPortraitImage(construction.name, 50f).apply {
val link = (construction as? IRulesetObject)?.makeLink() ?: return val link = (construction as? IRulesetObject)?.makeLink() ?: return@apply
if (link.isEmpty()) return if (link.isEmpty()) return@apply
touchable = Touchable.enabled touchable = Touchable.enabled
this.onClick { this.onClick {
UncivGame.Current.pushScreen(CivilopediaScreen(city.getRuleset(), link = link)) UncivGame.Current.pushScreen(CivilopediaScreen(city.getRuleset(), link = link))
@ -82,6 +83,7 @@ class ConstructionInfoTable(val cityScreen: CityScreen): Table() {
is BaseUnit -> construction.getDescription(city) is BaseUnit -> construction.getDescription(city)
is Building -> construction.getDescription(city, true) is Building -> construction.getDescription(city, true)
is PerpetualStatConversion -> construction.description.replace("[rate]", "[${construction.getConversionRate(city)}]").tr() is PerpetualStatConversion -> construction.description.replace("[rate]", "[${construction.getConversionRate(city)}]").tr()
is PerpetualConstruction -> construction.description
else -> "" // Should never happen else -> "" // Should never happen
} }

2
core/src/com/unciv/ui/images/ImageGetter.kt
View File

@ -273,7 +273,7 @@ object ImageGetter {
} else } else
getUnitIcon(construction).surroundWithCircle(size).surroundWithThinCircle() getUnitIcon(construction).surroundWithCircle(size).surroundWithThinCircle()
} }
if (construction in PerpetualConstruction.perpetualConstructionsMap) if (PerpetualConstruction.perpetualConstructionsMap.containsKey(construction))
return getImage("OtherIcons/Convert$construction").toGroup(size) return getImage("OtherIcons/Convert$construction").toGroup(size)
return getStatIcon(construction).surroundWithCircle(size).surroundWithThinCircle() return getStatIcon(construction).surroundWithCircle(size).surroundWithThinCircle()
} }