We could not synchronize checks via GitHub's checks API since Scrutinizer's GitHub App is not installed for this repository.
@@ -17,7 +17,7 @@ discard block |
||
| 17 | 17 | $this->cargo_left = $this->getCargoHolds(); |
| 18 | 18 | } |
| 19 | 19 | protected function doFullUNO() { |
| 20 | - foreach($this->getMaxHardware() as $hardwareTypeID => $max) { |
|
| 20 | + foreach ($this->getMaxHardware() as $hardwareTypeID => $max) { |
|
| 21 | 21 | $this->hardware[$hardwareTypeID] = $max; |
| 22 | 22 | $this->oldHardware[$hardwareTypeID] = $max; |
| 23 | 23 | } |
@@ -47,8 +47,8 @@ discard block |
||
| 47 | 47 | } |
| 48 | 48 | |
| 49 | 49 | public function getIllusionShip() { |
| 50 | - if(!isset($this->illusionShip)) { |
|
| 51 | - $this->illusionShip=false; |
|
| 50 | + if (!isset($this->illusionShip)) { |
|
| 51 | + $this->illusionShip = false; |
|
| 52 | 52 | } |
| 53 | 53 | return $this->illusionShip; |
| 54 | 54 | } |
@@ -58,20 +58,20 @@ discard block |
||
| 58 | 58 | $db = new SmrMySqlDatabase(); |
| 59 | 59 | $db->query('REPLACE INTO cached_dummys ' . |
| 60 | 60 | '(type, id, info) ' . |
| 61 | - 'VALUES (\'DummyShip\', '.$db->escapeString($this->getPlayer()->getPlayerName()).', '.$db->escapeString($cache).')'); |
|
| 61 | + 'VALUES (\'DummyShip\', ' . $db->escapeString($this->getPlayer()->getPlayerName()) . ', ' . $db->escapeString($cache) . ')'); |
|
| 62 | 62 | unserialize($cache); |
| 63 | 63 | } |
| 64 | 64 | |
| 65 | 65 | public static function getCachedDummyShip(AbstractSmrPlayer $player) { |
| 66 | - if(!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) { |
|
| 66 | + if (!isset(self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()])) { |
|
| 67 | 67 | $db = new SmrMySqlDatabase(); |
| 68 | 68 | $db->query('SELECT info FROM cached_dummys |
| 69 | 69 | WHERE type = \'DummyShip\' |
| 70 | 70 | AND id = ' . $db->escapeString($player->getPlayerName()) . ' LIMIT 1'); |
| 71 | - if($db->nextRecord()) { |
|
| 71 | + if ($db->nextRecord()) { |
|
| 72 | 72 | $return = unserialize($db->getField('info')); |
| 73 | 73 | $return->regenerate($player); |
| 74 | - self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] =& $return; |
|
| 74 | + self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = & $return; |
|
| 75 | 75 | } else { |
| 76 | 76 | self::$CACHED_DUMMY_SHIPS[$player->getPlayerName()] = new DummyShip($player); |
| 77 | 77 | } |
@@ -84,7 +84,7 @@ discard block |
||
| 84 | 84 | $db->query('SELECT id FROM cached_dummys |
| 85 | 85 | WHERE type = \'DummyShip\''); |
| 86 | 86 | $dummyNames = array(); |
| 87 | - while($db->nextRecord()) { |
|
| 87 | + while ($db->nextRecord()) { |
|
| 88 | 88 | $dummyNames[] = $db->getField('id'); |
| 89 | 89 | } |
| 90 | 90 | return $dummyNames; |
@@ -93,7 +93,7 @@ discard block |
||
| 93 | 93 | |
| 94 | 94 | |
| 95 | 95 | public function __sleep() { |
| 96 | - return array('gameID','weapons'); |
|
| 96 | + return array('gameID', 'weapons'); |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | public function __wakeup() { |
@@ -10,22 +10,22 @@ discard block |
||
| 10 | 10 | |
| 11 | 11 | debug('Script started'); |
| 12 | 12 | define('SCRIPT_ID', $db->getInsertID()); |
| 13 | - $db->query('UPDATE npc_logs SET script_id='.SCRIPT_ID.' WHERE log_id='.SCRIPT_ID); |
|
| 13 | + $db->query('UPDATE npc_logs SET script_id=' . SCRIPT_ID . ' WHERE log_id=' . SCRIPT_ID); |
|
| 14 | 14 | |
| 15 | 15 | define('NPC_SCRIPT', true); |
| 16 | 16 | |
| 17 | 17 | $descriptorSpec = array( |
| 18 | - 0 => array("pipe", "r"), // stdin is a pipe that the child will read from |
|
| 18 | + 0 => array("pipe", "r"), // stdin is a pipe that the child will read from |
|
| 19 | 19 | 1 => array("pipe", "w") // stdout is a pipe that the child will write to |
| 20 | 20 | ); |
| 21 | 21 | $engine = proc_open(UCI_CHESS_ENGINE, $descriptorSpec, $pipes); |
| 22 | - $toEngine =& $pipes[0]; |
|
| 23 | - $fromEngine =& $pipes[1]; |
|
| 22 | + $toEngine = & $pipes[0]; |
|
| 23 | + $fromEngine = & $pipes[1]; |
|
| 24 | 24 | |
| 25 | 25 | function readFromEngine($block = true) { |
| 26 | 26 | global $fromEngine; |
| 27 | 27 | stream_set_blocking($fromEngine, $block == true ? 1 : 0); |
| 28 | - while(($s = fgets($fromEngine)) !== false) { |
|
| 28 | + while (($s = fgets($fromEngine)) !== false) { |
|
| 29 | 29 | debug('<-- ' . trim($s)); |
| 30 | 30 | stream_set_blocking($fromEngine, 0); |
| 31 | 31 | } |
@@ -34,7 +34,7 @@ discard block |
||
| 34 | 34 | global $toEngine; |
| 35 | 35 | debug('--> ' . $s); |
| 36 | 36 | fputs($toEngine, $s . EOL); |
| 37 | - if($read === true) { |
|
| 37 | + if ($read === true) { |
|
| 38 | 38 | readFromEngine($block); |
| 39 | 39 | } |
| 40 | 40 | } |
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | writeToEngine('isready'); |
| 46 | 46 | writeToEngine('ucinewgame', false); |
| 47 | 47 | |
| 48 | - while(true) { |
|
| 48 | + while (true) { |
|
| 49 | 49 | //Redefine MICRO_TIME and TIME, the rest of the game expects them to be the single point in time that the script is executing, with it being redefined for each page load - unfortunately NPCs are one consistent script so we have to do a hack and redefine it (or change every instance of the TIME constant). |
| 50 | 50 | runkit_constant_redefine('MICRO_TIME', microtime(true)); |
| 51 | 51 | runkit_constant_redefine('TIME', IFloor(MICRO_TIME)); |
@@ -55,9 +55,9 @@ discard block |
||
| 55 | 55 | writeToEngine('position fen ' . $chessGame->getFENString(), false); |
| 56 | 56 | writeToEngine('go ' . ($chessGame->getCurrentTurnColour() == ChessGame::PLAYER_WHITE ? 'w' : 'b') . 'time ' . UCI_TIME_PER_MOVE_MS, true, false); |
| 57 | 57 | stream_set_blocking($fromEngine, 1); |
| 58 | - while(stripos($move = trim(fgets($fromEngine)), 'bestmove') !== 0) { |
|
| 58 | + while (stripos($move = trim(fgets($fromEngine)), 'bestmove') !== 0) { |
|
| 59 | 59 | debug('<-- ' . $move); |
| 60 | - if(stripos($move, 'Seg') === 0) { |
|
| 60 | + if (stripos($move, 'Seg') === 0) { |
|
| 61 | 61 | // Segfault |
| 62 | 62 | debug('UCI engine segfaulted?'); |
| 63 | 63 | exit; |
@@ -77,12 +77,12 @@ discard block |
||
| 77 | 77 | fclose($toEngine); |
| 78 | 78 | fclose($fromEngine); |
| 79 | 79 | proc_close($engine); |
| 80 | -} catch(Throwable $e) { |
|
| 80 | +} catch (Throwable $e) { |
|
| 81 | 81 | logException($e); |
| 82 | 82 | exit; |
| 83 | 83 | } |
| 84 | 84 | function debug($message, $debugObject = null) { |
| 85 | - global $account,$var,$db; |
|
| 86 | - echo date('Y-m-d H:i:s - ').$message.($debugObject!==null?EOL.var_export($debugObject,true):'').EOL; |
|
| 87 | - $db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES ('.(defined('SCRIPT_ID')?SCRIPT_ID:0).', '.(is_object($account)?$account->getAccountID():0).',NOW(),'.$db->escapeString($message).','.$db->escapeString(var_export($debugObject,true)).','.$db->escapeString(var_export($var,true)).')'); |
|
| 85 | + global $account, $var, $db; |
|
| 86 | + echo date('Y-m-d H:i:s - ') . $message . ($debugObject !== null ?EOL.var_export($debugObject, true) : '') . EOL; |
|
| 87 | + $db->query('INSERT INTO npc_logs (script_id, npc_id, time, message, debug_info, var) VALUES (' . (defined('SCRIPT_ID') ?SCRIPT_ID:0) . ', ' . (is_object($account) ? $account->getAccountID() : 0) . ',NOW(),' . $db->escapeString($message) . ',' . $db->escapeString(var_export($debugObject, true)) . ',' . $db->escapeString(var_export($var, true)) . ')'); |
|
| 88 | 88 | } |
@@ -32,11 +32,16 @@ |
||
| 32 | 32 | $ship->increaseHardware($hardware_id, $amount); |
| 33 | 33 | |
| 34 | 34 | //HoF |
| 35 | - if ($hardware_id == HARDWARE_COMBAT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE); |
|
| 36 | - if ($hardware_id == HARDWARE_SCOUT) $player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE); |
|
| 37 | - if ($hardware_id == HARDWARE_MINE) $player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE); |
|
| 38 | -} |
|
| 39 | -elseif ($action == 'Sell') { |
|
| 35 | + if ($hardware_id == HARDWARE_COMBAT) { |
|
| 36 | + $player->increaseHOF($amount, array('Forces', 'Bought', 'Combat Drones'), HOF_ALLIANCE); |
|
| 37 | + } |
|
| 38 | + if ($hardware_id == HARDWARE_SCOUT) { |
|
| 39 | + $player->increaseHOF($amount, array('Forces', 'Bought', 'Scout Drones'), HOF_ALLIANCE); |
|
| 40 | + } |
|
| 41 | + if ($hardware_id == HARDWARE_MINE) { |
|
| 42 | + $player->increaseHOF($amount, array('Forces', 'Bought', 'Mines'), HOF_ALLIANCE); |
|
| 43 | + } |
|
| 44 | + } elseif ($action == 'Sell') { |
|
| 40 | 45 | // We only allow selling combat drones |
| 41 | 46 | if ($hardware_id != HARDWARE_COMBAT) { |
| 42 | 47 | throw new Exception('This item cannot be sold!'); |
@@ -20,11 +20,11 @@ |
||
| 20 | 20 | $this->includeTemplate('includes/ForceFullCombatResults.inc', array('FullForceCombatResults'=>$CombatResults)); |
| 21 | 21 | } elseif ($CombatResultsType == 'PORT') { |
| 22 | 22 | $this->includeTemplate('includes/PortFullCombatResults.inc', array('FullPortCombatResults'=>$CombatResults, |
| 23 | - 'MinimalDisplay'=>false, |
|
| 24 | - 'AlreadyDestroyed'=>false)); |
|
| 23 | + 'MinimalDisplay'=>false, |
|
| 24 | + 'AlreadyDestroyed'=>false)); |
|
| 25 | 25 | } elseif ($CombatResultsType == 'PLANET') { |
| 26 | 26 | $this->includeTemplate('includes/PlanetFullCombatResults.inc', array('FullPlanetCombatResults'=>$CombatResults, |
| 27 | - 'MinimalDisplay'=>false, |
|
| 28 | - 'AlreadyDestroyed'=>false)); |
|
| 27 | + 'MinimalDisplay'=>false, |
|
| 28 | + 'AlreadyDestroyed'=>false)); |
|
| 29 | 29 | } |
| 30 | 30 | ?> |
@@ -45,8 +45,7 @@ |
||
| 45 | 45 | $template->assign('Weapons', $weapons); |
| 46 | 46 | |
| 47 | 47 | $template->display('weapon_list.php'); |
| 48 | -} |
|
| 49 | -catch (Throwable $e) { |
|
| 48 | +} catch (Throwable $e) { |
|
| 50 | 49 | handleException($e); |
| 51 | 50 | } |
| 52 | 51 | |
@@ -3,11 +3,11 @@ |
||
| 3 | 3 | // Holds information linking the received message and the game data |
| 4 | 4 | class GameLink |
| 5 | 5 | { |
| 6 | - public $valid = false; // identifies if the message is linked to game data |
|
| 7 | - public $user; // Discord user associated with the message |
|
| 8 | - public $account; // SmrAccount instance |
|
| 9 | - public $alliance; // SmrAlliance instance |
|
| 10 | - public $player; // SmrPlayer instance |
|
| 6 | + public $valid = false; // identifies if the message is linked to game data |
|
| 7 | + public $user; // Discord user associated with the message |
|
| 8 | + public $account; // SmrAccount instance |
|
| 9 | + public $alliance; // SmrAlliance instance |
|
| 10 | + public $player; // SmrPlayer instance |
|
| 11 | 11 | |
| 12 | 12 | // Takes the following arguments: |
| 13 | 13 | // channel = Discord\Parts\Channel\Channel instance |
@@ -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,73 +591,73 @@ 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 | } |
| 632 | 632 | |
| 633 | 633 | $pieceID = $p->pieceID; |
| 634 | 634 | $pieceNo = $p->pieceNo; |
| 635 | - if($moveInfo['PawnPromotion'] !== false) { |
|
| 635 | + if ($moveInfo['PawnPromotion'] !== false) { |
|
| 636 | 636 | $p->pieceID = $moveInfo['PawnPromotion']['PieceID']; |
| 637 | 637 | $p->pieceNo = $moveInfo['PawnPromotion']['PieceNo']; |
| 638 | 638 | } |
| 639 | 639 | |
| 640 | 640 | $checking = null; |
| 641 | - if($p->isAttacking($this->board, $this->getHasMoved(), true)) { |
|
| 641 | + if ($p->isAttacking($this->board, $this->getHasMoved(), true)) { |
|
| 642 | 642 | $checking = 'CHECK'; |
| 643 | 643 | } |
| 644 | - if($this->isCheckmated(self::getOtherColour($p->colour))) { |
|
| 644 | + if ($this->isCheckmated(self::getOtherColour($p->colour))) { |
|
| 645 | 645 | $checking = 'MATE'; |
| 646 | 646 | } |
| 647 | - if($this->moves!=null) { |
|
| 647 | + if ($this->moves != null) { |
|
| 648 | 648 | $this->moves[] = $this->createMove($pieceID, $x, $y, $toX, $toY, $pieceTakenID, $checking, $this->getCurrentTurnColour(), $moveInfo['Castling']['Type'], $moveInfo['EnPassant'], $moveInfo['PawnPromotion'] === false ? null : $moveInfo['PawnPromotion']['PieceID']); |
| 649 | 649 | } |
| 650 | - if(self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) { |
|
| 650 | + if (self::isPlayerChecked($this->board, $this->getHasMoved(), $p->colour)) { |
|
| 651 | 651 | return 3; |
| 652 | 652 | } |
| 653 | 653 | |
| 654 | 654 | $otherPlayer = $this->getCurrentTurnPlayer(); |
| 655 | - if($moveInfo['PawnPromotion'] !== false) { |
|
| 655 | + if ($moveInfo['PawnPromotion'] !== false) { |
|
| 656 | 656 | $piecePromotedSymbol = $p->getPieceSymbol(); |
| 657 | - $currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted','Total'), HOF_PUBLIC); |
|
| 658 | - $otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted','Total'), HOF_PUBLIC); |
|
| 659 | - $currentPlayer->increaseHOF(1, array($chessType,'Moves','Own Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC); |
|
| 660 | - $otherPlayer->increaseHOF(1, array($chessType,'Moves','Opponent Pawns Promoted',$piecePromotedSymbol), HOF_PUBLIC); |
|
| 657 | + $currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', 'Total'), HOF_PUBLIC); |
|
| 658 | + $otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', 'Total'), HOF_PUBLIC); |
|
| 659 | + $currentPlayer->increaseHOF(1, array($chessType, 'Moves', 'Own Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC); |
|
| 660 | + $otherPlayer->increaseHOF(1, array($chessType, 'Moves', 'Opponent Pawns Promoted', $piecePromotedSymbol), HOF_PUBLIC); |
|
| 661 | 661 | } |
| 662 | 662 | |
| 663 | 663 | $castlingType = $moveInfo['Castling'] === false ? null : $moveInfo['Castling']['Type']; |
@@ -20,7 +20,9 @@ |
||
| 20 | 20 | } |
| 21 | 21 | |
| 22 | 22 | public static function cmpNum($a, $b) { |
| 23 | - if ($a == $b) return 0; |
|
| 23 | + if ($a == $b) { |
|
| 24 | + return 0; |
|
| 25 | + } |
|
| 24 | 26 | return (self::$reverseOrder ? -1 : 1) * ($a < $b ? -1 : 1); |
| 25 | 27 | } |
| 26 | 28 | |
@@ -7,4 +7,4 @@ |
||
| 7 | 7 | $msg = '<span class="green">SUCCESS: </span>Enabled game ' . $game->getDisplayName(); |
| 8 | 8 | |
| 9 | 9 | forward(create_container('skeleton.php', 'enable_game.php', |
| 10 | - array('processing_msg' => $msg))); |
|
| 10 | + array('processing_msg' => $msg))); |
|