mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-14 01:39:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Wonder build screens redux (#4509)

Browse Source 
* wonder splash screens

* wonder splash screens atlas

* removed pyramids file, add portrait code

* restore atlas
This commit is contained in:
SimonCeder
2021-07-13 22:42:40 +02:00
committed by GitHub
parent c9010c5fdc
commit 314a2a48bb
2 changed files with 24 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -204,6 +204,8 @@ object ImageGetter {
return getImage("UnitIcons/$unitName").apply { this.color = color } return getImage("UnitIcons/$unitName").apply { this.color = color }
} }
fun getNationIndicator(nation: Nation, size: Float): IconCircleGroup { fun getNationIndicator(nation: Nation, size: Float): IconCircleGroup {
val civIconName = if (nation.isCityState()) "CityState" else nation.name val civIconName = if (nation.isCityState()) "CityState" else nation.name
return if (nationIconExists(civIconName)) { return if (nationIconExists(civIconName)) {
@ -218,6 +220,9 @@ object ImageGetter {
private fun nationIconExists(nation: String) = imageExists("NationIcons/$nation") private fun nationIconExists(nation: String) = imageExists("NationIcons/$nation")
fun getNationIcon(nation: String) = getImage("NationIcons/$nation") fun getNationIcon(nation: String) = getImage("NationIcons/$nation")
fun wonderImageExists(wonderName: String) = imageExists("WonderImages/$wonderName")
fun getWonderImage(wonderName: String) = getImage("WonderImages/$wonderName")
val foodCircleColor = colorFromRGB(129, 199, 132) val foodCircleColor = colorFromRGB(129, 199, 132)
private val productionCircleColor = Color.BROWN.cpy().lerp(Color.WHITE, 0.5f) private val productionCircleColor = Color.BROWN.cpy().lerp(Color.WHITE, 0.5f)
private val goldCircleColor = Color.GOLD.cpy().lerp(Color.WHITE, 0.5f) private val goldCircleColor = Color.GOLD.cpy().lerp(Color.WHITE, 0.5f)

22
core/src/com/unciv/ui/worldscreen/AlertPopup.kt
View File

@ -184,11 +184,27 @@ class AlertPopup(val worldScreen: WorldScreen, val popupAlert: PopupAlert): Popu
val wonder = worldScreen.gameInfo.ruleSet.buildings[popupAlert.value]!! val wonder = worldScreen.gameInfo.ruleSet.buildings[popupAlert.value]!!
addGoodSizedLabel(wonder.name) addGoodSizedLabel(wonder.name)
addSeparator() addSeparator()
if(ImageGetter.wonderImageExists(wonder.name)) { // Wonder Graphic exists
if(worldScreen.stage.height * 3 > worldScreen.stage.width * 4) { // Portrait
add(ImageGetter.getWonderImage(wonder.name))
.width(worldScreen.stage.width / 1.5f)
.height(worldScreen.stage.width / 3)
.row()
}
else { // Landscape (or squareish)
add(ImageGetter.getWonderImage(wonder.name))
.width(worldScreen.stage.width / 2.5f)
.height(worldScreen.stage.width / 5)
.row()
}
} else { // Fallback
add(ImageGetter.getConstructionImage(wonder.name).surroundWithCircle(100f)).pad(20f).row()
}
val centerTable = Table() val centerTable = Table()
centerTable.add(wonder.quote.toLabel().apply { wrap = true }).width(worldScreen.stage.width / 3) centerTable.add(wonder.quote.toLabel().apply { wrap = true }).width(worldScreen.stage.width / 3).pad(10f)
centerTable.add(ImageGetter.getConstructionImage(wonder.name).surroundWithCircle(100f)).pad(20f)
centerTable.add(wonder.getShortDescription(worldScreen.gameInfo.ruleSet) centerTable.add(wonder.getShortDescription(worldScreen.gameInfo.ruleSet)
.toLabel().apply { wrap = true }).width(worldScreen.stage.width / 3) .toLabel().apply { wrap = true }).width(worldScreen.stage.width / 3).pad(10f)
add(centerTable).row() add(centerTable).row()
add(getCloseButton(Constants.close)) add(getCloseButton(Constants.close))
} }