From a4da60fa4a816e3b8428eaffd2bd605dc0aed031 Mon Sep 17 00:00:00 2001 From: Joffrey Bion Date: Thu, 28 May 2020 12:47:00 +0200 Subject: Add UI support for playing discarded cards Resolves: https://github.com/joffrey-bion/seven-wonders/issues/25 Resolves: https://github.com/joffrey-bion/seven-wonders/issues/26 --- .../src/main/kotlin/org/luxons/sevenwonders/bot/SevenWondersBot.kt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'sw-bot') diff --git a/sw-bot/src/main/kotlin/org/luxons/sevenwonders/bot/SevenWondersBot.kt b/sw-bot/src/main/kotlin/org/luxons/sevenwonders/bot/SevenWondersBot.kt index 80bad9e4..daa4afe3 100644 --- a/sw-bot/src/main/kotlin/org/luxons/sevenwonders/bot/SevenWondersBot.kt +++ b/sw-bot/src/main/kotlin/org/luxons/sevenwonders/bot/SevenWondersBot.kt @@ -59,7 +59,7 @@ class SevenWondersBot( private suspend fun SevenWondersSession.playTurn(turn: PlayerTurnInfo): Boolean { when (turn.action) { Action.PLAY, Action.PLAY_2, Action.PLAY_LAST -> prepareMove(createPlayCardMove(turn)) - Action.PLAY_FREE_DISCARDED -> prepareMove(createPlayFreeDiscardedMove(turn)) + Action.PLAY_FREE_DISCARDED -> prepareMove(createPlayFreeDiscardedCardMove(turn)) Action.PICK_NEIGHBOR_GUILD -> prepareMove(createPickGuildMove(turn)) Action.SAY_READY -> sayReady() Action.WAIT -> Unit @@ -85,8 +85,8 @@ private fun createPlayCardMove(turnInfo: PlayerTurnInfo): PlayerMove { } } -private fun createPlayFreeDiscardedMove(turn: PlayerTurnInfo): PlayerMove { - val card = turn.discardedCards?.random() ?: error("No discarded card to play") +private fun createPlayFreeDiscardedCardMove(turnInfo: PlayerTurnInfo): PlayerMove { + val card = turnInfo.discardedCards?.random() ?: error("No discarded card to play") return PlayerMove(MoveType.PLAY_FREE_DISCARDED, card.name) } -- cgit