diff --git a/Extension/Sources/Extension/Board.swift b/Extension/Sources/Extension/Board.swift index 818fd25..995e0f0 100644 --- a/Extension/Sources/Extension/Board.swift +++ b/Extension/Sources/Extension/Board.swift @@ -14,10 +14,8 @@ public extension Board { for row in grid { for cell in row { if let piece = cell.piece { - print(cell.cellType.symbol + piece.owner.symbol + piece.animal.symbol, terminator: " ")} else { - print(cell.cellType.symbol, terminator: " ")} } print() diff --git a/Model/Sources/Model/Animal.swift b/Model/Sources/Model/Animal.swift index 1869392..521f6d9 100644 --- a/Model/Sources/Model/Animal.swift +++ b/Model/Sources/Model/Animal.swift @@ -9,28 +9,26 @@ import Foundation public enum Animal: String { case rat, cat, dog, wolf, leopard, tiger, lion, elephant - - public var description: String { - switch self { - case .rat: - return "Rat" - case .cat: - return "Cat" - case .dog: - return "Dog" - case .wolf: - return "Wolf" - case .leopard: - return "Leopard" - case .tiger: - return "Tiger" - case .lion: - return "Lion" - case .elephant: - return "Elephant" - } - } + switch self { + case .rat: + return "Rat" + case .cat: + return "Cat" + case .dog: + return "Dog" + case .wolf: + return "Wolf" + case .leopard: + return "Leopard" + case .tiger: + return "Tiger" + case .lion: + return "Lion" + case .elephant: + return "Elephant" + } + } } diff --git a/Model/Sources/Model/Board.swift b/Model/Sources/Model/Board.swift index 3909a4b..f89fa3a 100644 --- a/Model/Sources/Model/Board.swift +++ b/Model/Sources/Model/Board.swift @@ -30,15 +30,15 @@ public struct Board { } public var description: String { - var boardDescription = "" - for row in grid { - for cell in row { - boardDescription += cell.description + " " - } - boardDescription += "\n" - } - return boardDescription + var boardDescription = "" + for row in grid { + for cell in row { + boardDescription += cell.description + " " } + boardDescription += "\n" + } + return boardDescription + } } diff --git a/Model/Sources/Model/Cell.swift b/Model/Sources/Model/Cell.swift index 5e0c616..ec96bc8 100644 --- a/Model/Sources/Model/Cell.swift +++ b/Model/Sources/Model/Cell.swift @@ -19,12 +19,12 @@ public struct Cell { } public var description: String { - var pieceDescription = "nil" - if let piece = piece { - pieceDescription = piece.description - } - return "Cell(type: (cellType), owner: (initialOwner), piece: (pieceDescription))" - } + var pieceDescription = "nil" + if let piece = piece { + pieceDescription = piece.description + } + return "Cell(type: (cellType), owner: (initialOwner), piece: (pieceDescription))" + } } diff --git a/Model/Sources/Model/CellType.swift b/Model/Sources/Model/CellType.swift index f59fc22..875102b 100644 --- a/Model/Sources/Model/CellType.swift +++ b/Model/Sources/Model/CellType.swift @@ -11,18 +11,18 @@ public enum CellType { case unknown, jungle, water, trap, den public var description: String { - switch self { - case .unknown: - return "unknown cell" - case .jungle: - return "jungle cell" - case .water: - return "water cell" - case .trap: - return "trap cell" - case .den: - return "den cell" - } + switch self { + case .unknown: + return "unknown cell" + case .jungle: + return "jungle cell" + case .water: + return "water cell" + case .trap: + return "trap cell" + case .den: + return "den cell" } + } } diff --git a/Model/Sources/Model/Owner.swift b/Model/Sources/Model/Owner.swift index 7bd92d9..137d78e 100644 --- a/Model/Sources/Model/Owner.swift +++ b/Model/Sources/Model/Owner.swift @@ -9,7 +9,7 @@ import Foundation public enum Owner { case noOne, player1, player2 - + public var description: String { switch self { case .player1: