Linear + Diagonal moves
This commit is contained in:
@@ -1,27 +1,27 @@
|
||||
internal final class Bishop: Piece, DiagonalMoves {
|
||||
internal weak var board: Board?
|
||||
internal var kind: Kind = .Bishop
|
||||
final class Bishop: Piece, DiagonalMoves {
|
||||
weak var board: Board?
|
||||
var kind: Kind = .Bishop
|
||||
|
||||
internal var unicodeRepresentation: String {
|
||||
var unicodeRepresentation: String {
|
||||
return color == .Black ? "♝" : "♗"
|
||||
}
|
||||
internal var color: Color
|
||||
var color: Color
|
||||
|
||||
internal var position: Square.Position
|
||||
var position: Square.Position
|
||||
|
||||
internal var pseudoLegalPositions: [Square.Position] {
|
||||
var pseudoLegalPositions: [Square.Position] {
|
||||
return getDiagonalMoves(from: position)
|
||||
}
|
||||
|
||||
internal var legalPositions: [Square.Position] {
|
||||
var legalPositions: [Square.Position] {
|
||||
return pseudoLegalPositions.filter { isLegal(on: $0) }
|
||||
}
|
||||
|
||||
internal func move(to dst: Square.Position) -> Bool {
|
||||
func move(to dst: Square.Position) -> Bool {
|
||||
return false
|
||||
}
|
||||
|
||||
internal func isLegal(on pos: Square.Position) -> Bool {
|
||||
func isLegal(on pos: Square.Position) -> Bool {
|
||||
if let board = board, let s = board[pos] {
|
||||
if let p = s.piece {
|
||||
if p.color == color { return false }
|
||||
@@ -34,7 +34,7 @@ internal final class Bishop: Piece, DiagonalMoves {
|
||||
return true
|
||||
}
|
||||
|
||||
internal init(color: Color, on position: Square.Position) {
|
||||
init(color: Color, on position: Square.Position) {
|
||||
self.color = color
|
||||
self.position = position
|
||||
}
|
||||
|
||||
@@ -1,19 +1,35 @@
|
||||
internal protocol DiagonalMoves {
|
||||
protocol DiagonalMoves {
|
||||
func getDiagonalMoves(from pos: Square.Position) -> [Square.Position]
|
||||
}
|
||||
|
||||
extension DiagonalMoves {
|
||||
func getDiagonalMoves(from pos: Square.Position) -> [Square.Position] {
|
||||
return []
|
||||
var squares = [Square.Position]()
|
||||
for i: (Int8, Int8) in [(1, -1), (1, 1), (-1, 1), (-1, -1)] {
|
||||
var currentSquare = pos + i
|
||||
while currentSquare.index != nil {
|
||||
squares.append(currentSquare)
|
||||
currentSquare += i
|
||||
}
|
||||
}
|
||||
return squares
|
||||
}
|
||||
}
|
||||
|
||||
internal protocol LinearMoves {
|
||||
protocol LinearMoves {
|
||||
func getLinearMoves(from pos: Square.Position) -> [Square.Position]
|
||||
}
|
||||
|
||||
extension LinearMoves {
|
||||
func getLinearMoves(from pos: Square.Position) -> [Square.Position] {
|
||||
return []
|
||||
var squares = [Square.Position]()
|
||||
for i: (Int8, Int8) in [(1, 0), (0, 1), (-1, 0), (0, -1)] {
|
||||
var currentSquare = pos + i
|
||||
while currentSquare.index != nil {
|
||||
squares.append(currentSquare)
|
||||
currentSquare += i
|
||||
}
|
||||
}
|
||||
return squares
|
||||
}
|
||||
}
|
||||
@@ -1,27 +1,27 @@
|
||||
internal final class King: Piece {
|
||||
internal weak var board: Board?
|
||||
internal var kind: Kind = .King
|
||||
final class King: Piece {
|
||||
weak var board: Board?
|
||||
var kind: Kind = .King
|
||||
|
||||
internal var unicodeRepresentation: String {
|
||||
var unicodeRepresentation: String {
|
||||
return color == .Black ? "♛" : "♕"
|
||||
}
|
||||
internal var color: Color
|
||||
var color: Color
|
||||
|
||||
internal var position: Square.Position
|
||||
var position: Square.Position
|
||||
|
||||
internal var pseudoLegalPositions: [Square.Position] {
|
||||
var pseudoLegalPositions: [Square.Position] {
|
||||
return []
|
||||
}
|
||||
|
||||
internal var legalPositions: [Square.Position] {
|
||||
var legalPositions: [Square.Position] {
|
||||
return pseudoLegalPositions.filter { isLegal(on: $0) }
|
||||
}
|
||||
|
||||
internal func move(to dst: Square.Position) -> Bool {
|
||||
func move(to dst: Square.Position) -> Bool {
|
||||
return false
|
||||
}
|
||||
|
||||
internal func isLegal(on pos: Square.Position) -> Bool {
|
||||
func isLegal(on pos: Square.Position) -> Bool {
|
||||
if let board = board, let s = board[pos] {
|
||||
if let p = s.piece {
|
||||
if p.color == color { return false }
|
||||
@@ -35,7 +35,7 @@ internal final class King: Piece {
|
||||
return true
|
||||
}
|
||||
|
||||
internal init(color: Color, on position: Square.Position) {
|
||||
init(color: Color, on position: Square.Position) {
|
||||
self.color = color
|
||||
self.position = position
|
||||
}
|
||||
|
||||
@@ -1,40 +1,37 @@
|
||||
internal final class Knight: Piece {
|
||||
internal weak var board: Board?
|
||||
internal var kind: Kind = .Knight
|
||||
final class Knight: Piece {
|
||||
weak var board: Board?
|
||||
var kind: Kind = .Knight
|
||||
|
||||
internal var unicodeRepresentation: String {
|
||||
var unicodeRepresentation: String {
|
||||
return color == .Black ? "♞" : "♘"
|
||||
}
|
||||
internal var color: Color
|
||||
var color: Color
|
||||
|
||||
internal var position: Square.Position
|
||||
var position: Square.Position
|
||||
|
||||
internal var pseudoLegalPositions: [Square.Position] {
|
||||
var pseudoLegalPositions: [Square.Position] {
|
||||
let directions: [Square.Position] = [
|
||||
.init(file: position.file + 1, rank: position.rank + 2),
|
||||
.init(file: position.file - 1, rank: position.rank + 2),
|
||||
.init(file: position.file + 1, rank: position.rank - 2),
|
||||
.init(file: position.file - 1, rank: position.rank - 2),
|
||||
.init(file: position.file + 2, rank: position.rank + 1),
|
||||
.init(file: position.file - 2, rank: position.rank + 1),
|
||||
.init(file: position.file + 2, rank: position.rank - 1),
|
||||
.init(file: position.file - 2, rank: position.rank - 1)
|
||||
.init(rank: position.rank + 2, file: position.file + 1),
|
||||
.init(rank: position.rank + 2, file: position.file - 1),
|
||||
.init(rank: position.rank - 2, file: position.file + 1),
|
||||
.init(rank: position.rank - 2, file: position.file - 1),
|
||||
.init(rank: position.rank + 1, file: position.file + 2),
|
||||
.init(rank: position.rank + 1, file: position.file - 2),
|
||||
.init(rank: position.rank - 1, file: position.file + 2),
|
||||
.init(rank: position.rank - 1, file: position.file - 2)
|
||||
]
|
||||
return directions.filter {
|
||||
let index = $0.index
|
||||
return index < 0 || index > 63
|
||||
}
|
||||
return directions.filter { $0.index != nil }
|
||||
}
|
||||
|
||||
internal var legalPositions: [Square.Position] {
|
||||
var legalPositions: [Square.Position] {
|
||||
return pseudoLegalPositions.filter { isLegal(on: $0) }
|
||||
}
|
||||
|
||||
internal func move(to dst: Square.Position) -> Bool {
|
||||
func move(to dst: Square.Position) -> Bool {
|
||||
return false
|
||||
}
|
||||
|
||||
internal func isLegal(on pos: Square.Position) -> Bool {
|
||||
func isLegal(on pos: Square.Position) -> Bool {
|
||||
if let board = board, let s = board[pos] {
|
||||
if let p = s.piece {
|
||||
if p.color == color { return false }
|
||||
@@ -48,7 +45,7 @@ internal final class Knight: Piece {
|
||||
return true
|
||||
}
|
||||
|
||||
internal init(color: Color, on position: Square.Position) {
|
||||
init(color: Color, on position: Square.Position) {
|
||||
self.color = color
|
||||
self.position = position
|
||||
}
|
||||
|
||||
@@ -1,32 +1,29 @@
|
||||
internal final class Pawn: Piece {
|
||||
internal var kind: Kind = .Pawn
|
||||
internal weak var board: Board?
|
||||
internal var color: Color
|
||||
internal var position: Square.Position
|
||||
internal var pseudoLegalPositions: [Square.Position] {
|
||||
final class Pawn: Piece {
|
||||
var kind: Kind = .Pawn
|
||||
weak var board: Board?
|
||||
var color: Color
|
||||
var position: Square.Position
|
||||
var pseudoLegalPositions: [Square.Position] {
|
||||
let sign: Int8 = color == .Black ? -1 : 1
|
||||
let rank = Int8(position.rank)
|
||||
let directions: [Square.Position] = [
|
||||
.init(file: position.file, rank: rank + 1 * sign),
|
||||
.init(file: position.file, rank: rank + 2 * sign),
|
||||
.init(file: position.file + 1, rank: rank + 1 * sign),
|
||||
.init(file: position.file - 1, rank: rank + 1 * sign)
|
||||
.init(rank: rank + 1 * sign, file: position.file),
|
||||
.init(rank: rank + 2 * sign, file: position.file),
|
||||
.init(rank: rank + 1 * sign, file: position.file + 1),
|
||||
.init(rank: rank + 1 * sign, file: position.file - 1)
|
||||
]
|
||||
// TODO: Handle en passant
|
||||
return directions.filter {
|
||||
let index = $0.index
|
||||
return index < 1 || index > 63
|
||||
}
|
||||
return directions.filter { $0.index != nil }
|
||||
}
|
||||
internal var legalPositions: [Square.Position] {
|
||||
var legalPositions: [Square.Position] {
|
||||
pseudoLegalPositions.filter { isLegal(on: $0) }
|
||||
}
|
||||
|
||||
internal var unicodeRepresentation: String {
|
||||
var unicodeRepresentation: String {
|
||||
color == .Black ? "♟" : "♙"
|
||||
}
|
||||
|
||||
internal func move(to dst: Square.Position) -> Bool {
|
||||
func move(to dst: Square.Position) -> Bool {
|
||||
guard board != nil else {
|
||||
return false
|
||||
}
|
||||
@@ -45,7 +42,7 @@ internal final class Pawn: Piece {
|
||||
return true
|
||||
}
|
||||
|
||||
internal func isLegal(on pos: Square.Position) -> Bool {
|
||||
func isLegal(on pos: Square.Position) -> Bool {
|
||||
// TODO: Handle "En-Passant"
|
||||
if let board = board, let s = board[pos] {
|
||||
if let p = s.piece {
|
||||
@@ -60,7 +57,7 @@ internal final class Pawn: Piece {
|
||||
return true
|
||||
}
|
||||
|
||||
internal init(
|
||||
init(
|
||||
color: Color, on position: Square.Position
|
||||
) {
|
||||
self.color = color
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
internal enum Kind: String, CaseIterable {
|
||||
enum Kind: String, CaseIterable {
|
||||
case Pawn, Knight, Bishop, Rook, Queen, King
|
||||
|
||||
internal var value: Int8 {
|
||||
var value: Int8 {
|
||||
switch self {
|
||||
case .Pawn: 1
|
||||
case .Bishop: 3
|
||||
@@ -12,7 +12,7 @@ internal enum Kind: String, CaseIterable {
|
||||
}
|
||||
}
|
||||
|
||||
internal static subscript(_ c: Character) -> (Self, Color)? {
|
||||
static subscript(_ c: Character) -> (Self, Color)? {
|
||||
let v = c.uppercased()
|
||||
|
||||
guard
|
||||
@@ -39,7 +39,7 @@ internal enum Kind: String, CaseIterable {
|
||||
}
|
||||
}
|
||||
|
||||
internal protocol Piece {
|
||||
protocol Piece {
|
||||
var board: Board? { get }
|
||||
var color: Color { get }
|
||||
var unicodeRepresentation: String { get }
|
||||
|
||||
@@ -1,28 +1,28 @@
|
||||
internal final class Queen: Piece, LinearMoves, DiagonalMoves {
|
||||
internal weak var board: Board?
|
||||
internal var kind: Kind = .Queen
|
||||
final class Queen: Piece, LinearMoves, DiagonalMoves {
|
||||
weak var board: Board?
|
||||
var kind: Kind = .Queen
|
||||
|
||||
internal var unicodeRepresentation: String {
|
||||
var unicodeRepresentation: String {
|
||||
return color == .Black ? "♛" : "♕"
|
||||
}
|
||||
internal var color: Color
|
||||
var color: Color
|
||||
|
||||
internal var position: Square.Position
|
||||
var position: Square.Position
|
||||
|
||||
internal var pseudoLegalPositions: [Square.Position] {
|
||||
var pseudoLegalPositions: [Square.Position] {
|
||||
return getDiagonalMoves(from: position) + getLinearMoves(from: position)
|
||||
}
|
||||
|
||||
internal var legalPositions: [Square.Position] {
|
||||
var legalPositions: [Square.Position] {
|
||||
return pseudoLegalPositions.filter { isLegal(on: $0) }
|
||||
}
|
||||
|
||||
internal func move(to dst: Square.Position) -> Bool {
|
||||
func move(to dst: Square.Position) -> Bool {
|
||||
|
||||
return false
|
||||
}
|
||||
|
||||
internal func isLegal(on pos: Square.Position) -> Bool {
|
||||
func isLegal(on pos: Square.Position) -> Bool {
|
||||
if let board = board, let s = board[pos] {
|
||||
if let p = s.piece {
|
||||
if p.color == color { return false }
|
||||
@@ -36,7 +36,7 @@ internal final class Queen: Piece, LinearMoves, DiagonalMoves {
|
||||
return true
|
||||
}
|
||||
|
||||
internal init(color: Color, on position: Square.Position) {
|
||||
init(color: Color, on position: Square.Position) {
|
||||
self.color = color
|
||||
self.position = position
|
||||
}
|
||||
|
||||
@@ -1,27 +1,27 @@
|
||||
internal final class Rook: Piece, LinearMoves {
|
||||
internal weak var board: Board?
|
||||
internal var kind: Kind = .Rook
|
||||
final class Rook: Piece, LinearMoves {
|
||||
weak var board: Board?
|
||||
var kind: Kind = .Rook
|
||||
|
||||
internal var unicodeRepresentation: String {
|
||||
var unicodeRepresentation: String {
|
||||
return color == .Black ? "♜" : "♖"
|
||||
}
|
||||
internal var color: Color
|
||||
var color: Color
|
||||
|
||||
internal var position: Square.Position
|
||||
var position: Square.Position
|
||||
|
||||
internal var pseudoLegalPositions: [Square.Position] {
|
||||
var pseudoLegalPositions: [Square.Position] {
|
||||
return getLinearMoves(from: position)
|
||||
}
|
||||
|
||||
internal var legalPositions: [Square.Position] {
|
||||
var legalPositions: [Square.Position] {
|
||||
return pseudoLegalPositions.filter { isLegal(on: $0) }
|
||||
}
|
||||
|
||||
internal func move(to dst: Square.Position) -> Bool {
|
||||
func move(to dst: Square.Position) -> Bool {
|
||||
return false
|
||||
}
|
||||
|
||||
internal func isLegal(on pos: Square.Position) -> Bool {
|
||||
func isLegal(on pos: Square.Position) -> Bool {
|
||||
if let board = board, let s = board[pos] {
|
||||
if let p = s.piece {
|
||||
if p.color == color { return false }
|
||||
@@ -35,7 +35,7 @@ internal final class Rook: Piece, LinearMoves {
|
||||
return true
|
||||
}
|
||||
|
||||
internal init(color: Color, on position: Square.Position) {
|
||||
init(color: Color, on position: Square.Position) {
|
||||
self.color = color
|
||||
self.position = position
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user