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

Eiffel tower special now no longer overrides happiness from other policies

Browse Source 
Minimum distance between cities increased
This commit is contained in:
Yair Morgenstern 2018-09-09 13:29:30 +03:00
parent c4838f5fde
commit d7a08cfc01
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -159,8 +159,10 @@ class CivilizationInfo {
}
}
if (getBuildingUniques().contains("Provides 1 happiness per social policy"))
statMap["Policies"] = policies.getAdoptedPolicies().count { !it.endsWith("Complete") }.toFloat()
if (getBuildingUniques().contains("Provides 1 happiness per social policy")) {
if(!statMap.containsKey("Policies")) statMap["Policies"]=0f
statMap["Policies"] = statMap["Policies"]!! + policies.getAdoptedPolicies().count { !it.endsWith("Complete") }.toFloat()
}
return statMap
}

2
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -99,7 +99,7 @@ class UnitActions {
unit.destroy()
},
unit.currentMovement != 0f &&
!tile.getTilesInDistance(2).any { it.isCityCenter() })
!tile.getTilesInDistance(3).any { it.isCityCenter() })
}
if (unit.name == "Worker") {