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

Happiness label in menu bar now displays unhappy face and red text if hapiness is negative

Browse Source
This commit is contained in:
Yair Morgenstern
2018-05-11 16:19:40 +03:00
parent 3cd21c4b8e
commit a4fcc3a694
2 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/Policies.json
View File

@ -227,6 +227,7 @@
{ {
name:"Civil Society", name:"Civil Society",
description:"-50% food consumption by specialists", description:"-50% food consumption by specialists",
requires:["Constitution"],
row:2, row:2,
column:1 column:1
}, },

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

@ -20,10 +20,11 @@ class CivStatsTable(val screen: WorldScreen) : Table() {
private val turnsLabel = Label("Turns: 0/400", labelStyle) private val turnsLabel = Label("Turns: 0/400", labelStyle)
private val goldLabel = Label("Gold:",labelStyle).apply { color = Color().fromRGB(225,217,71) } private val goldLabel = Label("Gold:",labelStyle).apply { color = Color().fromRGB(225,217,71) }
private val scienceLabel = Label("Science:",labelStyle).apply { color = Color().fromRGB(78,140,151) } private val scienceLabel = Label("Science:",labelStyle).apply { color = Color().fromRGB(78,140,151) }
private val happinessLabel = Label("Happiness:",labelStyle).apply { color = Color().fromRGB(92,194,77) } private val happinessLabel = Label("Happiness:",labelStyle)
private val cultureLabel = Label("Culture:",labelStyle).apply { color = Color().fromRGB(200,60,200) } private val cultureLabel = Label("Culture:",labelStyle).apply { color = Color().fromRGB(210,94,210) }
private val resourceLabels = HashMap<String, Label>() private val resourceLabels = HashMap<String, Label>()
private val resourceImages = HashMap<String, Image>() private val resourceImages = HashMap<String, Image>()
private val happinessImage = ImageGetter.getStatIcon("Happiness")
init{ init{
background = ImageGetter.getDrawable("skin/whiteDot.png").tint(ImageGetter.getBlue().lerp(Color.BLACK,0.5f)) background = ImageGetter.getDrawable("skin/whiteDot.png").tint(ImageGetter.getBlue().lerp(Color.BLACK,0.5f))
@ -66,7 +67,7 @@ class CivStatsTable(val screen: WorldScreen) : Table() {
statsTable.add(scienceLabel) //.apply { setAlignment(Align.center) }).align(Align.top) statsTable.add(scienceLabel) //.apply { setAlignment(Align.center) }).align(Align.top)
statsTable.add(ImageGetter.getStatIcon("Science")).padRight(20f) statsTable.add(ImageGetter.getStatIcon("Science")).padRight(20f)
statsTable.add(ImageGetter.getStatIcon("Happiness")) statsTable.add(happinessImage)
statsTable.add(happinessLabel).padRight(20f)//.apply { setAlignment(Align.center) }).align(Align.top) statsTable.add(happinessLabel).padRight(20f)//.apply { setAlignment(Align.center) }).align(Align.top)
statsTable.add(cultureLabel)//.apply { setAlignment(Align.center) }).align(Align.top) statsTable.add(cultureLabel)//.apply { setAlignment(Align.center) }).align(Align.top)
@ -116,10 +117,19 @@ class CivStatsTable(val screen: WorldScreen) : Table() {
if (civInfo.goldenAges.isGoldenAge()) if (civInfo.goldenAges.isGoldenAge())
happinessText += " GOLDEN AGE (${civInfo.goldenAges.turnsLeftForCurrentGoldenAge})" happinessText += " GOLDEN AGE (${civInfo.goldenAges.turnsLeftForCurrentGoldenAge})"
else else
happinessText += ("(" + civInfo.goldenAges.storedHappiness + "/" happinessText += (" (" + civInfo.goldenAges.storedHappiness + "/"
+ civInfo.goldenAges.happinessRequiredForNextGoldenAge() + ")") + civInfo.goldenAges.happinessRequiredForNextGoldenAge() + ")")
happinessLabel.setText(happinessText) happinessLabel.setText(happinessText)
if(civInfo.happiness<0){
happinessLabel.color = Color.valueOf("ef5350")
happinessImage.drawable = ImageGetter.getStatIcon("Malcontent").drawable
}
else{
happinessLabel.color = Color().fromRGB(92,194,77)
happinessImage.drawable = ImageGetter.getStatIcon("Happiness").drawable
}
val turnsToNextPolicy = (civInfo.policies.getCultureNeededForNextPolicy() - civInfo.policies.storedCulture) / nextTurnStats.culture val turnsToNextPolicy = (civInfo.policies.getCultureNeededForNextPolicy() - civInfo.policies.storedCulture) / nextTurnStats.culture
var cultureString = "+" + Math.round(nextTurnStats.culture) var cultureString = "+" + Math.round(nextTurnStats.culture)
if(turnsToNextPolicy>0) cultureString+= " ("+ ceil(turnsToNextPolicy).toInt()+")" if(turnsToNextPolicy>0) cultureString+= " ("+ ceil(turnsToNextPolicy).toInt()+")"