mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-04 23:40:01 +07:00
Code Issues Packages Projects Releases Wiki Activity

City/civ names match ignore case and match with spaces or -

Browse Source
This commit is contained in:
Yair Morgenstern
2024-01-04 09:16:38 +02:00
parent 3b66009dd2
commit 3633e95584
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ class DevConsolePopup(val screen: WorldScreen) : Popup(screen) {
return commandRoot.autocomplete(params) ?: "" return commandRoot.autocomplete(params) ?: ""
} }
internal fun getCivByName(name: String) = gameInfo.civilizations.firstOrNull { it.civName.toCliInput() == name } internal fun getCivByName(name: String) = gameInfo.civilizations.firstOrNull { it.civName.toCliInput() == name.toCliInput() }
?: throw ConsoleErrorException("Unknown civ: $name") ?: throw ConsoleErrorException("Unknown civ: $name")
internal fun getSelectedTile() = screen.mapHolder.selectedTile ?: throw ConsoleErrorException("Select tile") internal fun getSelectedTile() = screen.mapHolder.selectedTile ?: throw ConsoleErrorException("Select tile")
@ -96,7 +96,7 @@ class DevConsolePopup(val screen: WorldScreen) : Popup(screen) {
/** Gets city by selected tile */ /** Gets city by selected tile */
internal fun getSelectedCity() = getSelectedTile().getCity() ?: throw ConsoleErrorException("Select tile belonging to city") internal fun getSelectedCity() = getSelectedTile().getCity() ?: throw ConsoleErrorException("Select tile belonging to city")
internal fun getCity(cityName:String) = gameInfo.getCities().firstOrNull { it.name.toCliInput() == cityName } internal fun getCity(cityName:String) = gameInfo.getCities().firstOrNull { it.name.toCliInput() == cityName.toCliInput() }
?: throw ConsoleErrorException("Unknown city: $cityName") ?: throw ConsoleErrorException("Unknown city: $cityName")
internal fun getSelectedUnit(): MapUnit { internal fun getSelectedUnit(): MapUnit {