Alex Hill, Glenn Leblanc, Jacob Miller, Ionatan Soule - Senior Swag - SS Patrol

Sources/KonaneColor.swift

@@ -1,3 +1,13 @@
+//
+//  KonaneColor.swift
+//  
+//
+//  Created by Alex Hill on 10/20/16.
+//
+//
+
+import Foundation
+
 enum KonaneColor {
-    case black, white, empty
-}
+	case black, white, empty
+}

Sources/KonaneGame.swift

@@ -1,96 +1,157 @@
+//
+//  KonaneGame.swift
+//
+//
+//  Created by Alex Hill on 10/20/16.
+//
+//
+
+import Foundation
+
+/*
+KonaneGame
+x   - init(blackIsHuman: Bool, whiteIsHuman: Bool)
+x   - private gameState: KonaneGameState
+x   - private blackInputSource: KonaneMoveInputSource
+x   - private whiteInputSource: KonaneMoveInputSource
+    - play() -> Bool // Returns true if black wins.
+    - private displayBoard()
+*/
+
+
+
+
+
+//WILL FIX LATER FIRST GETTING INITIALIZATION DONE
 class KonaneGame {
-    private let gameState: KonaneGameState = KonaneGameState()
+
+    private var gameState = KonaneGameState(width: 6, height: 6, isBlackTurn: true) //May have broken it
     private let blackInputSource: KonaneMoveInputSource
     private let whiteInputSource: KonaneMoveInputSource
 
+
     init(blackIsHuman: Bool, whiteIsHuman: Bool) {
+
         if blackIsHuman {
             blackInputSource = KonaneMoveInputSourceHuman(isBlack: true)
-        } else {
-            fatalError("Doesn't work yet!")
         }
-
+        else {
+        	//FIX ONCE AI CODE EXISTS
+            blackInputSource = KonaneMoveInputSourceAI(isBlack: true)
+        }
         if whiteIsHuman {
             whiteInputSource = KonaneMoveInputSourceHuman(isBlack: false)
-        } else {
-            fatalError("Doesn't work yet!")
+        }
+        else {
+        	//FIX ONCE AI CODE EXISTS
+            whiteInputSource = KonaneMoveInputSourceAI(isBlack: false)
         }
     }
 
-    func play() -> Bool {
-        // Remove Phase
-        print("Black starts by removing a middle or corner black piece")
-        displayBoard()
-
-        let blackRemovePoint = blackInputSource.removeFirstPiece(gameState: gameState.copy())
-        gameState.perform(blackRemove: blackRemovePoint)
-
-        print("Now white removes an adjacent white piece")
-        displayBoard()
-
-        let whiteRemovePoint = whiteInputSource.removeSecondPiece(gameState: gameState.copy())
-        gameState.perform(whiteRemove: whiteRemovePoint)
+    func displayBoard() {
+        var arbitraryVariable = 0
 
-        // Now, main game loop
-        while gameState.didBlackWin() == false && gameState.didWhiteWin() == false {
-
-            let move: KonaneMove
-            if gameState.getIsBlackTurn() {
-                print("It is black's turn to jump")
-                displayBoard()
-                move = blackInputSource.nextMove(gameState: gameState.copy())
-            } else {
-                print("It is white's turn to jump")
-                displayBoard()
-                move = whiteInputSource.nextMove(gameState: gameState.copy())
+        for rowNumber in (0..<gameState.height).reversed() {
+            //Print row numbering
+            if rowNumber < 10 {
+                print(" \(rowNumber)", terminator:" ")
             }
-
-            gameState.perform(move: move)
+            else {
+                print("\(rowNumber)", terminator:" ")
+            }
+            //Print actual board
+            for columnNumber in 0..<gameState.width {
+                if gameState.gameBoard[columnNumber][rowNumber] == KonaneColor.black {
+                    print(" x", terminator: " ") //black square
+                }
+                else if gameState.gameBoard[columnNumber][rowNumber] == KonaneColor.white {
+                    print(" o", terminator: " ") //white square
+                }
+                else {
+                    print("  ", terminator: " ") //empty square
+                }
+            }
+            print() //uses a terminator to make new line
+            //Print column numbering
         }
 
-        let blackWins = gameState.didBlackWin()
-        if blackWins {
-            print("Black wins!")
-        } else {
-            print("White wins!")
+        print("   ", terminator:"")
+        while arbitraryVariable < gameState.height {
+            if arbitraryVariable < 10 {
+                print(" \(arbitraryVariable)", terminator: " ")
+            } else {
+                print("\(arbitraryVariable)", terminator: " ")
+            }
+            arbitraryVariable += 1
         }
-        return blackWins
+        print()
     }
 
-    private func displayBoard() {
-        displayASCIIBoard()
+
+
+    func askForInput() -> (xCoord: Int, yCoord: Int) {
+        while true {
+            let x = Int(readLine()!)
+            let y = Int(readLine()!)
+            if x != nil && y != nil && x! < gameState.height && y! < gameState.height && x! >= 0 && y! >= 0 {
+                return (xCoord: x!, yCoord: y!)
+            } else  {
+                print("This is not a valid input. Try again")
+            }
+        }
     }
+
+
+    func play() -> Bool {
 
-    private func displayASCIIBoard() {
-        for y in (0..<gameState.height).reversed() {
-            var lineText = "\(y)   "
-            if y < 10 {
-                lineText.append(" ")
+        var winBool = false
+        var move: KonaneMove = KonaneMove(fromX: 0, fromY: 0, toX: 0, toY: 0)
+
+        //real play function
+        gameState.populateGameBoard()
+
+        displayBoard()
+
+        gameState.perform(blackRemove: blackInputSource.removeFirstPiece(gameState: gameState))
+
+        displayBoard()
+
+        gameState.perform(whiteRemove: whiteInputSource.removeSecondPiece(gameState: gameState))
+
+        displayBoard()
+
+        while winBool == false {
+            if gameState.getIsBlackTurn() {
+                move = blackInputSource.nextMove(gameState: gameState)
+            } else if !gameState.getIsBlackTurn() {
+                move = whiteInputSource.nextMove(gameState: gameState)
+            } else {
+                print("Error not black or white's turn?")
             }
-            for x in (0..<gameState.width) {
-                let color = gameState.color(atX: x, atY: y)
-                let colorText: String
-                if color == KonaneColor.black {
-                    colorText = "x"
-                } else if color == KonaneColor.white {
-                    colorText = "o"
-                } else {
-                    colorText = " "
-                }
-                lineText.append("\(colorText)   ")
+
+            gameState.perform(move: move)
+
+            if gameState.getIsBlackTurn() && gameState.didBlackWin() {
+                winBool = true
+            } else if !gameState.getIsBlackTurn() && gameState.didWhiteWin() {
+                winBool = true
+            } else {
+                winBool = false
             }
-            print(lineText)
+
+            //Changes turn
+            gameState.isBlackTurn = !gameState.isBlackTurn
+
+            displayBoard()
         }
-
-        // Bottom row of coordinates
-        var bottomRow = "     "
-        for x in 0..<gameState.width {
-            bottomRow.append("\(x)  ")
-            if x < 10 {
-                bottomRow.append(" ")
-            }
+        //Need to account for the fact that the player has changed
+        //That's why the code and players seem switched
+        if !gameState.getIsBlackTurn() {
+            print("Player1 (x's) has won the game!")
+        } else if gameState.getIsBlackTurn() {
+            print("Player2 (o's) has won the game!")
         }
-        print()
-        print(bottomRow)
+        return winBool
     }
 }
+//End of Class