diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json index 2d0c2862..0db0527b 100644 --- a/android/assets/jsons/Civ V - Vanilla/Buildings.json +++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json @@ -94,7 +94,7 @@ "cost": 75, "food": 2, "production": 1, - "uniques": ["[+2 Food] from [Lakes] tiles in this city", "Must be on [tile adjacent to source of fresh water]"], + "uniques": ["[+2 Food] from [Lakes] tiles in this city", "Must be next to [Fresh water]"], "hurryCostModifier": 25, "maintenance": 1, "percentStatBonus": {"food": 15}, @@ -149,7 +149,7 @@ "gold": 5, "greatPersonPoints": {"gold": 1}, "isWonder": true, - "uniques": ["Must be on [seacoast]", "[+1 Gold] from [Water] tiles in this city"], + "uniques": ["Must be next to [Coast]", "[+1 Gold] from [Water] tiles in this city"], "requiredTech": "Iron Working", "quote": "'Why man, he doth bestride the narrow world like a colossus, and we petty men walk under his huge legs, and peep about to find ourselves dishonorable graves.' - William Shakespeare, Julius Caesar" }, @@ -189,7 +189,7 @@ "hurryCostModifier": 25, "maintenance": 1, "resourceBonusStats": {"food": 1}, - "uniques": ["Must be on [seacoast]", "[+1 Food] from [Ocean] tiles in this city", "[+1 Food] from [Coast] tiles in this city"], + "uniques": ["Must be next to [Coast]", "[+1 Food] from [Ocean] tiles in this city", "[+1 Food] from [Coast] tiles in this city"], "requiredTech": "Optics" }, { @@ -198,7 +198,7 @@ "greatPersonPoints": {"gold": 1}, "isWonder": true, "providesFreeBuilding": "Lighthouse", - "uniques": ["Must be on [seacoast]", "All military naval units receive +1 movement and +1 sight"], + "uniques": ["Must be next to [Coast]", "All military naval units receive +1 movement and +1 sight"], "requiredTech": "Optics", "quote": "'They that go down to the sea in ships, that do business in great waters; these see the works of the Lord, and his wonders in the deep.' - The Bible, Psalms 107:23-24" }, @@ -353,7 +353,7 @@ { "name": "Garden", "cost": 120, - "uniques": ["+[25]% great person generation in this city", "Must be on [tile adjacent to source of fresh water]"], + "uniques": ["+[25]% great person generation in this city", "Must be next to [Fresh water]"], "hurryCostModifier": 25, "maintenance": 1, "requiredTech": "Theology" @@ -445,7 +445,7 @@ "maintenance": 2, "hurryCostModifier": 25, "uniques": ["[+1 Production] from [Water resource] tiles in this city", - "Connects trade routes over water","Must be on [seacoast]"], + "Connects trade routes over water","Must be next to [Coast]"], "requiredTech": "Compass" }, { @@ -677,7 +677,7 @@ "maintenance": 2, "requiredBuilding": "Harbor", "uniques": ["[+1 Production, +1 Gold] from [Water resource] tiles in this city", - "Must be on [seacoast]", "+[15]% production when building [naval units] in this city"], + "Must be next to [Coast]", "+[15]% production when building [naval units] in this city"], "requiredTech": "Navigation" }, { @@ -901,7 +901,7 @@ "isWonder": true, "greatPersonPoints": {"culture": 2}, "percentStatBonus": {"culture": 50}, - "uniques": ["Free Social Policy","Must be on [seacoast]"], + "uniques": ["Free Social Policy","Must be next to [Coast]"], "requiredTech": "Ecology", "quote": "'Those who lose dreaming are lost.' - Australian Aboriginal saying" }, diff --git a/android/assets/jsons/translations/template.properties b/android/assets/jsons/translations/template.properties index ff626ecf..199b299e 100644 --- a/android/assets/jsons/translations/template.properties +++ b/android/assets/jsons/translations/template.properties @@ -633,11 +633,8 @@ Water = # For [stats] from [Water resource] tiles in this city Water resource = River = -fresh water = +Fresh water = non-fresh water = -# For Must be on [] -seacoast = -tile adjacent to source of fresh water = Wonders = Base values = diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt index 0d3e7415..c403aa8a 100644 --- a/core/src/com/unciv/logic/map/TileInfo.kt +++ b/core/src/com/unciv/logic/map/TileInfo.kt @@ -27,8 +27,7 @@ open class TileInfo { // This will be called often - farm can be built on Hill and tundra if adjacent to fresh water // and farms on adjacent to fresh water tiles will have +1 additional Food after researching Civil Service @delegate:Transient - val isAdjacentToFreshwater: Boolean by lazy { isAdjacentToRiver() || neighbors.any { it.getBaseTerrain().uniques.contains("Fresh water") - || it.terrainFeature != null && it.getTerrainFeature()!!.uniques.contains("Fresh water") }} + val isAdjacentToFreshwater: Boolean by lazy { fitsUniqueFilter("Fresh water") || neighbors.any { it.fitsUniqueFilter("Fresh water") } } var militaryUnit: MapUnit? = null var civilianUnit: MapUnit? = null @@ -310,9 +309,7 @@ open class TileInfo { fun fitsUniqueFilter(filter:String): Boolean { return filter == baseTerrain - || filter == "River" && isAdjacentToRiver() - || filter == "seacoast" && isCoastalTile() - || filter == "tile adjacent to source of fresh water" && isAdjacentToFreshwater + || (filter == "River" || filter == "Fresh water") && isAdjacentToRiver() || filter == terrainFeature || baseTerrainObject.uniques.contains(filter) || terrainFeature != null && getTerrainFeature()!!.uniques.contains(filter) diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt index 5580903f..014c7e7d 100644 --- a/core/src/com/unciv/models/ruleset/Building.kt +++ b/core/src/com/unciv/models/ruleset/Building.kt @@ -252,9 +252,9 @@ class Building : NamedStats(), IConstruction { if (cityCenter.baseTerrain == Constants.plains) return unique.text "Must not be on hill" -> // Deprecated as of 3.10.8 . Use "Must not be on [Hill]" instead if (cityCenter.baseTerrain == Constants.hill) return unique.text - "Can only be built in coastal cities" -> // Deprecated as of 3.10.8 . Use "Must be on [seacoast]" instead + "Can only be built in coastal cities" -> // Deprecated as of 3.10.8 . Use "Must be next to [Coast]" instead if (!cityCenter.isCoastalTile()) return unique.text - "Must border a source of fresh water" -> // Deprecated as of 3.10.8 . Use "Must be on [tile adjacent to source of fresh water]" instead + "Must border a source of fresh water" -> // Deprecated as of 3.10.8 . Use "Must be next to [Fresh water]" instead if (!cityCenter.isAdjacentToFreshwater) return unique.text }