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

Can now use [stats] unique to add happiness globally

Browse Source
This commit is contained in:
Yair Morgenstern
2022-11-21 11:33:29 +02:00
parent 0cf5c33475
commit 8530de7de1
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/com/unciv/logic/civilization/CivInfoStats.kt
View File

@ -331,6 +331,12 @@ class CivInfoStats(val civInfo: CivilizationInfo) {
if (cityStatesHappiness > 0) statMap[Constants.cityStates] = cityStatesHappiness if (cityStatesHappiness > 0) statMap[Constants.cityStates] = cityStatesHappiness
for (unique in civInfo.getMatchingUniques(UniqueType.Stats))
if (unique.sourceObjectType != UniqueTarget.Building && unique.sourceObjectType != UniqueTarget.Wonder && unique.stats.happiness != 0f){
if (!statMap.containsKey(unique.sourceObjectName)) statMap[unique.sourceObjectName!!] = unique.stats.happiness
else statMap[unique.sourceObjectName!!] = statMap[unique.sourceObjectName]!! + unique.stats.happiness
}
return statMap return statMap
} }

7
tests/src/com/unciv/uniques/GlobalUniquesTests.kt
View File

@ -46,6 +46,13 @@ class GlobalUniquesTests {
Assert.assertTrue(civInfo.statsForNextTurn.equals(Stats(gold=2f))) Assert.assertTrue(civInfo.statsForNextTurn.equals(Stats(gold=2f)))
} }
@Test
fun statsHappinessNotOnBuilding() {
val civInfo = game.addCiv("[+7 Happiness]")
civInfo.updateStatsForNextTurn()
Assert.assertTrue(civInfo.happinessForNextTurn == civInfo.getDifficulty().baseHappiness + 7)
}
@Test @Test
fun statsPerCity() { fun statsPerCity() {