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

Console: city addtile <cityName> takes an optional [radius] parameter

Browse Source
This commit is contained in:
yairm210
2024-06-09 19:34:38 +03:00
parent d61df7fe51
commit b0c70e6ec8
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/src/com/unciv/ui/screens/devconsole/ConsoleCityCommands.kt
View File

@ -40,13 +40,17 @@ internal class ConsoleCityCommands : ConsoleCommandNode {
DevConsoleResponse.OK DevConsoleResponse.OK
}, },
"addtile" to ConsoleAction("city addtile <cityName>") { console, params -> "addtile" to ConsoleAction("city addtile <cityName> [radius]") { console, params ->
val selectedTile = console.getSelectedTile() val selectedTile = console.getSelectedTile()
val city = console.getCity(params[0]) val city = console.getCity(params[0])
if (selectedTile.neighbors.none { it.getCity() == city }) if (selectedTile.neighbors.none { it.getCity() == city })
throw ConsoleErrorException("Tile is not adjacent to any tile already owned by the city") throw ConsoleErrorException("Tile is not adjacent to any tile already owned by the city")
if (selectedTile.isCityCenter()) throw ConsoleErrorException("Cannot transfer city center") if (selectedTile.isCityCenter()) throw ConsoleErrorException("Cannot transfer city center")
city.expansion.takeOwnership(selectedTile) val radius = params.getOrNull(1)?.toInt() ?: 0
for (tile in selectedTile.getTilesInDistance(radius)) {
if (tile.getCity() != city && !tile.isCityCenter())
city.expansion.takeOwnership(tile)
}
DevConsoleResponse.OK DevConsoleResponse.OK
}, },

2
core/src/com/unciv/ui/screens/devconsole/DevConsolePopup.kt
View File

@ -163,7 +163,7 @@ class DevConsolePopup(val screen: WorldScreen) : Popup(screen) {
} }
private fun handleCommand(): DevConsoleResponse { private fun handleCommand(): DevConsoleResponse {
val params = textField.text.splitToCliInput() val params = textField.text.trim().splitToCliInput()
return commandRoot.handle(this, params) return commandRoot.handle(this, params)
} }