We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -11,7 +11,7 @@ |
||
| 11 | 11 | |
| 12 | 12 | $db = new $var['HistoryDatabase'](); |
| 13 | 13 | $db->query('SELECT start_date, type, end_date, game_name, speed, game_id ' . |
| 14 | - 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 14 | + 'FROM game WHERE game_id = ' . $db->escapeNumber($game_id)); |
|
| 15 | 15 | $db->requireRecord(); |
| 16 | 16 | $template->assign('GameName', $game_name); |
| 17 | 17 | $template->assign('Start', date(DATE_DATE_SHORT, $db->getInt('start_date'))); |
@@ -201,29 +201,29 @@ discard block |
||
| 201 | 201 | |
| 202 | 202 | public function getFENString() { |
| 203 | 203 | $fen = ''; |
| 204 | - $board =& $this->getBoard(); |
|
| 204 | + $board = & $this->getBoard(); |
|
| 205 | 205 | $blanks = 0; |
| 206 | - for($y=0; $y < 8; $y++) { |
|
| 207 | - if($y > 0) { |
|
| 206 | + for ($y = 0; $y < 8; $y++) { |
|
| 207 | + if ($y > 0) { |
|
| 208 | 208 | $fen .= '/'; |
| 209 | 209 | } |
| 210 | - for($x=0; $x < 8; $x++) { |
|
| 211 | - if($board[$y][$x] == null) { |
|
| 210 | + for ($x = 0; $x < 8; $x++) { |
|
| 211 | + if ($board[$y][$x] == null) { |
|
| 212 | 212 | $blanks++; |
| 213 | 213 | } else { |
| 214 | - if($blanks > 0) { |
|
| 214 | + if ($blanks > 0) { |
|
| 215 | 215 | $fen .= $blanks; |
| 216 | 216 | $blanks = 0; |
| 217 | 217 | } |
| 218 | 218 | $fen .= $board[$y][$x]->getPieceLetter(); |
| 219 | 219 | } |
| 220 | 220 | } |
| 221 | - if($blanks > 0) { |
|
| 221 | + if ($blanks > 0) { |
|
| 222 | 222 | $fen .= $blanks; |
| 223 | 223 | $blanks = 0; |
| 224 | 224 | } |
| 225 | 225 | } |
| 226 | - switch($this->getCurrentTurnColour()) { |
|
| 226 | + switch ($this->getCurrentTurnColour()) { |
|
| 227 | 227 | case self::PLAYER_WHITE: |
| 228 | 228 | $fen .= ' w '; |
| 229 | 229 | break; |
@@ -449,72 +449,72 @@ discard block |
||
| 449 | 449 | } |
| 450 | 450 | |
| 451 | 451 | public static function movePiece(array &$board, array &$hasMoved, $x, $y, $toX, $toY, $pawnPromotionPiece = ChessPiece::QUEEN) { |
| 452 | - if(!self::isValidCoord($x, $y, $board)) { |
|
| 452 | + if (!self::isValidCoord($x, $y, $board)) { |
|
| 453 | 453 | throw new Exception('Invalid from coordinates, x=' . $x . ', y=' . $y); |
| 454 | 454 | } |
| 455 | - if(!self::isValidCoord($toX, $toY, $board)) { |
|
| 455 | + if (!self::isValidCoord($toX, $toY, $board)) { |
|
| 456 | 456 | throw new Exception('Invalid to coordinates, x=' . $toX . ', y=' . $toY); |
| 457 | 457 | } |
| 458 | 458 | $pieceTaken = $board[$toY][$toX]; |
| 459 | 459 | $board[$toY][$toX] = $board[$y][$x]; |
| 460 | - $p =& $board[$toY][$toX]; |
|
| 460 | + $p = & $board[$toY][$toX]; |
|
| 461 | 461 | $board[$y][$x] = null; |
| 462 | - if($p == null) { |
|
| 462 | + if ($p == null) { |
|
| 463 | 463 | throw new Exception('Trying to move non-existent piece: ' . var_export($board, true)); |
| 464 | 464 | } |
| 465 | 465 | $p->setX($toX); |
| 466 | 466 | $p->setY($toY); |
| 467 | 467 | |
| 468 | 468 | $oldPawnMovement = $hasMoved[ChessPiece::PAWN]; |
| 469 | - $nextPawnMovement = array(-1,-1); |
|
| 469 | + $nextPawnMovement = array(-1, -1); |
|
| 470 | 470 | $castling = false; |
| 471 | 471 | $enPassant = false; |
| 472 | 472 | $rookMoved = false; |
| 473 | 473 | $rookTaken = false; |
| 474 | 474 | $pawnPromotion = false; |
| 475 | - if($p->pieceID == ChessPiece::KING) { |
|
| 475 | + if ($p->pieceID == ChessPiece::KING) { |
|
| 476 | 476 | //Castling? |
| 477 | 477 | $castling = self::isCastling($x, $toX); |
| 478 | - if($castling !== false) { |
|
| 478 | + if ($castling !== false) { |
|
| 479 | 479 | $hasMoved[$p->colour][ChessPiece::KING] = true; |
| 480 | 480 | $hasMoved[$p->colour][ChessPiece::ROOK][$castling['Type']] = true; |
| 481 | - if($board[$y][$castling['X']] == null) { |
|
| 481 | + if ($board[$y][$castling['X']] == null) { |
|
| 482 | 482 | throw new Exception('Cannot castle with non-existent castle.'); |
| 483 | 483 | } |
| 484 | 484 | $board[$toY][$castling['ToX']] = $board[$y][$castling['X']]; |
| 485 | 485 | $board[$toY][$castling['ToX']]->setX($castling['ToX']); |
| 486 | 486 | $board[$y][$castling['X']] = null; |
| 487 | 487 | } |
| 488 | - } elseif($p->pieceID == ChessPiece::PAWN) { |
|
| 489 | - if($toY == 0 || $toY == 7) { |
|
| 488 | + } elseif ($p->pieceID == ChessPiece::PAWN) { |
|
| 489 | + if ($toY == 0 || $toY == 7) { |
|
| 490 | 490 | $pawnPromotion = $p->promote($pawnPromotionPiece, $board); |
| 491 | 491 | } |
| 492 | 492 | //Double move to track? |
| 493 | - elseif(($y == 1 || $y == 6) && ($toY == 3 || $toY == 4)) { |
|
| 493 | + elseif (($y == 1 || $y == 6) && ($toY == 3 || $toY == 4)) { |
|
| 494 | 494 | $nextPawnMovement = array($toX, $toY); |
| 495 | 495 | } |
| 496 | 496 | //En passant? |
| 497 | - elseif($hasMoved[ChessPiece::PAWN][0] == $toX && |
|
| 497 | + elseif ($hasMoved[ChessPiece::PAWN][0] == $toX && |
|
| 498 | 498 | ($hasMoved[ChessPiece::PAWN][1] == 3 && $toY == 2 || $hasMoved[ChessPiece::PAWN][1] == 4 && $toY == 5)) { |
| 499 | 499 | $enPassant = true; |
| 500 | 500 | $pieceTaken = $board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]]; |
| 501 | - if($board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] == null) { |
|
| 501 | + if ($board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] == null) { |
|
| 502 | 502 | throw new Exception('Cannot en passant a non-existent pawn.'); |
| 503 | 503 | } |
| 504 | 504 | $board[$hasMoved[ChessPiece::PAWN][1]][$hasMoved[ChessPiece::PAWN][0]] = null; |
| 505 | 505 | } |
| 506 | - } elseif($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) { |
|
| 506 | + } elseif ($p->pieceID == ChessPiece::ROOK && ($x == 0 || $x == 7) && $y == ($p->colour == self::PLAYER_WHITE ? 7 : 0)) { |
|
| 507 | 507 | //Rook moved? |
| 508 | - if($hasMoved[$p->colour][ChessPiece::ROOK][$x==0?'Queen':'King'] === false) { |
|
| 508 | + if ($hasMoved[$p->colour][ChessPiece::ROOK][$x == 0 ? 'Queen' : 'King'] === false) { |
|
| 509 | 509 | // We set rook moved in here as it's used for move info. |
| 510 | - $rookMoved = $x==0?'Queen':'King'; |
|
| 510 | + $rookMoved = $x == 0 ? 'Queen' : 'King'; |
|
| 511 | 511 | $hasMoved[$p->colour][ChessPiece::ROOK][$rookMoved] = true; |
| 512 | 512 | } |
| 513 | 513 | } |
| 514 | 514 | // Check if we've taken a rook and marked them as moved, if they've already moved this does nothing, but if they were taken before moving this stops an issue with trying to castle with a non-existent castle. |
| 515 | - if($pieceTaken != null && $pieceTaken->pieceID == ChessPiece::ROOK && ($toX == 0 || $toX == 7) && $toY == ($pieceTaken->colour == self::PLAYER_WHITE ? 7 : 0)) { |
|
| 516 | - if($hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$toX==0?'Queen':'King'] === false) { |
|
| 517 | - $rookTaken = $toX==0?'Queen':'King'; |
|
| 515 | + if ($pieceTaken != null && $pieceTaken->pieceID == ChessPiece::ROOK && ($toX == 0 || $toX == 7) && $toY == ($pieceTaken->colour == self::PLAYER_WHITE ? 7 : 0)) { |
|
| 516 | + if ($hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$toX == 0 ? 'Queen' : 'King'] === false) { |
|
| 517 | + $rookTaken = $toX == 0 ? 'Queen' : 'King'; |
|
| 518 | 518 | $hasMoved[$pieceTaken->colour][ChessPiece::ROOK][$rookTaken] = true; |
| 519 | 519 | } |
| 520 | 520 | } |
@@ -531,18 +531,18 @@ discard block |
||
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | public static function undoMovePiece(array &$board, array &$hasMoved, $x, $y, $toX, $toY, $moveInfo) { |
| 534 | - if(!self::isValidCoord($x, $y, $board)) { |
|
| 534 | + if (!self::isValidCoord($x, $y, $board)) { |
|
| 535 | 535 | throw new Exception('Invalid from coordinates, x=' . $x . ', y=' . $y); |
| 536 | 536 | } |
| 537 | - if(!self::isValidCoord($toX, $toY, $board)) { |
|
| 537 | + if (!self::isValidCoord($toX, $toY, $board)) { |
|
| 538 | 538 | throw new Exception('Invalid to coordinates, x=' . $toX . ', y=' . $toY); |
| 539 | 539 | } |
| 540 | - if($board[$y][$x] != null) { |
|
| 540 | + if ($board[$y][$x] != null) { |
|
| 541 | 541 | throw new Exception('Undoing move onto another piece? x=' . $x . ', y=' . $y); |
| 542 | 542 | } |
| 543 | 543 | $board[$y][$x] = $board[$toY][$toX]; |
| 544 | - $p =& $board[$y][$x]; |
|
| 545 | - if($p == null) { |
|
| 544 | + $p = & $board[$y][$x]; |
|
| 545 | + if ($p == null) { |
|
| 546 | 546 | throw new Exception('Trying to undo move of a non-existent piece: ' . var_export($board, true)); |
| 547 | 547 | } |
| 548 | 548 | $board[$toY][$toX] = $moveInfo['PieceTaken']; |
@@ -591,41 +591,41 @@ discard block |
||
| 591 | 591 | $toX = ord($move[2]) - $aVal; |
| 592 | 592 | $toY = 8 - $move[3]; |
| 593 | 593 | $pawnPromotionPiece = null; |
| 594 | - if(isset($move[4])) { |
|
| 594 | + if (isset($move[4])) { |
|
| 595 | 595 | $pawnPromotionPiece = ChessPiece::getPieceForLetter($move[4]); |
| 596 | 596 | } |
| 597 | 597 | return $this->tryMove($x, $y, $toX, $toY, $this->getCurrentTurnAccountID(), $pawnPromotionPiece); |
| 598 | 598 | } |
| 599 | 599 | |
| 600 | 600 | public function tryMove($x, $y, $toX, $toY, $forAccountID, $pawnPromotionPiece) { |
| 601 | - if($this->hasEnded()) { |
|
| 601 | + if ($this->hasEnded()) { |
|
| 602 | 602 | return 5; |
| 603 | 603 | } |
| 604 | - if($this->getCurrentTurnAccountID() != $forAccountID) { |
|
| 604 | + if ($this->getCurrentTurnAccountID() != $forAccountID) { |
|
| 605 | 605 | return 4; |
| 606 | 606 | } |
| 607 | 607 | $lastTurnPlayer = $this->getCurrentTurnPlayer(); |
| 608 | 608 | $this->getBoard(); |
| 609 | 609 | $p = $this->board[$y][$x]; |
| 610 | - if($p == null || $p->colour != $this->getColourForAccountID($forAccountID)) { |
|
| 610 | + if ($p == null || $p->colour != $this->getColourForAccountID($forAccountID)) { |
|
| 611 | 611 | return 2; |
| 612 | 612 | } |
| 613 | 613 | |
| 614 | 614 | $moves = $p->getPossibleMoves($this->board, $this->getHasMoved(), $forAccountID); |
| 615 | - foreach($moves as $move) { |
|
| 616 | - if($move[0]==$toX && $move[1]==$toY) { |
|
| 615 | + foreach ($moves as $move) { |
|
| 616 | + if ($move[0] == $toX && $move[1] == $toY) { |
|
| 617 | 617 | $chessType = $this->isNPCGame() ? 'Chess (NPC)' : 'Chess'; |
| 618 | 618 | $currentPlayer = $this->getCurrentTurnPlayer(); |
| 619 | 619 | |
| 620 | 620 | $moveInfo = ChessGame::movePiece($this->board, $this->getHasMoved(), $x, $y, $toX, $toY, $pawnPromotionPiece); |
| 621 | 621 | |
| 622 | 622 | //We have taken the move, we should refresh $p |
| 623 | - $p =& $this->board[$toY][$toX]; |
|
| 623 | + $p = & $this->board[$toY][$toX]; |
|
| 624 | 624 | |
| 625 | 625 | $pieceTakenID = null; |
| 626 | - if($moveInfo['PieceTaken'] != null) { |
|
| 626 | + if ($moveInfo['PieceTaken'] != null) { |
|
| 627 | 627 | $pieceTakenID = $moveInfo['PieceTaken']->pieceID; |
| 628 | - if($moveInfo['PieceTaken']->pieceID == ChessPiece::KING) { |
|
| 628 | + if ($moveInfo['PieceTaken']->pieceID == ChessPiece::KING) { |
|
| 629 | 629 | throw new Exception('King was taken.'); |
| 630 | 630 | } |
| 631 | 631 | } |
@@ -633,36 +633,36 @@ discard block |
||
| 633 | 633 | $pieceID = $p->pieceID; |
| 634 | 634 | $pieceNo = $p->pieceNo; |
| 635 | 635 | $promotionPieceID = null; |
| 636 | - if($moveInfo['PawnPromotion'] !== false) { |
|
| 636 | + if ($moveInfo['PawnPromotion'] !== false) { |
|
| 637 | 637 | $p->pieceID = $moveInfo['PawnPromotion']['PieceID']; |
| 638 | 638 | $p->pieceNo = $moveInfo['PawnPromotion']['PieceNo']; |
| 639 | 639 | $promotionPieceID = $p->pieceID; |
| 640 | 640 | } |
| 641 | 641 | |
| 642 | 642 | $checking = null; |
| 643 | - if($p->isAttacking($this->board, $this->getHasMoved(), true)) { |
|
| 643 | + if ($p->isAttacking($this->board, $this->getHasMoved(), true)) { |
|
| 644 | 644 | $checking = 'CHECK'; |
| 645 | 645 | } |
| 646 | - if($this->isCheckmated(self::getOtherColour($p->colour))) { |
|
| 646 | + if ($this->isCheckmated(self::getOtherColour($p->colour))) { |
|
| 647 | 647 | $checking = 'MATE'; |
| 648 | 648 | } |
| 649 | 649 | |
| 650 | 650 | $castlingType = $moveInfo['Castling'] === false ? null : $moveInfo['Castling']['Type']; |
| 651 | 651 | |
| 652 | - if($this->moves!=null) { |
|
| 652 | + if ($this->moves != null) { |
|
| 653 | 653 | $this->moves[] = $this->createMove($pieceID, $x, $y, $toX, $toY, $pieceTakenID, $checking, $this->getCurrentTurnColour(), $castlingType, $moveInfo['EnPassant'], $promotionPieceID); |
| 654 | 654 | } |
| 655 | - if(self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) { |
|
| 655 | + if (self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) { |
|
| 656 | 656 | return 3; |
| 657 | 657 | } |
| 658 | 658 | |
| 659 | 659 | $otherPlayer = $this->getCurrentTurnPlayer(); |
| 660 | - if($moveInfo['PawnPromotion'] !== false) { |
|
| 660 | + if ($moveInfo['PawnPromotion'] !== false) { |
|
| 661 | 661 | $piecePromotedSymbol = $p->getPieceSymbol(); |
| 662 | - $currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted','Total'), HOF_PUBLIC); |
|
| 663 | - $otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted','Total'), HOF_PUBLIC); |
|
| 664 | - $currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC); |
|
| 665 | - $otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC); |
|
| 662 | + $currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', 'Total'), HOF_PUBLIC); |
|
| 663 | + $otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', 'Total'), HOF_PUBLIC); |
|
| 664 | + $currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC); |
|
| 665 | + $otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC); |
|
| 666 | 666 | } |
| 667 | 667 | |
| 668 | 668 | $this->db->query('INSERT INTO chess_game_moves |