Fixed pillage tests

This commit is contained in:
Yair Morgenstern
2023-12-08 14:10:56 +02:00
parent c483c4329a
commit cce678800f
3 changed files with 16 additions and 19 deletions

View File

@ -237,10 +237,10 @@ class ConsoleTileCommands: ConsoleCommandNode {
class ConsoleCivCommands : ConsoleCommandNode {
override val subcommands = hashMapOf<String, ConsoleCommand>(
"addstat" to ConsoleAction { console, params ->
"add" to ConsoleAction { console, params ->
var statPos = 0
if (params.size !in 2..3)
return@ConsoleAction DevConsoleResponse.hint("Format: civ addstat [civ] [stat] <amount>")
return@ConsoleAction DevConsoleResponse.hint("Format: civ add [civ] <stat> <amount>")
val civ = if (params.size == 2) console.screen.selectedCiv
else {
statPos++

View File

@ -11,7 +11,6 @@ import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.stats.Stat
import com.unciv.models.stats.Stats
import com.unciv.ui.popups.ConfirmPopup
import com.unciv.ui.popups.hasOpenPopups
import kotlin.random.Random
object UnitActionsPillage {
@ -19,21 +18,19 @@ object UnitActionsPillage {
fun getPillageActions(unit: MapUnit, tile: Tile): List<UnitAction> {
val pillageAction = getPillageAction(unit, tile)
?: return listOf()
if (pillageAction.action == null)
if (pillageAction.action == null || unit.civ.isAI())
return listOf(pillageAction)
else return listOf(UnitAction(UnitActionType.Pillage, pillageAction.title) {
if (!GUI.getWorldScreen().hasOpenPopups()) {
val pillageText = "Are you sure you want to pillage this [${tile.getImprovementToPillageName()!!}]?"
ConfirmPopup(
GUI.getWorldScreen(),
pillageText,
"Pillage",
true
) {
(pillageAction.action)()
GUI.setUpdateWorldOnNextRender()
}.open()
}
val pillageText = "Are you sure you want to pillage this [${tile.getImprovementToPillageName()!!}]?"
ConfirmPopup(
GUI.getWorldScreen(),
pillageText,
"Pillage",
true
) {
(pillageAction.action)()
GUI.setUpdateWorldOnNextRender()
}.open()
})
}