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

Map editor normalizes tiles, so you can't add improvements of features where they shouldn't belong

Browse source 
Placing a civ starting location removes older starting locations
This commit is contained in:
Yair Morgenstern 2019-11-29 12:01:32 +02:00
parent 5807957d32
commit 68ee549edb
1 changed files with 37 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
View file

@ -307,11 +307,48 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
if (improvement.name == "Road") tileInfo.roadStatus = RoadStatus.Road
else if (improvement.name == "Railroad") tileInfo.roadStatus = RoadStatus.Railroad
else tileInfo.improvement = improvement.name
if(improvement.name.startsWith("StartingLocation"))
for(tileGroup in mapEditorScreen.mapHolder.tileGroups){
val tile = tileGroup.tileInfo
if(tile.improvement==improvement.name && tile!=tileInfo)
tile.improvement=null
tile.setTransients()
tileGroup.update()
}
}
toggleBottomLeftRiver -> tileInfo.hasBottomLeftRiver = !tileInfo.hasBottomLeftRiver
toggleBottomRiver -> tileInfo.hasBottomRiver = !tileInfo.hasBottomRiver
toggleBottomRightRiver -> tileInfo.hasBottomRightRiver = !tileInfo.hasBottomRightRiver
}
normalizeTile(tileInfo)
tileInfo.setTransients()
}
fun normalizeTile(tileInfo: TileInfo){
if(tileInfo.terrainFeature!=null){
val terrainFeature = tileInfo.getTerrainFeature()!!
if(terrainFeature.occursOn!=null && !terrainFeature.occursOn.contains(tileInfo.baseTerrain))
tileInfo.terrainFeature=null
}
if(tileInfo.resource!=null){
val resource = tileInfo.getTileResource()
if(resource.terrainsCanBeFoundOn.none { it==tileInfo.baseTerrain || it==tileInfo.terrainFeature })
tileInfo.resource=null
}
if(tileInfo.improvement!=null){
if(tileInfo.improvement!!.startsWith("StartingLocation")){
if(tileInfo.isWater || tileInfo.getBaseTerrain().impassable)
tileInfo.improvement=null
}
else {
val improvement = tileInfo.getTileImprovement()!!
if (improvement.terrainsCanBeBuiltOn.isNotEmpty() // for "everywhere" improvements like city ruins, encampments, ancient ruins
&& improvement.terrainsCanBeBuiltOn.none { it == tileInfo.baseTerrain || it == tileInfo.terrainFeature })
tileInfo.improvement = null
}
}
}