refactor: use playersState

stephtelolahy · Jun 29, 2024 · 6b4b9d0 · 6b4b9d0
1 parent 4d2e149
commit 6b4b9d0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/WildWestOnline/Core/Game/Sources/Reducer/ArgPlayer+Resolver/PlayerDamaged.swift b/WildWestOnline/Core/Game/Sources/Reducer/ArgPlayer+Resolver/PlayerDamaged.swift
@@ -9,7 +9,14 @@ struct PlayerDamaged: ArgPlayerResolver {
     func resolve(state: GameState, ctx: EffectContext) throws -> PlayerArgOutput {
         let damaged = state.playOrder
             .starting(with: ctx.sourceActor)
-            .filter { state.player($0).isDamaged }
+            .filter { state.isPlayerDamaged(id: $0) }
         return .identified(damaged)
     }
 }
+
+private extension GameState {
+    func isPlayerDamaged(id: String) -> Bool {
+        let playerObj = playersState.players.get(id)
+        return playerObj.health < playerObj.maxHealth
+    }
+}
diff --git a/WildWestOnline/Core/Game/Sources/Reducer/PlayReq+Matcher/OnDamage.swift b/WildWestOnline/Core/Game/Sources/Reducer/PlayReq+Matcher/OnDamage.swift
@@ -9,7 +9,7 @@ struct OnDamage: PlayReqMatcher {
     func match(state: GameState, ctx: PlayReqContext) -> Bool {
         if case let .damage(_, player) = ctx.event,
            player == ctx.actor,
-           state.player(player).health > 0 {
+           state.playersState.players.get(player).health > 0 {
             true
         } else {
             false

diff --git a/WildWestOnline/Core/Game/Sources/Reducer/PlayReq+Matcher/OnDamageLethal.swift b/WildWestOnline/Core/Game/Sources/Reducer/PlayReq+Matcher/OnDamageLethal.swift
@@ -9,7 +9,7 @@ struct OnDamageLethal: PlayReqMatcher {
     func match(state: GameState, ctx: PlayReqContext) -> Bool {
         if case let .damage(_, player) = ctx.event,
            player == ctx.actor,
-           state.player(player).health <= 0 {
+           state.playersState.players.get(player).health <= 0 {
             true
         } else {
             false

diff --git a/WildWestOnline/Core/Game/Sources/Setup/Setup.swift b/WildWestOnline/Core/Game/Sources/Setup/Setup.swift
@@ -42,13 +42,20 @@ public enum Setup {
         }
 
         var playerDictionary: [String: Player] = [:]
+        var playersStateDictionary: [String: PlayersState.Player] = [:]
         var playOrder: [String] = []
+
         for player in players {
             playerDictionary[player.id] = player
+            let health = player.attributes[.maxHealth] ?? 0
+            playersStateDictionary[player.id] = .init(maxHealth: health, health: health)
             playOrder.append(player.id)
         }
 
+        let playersState = PlayersState(players: playersStateDictionary)
+
         return GameState(
+            playersState: playersState,
             players: playerDictionary,
             playOrder: playOrder,
             startOrder: playOrder,
@@ -106,7 +113,6 @@ private extension Setup {
             figure: figure,
             abilities: abilities,
             attributes: figureObj.attributes,
-            health: health,
             hand: hand,
             inPlay: []
         )