diff --git a/core/src/com/unciv/logic/city/PopulationManager.kt b/core/src/com/unciv/logic/city/PopulationManager.kt index 491812cd1a..0d12b0fc37 100644 --- a/core/src/com/unciv/logic/city/PopulationManager.kt +++ b/core/src/com/unciv/logic/city/PopulationManager.kt @@ -46,7 +46,6 @@ class PopulationManager { // starvation! { population-- - unassignExtraPopulation() foodStored = 0 cityInfo.civInfo.addNotification(cityInfo.name + " is starving!", cityInfo.location, Color.RED) } diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index f6d76c1e55..831b669966 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -117,9 +117,15 @@ class MapUnit { doPreTurnAction() } - fun hasUnique(unique:String): Boolean { + fun getUniques(): MutableList { + val uniques = mutableListOf() val baseUnit = getBaseUnit() - return baseUnit.uniques!=null && baseUnit.uniques!!.contains(unique) + if(baseUnit.uniques!=null) uniques.addAll(baseUnit.uniques!!) + return uniques + } + + fun hasUnique(unique:String): Boolean { + return getUniques().contains(unique) } fun movementAlgs() = UnitMovementAlgorithms(this) @@ -130,6 +136,7 @@ class MapUnit { fun getViewableTiles(): MutableList { var visibilityRange = 2 + visibilityRange += getUniques().count{it=="+1 Visibility Range"} if(hasUnique("Limited Visibility")) visibilityRange-=1 return getTile().getViewableTiles(visibilityRange) } diff --git a/core/src/com/unciv/ui/CivilopediaScreen.kt b/core/src/com/unciv/ui/CivilopediaScreen.kt index dd8b68e2e1..11936df261 100644 --- a/core/src/com/unciv/ui/CivilopediaScreen.kt +++ b/core/src/com/unciv/ui/CivilopediaScreen.kt @@ -50,7 +50,6 @@ class CivilopediaScreen : CameraStageBaseScreen() { nameList.style = List.ListStyle(nameList.style) nameList.style.fontColorSelected = Color.BLACK - nameList.style.font.data.setScale(1.5f) val buttons = ArrayList