update

Author: stephtelolahy

Modules/CardLibraryLive/Sources/Modifiers/IgnoreLimitPerTurn.swift

@@ -7,12 +7,12 @@
 
 @testable import GameCore
 
-extension Card.QueueModifier {
-    static let ignoreLimitPerTurn = Card.QueueModifier(rawValue: "ignoreLimitPerTurn")
+extension Card.ModifierName {
+    static let ignoreLimitPerTurn = Card.ModifierName(rawValue: "ignoreLimitPerTurn")
 }
 
 struct IgnoreLimitPerTurn: QueueModifierHandler {
-    static let id = Card.QueueModifier.ignoreLimitPerTurn
+    static let name = Card.ModifierName.ignoreLimitPerTurn
 
     static func apply(_ action: GameFeature.Action, state: GameFeature.State) throws(GameFeature.Error) -> [GameFeature.Action] {
         guard let playIndex = state.queue.firstIndex(where: {

Modules/CardLibraryLive/Sources/Modifiers/IncrementCardsPerTurn.swift

@@ -7,12 +7,12 @@
 
 @testable import GameCore
 
-extension Card.QueueModifier {
-    static let incrementCardsPerTurn = Card.QueueModifier(rawValue: "incrementCardsPerTurn")
+extension Card.ModifierName {
+    static let incrementCardsPerTurn = Card.ModifierName(rawValue: "incrementCardsPerTurn")
 }
 
 struct IncrementCardsPerTurn: QueueModifierHandler {
-    static let id = Card.QueueModifier.incrementCardsPerTurn
+    static let name = Card.ModifierName.incrementCardsPerTurn
 
     static func apply(_ action: GameFeature.Action, state: GameFeature.State) throws(GameFeature.Error) -> [GameFeature.Action] {
         guard let amount = action.amount else { fatalError("Missing amount") }

Modules/CardLibraryLive/Sources/Modifiers/IncrementRequiredMisses.swift

@@ -7,12 +7,12 @@
 
 @testable import GameCore
 
-extension Card.QueueModifier {
-    static let incrementRequiredMisses = Card.QueueModifier(rawValue: "incrementRequiredMisses")
+extension Card.ModifierName {
+    static let incrementRequiredMisses = Card.ModifierName(rawValue: "incrementRequiredMisses")
 }
 
 struct IncrementRequiredMisses: QueueModifierHandler {
-    static let id = Card.QueueModifier.incrementRequiredMisses
+    static let name = Card.ModifierName.incrementRequiredMisses
 
     static func apply(_ action: GameFeature.Action, state: GameFeature.State) throws(GameFeature.Error) -> [GameFeature.Action] {
         guard let amount = action.amount else { fatalError("Missing amount") }

Modules/CardLibraryLive/Tests/SimulationTest.swift

@@ -33,7 +33,7 @@ struct SimulationTest {
             initialState: state,
             reducer: GameFeature.reducer,
             withDependencies: {
-                $0.queueModifierClient = .live(handlers: QueueModifiers.allHandlers)
+                $0 = dependencies
             }
         )
 
@@ -55,7 +55,7 @@ struct SimulationTest {
             .sink {
                 print($0)
                 var nextState = prevState
-                _ = GameFeature.reducerMechanics(into: &nextState, action: $0, dependencies: dependencies)
+                _ = GameFeature.reducerMain(into: &nextState, action: $0, dependencies: dependencies)
                 #expect(nextState == currentState, "Inconsistent state after applying \($0)")
             }
             .store(in: &cancellables)

Modules/GameCore/Sources/Card.swift

@@ -36,7 +36,7 @@ public struct Card: Equatable, Sendable {
     public struct Effect: Equatable, Sendable {
         public let trigger: Trigger
         public let action: ActionName
-        public let modifier: QueueModifier?
+        public let modifier: ModifierName?
         public let amount: Int?
         public let amountPerTurn: [String: Int]?
         public let alias: [String: String]?
@@ -45,7 +45,7 @@ public struct Card: Equatable, Sendable {
         public init(
             trigger: Trigger,
             action: ActionName,
-            modifier: QueueModifier? = nil,
+            modifier: ModifierName? = nil,
             amount: Int? = nil,
             amountPerTurn: [String: Int]? = nil,
             alias: [String: String]? = nil,
@@ -214,7 +214,7 @@ public struct Card: Equatable, Sendable {
         }
     }
 
-    public struct QueueModifier: RawRepresentable, Hashable, Sendable {
+    public struct ModifierName: RawRepresentable, Hashable, Sendable {
         public let rawValue: String
 
         public init (rawValue: String) {

Modules/GameCore/Sources/GameFeature.swift

@@ -62,7 +62,7 @@ public enum GameFeature {
         var selection: String?
         var alias: String?
         var playableCards: [String]?
-        var modifier: Card.QueueModifier?
+        var modifier: Card.ModifierName?
         var children: [Self]?
         var selectors: [Card.Selector] = []
 
@@ -85,9 +85,8 @@ public enum GameFeature {
 
     public static var reducer: Reducer<State, Action> {
         combine(
-            reducerMechanics,
-            reducerLoop,
-            reducerAI
+            reducerMain,
+            reducerLoop
         )
     }
 }

Modules/GameCore/Sources/QueueModifierClient/QueueModifierClient+Live.swift

@@ -15,12 +15,12 @@ public extension QueueModifierClient {
 }
 
 struct QueueModifierRegistry {
-    let dictionary: [Card.QueueModifier: QueueModifierHandler.Type]
+    let dictionary: [Card.ModifierName: QueueModifierHandler.Type]
 
     init(handlers: [QueueModifierHandler.Type]) {
-        var dict: [Card.QueueModifier: QueueModifierHandler.Type] = [:]
+        var dict: [Card.ModifierName: QueueModifierHandler.Type] = [:]
         for type in handlers {
-            dict[type.id] = type
+            dict[type.name] = type
         }
         dictionary = dict
     }
@@ -34,7 +34,7 @@ struct QueueModifierRegistry {
 }
 
 public protocol QueueModifierHandler {
-    static var id: Card.QueueModifier { get }
+    static var name: Card.ModifierName { get }
 
     static func apply(_ action: GameFeature.Action, state: GameFeature.State) throws(GameFeature.Error) -> [GameFeature.Action]
 }