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

Adding convert Function (#3687)

Browse Source 
* Adding convert Function

* field = null to be safe
This commit is contained in:
GGGuenni
2021-03-12 11:20:55 +01:00
committed by GitHub
parent 8780107ae4
commit d1df2fd128
1 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,6 +54,7 @@ open class TileInfo {
val terrainFeatures: ArrayList<String> = ArrayList() val terrainFeatures: ArrayList<String> = ArrayList()
@Transient // So it won't be serialized from now on @Transient // So it won't be serialized from now on
@Deprecated(message = "Since 3.13.7 - gets replaced by terrainFeatures")
var terrainFeature: String? = null var terrainFeature: String? = null
get() = terrainFeatures.firstOrNull() get() = terrainFeatures.firstOrNull()
?: field //if terrainFeatures contains no terrainFeature maybe one got deserialized to field ?: field //if terrainFeatures contains no terrainFeature maybe one got deserialized to field
@ -64,7 +65,20 @@ open class TileInfo {
} else { } else {
if (value != null) terrainFeatures.add(value) if (value != null) terrainFeatures.add(value)
} }
field = null
} }
private fun convertTerrainFeatureToArray() {
if (terrainFeatures.firstOrNull() == null && terrainFeature != null)// -> terranFeature getter returns terrainFeature field
terrainFeature = terrainFeature // getter returns field, setter calls terrainFeatures.add()
//Note to Future GGGuenni
//TODO Use the following when terrainFeature got changed everywhere to support old saves in the future
//if (terrainFeature != null){
//terrainFeatures.add(terrainFeature)
//terrainFeature = null
//}
}
var naturalWonder: String? = null var naturalWonder: String? = null
var resource: String? = null var resource: String? = null
var improvement: String? = null var improvement: String? = null
@ -92,6 +106,7 @@ open class TileInfo {
toReturn.position = position.cpy() toReturn.position = position.cpy()
toReturn.baseTerrain = baseTerrain toReturn.baseTerrain = baseTerrain
// toReturn.terrainFeature = terrainFeature // toReturn.terrainFeature = terrainFeature
convertTerrainFeatureToArray()
toReturn.terrainFeatures.addAll(terrainFeatures) toReturn.terrainFeatures.addAll(terrainFeatures)
toReturn.naturalWonder = naturalWonder toReturn.naturalWonder = naturalWonder
toReturn.resource = resource toReturn.resource = resource
@ -538,9 +553,7 @@ 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 convertTerrainFeatureToArray()
terrainFeature = terrainFeature // getter returns field, setter calls terrainFeatures.add()
}
setTerrainTransients() setTerrainTransients()
setUnitTransients(true) setUnitTransients(true)
} }