From 1f686b2d824293b6e805371e5e3b2577e8a380e5 Mon Sep 17 00:00:00 2001 From: YueR Date: Sat, 5 Oct 2019 00:11:02 +0800 Subject: [PATCH] update --- android/assets/jsons/Translations/Policies.json | 2 +- core/src/com/unciv/logic/civilization/CivInfoStats.kt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/android/assets/jsons/Translations/Policies.json b/android/assets/jsons/Translations/Policies.json index fdca45d687..d33753da58 100644 --- a/android/assets/jsons/Translations/Policies.json +++ b/android/assets/jsons/Translations/Policies.json @@ -849,7 +849,7 @@ Russian:"+1 к счастью от каждого редкого ресурса" Romanian:"+1 fericire din fiecare resursă de lux" Spanish:"+1 felicidad por cada recurso de lujo" - Simplified_Chinese:"每个奢侈资源+1快乐" + Simplified_Chinese:"每种奢侈资源额外+1快乐" Portuguese:"+1 Felicidade por cade recurso de luxo" German:"+1 Zufriedenheit für jede Luxusresource" French:"+1 Bonheur pour chaque ressource de luxe" diff --git a/core/src/com/unciv/logic/civilization/CivInfoStats.kt b/core/src/com/unciv/logic/civilization/CivInfoStats.kt index 5c5e8f716b..f63310adb9 100644 --- a/core/src/com/unciv/logic/civilization/CivInfoStats.kt +++ b/core/src/com/unciv/logic/civilization/CivInfoStats.kt @@ -101,7 +101,7 @@ class CivInfoStats(val civInfo: CivilizationInfo){ val statMap = HashMap() statMap["Base happiness"] = civInfo.getDifficulty().baseHappiness.toFloat() - var happinessPerUniqueLuxury = 5f + civInfo.getDifficulty().extraHappinessPerLuxury + var happinessPerUniqueLuxury = 4f + civInfo.getDifficulty().extraHappinessPerLuxury if (civInfo.policies.isAdopted("Protectionism")) happinessPerUniqueLuxury += 1 statMap["Luxury resources"]= civInfo.getCivResources().map { it.resource } .count { it.resourceType === ResourceType.Luxury } * happinessPerUniqueLuxury