Piece: expanding getLegalMoves for Queen/Knight/Bishop
This commit is contained in:
parent
e5a124d193
commit
6773da28fb
4 changed files with 70 additions and 5 deletions
53
Piece.cpp
53
Piece.cpp
|
|
@ -12,6 +12,9 @@ Piece::~Piece() {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TODO: Add operator overload for << to allow easy printing
|
||||||
|
// TODO: Test getPieceAt() function to see if it works as intended
|
||||||
|
|
||||||
// because the Piece class is instantiated in another class using
|
// because the Piece class is instantiated in another class using
|
||||||
// unique_ptr, non-pure virtual functions apparently *must*
|
// unique_ptr, non-pure virtual functions apparently *must*
|
||||||
// have definitions, or the linker freaks out
|
// have definitions, or the linker freaks out
|
||||||
|
|
@ -164,7 +167,7 @@ std::vector<Move> Rook::getLegalMoves(const Square &from, Board &board) const {
|
||||||
{0, -1}, // Left
|
{0, -1}, // Left
|
||||||
{0, 1} // Right
|
{0, 1} // Right
|
||||||
};
|
};
|
||||||
for(auto& dir : directions) {
|
for(auto &dir : directions) {
|
||||||
int r = from.rank + dir[0];
|
int r = from.rank + dir[0];
|
||||||
int f = from.file + dir[1];
|
int f = from.file + dir[1];
|
||||||
while(r >= 0 && r < 8 && f >= 0 && f < 8) {
|
while(r >= 0 && r < 8 && f >= 0 && f < 8) {
|
||||||
|
|
@ -188,16 +191,64 @@ std::vector<Move> Rook::getLegalMoves(const Square &from, Board &board) const {
|
||||||
|
|
||||||
std::vector<Move> Queen::getLegalMoves(const Square &from, Board &board) const {
|
std::vector<Move> Queen::getLegalMoves(const Square &from, Board &board) const {
|
||||||
std::vector<Move> moveList;
|
std::vector<Move> moveList;
|
||||||
|
std::vector<std::vector<int>> directions = {
|
||||||
|
{-1, 0}, // Up
|
||||||
|
{-1, -1}, // up-left
|
||||||
|
{-1, 1}, // up-right
|
||||||
|
{1, 0}, // Down
|
||||||
|
{1, -1}, // down-left
|
||||||
|
{1, 1}, // down-right
|
||||||
|
{0, -1}, // Left
|
||||||
|
{0, 1} // Right
|
||||||
|
};
|
||||||
|
for(auto &dir : directions) {
|
||||||
|
// establish r/f for square to check
|
||||||
|
int r = from.rank + dir[0];
|
||||||
|
int f = from.file + dir[1];
|
||||||
|
auto ra = static_cast<Rank>(r);
|
||||||
|
auto fi = static_cast<File>(f);
|
||||||
|
Square targetSquare = {ra, fi};
|
||||||
|
while(r >= 0 && r < 8 && f >= 0 && f < 8) {
|
||||||
|
const auto &target = board.boardGrid[r][f]; // examine the target square
|
||||||
|
if(!target) { // if square is empty (NULL)
|
||||||
|
moveList.push_back({from, targetSquare}); // then it's potentially a legal move
|
||||||
|
} else if(target && target->getColour() != this->getColour()) { // if it's occupied with a piece of opposite colour
|
||||||
|
moveList.push_back({from, targetSquare}); // then again it's potentially legal
|
||||||
|
break;
|
||||||
|
} else {
|
||||||
|
// otherwise it's one of our pieces
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
r += dir[0];
|
||||||
|
f += dir[1];
|
||||||
|
}
|
||||||
|
}
|
||||||
return moveList;
|
return moveList;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<Move> Knight::getLegalMoves(const Square &from, Board &board) const {
|
std::vector<Move> Knight::getLegalMoves(const Square &from, Board &board) const {
|
||||||
std::vector<Move> moveList;
|
std::vector<Move> moveList;
|
||||||
|
std::vector<std::vector<int>> directions = {
|
||||||
|
{-1, -2},
|
||||||
|
{-1, 2},
|
||||||
|
{-2, -1},
|
||||||
|
{-2, 1},
|
||||||
|
{1, -2},
|
||||||
|
{1, 2},
|
||||||
|
{2, -1},
|
||||||
|
{2, 1}
|
||||||
|
};
|
||||||
return moveList;
|
return moveList;
|
||||||
}
|
}
|
||||||
|
|
||||||
std::vector<Move> Bishop::getLegalMoves(const Square &from, Board &board) const {
|
std::vector<Move> Bishop::getLegalMoves(const Square &from, Board &board) const {
|
||||||
std::vector<Move> moveList;
|
std::vector<Move> moveList;
|
||||||
|
std::vector<std::vector<int>> directions = {
|
||||||
|
{-1, -1}, // up-left
|
||||||
|
{-1, 1}, // up-right
|
||||||
|
{1, -1}, // down-left
|
||||||
|
{1, 1}, // down-right
|
||||||
|
};
|
||||||
return moveList;
|
return moveList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -13,6 +13,7 @@
|
||||||
#include <memory>
|
#include <memory>
|
||||||
#include <string>
|
#include <string>
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
#include <iostream>
|
||||||
|
|
||||||
#include "Piece.hpp"
|
#include "Piece.hpp"
|
||||||
|
|
||||||
|
|
@ -32,6 +33,7 @@ public:
|
||||||
std::vector<std::vector<std::unique_ptr<Piece>>> boardGrid;
|
std::vector<std::vector<std::unique_ptr<Piece>>> boardGrid;
|
||||||
Board();
|
Board();
|
||||||
virtual ~Board();
|
virtual ~Board();
|
||||||
|
|
||||||
void setupInitialPosition();
|
void setupInitialPosition();
|
||||||
std::unique_ptr<Piece> &getPieceAt(Square square);
|
std::unique_ptr<Piece> &getPieceAt(Square square);
|
||||||
void movePiece(Square from, Square to);
|
void movePiece(Square from, Square to);
|
||||||
|
|
|
||||||
|
|
@ -8,7 +8,6 @@
|
||||||
|
|
||||||
#ifndef PIECE_HPP
|
#ifndef PIECE_HPP
|
||||||
#define PIECE_HPP
|
#define PIECE_HPP
|
||||||
#pragma once
|
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
@ -115,6 +114,13 @@ class King : public Piece {
|
||||||
else
|
else
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void setCastleQS(bool canCastle) {
|
||||||
|
canCastleQS = canCastle;
|
||||||
|
}
|
||||||
|
void setCastleKS(bool canCastle) {
|
||||||
|
canCastleKS = canCastle;
|
||||||
|
}
|
||||||
protected:
|
protected:
|
||||||
bool canCastleQS = true;
|
bool canCastleQS = true;
|
||||||
bool canCastleKS = true;
|
bool canCastleKS = true;
|
||||||
|
|
@ -179,6 +185,10 @@ class Pawn : public Piece {
|
||||||
pieceType = PAWN;
|
pieceType = PAWN;
|
||||||
}
|
}
|
||||||
virtual std::vector<Move> getLegalMoves(const Square &from, Board &board) const override;
|
virtual std::vector<Move> getLegalMoves(const Square &from, Board &board) const override;
|
||||||
|
void promote(const Square &promotionSquare, Board &board, PieceType promoteTo);
|
||||||
|
protected:
|
||||||
|
bool vulnEnPassant = false;
|
||||||
|
bool firstMove = true;
|
||||||
};
|
};
|
||||||
#endif // PIECE_HPP
|
#endif // PIECE_HPP
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4,10 +4,10 @@
|
||||||
<logicalFolder name="HeaderFiles"
|
<logicalFolder name="HeaderFiles"
|
||||||
displayName="Header Files"
|
displayName="Header Files"
|
||||||
projectFiles="true">
|
projectFiles="true">
|
||||||
<itemPath>Board.hpp</itemPath>
|
|
||||||
<itemPath>Piece.hpp</itemPath>
|
|
||||||
<itemPath>NeoPixel.hpp</itemPath>
|
|
||||||
<itemPath>inc/strFuncs.hpp</itemPath>
|
<itemPath>inc/strFuncs.hpp</itemPath>
|
||||||
|
<itemPath>inc/Board.hpp</itemPath>
|
||||||
|
<itemPath>inc/NeoPixel.hpp</itemPath>
|
||||||
|
<itemPath>inc/Piece.hpp</itemPath>
|
||||||
</logicalFolder>
|
</logicalFolder>
|
||||||
<logicalFolder name="ExternalFiles"
|
<logicalFolder name="ExternalFiles"
|
||||||
displayName="Important Files"
|
displayName="Important Files"
|
||||||
|
|
@ -408,6 +408,8 @@
|
||||||
value="${memories.instruction.ram.ranges}"/>
|
value="${memories.instruction.ram.ranges}"/>
|
||||||
<property key="memories.programmemory" value="true"/>
|
<property key="memories.programmemory" value="true"/>
|
||||||
<property key="memories.programmemory.ranges" value="1d000000-1d03ffff"/>
|
<property key="memories.programmemory.ranges" value="1d000000-1d03ffff"/>
|
||||||
|
<property key="programmerToGoFilePath"
|
||||||
|
value="/home/amr/MPLABXProjects/chessmcu.X/debug/Debug/chessmcu_ptg"/>
|
||||||
<property key="programoptions.donoteraseauxmem" value="false"/>
|
<property key="programoptions.donoteraseauxmem" value="false"/>
|
||||||
<property key="programoptions.eraseb4program" value="true"/>
|
<property key="programoptions.eraseb4program" value="true"/>
|
||||||
<property key="programoptions.pgmentry.voltage" value="low"/>
|
<property key="programoptions.pgmentry.voltage" value="low"/>
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue