AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-27 22:06:05 -04:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
YueR 2019-10-05 00:11:02 +08:00
parent c7ac39c54e
commit 1f686b2d82
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Translations/Policies.json
View File

@ -849,7 +849,7 @@
Russian:"+1 к счастью от каждого редкого ресурса" Russian:"+1 к счастью от каждого редкого ресурса"
Romanian:"+1 fericire din fiecare resursă de lux" Romanian:"+1 fericire din fiecare resursă de lux"
Spanish:"+1 felicidad por cada recurso de lujo" Spanish:"+1 felicidad por cada recurso de lujo"
Simplified_Chinese:"每个奢侈资源+1快乐" Simplified_Chinese:"每种奢侈资源额外+1快乐"
Portuguese:"+1 Felicidade por cade recurso de luxo" Portuguese:"+1 Felicidade por cade recurso de luxo"
German:"+1 Zufriedenheit für jede Luxusresource" German:"+1 Zufriedenheit für jede Luxusresource"
French:"+1 Bonheur pour chaque ressource de luxe" French:"+1 Bonheur pour chaque ressource de luxe"

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

@ -101,7 +101,7 @@ class CivInfoStats(val civInfo: CivilizationInfo){
val statMap = HashMap<String, Float>() val statMap = HashMap<String, Float>()
statMap["Base happiness"] = civInfo.getDifficulty().baseHappiness.toFloat() 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 if (civInfo.policies.isAdopted("Protectionism")) happinessPerUniqueLuxury += 1
statMap["Luxury resources"]= civInfo.getCivResources().map { it.resource } statMap["Luxury resources"]= civInfo.getCivResources().map { it.resource }
.count { it.resourceType === ResourceType.Luxury } * happinessPerUniqueLuxury .count { it.resourceType === ResourceType.Luxury } * happinessPerUniqueLuxury