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

Support for multiple terrain features Part 1 (#3678)

Browse Source 
* Adding terrainFeatures ArrayList

* fixed existing save loses all terrainFeatures
This commit is contained in:
GGGuenni
2021-03-11 18:07:44 +01:00
committed by GitHub
parent 7bb2c70245
commit 1286fc1dff
1 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,7 +49,17 @@ open class TileInfo {
var position: Vector2 = Vector2.Zero var position: Vector2 = Vector2.Zero
lateinit var baseTerrain: String lateinit var baseTerrain: String
val terrainFeatures: ArrayList<String> = ArrayList()
var terrainFeature: String? = null var terrainFeature: String? = null
get() = terrainFeatures.firstOrNull() ?: field //if terrainFeatures contains no terrainFeature maybe one got deserialized to field
set(value) {
if (terrainFeatures.isNotEmpty()) {
if (value == null) terrainFeatures.removeAt(0)
else terrainFeatures[0] = value
} else {
if (value != null) terrainFeatures.add(value)
}
}
var naturalWonder: String? = null var naturalWonder: String? = null
var resource: String? = null var resource: String? = null
var improvement: String? = null var improvement: String? = null
@ -523,6 +533,8 @@ open class TileInfo {
//region state-changing functions //region state-changing functions
fun setTransients() { fun setTransients() {
if (terrainFeatures.firstOrNull() == null && terrainFeature != null)// -> terranFeature getter returns terrainFeature field
terrainFeature = terrainFeature // getter returns field, setter calls terrainFeatures.add()
setTerrainTransients() setTerrainTransients()
setUnitTransients(true) setUnitTransients(true)
} }