wip

stephtelolahy · Nov 19, 2023 · c75e980 · c75e980
1 parent eec5655
commit c75e980
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 10 deletions.
diff --git a/GameKit/Sources/Game/Reducer/Effect+Resolver/CardEffect+Resolver.swift b/GameKit/Sources/Game/Reducer/Effect+Resolver/CardEffect+Resolver.swift
@@ -46,8 +46,8 @@ private extension CardEffect {
         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)

diff --git a/...er/Effect+Resolver/EffectChooseCard.swift → ...cer/Effect+Resolver/EffectDrawArena.swift b/...er/Effect+Resolver/EffectChooseCard.swift → ...cer/Effect+Resolver/EffectDrawArena.swift
@@ -1,14 +1,13 @@
 //
-//  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 {

diff --git a/GameKit/Sources/Game/State/CardEffect.swift b/GameKit/Sources/Game/State/CardEffect.swift
@@ -35,8 +35,8 @@ public indirect enum CardEffect: Codable, Equatable {
     /// - `toPlayer` is the player that receives the card
     case passInPlay(ArgCard, toPlayer: ArgPlayer)
 
-    /// Choose card from a location
-    case chooseCard(ArgCard)
+    /// Draw  cards from arena
+    case drawArena
 
     /// Draw a card from deck and put to arena
     case discover

diff --git a/GameKit/Sources/Inventory/CardList.swift b/GameKit/Sources/Inventory/CardList.swift
@@ -120,7 +120,7 @@ private extension CardList {
         CardEffect.group {
             CardEffect.discover
                 .repeat(.activePlayers)
-            CardEffect.chooseCard(.selectArena)
+            CardEffect.drawArena
                 .target(.all)
         }
         .on([.playImmediate])
@@ -370,7 +370,7 @@ private extension CardList {
             CardEffect.discover
                 .repeat(.attr(.startTurnCards))
             CardEffect.discover
-            CardEffect.chooseCard(.selectArena)
+            CardEffect.drawArena
                 .repeat(.attr(.startTurnCards))
             CardEffect.putBack
         }