Skip to content

Commit

Permalink
Renamed startPos as shuffle
Browse files Browse the repository at this point in the history
  • Loading branch information
@programarivm
programarivm committed Feb 17, 2025
1 parent 916c2a2 commit 43c9f46
Show file tree
Hide file tree
Showing 6 changed files with 42 additions and 54 deletions.
12 changes: 6 additions & 6 deletions src/Command/Game/Blocking/ExtractTask.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,19 +19,19 @@ public function run()
$f = new FastFunction();

if ($this->params['variant'] === VariantType::CHESS_960) {
$startPos = str_split($this->params['startPos']);
$shuffle = str_split($this->params['shuffle']);
$board = isset($this->params['fen'])
? FenToBoardFactory::create($this->params['fen'], new Chess960Board($startPos))
: new Chess960Board($startPos);
? FenToBoardFactory::create($this->params['fen'], new Chess960Board($shuffle))
: new Chess960Board($shuffle);
} elseif ($this->params['variant'] === VariantType::CAPABLANCA) {
$board = isset($this->params['fen'])
? FenToBoardFactory::create($this->params['fen'], new CapablancaBoard())
: new CapablancaBoard();
} elseif ($this->params['variant'] === VariantType::CAPABLANCA_FISCHER) {
$startPos = str_split($this->params['startPos']);
$shuffle = str_split($this->params['shuffle']);
$board = isset($this->params['fen'])
? FenToBoardFactory::create($this->params['fen'], new CapablancaFischerBoard($startPos))
: new CapablancaFischerBoard($startPos);
? FenToBoardFactory::create($this->params['fen'], new CapablancaFischerBoard($shuffle))
: new CapablancaFischerBoard($shuffle);
} elseif ($this->params['variant'] === VariantType::CLASSICAL) {
$board = isset($this->params['fen'])
? FenToBoardFactory::create($this->params['fen'], new ClassicalBoard())
Expand Down
8 changes: 2 additions & 6 deletions src/Command/Game/Blocking/PlayRavTask.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ class PlayRavTask extends AbstractBlockingTask
public function run()
{
if ($this->params['variant'] === VariantType::CHESS_960) {
$startPos = str_split($this->params['startPos']);
$board = new Chess960Board($startPos);
$shuffle = str_split($this->params['shuffle']);
$board = new Chess960Board($shuffle);
if (isset($this->params['fen'])) {
$board = FenToBoardFactory::create($this->params['fen'], $board);
}
Expand All @@ -37,10 +37,6 @@ public function run()
'movetext' => $ravPlay->ravMovetext->main(),
'breakdown' => $ravPlay->ravMovetext->breakdown,
'fen' => $ravPlay->fen,
...($this->params['variant'] === VariantType::CHESS_960
? ['startPos' => $this->params['startPos']]
: []
),
];
}
}
12 changes: 6 additions & 6 deletions src/Command/Game/Blocking/PlotTask.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,19 @@ class PlotTask extends AbstractBlockingTask
public function run()
{
if ($this->params['variant'] === VariantType::CHESS_960) {
$startPos = str_split($this->params['startPos']);
$shuffle = str_split($this->params['shuffle']);
$board = isset($this->params['fen'])
? FenToBoardFactory::create($this->params['fen'], new Chess960Board($startPos))
: new Chess960Board($startPos);
? FenToBoardFactory::create($this->params['fen'], new Chess960Board($shuffle))
: new Chess960Board($shuffle);
} elseif ($this->params['variant'] === VariantType::CAPABLANCA) {
$board = isset($this->params['fen'])
? FenToBoardFactory::create($this->params['fen'], new CapablancaBoard())
: new CapablancaBoard();
} elseif ($this->params['variant'] === VariantType::CAPABLANCA_FISCHER) {
$startPos = str_split($this->params['startPos']);
$shuffle = str_split($this->params['shuffle']);
$board = isset($this->params['fen'])
? FenToBoardFactory::create($this->params['fen'], new CapablancaFischerBoard($startPos))
: new CapablancaFischerBoard($startPos);
? FenToBoardFactory::create($this->params['fen'], new CapablancaFischerBoard($shuffle))
: new CapablancaFischerBoard($shuffle);
} elseif ($this->params['variant'] === VariantType::CLASSICAL) {
$board = isset($this->params['fen'])
? FenToBoardFactory::create($this->params['fen'], new ClassicalBoard())
Expand Down
8 changes: 4 additions & 4 deletions src/Command/Game/Blocking/RestartCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,12 @@ public function run(AbstractSocket $socket, array $argv, int $id)
'decoded' => $gameMode->getJwtDecoded(),
]))->then(function ($result) use ($socket, $gameMode) {
if ($result->variant === VariantType::CHESS_960) {
$startPos = str_split($result->startPos);
$board = FenToBoardFactory::create($result->fen, new Chess960Board($startPos));
$shuffle = str_split($result->shuffle);
$board = FenToBoardFactory::create($result->fen, new Chess960Board($shuffle));
$game = (new Game($result->variant, Game::MODE_PLAY))->setBoard($board);
} elseif ($result->variant === VariantType::CAPABLANCA_FISCHER) {
$startPos = str_split($result->startPos);
$board = FenToBoardFactory::create($result->fen, new CapablancaFischerBoard($startPos));
$shuffle = str_split($result->shuffle);
$board = FenToBoardFactory::create($result->fen, new CapablancaFischerBoard($shuffle));
$game = (new Game($result->variant, Game::MODE_PLAY))->setBoard($board);
} else {
$game = new Game($result->variant, Game::MODE_PLAY);
Expand Down
8 changes: 4 additions & 4 deletions src/Command/Game/Game.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@ public function __construct(string $variant, string $mode)
$this->mode = $mode;

if ($this->variant === VariantType::CHESS_960) {
$startPos = (new Chess960StartPosition())->create();
$this->board = new Chess960Board($startPos);
$shuffle = (new Chess960StartPosition())->create();
$this->board = new Chess960Board($shuffle);
} elseif ($this->variant === VariantType::CAPABLANCA) {
$this->board = new CapablancaBoard();
} elseif ($this->variant === VariantType::CAPABLANCA_FISCHER) {
$startPos = (new CapablancaFischerStartPosition())->create();
$this->board = new CapablancaFischerBoard($startPos);
$shuffle = (new CapablancaFischerStartPosition())->create();
$this->board = new CapablancaFischerBoard($shuffle);
} elseif ($this->variant === VariantType::CLASSICAL) {
$this->board = new ClassicalBoard();
} elseif ($this->variant === VariantType::DUNSANY) {
Expand Down
48 changes: 20 additions & 28 deletions src/Command/Game/NonBlocking/StartCommand.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,24 +45,24 @@ public function run(AbstractSocket $socket, array $argv, int $id)
$params = $this->params($argv[1]);
if (AnalysisMode::NAME === $params['mode']) {
if ($params['variant'] === VariantType::CHESS_960) {
if (isset($params['settings']['startPos']) && isset($params['settings']['fen'])) {
$startPos = str_split($params['settings']['startPos']);
$board = FenToBoardFactory::create($params['settings']['fen'], new Chess960Board($startPos));
if (isset($params['settings']['shuffle']) && isset($params['settings']['fen'])) {
$shuffle = str_split($params['settings']['shuffle']);
$board = FenToBoardFactory::create($params['settings']['fen'], new Chess960Board($shuffle));
} else {
$startPos = (new Chess960StartPosition())->create();
$board = new Chess960Board($startPos);
$shuffle = (new Chess960StartPosition())->create();
$board = new Chess960Board($shuffle);
}
} elseif ($params['variant'] === VariantType::CAPABLANCA) {
$board = isset($params['settings']['fen'])
? FenToBoardFactory::create($params['settings']['fen'], new CapablancaBoard())
: new CapablancaBoard();
} elseif ($params['variant'] === VariantType::CAPABLANCA_FISCHER) {
if (isset($params['settings']['startPos']) && isset($params['settings']['fen'])) {
$startPos = str_split($params['settings']['startPos']);
$board = FenToBoardFactory::create($params['settings']['fen'], new CapablancaFischerBoard($startPos));
if (isset($params['settings']['shuffle']) && isset($params['settings']['fen'])) {
$shuffle = str_split($params['settings']['shuffle']);
$board = FenToBoardFactory::create($params['settings']['fen'], new CapablancaFischerBoard($shuffle));
} else {
$startPos = (new CapablancaFischerStartPosition())->create();
$board = new CapablancaFischerBoard($startPos);
$shuffle = (new CapablancaFischerStartPosition())->create();
$board = new CapablancaFischerBoard($shuffle);
}
} elseif ($params['variant'] === VariantType::DUNSANY) {
$board = isset($params['settings']['fen'])
Expand Down Expand Up @@ -94,36 +94,28 @@ public function run(AbstractSocket $socket, array $argv, int $id)
'turn' => $game->state()->turn,
'movetext' => $sanPlay->sanMovetext->validate(),
'fen' => $sanPlay->fen,
...($params['variant'] === VariantType::CHESS_960
? ['startPos' => implode('', $startPos)]
: []
),
...($params['variant'] === VariantType::CAPABLANCA_FISCHER
? ['startPos' => implode('', $startPos)]
: []
),
],
]);
} elseif (PlayMode::NAME === $params['mode']) {
if ($params['variant'] === VariantType::CHESS_960) {
if (isset($params['settings']['startPos']) && isset($params['settings']['fen'])) {
$startPos = str_split($params['settings']['startPos']);
$board = FenToBoardFactory::create($params['settings']['fen'], new Chess960Board($startPos));
if (isset($params['settings']['shuffle']) && isset($params['settings']['fen'])) {
$shuffle = str_split($params['settings']['shuffle']);
$board = FenToBoardFactory::create($params['settings']['fen'], new Chess960Board($shuffle));
} else {
$startPos = (new Chess960StartPosition())->create();
$board = new Chess960Board($startPos);
$shuffle = (new Chess960StartPosition())->create();
$board = new Chess960Board($shuffle);
}
} elseif ($params['variant'] === VariantType::CAPABLANCA) {
$board = isset($params['settings']['fen'])
? FenToBoardFactory::create($params['settings']['fen'], new CapablancaBoard())
: new CapablancaBoard();
} elseif ($params['variant'] === VariantType::CAPABLANCA_FISCHER) {
if (isset($params['settings']['startPos']) && isset($params['settings']['fen'])) {
$startPos = str_split($params['settings']['startPos']);
$board = FenToBoardFactory::create($params['settings']['fen'], new CapablancaFischerBoard($startPos));
if (isset($params['settings']['shuffle']) && isset($params['settings']['fen'])) {
$shuffle = str_split($params['settings']['shuffle']);
$board = FenToBoardFactory::create($params['settings']['fen'], new CapablancaFischerBoard($shuffle));
} else {
$startPos = (new CapablancaFischerStartPosition())->create();
$board = new CapablancaFischerBoard($startPos);
$shuffle = (new CapablancaFischerStartPosition())->create();
$board = new CapablancaFischerBoard($shuffle);
}
} elseif ($params['variant'] === VariantType::DUNSANY) {
$board = isset($params['settings']['fen'])
Expand Down

0 comments on commit 43c9f46

Please sign in to comment.