we have nice looing gui now

working

src/controller/controller.py

@@ -1,4 +1,7 @@
 from logic.board import Board
+from logic.move import Move
+from logic.pieces.piece import Piece
+from logic.position import Position
 from view.view import View
 
 
@@ -8,6 +11,47 @@ class Controller:
         self._view = view
 
         self._view.set_controller(self)
+        self._reset_selection()
+
+        self._selected_piece: Piece = None
+        self._legal_moves: list[Move] = []
+
+    def _reset_selection(self):
+        self._selected_piece = None
+        self._legal_moves = []
+        self._view.update_board(self._board, self._selected_piece, self._legal_moves)
+
+
+    def _show_legal_moves(self, pos: Position):
+        piece = self._board.piece_at(pos.x, pos.y)
+
+        if piece:
+            if piece.colour != self._board._turn:
+                return
+            self._selected_piece = piece
+            self._legal_moves = piece.legal_moves(self._board)
+            self._view.update_board(self._board, self._selected_piece, self._legal_moves)
+        else:
+            self._reset_selection()
+
+    def _make_move(self, move: Move) -> None:
+        self._board = self._board.make_move(move)
+        self._reset_selection()
 
     def on_tile_selected(self, x: int, y: int) -> None:
-        raise NotImplementedError(f"Cannot handle tile selected event, {type(self).__name__} did not implement it")
+        pos = Position(x, y)
+        print(f"Clicked on {pos.to_algebraic()}")
+
+        piece = self._board.piece_at(x, y)
+
+        if self._selected_piece is None or (piece is not None and piece != self._selected_piece):
+            self._show_legal_moves(pos)
+        else:
+            legal_moves_positions = [move for move in self._legal_moves if move.pos == pos]
+            assert len(legal_moves_positions) <= 1, f"Apparently we can make multiple moves towards {pos.to_algebraic()} with {type(self._selected_piece)}, which doesn't make sense..."
+
+            if len(legal_moves_positions) == 0: # click on a square outside of the possible moves
+                self._reset_selection()
+            else:
+                move = legal_moves_positions[0]
+                self._make_move(move)

src/controller/gui_controller.py

@@ -1,20 +0,0 @@
-from logic.board import Board
-from view.view import View
-from .controller import Controller
-
-
-class GuiController(Controller):
-    def __init__(self, board: Board, view: View) -> None:
-        super().__init__(board, view)
-        self._view.update_board(self._board, None, [])
-
-    def on_tile_selected(self, x: int, y: int) -> None:
-        piece = self._board.piece_at(x, y)
-        print(f"Clicked on {x, y}, {piece = }")
-
-        if piece:
-            self._view.update_board(self._board, piece, piece.legal_moves(self._board))
-        else:
-            self._view.update_board(self._board, None, [])
-
-

src/logic/board.py

@@ -1,3 +1,4 @@
+from logic.move import Move
 from logic.pieces.bishop import Bishop
 from logic.pieces.king import King
 from logic.pieces.knight import Knight
@@ -111,3 +112,32 @@ class Board:
         if white_piece != None:
             return white_piece
         return black_piece
+
+    def make_move(self, move: Move) -> "Board":
+        dest_piece = self.piece_at(move.pos.x, move.pos.y) 
+
+        if dest_piece:
+            assert dest_piece.colour != move.piece.colour, "A piece cannot cannot eat another piece of the same colour"
+
+        ret = Board()
+        ret._white = self._white.copy()
+        ret._black = self._black.copy()
+        ret._turn = Colour.WHITE if self._turn == Colour.BLACK else Colour.BLACK
+        ret._white_castling_write = self._white_castling_write.copy()
+        ret._black_castling_write = self._black_castling_write.copy()
+        ret._en_passant_target = self._en_passant_target
+
+        piece = move.piece
+
+        if piece.colour == Colour.WHITE:
+            del ret._white[piece.pos]
+            ret._white[move.pos] = piece.move_to(move.pos)
+            if move.pos in ret._black:
+                del ret._black[move.pos]
+        else:
+            del ret._black[piece.pos]
+            ret._black[move.pos] = piece.move_to(move.pos)
+            if move.pos in ret._white:
+                del ret._white[move.pos]
+
+        return ret

src/logic/pieces/pawn.py

@@ -37,6 +37,4 @@ class Pawn(Piece):
                 pos = Position(self.pos.x, self.pos.y - dy)
                 ret.append(PieceMove(self, pos))
 
-
-        print(ret)
         return ret

src/logic/pieces/piece.py

@@ -43,5 +43,9 @@ class Piece:
     def position(self) -> Position:
         return self.pos
 
+    def move_to(self, pos: Position) -> "Piece":
+        ret = type(self)(pos, self.colour)
+        return ret
+
     def legal_moves(self, board: "Board") -> list["Move"]:
         raise NotImplementedError(f"Can't say what the legal moves are for {type(self).__name__}, the method hasn't been implemented yet")

src/logic/position.py

@@ -1,4 +1,7 @@
 class Position:
+    _RANKS = range(1, 9)
+    _FILES = "abcdefgh"
+
     _MIN_POS = 0
     _MAX_POS = 7
 
@@ -14,6 +17,8 @@ class Position:
         return x >= Position._MIN_POS and x <= Position._MAX_POS \
             and y >= Position._MIN_POS and y <= Position._MAX_POS
 
+    def to_algebraic(self) -> str:
+        return f"{Position._FILES[self.x]}{Position._RANKS[self.y]}"
 
     def __eq__(self, value: object, /) -> bool:
         if type(value) != type(self):

src/main.py

@@ -1,4 +1,4 @@
-from controller.gui_controller import GuiController
+from controller.controller import Controller
 from logic.board import Board
 from view.gui import GUI
 from view.tui import TUI
