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

Terrace Farms: Bonus resource restriction (#2522)

Browse Source
This commit is contained in:
SomeTroglodyte
2020-04-26 18:39:48 +02:00
committed by GitHub
parent 818adbd1a3
commit 5e5a175f06
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/assets/jsons/Civ V - Vanilla/TileImprovements.json
View File

@ -184,13 +184,13 @@
{ {
"name": "Terrace farm", "name": "Terrace farm",
"uniqueTo": "Inca", "uniqueTo": "Inca",
"terrainsCanBeBuiltOn": ["Hill"],
"food": 1, "food": 1,
"turnsToBuild": 7, "turnsToBuild": 7,
"uniques": ["+1 food for each adjacent Mountain"], "uniques": ["+1 food for each adjacent Mountain", "Cannot be built on bonus resource"],
"techRequired": "Construction", "techRequired": "Construction",
"improvingTech": "Fertilizer", "improvingTech": "Fertilizer",
"improvingTechStats": {"food":1}, "improvingTechStats": {"food":1}
"terrainsCanBeBuiltOn": ["Hill"]
}, },
{ "name": "Ancient ruins" }, { "name": "Ancient ruins" },

2
core/src/com/unciv/logic/map/TileInfo.kt
View File

@ -271,6 +271,8 @@ open class TileInfo {
improvement.name == this.improvement -> false improvement.name == this.improvement -> false
improvement.uniqueTo != null && improvement.uniqueTo != civInfo.civName -> false improvement.uniqueTo != null && improvement.uniqueTo != civInfo.civName -> false
improvement.techRequired?.let { civInfo.tech.isResearched(it) } == false -> false improvement.techRequired?.let { civInfo.tech.isResearched(it) } == false -> false
"Cannot be built on bonus resource" in improvement.uniques && resource != null
&& getTileResource().resourceType == ResourceType.Bonus -> false
improvement.terrainsCanBeBuiltOn.contains(topTerrain.name) -> true improvement.terrainsCanBeBuiltOn.contains(topTerrain.name) -> true
improvement.name == "Road" && roadStatus == RoadStatus.None -> true improvement.name == "Road" && roadStatus == RoadStatus.None -> true
improvement.name == "Railroad" && this.roadStatus != RoadStatus.Railroad -> true improvement.name == "Railroad" && this.roadStatus != RoadStatus.Railroad -> true