Update(Tp1): Format

pull/1/head
Louis DUFOUR 2 years ago
parent 051e68e176
commit 3a6245e2cf

@ -14,10 +14,8 @@ public extension Board {
for row in grid { for row in grid {
for cell in row { for cell in row {
if let piece = cell.piece { if let piece = cell.piece {
print(cell.cellType.symbol + piece.owner.symbol + piece.animal.symbol, terminator: " ")} print(cell.cellType.symbol + piece.owner.symbol + piece.animal.symbol, terminator: " ")}
else { else {
print(cell.cellType.symbol, terminator: " ")} print(cell.cellType.symbol, terminator: " ")}
} }
print() print()

@ -9,28 +9,26 @@ import Foundation
public enum Animal: String { case rat, cat, dog, wolf, leopard, tiger, lion, elephant public enum Animal: String { case rat, cat, dog, wolf, leopard, tiger, lion, elephant
public var description: String { public var description: String {
switch self { switch self {
case .rat: case .rat:
return "Rat" return "Rat"
case .cat: case .cat:
return "Cat" return "Cat"
case .dog: case .dog:
return "Dog" return "Dog"
case .wolf: case .wolf:
return "Wolf" return "Wolf"
case .leopard: case .leopard:
return "Leopard" return "Leopard"
case .tiger: case .tiger:
return "Tiger" return "Tiger"
case .lion: case .lion:
return "Lion" return "Lion"
case .elephant: case .elephant:
return "Elephant" return "Elephant"
} }
} }
} }

@ -30,15 +30,15 @@ public struct Board {
} }
public var description: String { public var description: String {
var boardDescription = "" var boardDescription = ""
for row in grid { for row in grid {
for cell in row { for cell in row {
boardDescription += cell.description + " " boardDescription += cell.description + " "
}
boardDescription += "\n"
}
return boardDescription
} }
boardDescription += "\n"
}
return boardDescription
}
} }

@ -19,12 +19,12 @@ public struct Cell {
} }
public var description: String { public var description: String {
var pieceDescription = "nil" var pieceDescription = "nil"
if let piece = piece { if let piece = piece {
pieceDescription = piece.description pieceDescription = piece.description
} }
return "Cell(type: (cellType), owner: (initialOwner), piece: (pieceDescription))" return "Cell(type: (cellType), owner: (initialOwner), piece: (pieceDescription))"
} }
} }

@ -11,18 +11,18 @@ public enum CellType {
case unknown, jungle, water, trap, den case unknown, jungle, water, trap, den
public var description: String { public var description: String {
switch self { switch self {
case .unknown: case .unknown:
return "unknown cell" return "unknown cell"
case .jungle: case .jungle:
return "jungle cell" return "jungle cell"
case .water: case .water:
return "water cell" return "water cell"
case .trap: case .trap:
return "trap cell" return "trap cell"
case .den: case .den:
return "den cell" return "den cell"
}
} }
}
} }

@ -9,7 +9,7 @@ import Foundation
public enum Owner { public enum Owner {
case noOne, player1, player2 case noOne, player1, player2
public var description: String { public var description: String {
switch self { switch self {
case .player1: case .player1:

Loading…
Cancel
Save