diff --git a/android/Images/ResourceIcons/Sugar.png b/android/Images/ResourceIcons/Sugar.png index f1adb06d87..97accd894a 100644 Binary files a/android/Images/ResourceIcons/Sugar.png and b/android/Images/ResourceIcons/Sugar.png differ diff --git a/android/Images/TechIcons/Plastics.png b/android/Images/TechIcons/Plastics.png index f7780b9b32..90111d342a 100644 Binary files a/android/Images/TechIcons/Plastics.png and b/android/Images/TechIcons/Plastics.png differ diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json index 1d0ec95f6f..a8ec4a9577 100644 --- a/android/assets/jsons/Nations.json +++ b/android/assets/jsons/Nations.json @@ -72,6 +72,15 @@ "Aden","Yamama","Muscat","Mansura","Bukhara","Fez","Shiraz","Merw","Balkh","Mosul", "Aydab","Bayt","Suhar","Taif","Hama","Tabuk","Sana'a","Shihr","Tripoli","Tunis"] }, + { + name:"America", + mainColor:[ 28,51,119], + secondaryColor:[255,255,255], + unique:"All land military units have +1 sight, 50% discount when purchasing tiles", + cities:["Washington","New York","Boston","Philadelphia","Atlanta","Chicago","Seattle","San Francisco","Los Angeles","Houston", + "Portland","St. Louis","Miami","Buffalo","Detroit","New Orleans","Baltimore","Denver","Cincinnati","Dallas","Memphis", + "Cleveland","Kansas City","San Diego","Richmond","Las Vegas","Phoenix","Albuquerque","Minneapolis","Pittsburgh"] + }, { name:"Barbarians", mainColor:[200,200,200], diff --git a/core/src/com/unciv/logic/city/CityExpansionManager.kt b/core/src/com/unciv/logic/city/CityExpansionManager.kt index fdbd30e3f8..72a7c404e6 100644 --- a/core/src/com/unciv/logic/city/CityExpansionManager.kt +++ b/core/src/com/unciv/logic/city/CityExpansionManager.kt @@ -42,7 +42,9 @@ class CityExpansionManager { val baseCost = 50 val numTilesClaimed= cityInfo.tiles.size - 7 val distanceFromCenter = tileInfo.arialDistanceTo(cityInfo.getCenterTile()) - val cost = baseCost * (distanceFromCenter-1) + numTilesClaimed*5 + var cost = baseCost * (distanceFromCenter-1) + numTilesClaimed*5 + if(cityInfo.civInfo.getNation().unique=="All land military units have +1 sight, 50% discount when purchasing tiles") + cost /= 2 return cost } diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt index 776e4a9800..4104772298 100644 --- a/core/src/com/unciv/logic/map/MapUnit.kt +++ b/core/src/com/unciv/logic/map/MapUnit.kt @@ -76,6 +76,8 @@ class MapUnit { var visibilityRange = 2 visibilityRange += getUniques().count{it=="+1 Visibility Range"} if(hasUnique("Limited Visibility")) visibilityRange-=1 + if(civInfo.getNation().unique=="All land military units have +1 sight, 50% discount when purchasing tiles") + visibilityRange += 1 val tile = getTile() if (tile.baseTerrain == "Hill") visibilityRange += 1 return tile.getViewableTiles(visibilityRange) @@ -222,6 +224,7 @@ class MapUnit { class YouCantGetThereFromHereException : Exception() if (!distanceToTiles.containsKey(otherTile)) + throw YouCantGetThereFromHereException() class CantEnterThisTileException : Exception()