diff --git a/GameKit/Sources/Game/Reducer/Effect+Resolver/CardEffect+Resolver.swift b/GameKit/Sources/Game/Reducer/Effect+Resolver/CardEffect+Resolver.swift index 905e1d1ac..a3c181122 100644 --- 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/GameKit/Sources/Game/Reducer/Effect+Resolver/EffectChooseCard.swift b/GameKit/Sources/Game/Reducer/Effect+Resolver/EffectDrawArena.swift similarity index 80% rename from GameKit/Sources/Game/Reducer/Effect+Resolver/EffectChooseCard.swift rename to GameKit/Sources/Game/Reducer/Effect+Resolver/EffectDrawArena.swift index a77961f04..d1d9945be 100644 --- a/GameKit/Sources/Game/Reducer/Effect+Resolver/EffectChooseCard.swift +++ b/GameKit/Sources/Game/Reducer/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 index f7e173e1e..868524150 100644 --- 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 index 3207c1040..4603f13fa 100644 --- 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 }