@@ -9,6 +9,6 @@ if __name__ == "__main__":
 
     view = GUI()
 
-    controller = GuiController(board, view)
+    controller = Controller(board, view)
 
     view.show()

src/view/gui.py

@@ -1,8 +1,17 @@
 import tkinter as tk
+from typing import Type
+from PIL import ImageTk, Image
+import os
 
 from logic.board import Board
 from logic.move import Move
+from logic.pieces.bishop import Bishop
+from logic.pieces.king import King
+from logic.pieces.knight import Knight
+from logic.pieces.pawn import Pawn
 from logic.pieces.piece import Colour, Piece
+from logic.pieces.queen import Queen
+from logic.pieces.rook import Rook
 from logic.position import Position
 from view.view import View
 
@@ -21,26 +30,55 @@ class GUI(View):
 
         self.canvas.bind("<Button-1>", self._on_canvas_click)
 
+        self._piece_images = self._load_piece_images("res/")
+
+    def _piece_svg(self, root: str, piece: Type[Piece], colour: Colour) -> ImageTk.PhotoImage:
+        piece_name = piece.__name__.lower()
+
+        path = os.path.join(root, f"{"white" if colour == Colour.WHITE else "black"}-{piece_name}.png")
+        img = Image.open(path)
+        size = int(self.tile_size * .85)
+        # img = img.resize((size, size))
+
+        if img.mode == "LA":
+            img = img.convert(mode="RGBA")
+            img.save(path)
+
+        return ImageTk.PhotoImage(img)
+
+    def _load_piece_images(self, root: str) -> dict[Type[Piece], dict[Colour, ImageTk.PhotoImage]]:
+        ret = {}
+        for piece in [Pawn, Rook, Knight, Bishop, Queen, King]:
+            if piece not in ret:
+                ret[piece] = {}
+            ret[piece][Colour.WHITE] = self._piece_svg(root, piece, Colour.WHITE)
+            ret[piece][Colour.BLACK] = self._piece_svg(root, piece, Colour.BLACK)
+
+        return ret
+
     def _on_canvas_click(self, event):
         x, y = event.x // self.tile_size, event.y // self.tile_size
         y = 7 - y
 
         self._controller.on_tile_selected(x, y)
 
+
     def update_board(self, board: Board, selected_piece: Piece, legal_moves: list[Move]) -> None:
         self.canvas.delete("all")
         self._draw_chess_board(board, selected_piece, legal_moves)
 
-    def _draw_chess_board(self, board, selected_piece = None, legal_moves = []):
-        colours = ["#F0D9B5", "#B58863"]  # Light and dark squares
+
+    def _draw_chess_board(self, board: Board, selected_piece = None, legal_moves = []):
+        colours = ["#EDD6B0", "#B88762"]  # Light and dark squares
+        alt_colours = ["#F6EB72", "#DCC34B"]  # Light and dark squares, when selected
+        circle_colours = ["#CCB897", "#9E7454"] # circles to show legal moves
 
         for y in range(8):
             for x in range(8):
                 colour = colours[(x + y) % 2]
-                if selected_piece is not None:
-                    possible_positions = [move.pos for move in legal_moves] 
-                    if Position(x, 7-y) in possible_positions:
-                        colour = "#ADD8E6"  # Highlight legal moves
+                pos = Position(x, 7-y)
+                if selected_piece is not None and pos == selected_piece.pos:
+                    colour = alt_colours[(x + y) % 2]
 
                 self.canvas.create_rectangle(
                     x * self.tile_size, 
@@ -51,16 +89,29 @@ class GUI(View):
                     outline=colour,
                 )
 
+                if selected_piece is not None:
+                    possible_positions = [move.pos for move in legal_moves] 
+                    if pos in possible_positions:
+                        radius = .15 * self.tile_size
+                        colour = circle_colours[(x + y) % 2]
+                        self.canvas.create_oval(
+                            (x + .5) * self.tile_size - radius,
+                            (y + .5) * self.tile_size - radius,
+                            (x + .5) * self.tile_size + radius,
+                            (y + .5) * self.tile_size + radius,
+                            fill=colour,
+                            outline=colour,
+                        )
+
+
                 piece = board.piece_at(x, 7-y)
 
                 if piece:
-                    text_colour = "white" if piece.colour == Colour.WHITE else "black"
-                    self.canvas.create_text(
+                    self.canvas.create_image(
                         (x + 0.5) * self.tile_size, 
-                        (y + 0.5) * self.tile_size, 
-                        text=piece.__class__.__name__[0], 
-                        fill=text_colour, 
-                        font=("Arial", 32, "bold")
+                        (y + 0.9) * self.tile_size, 
+                        image=self._piece_images[type(piece)][piece.colour],
+                        anchor=tk.S,
                     )
 
                 # Cell annotations
@@ -68,19 +119,19 @@ class GUI(View):
 
                 if x == 0: # numbers in the top left of the first column
                     self.canvas.create_text(
-                        (x + 0.15) * self.tile_size, 
-                        (y + 0.15) * self.tile_size, 
+                        (x + .15) * self.tile_size, 
+                        (y + .15) * self.tile_size, 
                         text=8-y, 
                         fill=text_colour, 
-                        font=("Arial", 10, "bold")
+                        font=("Arial", 12, "bold")
                     )
                 if y == 7: # numbers in the top left of the first column
                     self.canvas.create_text(
-                        (x + 0.85) * self.tile_size, 
-                        (y + 0.85) * self.tile_size, 
+                        (x + .85) * self.tile_size, 
+                        (y + .85) * self.tile_size, 
                         text="abcdefgh"[x], 
                         fill=text_colour, 
-                        font=("Arial", 10, "bold")
+                        font=("Arial", 12, "bold")
                     )
 
     def show(self) -> None: