Draw action family

GameKit/Sources/Game/Middleware/GameLoop/HandlerActivateCards.swift

@@ -27,7 +27,7 @@ struct HandlerActivateCards: GameActionHandler {
             return nil
         }
 
-        return .activateCards(player: player, cards: activeCards)
+        return .activate(activeCards, player: player)
     }
 
     private func activableCardsOfPlayer(_ playerObj: Player) -> [String] {

GameKit/Sources/Game/Middleware/GameLoop/HandlerNextAction.swift

@@ -10,7 +10,7 @@ struct HandlerNextAction: GameActionHandler {
         switch action {
         case .setGameOver,
                 .chooseOne,
-                .activateCards:
+                .activate:
             nil
 
         default:

GameKit/Sources/Game/Reducer/Action+Reducer/ActionActivateCards.swift → GameKit/Sources/Game/Reducer/Action+Reducer/ActionActivate.swift

@@ -1,11 +1,11 @@
 //
-//  ActionActivateCards.swift
+//  ActionActivate.swift
 //  
 //
 //  Created by Hugues Telolahy on 01/07/2023.
 //
 
-struct ActionActivateCards: GameActionReducer {
+struct ActionActivate: GameActionReducer {
     let player: String
     let cards: [String]
 

GameKit/Sources/Game/Reducer/Action+Reducer/ActionDraw.swift

@@ -2,16 +2,14 @@
 //  ActionDraw.swift
 //  
 //
-//  Created by Hugues Telolahy on 10/04/2023.
+//  Created by Hugues Telolahy on 18/11/2023.
 //
 
 struct ActionDraw: GameActionReducer {
-    let player: String
-
     func reduce(state: GameState) throws -> GameState {
         var state = state
         let card = try state.popDeck()
-        state[keyPath: \GameState.players[player]]?.hand.add(card)
+        state.discard.push(card)
         return state
     }
 }

GameKit/Sources/Game/Reducer/Action+Reducer/ActionChooseArena.swift → GameKit/Sources/Game/Reducer/Action+Reducer/ActionDrawArena.swift

@@ -1,11 +1,11 @@
 //
-//  ActionChooseArena.swift
+//  ActionDrawArena.swift
 //  
 //
 //  Created by Hugues Telolahy on 11/04/2023.
 //
 
-struct ActionChooseArena: GameActionReducer {
+struct ActionDrawArena: GameActionReducer {
     let player: String
     let card: String
 

GameKit/Sources/Game/Reducer/Action+Reducer/ActionDrawDeck.swift

@@ -0,0 +1,17 @@
+//
+//  ActionDrawDeck.swift
+//  
+//
+//  Created by Hugues Telolahy on 10/04/2023.
+//
+
+struct ActionDrawDeck: GameActionReducer {
+    let player: String
+
+    func reduce(state: GameState) throws -> GameState {
+        var state = state
+        let card = try state.popDeck()
+        state[keyPath: \GameState.players[player]]?.hand.add(card)
+        return state
+    }
+}

GameKit/Sources/Game/Reducer/Action+Reducer/ActionStealHand.swift → GameKit/Sources/Game/Reducer/Action+Reducer/ActionDrawHand.swift

@@ -1,11 +1,11 @@
 //
-//  ActionStealHand.swift
+//  ActionDrawHand.swift
 //  
 //
 //  Created by Hugues Telolahy on 02/09/2023.
 //
 
-struct ActionStealHand: GameActionReducer {
+struct ActionDrawHand: GameActionReducer {
     let player: String
     let target: String
     let card: String

GameKit/Sources/Game/Reducer/Action+Reducer/ActionStealInPlay.swift → GameKit/Sources/Game/Reducer/Action+Reducer/ActionDrawInPlay.swift

@@ -1,11 +1,11 @@
 //
-//  ActionStealInPlay.swift
+//  ActionDrawInPlay.swift
 //  
 //
 //  Created by Hugues Telolahy on 02/09/2023.
 //
 
-struct ActionStealInPlay: GameActionReducer {
+struct ActionDrawInPlay: GameActionReducer {
     let player: String
     let target: String
     let card: String

GameKit/Sources/Game/Reducer/Action+Reducer/ActionPlay.swift

@@ -26,6 +26,8 @@ struct ActionPlay: GameActionReducer {
             try playReq.throwingMatch(state: state, ctx: playReqContext)
         }
 
+        var state = state
+
         // resolve target
         if case let .target(requiredTarget, _) = playRule.effect {
             let ctx = EffectContext(
@@ -35,7 +37,6 @@ struct ActionPlay: GameActionReducer {
             )
             let resolvedTarget = try requiredTarget.resolve(state: state, ctx: ctx)
             if case let .selectable(pIds) = resolvedTarget {
-                var state = state
                 let options = pIds.reduce(into: [String: GameAction]()) {
                     let action: GameAction =
                     if playRule.isMatching(.playImmediate) {
@@ -66,7 +67,6 @@ struct ActionPlay: GameActionReducer {
         }
 
         // queue play action
-        var state = state
         state.sequence.insert(action, at: 0)
         return state
     }

GameKit/Sources/Game/Reducer/Action+Reducer/ActionPutBack.swift

@@ -0,0 +1,17 @@
+//
+//  ActionPutBack.swift
+//  
+//
+//  Created by Hugues Telolahy on 18/11/2023.
+//
+
+struct ActionPutBack: GameActionReducer {
+    func reduce(state: GameState) throws -> GameState {
+        var state = state
+        if let arena = state.arena {
+            state.deck.cards.insert(contentsOf: arena.cards, at: 0)
+            state.arena = nil
+        }
+        return state
+    }
+}

GameKit/Sources/Game/Reducer/Action+Reducer/ActionReveal.swift → GameKit/Sources/Game/Reducer/Action+Reducer/ActionRevealHand.swift

@@ -1,11 +1,11 @@
 //
-//  ActionReveal.swift
+//  ActionRevealHand.swift
 //  
 //
-//  Created by Hugues Stephano TELOLAHY on 10/11/2023.
+//  Created by Hugues Telolahy on 19/11/2023.
 //
 
-struct ActionReveal: GameActionReducer {
+struct ActionRevealHand: GameActionReducer {
     let card: String
     let player: String
 

GameKit/Sources/Game/Reducer/Action+Reducer/GameAction+Reducer.swift

@@ -11,9 +11,7 @@ protocol GameActionReducer {
 
 extension GameAction {
     func reduce(state: GameState) throws -> GameState {
-        var state = state
-        state = try reducer().reduce(state: state)
-        return state
+        try reducer().reduce(state: state)
     }
 }
 
@@ -45,32 +43,35 @@ private extension GameAction {
         case let .discardHand(card, player):
             ActionDiscardHand(player: player, card: card)
 
+        case let .revealHand(card, player):
+            ActionRevealHand(card: card, player: player)
+
         case let .discardInPlay(card, player):
             ActionDiscardInPlay(player: player, card: card)
 
-        case let .draw(player):
-            ActionDraw(player: player)
+        case let .drawDeck(player):
+            ActionDrawDeck(player: player)
+
+        case let .drawArena(card, player):
+            ActionDrawArena(player: player, card: card)
 
-        case let .stealHand(card, target, player):
-            ActionStealHand(player: player, target: target, card: card)
+        case let .drawHand(card, target, player):
+            ActionDrawHand(player: player, target: target, card: card)
 
-        case let .stealInPlay(card, target, player):
-            ActionStealInPlay(player: player, target: target, card: card)
+        case let .drawInPlay(card, target, player):
+            ActionDrawInPlay(player: player, target: target, card: card)
 
-        case let .passInplay(card, target, player):
+        case let .passInPlay(card, target, player):
             ActionPassInPlay(card: card, target: target, player: player)
 
         case .discover:
             ActionDiscover()
 
-        case let .reveal(card, player):
-            ActionReveal(card: card, player: player)
-
-        case .luck:
-            ActionLuck()
+        case .putBack:
+            ActionPutBack()
 
-        case let .chooseArena(card, player):
-            ActionChooseArena(player: player, card: card)
+        case .draw:
+            ActionDraw()
 
         case let .group(actions):
             ActionGroup(children: actions)
@@ -87,8 +88,8 @@ private extension GameAction {
         case let .chooseOne(player, options):
             ActionChooseOne(chooser: player, options: options)
 
-        case let .activateCards(player, cards):
-            ActionActivateCards(player: player, cards: cards)
+        case let .activate(cards, player):
+            ActionActivate(player: player, cards: cards)
 
         case let .cancel(action):
             ActionCancel(action: action)

GameKit/Sources/Game/Reducer/Effect+Resolver/CardEffect+Resolver.swift

@@ -28,28 +28,34 @@ private extension CardEffect {
         case .shoot:
             EffectJust { .damage(1, player: $0.player()) }
 
-        case .draw:
-            EffectJust { .draw(player: $0.player()) }
+        case .drawDeck:
+            EffectJust { .drawDeck(player: $0.player()) }
 
         case .discover:
             EffectJust { _ in .discover }
 
+        case .putBack:
+            EffectJust { _ in .putBack }
+
+        case .draw:
+            EffectJust { _ in .draw }
+
         case .setTurn:
             EffectJust { .setTurn($0.player()) }
 
         case .eliminate:
             EffectJust { .eliminate(player: $0.player()) }
 
-        case let .chooseCard(card):
-            EffectChooseCard(card: card)
+        case .drawArena:
+            EffectDrawArena()
 
         case let .discard(card, chooser):
             EffectDiscard(card: card, chooser: chooser)
 
         case let .steal(card, toPlayer):
             EffectSteal(card: card, toPlayer: toPlayer)
 
-        case let .passInplay(card, toPlayer):
+        case let .passInPlay(card, toPlayer):
             EffectPassInPlay(card: card, toPlayer: toPlayer)
 
         case let .target(target, effect):
@@ -73,8 +79,8 @@ private extension CardEffect {
         case .nothing:
             EffectNone()
 
-        case let .luck(regex, onSuccess, onFailure):
-            EffectLuck(regex: regex, onSuccess: onSuccess, onFailure: onFailure)
+        case let .luck(card, regex, onSuccess, onFailure):
+            EffectLuck(card: card, regex: regex, onSuccess: onSuccess, onFailure: onFailure)
 
         case .activateCounterCards:
             EffectActivateCounterCards()
@@ -87,9 +93,6 @@ private extension CardEffect {
 
         case .counterShoot:
             EffectCounterShoot()
-
-        case let .revealLastDrawn(regex, onSuccess):
-            EffectRevealLastDrawn(regex: regex, onSuccess: onSuccess)
         }
     }
 }

GameKit/Sources/Game/Reducer/Effect+Resolver/EffectChooseCard.swift → GameKit/Sources/Game/Reducer/Effect+Resolver/EffectDrawArena.swift

@@ -1,19 +1,18 @@
 //
-//  EffectChooseCard.swift
+//  EffectDrawArena.swift
 //  
 //
 //  Created by Hugues Stephano TELOLAHY on 20/06/2023.
 //
 
-struct EffectChooseCard: EffectResolver {
-    let card: ArgCard
-
+struct EffectDrawArena: EffectResolver {
     func resolve(state: GameState, ctx: EffectContext) throws -> [GameAction] {
+        let card = ArgCard.selectArena
         let player = ctx.player()
         return try card.resolve(state: state, ctx: ctx) {
             switch card {
             case .selectArena:
-                .chooseArena($0, player: player)
+                .drawArena($0, player: player)
 
             default:
                 fatalError("unexpected")