dnrops
/
book--hacking-with-swift
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Polish up end-game alert timing and current player switching logic

This commit is contained in:
CypherPoet 2019-03-01 23:13:47 -05:00
parent add3d4cb5e
commit b3ffdd4625
1 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
34-gamekit-four-in-a-row/Four In A Row/Sources/Controllers/Home/HomeViewController.swift
View File

@ -59,7 +59,8 @@ class HomeViewController: UIViewController {
func resetGame() {
board = Board()
columnButtons.forEach({ $0.isEnabled = true })
for i in 0..<placedChipColumns.count {
placedChipColumns[i].forEach({ $0.removeFromSuperview() })
placedChipColumns[i].removeAll(keepingCapacity: true)
@ -112,19 +113,13 @@ class HomeViewController: UIViewController {
func advanceGame() {
if board.isFull {
if board.isWin(for: board.currentPlayer) {
currentGameplayState = .playerHasWon(board.currentPlayer)
} else {
currentGameplayState = .fullBoardDraw
}
if board.isWin(for: board.currentPlayer) {
currentGameplayState = .playerHasWon(board.currentPlayer)
} else if board.isFull {
currentGameplayState = .fullBoardDraw
} else {
if board.isWin(for: board.currentPlayer) {
currentGameplayState = .playerHasWon(board.currentPlayer)
} else {
currentGameplayState = .playing(board.currentPlayer)
board.switchCurrentPlayer()
}
board.switchCurrentPlayer()
currentGameplayState = .playing(board.currentPlayer)
}
}
@ -136,7 +131,9 @@ class HomeViewController: UIViewController {
self.resetGame()
})
present(alertController, animated: true)
DispatchQueue.main.asyncAfter(deadline: .now() + 0.25) { [unowned self] in
self.present(alertController, animated: true)
}
}
@ -145,7 +142,7 @@ class HomeViewController: UIViewController {
private func gameplayStateChanged() {
switch currentGameplayState {
case .inactive:
break
columnButtons.forEach({ $0.isEnabled = false })
case .playing(let currentPlayer):
title = "\(currentPlayer.name)'s Turn"
case .fullBoardDraw: