atridad/MagicCounter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 13 Activity

Fixed a few issues

Browse Source
This commit is contained in:
Atridad Lahiji
2025-12-23 11:47:06 -07:00
parent 5e815353cb
commit b6b56ac01a
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ios/MagicCounter.xcodeproj/project.pbxproj
View File

@@ -411,7 +411,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 4BC9Y2LL4B; DEVELOPMENT_TEAM = 4BC9Y2LL4B;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;
@@ -446,7 +446,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor; ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO; ASSETCATALOG_COMPILER_INCLUDE_ALL_APPICON_ASSETS = NO;
CODE_SIGN_STYLE = Automatic; CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 2; CURRENT_PROJECT_VERSION = 3;
DEVELOPMENT_TEAM = 4BC9Y2LL4B; DEVELOPMENT_TEAM = 4BC9Y2LL4B;
ENABLE_PREVIEWS = YES; ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES; GENERATE_INFOPLIST_FILE = YES;

BIN
ios/MagicCounter.xcodeproj/project.xcworkspace/xcuserdata/atridad.xcuserdatad/UserInterfaceState.xcuserstate generated
View File

Binary file not shown.

19
ios/MagicCounter/GameView.swift
View File

@@ -306,10 +306,16 @@ struct PlayerCell: View {
*/ */
struct CommanderDamageView: View { struct CommanderDamageView: View {
@Environment(\.dismiss) var dismiss @Environment(\.dismiss) var dismiss
let targetPlayer: PlayerState @State private var targetPlayer: PlayerState
let gameState: GameState let gameState: GameState
let onUpdate: (PlayerState) -> Void let onUpdate: (PlayerState) -> Void
init(targetPlayer: PlayerState, gameState: GameState, onUpdate: @escaping (PlayerState) -> Void) {
self._targetPlayer = State(initialValue: targetPlayer)
self.gameState = gameState
self.onUpdate = onUpdate
}
var body: some View { var body: some View {
NavigationStack { NavigationStack {
List { List {
@@ -352,14 +358,21 @@ struct CommanderDamageView: View {
private func adjustCommanderDamage(attackerId: Int, by amount: Int) { private func adjustCommanderDamage(attackerId: Int, by amount: Int) {
Haptics.play(.light) Haptics.play(.light)
let wasEliminated = targetPlayer.isEliminated
var newPlayer = targetPlayer var newPlayer = targetPlayer
var damages = newPlayer.commanderDamages var damages = newPlayer.commanderDamages
let current = damages[attackerId] ?? 0 let current = damages[attackerId] ?? 0
damages[attackerId] = max(0, current + amount) let newDamage = max(0, current + amount)
let damageChange = newDamage - current
damages[attackerId] = newDamage
newPlayer.commanderDamages = damages newPlayer.commanderDamages = damages
// Commander damage also reduces life total
newPlayer.life -= damageChange
// Update local state so the view refreshes
targetPlayer = newPlayer
onUpdate(newPlayer) onUpdate(newPlayer)
if newPlayer.isEliminated && !targetPlayer.isEliminated { if newPlayer.isEliminated && !wasEliminated {
Haptics.notification(.error) Haptics.notification(.error)
} }
} }