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

Custom improvements for water resources now moddable

Browse Source
This commit is contained in:
Yair Morgenstern
2021-03-25 10:46:45 +02:00
parent 5ac2ee19c7
commit eda9ceb140
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,6 +50,7 @@
}, },
{ {
"name": "Oil well", "name": "Oil well",
"terrainsCanBeBuiltOn": ["Coast"],
"turnsToBuild": 9, "turnsToBuild": 9,
"techRequired": "Biology" "techRequired": "Biology"
}, },

25
core/src/com/unciv/ui/worldscreen/unit/UnitActions.kt
View File

@ -83,19 +83,18 @@ object UnitActions {
fun getWaterImprovementAction(unit: MapUnit): UnitAction? { fun getWaterImprovementAction(unit: MapUnit): UnitAction? {
val tile = unit.currentTile val tile = unit.currentTile
for (improvement in listOf("Fishing Boats", "Oil well")) { if (!tile.isWater || !unit.hasUnique("May create improvements on water resources") || tile.resource == null) return null
if (unit.hasUnique("May create improvements on water resources") && tile.resource != null
&& tile.isWater // because fishing boats can enter cities, and if there's oil in the city... ;) val improvement = tile.getTileResource().improvement
&& tile.improvement == null
&& tile.getTileResource().improvement == improvement if (tile.improvement == null
&& unit.civInfo.tech.isResearched(unit.civInfo.gameInfo.ruleSet.tileImprovements[improvement]!!.techRequired!!) && unit.civInfo.tech.isResearched(tile.ruleset.tileImprovements[improvement]!!.techRequired!!))
) return UnitAction(UnitActionType.Create, "Create [$improvement]",
return UnitAction(UnitActionType.Create, "Create [$improvement]", action = {
action = { tile.improvement = improvement
tile.improvement = improvement unit.destroy()
unit.destroy() }.takeIf { unit.currentMovement > 0 })
}.takeIf { unit.currentMovement > 0 })
}
return null return null
} }