Minor code changes in response to swiftlint warnings and errors

PokemonKit/Sources/Ability.swift

@@ -38,7 +38,7 @@ public struct Ability: Codable {
 }
 
 extension Ability: Equatable {
-	public static func ==(lhs: Ability, rhs: Ability) -> Bool {
+	public static func == (lhs: Ability, rhs: Ability) -> Bool {
 		return lhs.name == rhs.name
 	}
 }

PokemonKit/Sources/Action.swift

@@ -23,7 +23,7 @@ public enum Action: Codable, Equatable {
 		case attack, switchTo, forceSwitch, recharge, run
 	}
 
-	// MARK:- Codable
+	// MARK: - Codable
 	public func encode(to encoder: Encoder) throws {
 		var container = encoder.container(keyedBy: CodingKeys.self)
 

PokemonKit/Sources/Attack.swift

@@ -121,7 +121,7 @@ extension Attack: Equatable, Hashable {
 		return self.name.hashValue
 	}
 
-	public static func ==(lhs: Attack, rhs: Attack) -> Bool {
+	public static func == (lhs: Attack, rhs: Attack) -> Bool {
         return lhs.name == rhs.name &&
             lhs.power == rhs.power &&
             lhs.basePP == rhs.basePP &&

PokemonKit/Sources/BattleEngine.swift

@@ -131,7 +131,7 @@ public class BattleEngine: NSObject, GKGameModel {
 				if
 					let lookahead = turns.first,
 					case let .attack(attack) = lookahead.action,
-					case .multiHitMove(_,_)? = attack.bonusEffect
+					case .multiHitMove(_, _)? = attack.bonusEffect
 				{
 					multiHitMoveRunning = true
 				}
@@ -142,7 +142,6 @@ public class BattleEngine: NSObject, GKGameModel {
 				case var .attack(attack):
 					var attacker: Pokemon
 					var defender: Pokemon
-
 
 					if turn.player.playerId == playerOne.playerId {
 						attacker = playerOne.activePokemon
@@ -172,13 +171,13 @@ public class BattleEngine: NSObject, GKGameModel {
 						lastDamage = 0
 
 						// Skips doing damage if this is the first half of a multi-turn move, but still queues the relevant .useAttack
-						if case .multiTurnMove(_,_)? = attack.bonusEffect {
+						if case .multiTurnMove(_, _)? = attack.bonusEffect {
 							view?.queue(action: .useAttack(attacker: attacker, defender: defender, attack: attack))
 							return
 						}
 
 						// Skips doing damage if this is the first instance of a multi-hit move
-						if case .multiHitMove(_,_)? = attack.bonusEffect {
+						if case .multiHitMove(_, _)? = attack.bonusEffect {
 							return
 						}
 
@@ -287,10 +286,17 @@ public class BattleEngine: NSObject, GKGameModel {
 						}
 					}
 
-					let shouldAttack = [confusionCheck(), sleepCheck(), paralysisCheck(), protectedCheck(), hitCheck()].reduce(true) { $0 && $1 }
+					let shouldAttack = [
+						confusionCheck(),
+						sleepCheck(),
+						paralysisCheck(),
+						protectedCheck(),
+						hitCheck()
+					].reduce(true) { $0 && $1 }
 
 					func successfulDamage() {
-						// If the condition for a multi-turn move is matched, use it immediately (e.g. in the case of Solar Beam, if the weather is sunny)
+						// If the condition for a multi-turn move is matched, use it immediately
+						// (e.g. in the case of Solar Beam, if the weather is sunny)
 						if case .multiTurnMove(let condition, _)? = attack.bonusEffect, condition(self) {
 							attack = attack.withoutBonusEffect()
 						}
@@ -429,7 +435,6 @@ public class BattleEngine: NSObject, GKGameModel {
 		view?.queue(action: .clear)
 	}
 
-
 	/// Initialiser for the Battle Engine
 	///
 	/// - Parameters:
@@ -558,7 +563,7 @@ public class BattleEngine: NSObject, GKGameModel {
 
 		if !turns.isEmpty {
 			switch turn.action {
-			case .attack(_), .switchTo(_):
+			case .attack, .switchTo:
 				removeTurns(belongingTo: turn.player)
 				turns.append(turn)
 			default:
@@ -590,7 +595,7 @@ public class BattleEngine: NSObject, GKGameModel {
 	private func removeTurns(belongingTo player: Player) {
 		turns = turns.filter { turn in
 			switch turn.action {
-			case .attack(_), .switchTo(_):
+			case .attack, .switchTo:
 				return turn.player != player
 			default:
 				return true
@@ -614,7 +619,7 @@ public class BattleEngine: NSObject, GKGameModel {
 		case running, completed, awaitingSwitch
 	}
 
-	// MARK:- GameplayKit Methods
+	// MARK: - GameplayKit Methods
 
 	public var players: [GKGameModelPlayer]? {
 		return [playerOne, playerTwo]
@@ -705,7 +710,7 @@ public class BattleEngine: NSObject, GKGameModel {
 					score -= 30
 				case .mustRecharge:
 					score -= 20
-				case .preparingTo(_):
+				case .preparingTo:
 					score -= 20
 				}
 			}
@@ -786,7 +791,7 @@ public class BattleEngine: NSObject, GKGameModel {
 		return copy
 	}
 
-	public static func ==(lhs: BattleEngine, rhs: BattleEngine) -> Bool {
+	public static func == (lhs: BattleEngine, rhs: BattleEngine) -> Bool {
 		let value =
 			lhs.playerOne == rhs.playerOne &&
 				lhs.playerTwo == rhs.playerTwo &&
@@ -803,7 +808,7 @@ public class BattleEngine: NSObject, GKGameModel {
 		return value
 	}
 
-	public static func !=(lhs: BattleEngine, rhs: BattleEngine) -> Bool {
+	public static func != (lhs: BattleEngine, rhs: BattleEngine) -> Bool {
 		return !(lhs == rhs)
 	}
 

PokemonKit/Sources/Player.swift

@@ -58,48 +58,46 @@ public class Player: NSObject, Codable, GKGameModelPlayer {
 }
 
 extension Player {
-	public static func ==(lhs: Player, rhs: Player) -> Bool {
+	public static func == (lhs: Player, rhs: Player) -> Bool {
 		return lhs.name == rhs.name &&
 			lhs.playerId == rhs.playerId &&
 			lhs.team == rhs.team &&
 			lhs.activePokemon == rhs.activePokemon
 	}
 
-	public static func !=(lhs: Player, rhs: Player) -> Bool {
+	public static func != (lhs: Player, rhs: Player) -> Bool {
 		return !(lhs == rhs)
 	}
 
-	public static func ==(lhs: Player, rhs: GKGameModelPlayer) -> Bool {
+	public static func == (lhs: Player, rhs: GKGameModelPlayer) -> Bool {
 		if let right = rhs as? Player {
 			return lhs == right
 		} else {
 			return false
 		}
 	}
 
-	public static func ==(lhs: GKGameModelPlayer, rhs: Player) -> Bool {
+	public static func == (lhs: GKGameModelPlayer, rhs: Player) -> Bool {
 		if let left = lhs as? Player {
 			return left == rhs
 		} else {
 			return false
 		}
 	}
 
-	public static func !=(lhs: Player, rhs: GKGameModelPlayer) -> Bool {
+	public static func != (lhs: Player, rhs: GKGameModelPlayer) -> Bool {
 		if let right = rhs as? Player {
 			return lhs != right
 		} else {
 			return false
 		}
 	}
 
-	public static func !=(lhs: GKGameModelPlayer, rhs: Player) -> Bool {
+	public static func != (lhs: GKGameModelPlayer, rhs: Player) -> Bool {
 		if let left = lhs as? Player {
 			return left != rhs
 		} else {
 			return false
 		}
 	}
 }
-
-

PokemonKit/Sources/Pokedex.swift

@@ -216,7 +216,6 @@ public class Pokedex {
 
 			let languageID = Expression<Int>("local_language_id")
 
-
 			let query = """
 			select p.id, p.identifier, ps.name,
 			(select tn.name from type_names as tn

PokemonKit/Sources/Pokemon.swift

@@ -247,7 +247,7 @@ extension Pokemon: CustomStringConvertible {
 }
 
 extension Pokemon: Equatable {
-	public static func ==(lhs: Pokemon, rhs: Pokemon) -> Bool {
+	public static func == (lhs: Pokemon, rhs: Pokemon) -> Bool {
 		return
 			lhs.species == rhs.species &&
 			lhs._nickname == rhs._nickname &&
@@ -263,5 +263,3 @@ extension Pokemon: Equatable {
 			lhs._currentHP == rhs._currentHP
 	}
 }
-
-

PokemonKit/Sources/Random.swift

@@ -76,7 +76,7 @@ public class Random {
 	}
 
 	func copy() -> Random {
-		let copyRandomSource = self.randomSource.copy() as! GKRandomSource
+		guard let copyRandomSource = self.randomSource.copy() as? GKRandomSource else { fatalError() }
 
 		return Random(source: copyRandomSource)
 	}

PokemonKit/Sources/Stats.swift

@@ -38,7 +38,12 @@ public struct Stats: Codable {
 }
 
 extension Stats: Equatable {
-	public static func ==(lhs: Stats, rhs: Stats) -> Bool {
-		return lhs.hp == rhs.hp && lhs.atk == rhs.atk && lhs.spAtk == rhs.spAtk && lhs.spDef == rhs.spDef && lhs.spd == rhs.spd
+	public static func == (lhs: Stats, rhs: Stats) -> Bool {
+		return
+			lhs.hp == rhs.hp &&
+			lhs.atk == rhs.atk &&
+			lhs.spAtk == rhs.spAtk &&
+			lhs.spDef == rhs.spDef &&
+			lhs.spd == rhs.spd
 	}
 }

PokemonKit/Sources/Turn.swift

@@ -20,7 +20,7 @@ public class Turn: NSObject, Codable, GKGameModelUpdate {
 
 	var playerSpeed: Int {
 		switch action {
-		case .attack(_):
+		case .attack:
 			if player.activePokemon.status == .paralysed {
 				return player.activePokemon.baseStats.spd / 2
 			} else {
@@ -35,9 +35,9 @@ public class Turn: NSObject, Codable, GKGameModelUpdate {
 		switch action {
 		case let .attack(attack):
 			return attack.priority
-		case .switchTo(_):
+		case .switchTo:
 			return 6
-		case .forceSwitch(_):
+		case .forceSwitch:
 			return 7
 		case .run:
 			return 7
@@ -58,7 +58,7 @@ public class Turn: NSObject, Codable, GKGameModelUpdate {
 }
 
 extension Turn {
-	public static func ==(lhs: Turn, rhs: Turn) -> Bool {
+	public static func == (lhs: Turn, rhs: Turn) -> Bool {
 		return lhs.playerSpeed == rhs.playerSpeed &&
 			lhs.priority == rhs.priority &&
 			lhs.action == rhs.action

PokemonKit/Sources/VolatileStatus.swift

@@ -15,14 +15,14 @@ public enum VolatileStatus: Codable, Equatable, Hashable {
 
 	public func turn() -> VolatileStatus {
 		switch self {
-		case .confused(let c):
-			return .confused(c - 1)
+		case .confused(let counter):
+			return .confused(counter - 1)
 		default:
 			return self
 		}
 	}
 
-	// MARK:- Codable implementation
+	// MARK: - Codable implementation
 	enum CodingKeys: CodingKey {
 		case base, counter, attack
 	}

PokemonKit/Sources/Weather.swift

@@ -77,7 +77,7 @@ public enum Weather: CustomStringConvertible {
 			return true
 		case (.extremelyHarshSunlight, .water):
 			return true
-		case(_,_):
+		case(_, _):
 			return false
 		}
 	}

PokemonKit/Tests/Sources/PokemonKitTests.swift

@@ -58,12 +58,9 @@ class PokemonKitTests: XCTestCase {
 			print(String(data: encodedTeamData, encoding: .utf8)!)
 			decodedTeamData = try JSONDecoder().decode([Pokemon].self, from: encodedTeamData)
 		} catch let error {
-			print(error)
-			XCTFail()
+			XCTFail(error.localizedDescription)
 		}
 		XCTAssertEqual(team, decodedTeamData)
-
-
 	}
 
 	func testActivePokemon() {
@@ -296,7 +293,6 @@ class PokemonKitTests: XCTestCase {
 		XCTAssertEqual(effectiveness, Type.Effectiveness.notEffective)
 	}
 
-
 	/// Checks that Solar Beam applies the correct volatile status to the Pokémon that uses it, and does no damage on the first turn
 	func testSolarBeamFirstTurn() {
 		let solarBeam = Pokedex.default.attacks["Solar Beam"]!
@@ -487,7 +483,7 @@ class PokemonKitTests: XCTestCase {
 		XCTAssertNotEqual(rhys.playerId, joe.playerId)
 	}
 
-	// MARK:- GKMinmaxStrategist tests
+	// MARK: - GKMinmaxStrategist tests
 
 	func testAICanMakeTurn() {
 		joe.activePokemon.attacks.append(Pokedex.default.attacks["Hyper Beam"]!)
@@ -548,7 +544,7 @@ class PokemonKitTests: XCTestCase {
 		XCTAssertTrue(engine.turns.count == 0)
 	}
 
-	// MARK:- Test Copy Constructors
+	// MARK: - Test Copy Constructors
 
 	func testPokemonCopyConstructor() {
 		bulbasaur.volatileStatus.insert(.flinch)
@@ -568,7 +564,7 @@ class PokemonKitTests: XCTestCase {
 		XCTAssertNotEqual(bulbasaur, bulbasaurCopy)
 	}
 
-	// MARK:- Weather Tests
+	// MARK: - Weather Tests
 	func testFireMoveInSunlight() {
 		engine.weather = .harshSunlight