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

Resolved #3635 - can remove natural wonders and roads/railroads in map editor

Browse Source
This commit is contained in:
Yair Morgenstern 2021-03-07 11:41:09 +02:00
parent 7ddcc58955
commit 011c1de102
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
android/assets/jsons/translations/template.properties
View File

@ -793,6 +793,7 @@ Requires =
Menu =
Brush Size =
Map saved =
Change map to fit selected ruleset? =
# Civilopedia difficulty levels
Player settings =

4
core/src/com/unciv/ui/mapeditor/MapEditorMenuPopup.kt
View File

@ -45,7 +45,7 @@ class MapEditorMenuPopup(var mapEditorScreen: MapEditorScreen): Popup(mapEditorS
incompatibilities.remove("")
if (incompatibilities.isEmpty()) {
mapEditorScreen.tileMap.mapParameters.mods = mods;
mapEditorScreen.tileMap.mapParameters.mods = mods
mapEditorScreen.game.setScreen(MapEditorScreen(mapEditorScreen.tileMap)) // reset all images etc.
return@addButton
}
@ -60,7 +60,7 @@ class MapEditorMenuPopup(var mapEditorScreen: MapEditorScreen): Popup(mapEditorS
for (tile in mapEditorScreen.tileMap.values)
tile.normalizeToRuleset(ruleset)
mapEditorScreen.tileMap.mapParameters.mods = mods
mapEditorScreen.game.setScreen(MapEditorScreen(mapEditorScreen.tileMap)) // reset all images etc.
mapEditorScreen.game.setScreen(MapEditorScreen(mapEditorScreen.tileMap))
}
incompatPopup.addButton("No") { incompatPopup.close() }
incompatPopup.open(true)

3
core/src/com/unciv/ui/mapeditor/TileEditorOptionsTable.kt
View File

@ -127,7 +127,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
val improvementsTable = Table()
improvementsTable.add(getHex(getRedCross(40f, 0.6f)).apply {
onClick {
tileAction = { it.improvement = null }
tileAction = { it.improvement = null; it.roadStatus = RoadStatus.None }
setCurrentHex(getHex(getRedCross(40f, 0.6f)), "Clear improvements")
}
}).row()
@ -353,6 +353,7 @@ class TileEditorOptionsTable(val mapEditorScreen: MapEditorScreen): Table(Camera
group.onClick {
tileAction = {
it.naturalWonder = null // If we're setting a base terrain it should remove the nat wonder
when (terrain.type) {
TerrainType.TerrainFeature -> it.terrainFeature = terrain.name
TerrainType.NaturalWonder -> it.naturalWonder = terrain.name