Merge pull request #180 from Ido-Barnea/131-create-a-shield-item

Created shield item

Author: Ido-Barnea

development/code/Game.ts

@@ -10,7 +10,7 @@ import { Piece } from './logic/pieces/Piece';
 import { Queen } from './logic/pieces/Queen';
 import { Rook } from './logic/pieces/Rook';
 import { RulesManager } from './logic/rules/RulesManager';
-import { showWinningAlert } from './ui/Screen';
+import { showWinningAlert as showGameEndAlert } from './ui/Screen';
 
 let rulesManager: RulesManager;
 const whitePlayer = new Player(PlayerColors.WHITE);
@@ -59,7 +59,7 @@ let isCastling = false;
 let isFriendlyFire = false;
 let isPieceKilled = false;
 let fellOffTheBoardPiece: Piece | undefined;
-let winner: Player | undefined = undefined;
+let isGameFinished = false;
 
 function initializeGame() {
   rulesManager = new RulesManager();
@@ -86,8 +86,10 @@ function endTurn() {
   // To make sure the element is removed before displaying the winning alert, we need to add
   // a small delay before displaying the alert.
   setTimeout(() => {  
-    if (winner !== undefined) {
-      showWinningAlert(winner.color);
+    if (isGameFinished) {
+      const livingKingPlayer = pieces.filter(piece => piece instanceof King)[0].player;
+
+      showGameEndAlert(livingKingPlayer.color);
       window.location.reload();
     }
   }, 10);
@@ -192,12 +194,13 @@ function setFellOffTheBoardPiece(_fellOffTheBoardPiece: Piece | undefined) {
   fellOffTheBoardPiece = _fellOffTheBoardPiece;
 }
 
-function setWinner(_winner: Player) {
-  winner = _winner;
+function endGame() {
+  isGameFinished = true;
 }
 
 export const game = {
   initialize: initializeGame,
+  end: endGame,
   endTurn,
   getCurrentPlayer,
   switchIsCastling,
@@ -217,5 +220,4 @@ export const game = {
   setIsPieceKilled,
   getFellOffTheBoardPiece,
   setFellOffTheBoardPiece,
-  setWinner,
 };

development/code/LogicAdapter.ts

@@ -1,6 +1,6 @@
 import { game } from './Game';
 import { isPlayerAllowedToAct, onPieceFellOffTheBoard, onPlayerAction } from './logic/PieceLogic';
-import { Player, PlayerColors } from './logic/Players';
+import { PlayerColors } from './logic/Players';
 import { comparePositions, convertSquareIdToPosition } from './logic/Utilities';
 import { Item } from './logic/items/Items';
 import { Piece } from './logic/pieces/Piece';
@@ -131,16 +131,16 @@ export function onPieceSelected(
 
 export function movePieceOnBoard(
   draggedPiece: Piece,
-  targetSquare: Square,
+  targetPosition: Position,
 ) {
   const draggedPieceCoordinates = draggedPiece.position.coordinates;
   const originSquareId = draggedPieceCoordinates.join(',');
 
   const boardId = draggedPiece.position.boardId;
-  const targetSquareId = targetSquare.position.coordinates.join(',');
+  const targetSquareId = targetPosition.coordinates.join(',');
 
   // Ensure square is not highlighted if piece did not move
-  if (!comparePositions(draggedPiece.position, targetSquare.position)) {
+  if (!comparePositions(draggedPiece.position, targetPosition)) {
     const originSquareElement = getSquareElementById(originSquareId, boardId) as HTMLElement;
     const targetSquareElement = getSquareElementById(targetSquareId, boardId) as HTMLElement;
     highlightLastMove(originSquareElement, targetSquareElement, boardId);
@@ -196,6 +196,6 @@ export function changePieceToAnotherPlayer(piece: Piece) {
   piece.player = game.getPlayers().filter(_player => _player !== piece.player)[0];
 }
 
-export function winGame(winnerPlayer: Player){
-  game.setWinner(winnerPlayer);
+export function endGame(){
+  game.end();
 }

development/code/logic/Constants.ts

@@ -22,3 +22,5 @@ export const SELECTED_PIECE_CLASS = 'selected-piece';
 export const NOTATIONS_LETTERS = ['a', 'b', 'c', 'd', 'e', 'f', 'g', 'h'];
 export const NOTATIONS_NUMBERS = ['8', '7', '6', '5', '4', '3', '2', '1'];
 export const BOARD_WIDTH = 8;
+
+export const MIN_KILLINGS_FOR_BOUNTY = 3;