Merge pull request #118 from downie/fix-swift-starter

Fix swift starter

Author: lidavidm

starter_kits/Swift/Halite-III/Halite-III/hlt/Command.swift

@@ -8,13 +8,8 @@
 
 import Foundation
 
-enum Command: String {
-    case north = "n"
-    case south = "s"
-    case east = "e"
-    case west = "w"
-    case stayStill = "o"
-    case generate = "g"
-    case construct = "c"
-    case move = "m"
+enum Command {
+    case move(shipId: Ship.ID, direction: Direction)
+    case construct(fromShipId: Ship.ID)
+    case generate
 }

starter_kits/Swift/Halite-III/Halite-III/hlt/Direction.swift

@@ -23,19 +23,8 @@ enum Direction: CaseIterable {
     ///
     /// - Parameter direction: The direction to convert to a
     /// - Returns: A command equivalent to the given direction
-    static func convert(_ direction: Direction) -> Command {
-        switch direction {
-        case .north:
-            return .north
-        case .south:
-            return .south
-        case .east:
-            return .east
-        case .west:
-            return .west
-        case .still:
-            return .stayStill
-        }
+    static func convert(_ direction: Direction, forShipId shipId: Ship.ID) -> Command {
+        return .move(shipId: shipId, direction: direction)
     }
 
     /// Returns the opposite cardinal direction given a direction

starter_kits/Swift/Halite-III/Halite-III/hlt/Game.swift

@@ -14,7 +14,7 @@ struct Game {
     var turnNumber = 0
 
     var me: Player {
-        return players[myId]
+        return players.first(where: { $0.id == myId })!
     }
     var gameMap: Map
 
@@ -103,6 +103,7 @@ struct Game {
             }
             let updatedPlayer = Player(id: update.playerID,
                                        shipyard: playerToUpdate.shipyard,
+                                       haliteAmount: update.halite,
                                        ships: update.ships,
                                        dropoffs: update.dropoffs)
             updatedPlayers.append(updatedPlayer)

starter_kits/Swift/Halite-III/Halite-III/hlt/Networking.swift

@@ -137,7 +137,7 @@ class Networking {
     }
 
     func write(commands: [Command]) {
-        let output = commands.map { $0.rawValue }.joined(separator: " ")
+        let output = commands.map { string(from: $0) }.joined(separator: " ")
         write(string: output)
     }
 
@@ -157,4 +157,30 @@ class Networking {
         }
         return input
     }
+    
+    private func string(from command: Command) -> String {
+        switch command {
+        case .move(let shipId, let direction):
+            return "m \(shipId) \(string(from: direction))"
+        case .generate:
+            return "g"
+        case .construct(let shipId):
+            return "c \(shipId)"
+        }
+    }
+    
+    private func string(from direction: Direction) -> String {
+        switch direction {
+        case .north:
+            return "n"
+        case .south:
+            return "s"
+        case .east:
+            return "e"
+        case .west:
+            return "w"
+        case .still:
+            return "s"
+        }
+    }
 }

starter_kits/Swift/Halite-III/Halite-III/hlt/Ship.swift

@@ -32,7 +32,7 @@ struct Ship: Placeable {
     ///
     /// - Returns: An engine command to convert this ship into a dropoff.
     func makeDropoff() -> Command {
-        return .construct
+        return .construct(fromShipId: id)
     }
 
     /// Returns an engine command to keep this ship where it is and collect halite.
@@ -41,7 +41,7 @@ struct Ship: Placeable {
     ///
     /// - Returns: An engine command to keep this ship where it is and collect halite.
     func stayStill() -> Command {
-        return .stayStill
+        return .move(shipId: id, direction: .still)
     }
 
     /// Returns an engine command to move this ship in a direction without checking for collisions.
@@ -53,6 +53,6 @@ struct Ship: Placeable {
     /// - Parameter direction: The direction to move
     /// - Returns: An engine command to move this ship in a direction without checking for collisions.
     func move(direction: Direction) -> Command {
-        return Direction.convert(direction)
+        return .move(shipId: id, direction: direction)
     }
 }