wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Simplified "on [seacost]" and "on [tile next to fresh water]" to "next to [Coast]" and "next to [Fresh water]"

Browse source
This commit is contained in:
Yair Morgenstern 2020-09-11 09:24:08 +03:00
parent 9e7b28a6e4
commit cb0599b9f5
4 changed files with 13 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
android/assets/jsons/Civ V - Vanilla/Buildings.json
View file

@ -94,7 +94,7 @@
"cost": 75, "cost": 75,
"food": 2, "food": 2,
"production": 1, "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, "hurryCostModifier": 25,
"maintenance": 1, "maintenance": 1,
"percentStatBonus": {"food": 15}, "percentStatBonus": {"food": 15},
@ -149,7 +149,7 @@
"gold": 5, "gold": 5,
"greatPersonPoints": {"gold": 1}, "greatPersonPoints": {"gold": 1},
"isWonder": true, "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", "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" "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, "hurryCostModifier": 25,
"maintenance": 1, "maintenance": 1,
"resourceBonusStats": {"food": 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" "requiredTech": "Optics"
}, },
{ {
@ -198,7 +198,7 @@
"greatPersonPoints": {"gold": 1}, "greatPersonPoints": {"gold": 1},
"isWonder": true, "isWonder": true,
"providesFreeBuilding": "Lighthouse", "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", "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" "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", "name": "Garden",
"cost": 120, "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, "hurryCostModifier": 25,
"maintenance": 1, "maintenance": 1,
"requiredTech": "Theology" "requiredTech": "Theology"
@ -445,7 +445,7 @@
"maintenance": 2, "maintenance": 2,
"hurryCostModifier": 25, "hurryCostModifier": 25,
"uniques": ["[+1 Production] from [Water resource] tiles in this city", "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" "requiredTech": "Compass"
}, },
{ {
@ -677,7 +677,7 @@
"maintenance": 2, "maintenance": 2,
"requiredBuilding": "Harbor", "requiredBuilding": "Harbor",
"uniques": ["[+1 Production, +1 Gold] from [Water resource] tiles in this city", "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" "requiredTech": "Navigation"
}, },
{ {
@ -901,7 +901,7 @@
"isWonder": true, "isWonder": true,
"greatPersonPoints": {"culture": 2}, "greatPersonPoints": {"culture": 2},
"percentStatBonus": {"culture": 50}, "percentStatBonus": {"culture": 50},
"uniques": ["Free Social Policy","Must be on [seacoast]"], "uniques": ["Free Social Policy","Must be next to [Coast]"],
"requiredTech": "Ecology", "requiredTech": "Ecology",
"quote": "'Those who lose dreaming are lost.' - Australian Aboriginal saying" "quote": "'Those who lose dreaming are lost.' - Australian Aboriginal saying"
}, },

5
android/assets/jsons/translations/template.properties
View file

@ -633,11 +633,8 @@ Water =
# For [stats] from [Water resource] tiles in this city # For [stats] from [Water resource] tiles in this city
Water resource = Water resource =
River = River =
fresh water = Fresh water =
non-fresh water = non-fresh water =
# For Must be on []
seacoast =
tile adjacent to source of fresh water =
Wonders = Wonders =
Base values = Base values =

7
core/src/com/unciv/logic/map/TileInfo.kt
View file

@ -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 // 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 // and farms on adjacent to fresh water tiles will have +1 additional Food after researching Civil Service
@delegate:Transient @delegate:Transient
val isAdjacentToFreshwater: Boolean by lazy { isAdjacentToRiver() || neighbors.any { it.getBaseTerrain().uniques.contains("Fresh water") val isAdjacentToFreshwater: Boolean by lazy { fitsUniqueFilter("Fresh water") || neighbors.any { it.fitsUniqueFilter("Fresh water") } }
|| it.terrainFeature != null && it.getTerrainFeature()!!.uniques.contains("Fresh water") }}
var militaryUnit: MapUnit? = null var militaryUnit: MapUnit? = null
var civilianUnit: MapUnit? = null var civilianUnit: MapUnit? = null
@ -310,9 +309,7 @@ open class TileInfo {
fun fitsUniqueFilter(filter:String): Boolean { fun fitsUniqueFilter(filter:String): Boolean {
return filter == baseTerrain return filter == baseTerrain
|| filter == "River" && isAdjacentToRiver() || (filter == "River" || filter == "Fresh water") && isAdjacentToRiver()
|| filter == "seacoast" && isCoastalTile()
|| filter == "tile adjacent to source of fresh water" && isAdjacentToFreshwater
|| filter == terrainFeature || filter == terrainFeature
|| baseTerrainObject.uniques.contains(filter) || baseTerrainObject.uniques.contains(filter)
|| terrainFeature != null && getTerrainFeature()!!.uniques.contains(filter) || terrainFeature != null && getTerrainFeature()!!.uniques.contains(filter)

4
core/src/com/unciv/models/ruleset/Building.kt
View file

@ -252,9 +252,9 @@ class Building : NamedStats(), IConstruction {
if (cityCenter.baseTerrain == Constants.plains) return unique.text 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 "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 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 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 if (!cityCenter.isAdjacentToFreshwater) return unique.text
} }