diff --git a/webapp-service-layer/src/main/kotlin/io/elephantchess/servicelayer/dto/botgame/CreateBotGameRequest.kt b/webapp-service-layer/src/main/kotlin/io/elephantchess/servicelayer/dto/botgame/CreateBotGameRequest.kt index 2cd0f0bbc..2ae55bde6 100644 --- a/webapp-service-layer/src/main/kotlin/io/elephantchess/servicelayer/dto/botgame/CreateBotGameRequest.kt +++ b/webapp-service-layer/src/main/kotlin/io/elephantchess/servicelayer/dto/botgame/CreateBotGameRequest.kt @@ -12,4 +12,6 @@ data class CreateBotGameRequest( val startFen: String?, val openingMode: OpeningMode = OpeningMode.BY_FREQUENCY, val variant: Variant = Variant.XIANGQI, + val timeControlBase: Int? = null, + val timeControlIncrement: Int? = null, ) diff --git a/webapp-service-layer/src/main/kotlin/io/elephantchess/servicelayer/services/PlayerVsBotGameService.kt b/webapp-service-layer/src/main/kotlin/io/elephantchess/servicelayer/services/PlayerVsBotGameService.kt index 3c26060e9..6bc6b2edc 100644 --- a/webapp-service-layer/src/main/kotlin/io/elephantchess/servicelayer/services/PlayerVsBotGameService.kt +++ b/webapp-service-layer/src/main/kotlin/io/elephantchess/servicelayer/services/PlayerVsBotGameService.kt @@ -126,6 +126,20 @@ class PlayerVsBotGameService( throw BadRequestException("You must be authenticated in to play with depth greater than 6") } + request.timeControlBase?.let { base -> + if (base <= 0) { + throw BadRequestException("Time control base must be positive") + } + } + request.timeControlIncrement?.let { increment -> + if (increment < 0) { + throw BadRequestException("Time control increment must be non-negative") + } + if (request.timeControlBase == null) { + throw BadRequestException("Time control increment requires a base time") + } + } + // Manchu variant requires Engine only opening mode if (request.variant == Variant.MANCHU && request.openingMode != OpeningMode.ENGINE_ONLY) { throw BadRequestException("Variants require engine-only opening mode") diff --git a/webapp/src/main/resources/modals/play-bot.html b/webapp/src/main/resources/modals/play-bot.html index f86a9f608..d135398c0 100644 --- a/webapp/src/main/resources/modals/play-bot.html +++ b/webapp/src/main/resources/modals/play-bot.html @@ -1,6 +1,6 @@
-

Play Bot

-
+

Play Bot

+
@@ -68,6 +68,21 @@

Play Bot

+ + + +
+
+ time control +
+ 		+
+ No time control +
+

Depth

@@ -134,7 +149,120 @@

Starting Position

+
+
diff --git a/webapp/src/main/resources/public/js/modal-handlers/play-bot-modal-handler.js b/webapp/src/main/resources/public/js/modal-handlers/play-bot-modal-handler.js index 85739a6c9..34a03a2ad 100644 --- a/webapp/src/main/resources/public/js/modal-handlers/play-bot-modal-handler.js +++ b/webapp/src/main/resources/public/js/modal-handlers/play-bot-modal-handler.js @@ -24,10 +24,16 @@ const BOT_OPTION_BUTTON_DISABLED_CLASS = 'option-button-div-disabled'; const BOT_VARIANT_OPTION_GROUP = 'bot-variant-option-button-div'; const BOT_COLOR_OPTION_GROUP = 'bot-color-option-button-div'; const BOT_ENGINE_OPTION_GROUP = 'bot-engine-option-button-div'; +const BOT_TIME_CONTROL_OPTION_GROUP = 'bot-tc-option-button-div'; class PlayBotModalHandler extends ModalHandler { - #exclusionGroups = [BOT_VARIANT_OPTION_GROUP, BOT_COLOR_OPTION_GROUP, BOT_ENGINE_OPTION_GROUP]; + #exclusionGroups = [ + BOT_VARIANT_OPTION_GROUP, + BOT_COLOR_OPTION_GROUP, + BOT_ENGINE_OPTION_GROUP, + BOT_TIME_CONTROL_OPTION_GROUP, + ]; #optionDivs; #depthInput = document.getElementById('play-bot-depth'); @@ -45,6 +51,13 @@ class PlayBotModalHandler extends ModalHandler { #playBotButton = document.getElementById('play-bot-button'); + #mainPanel = document.getElementById('play-bot-main-panel'); + #timeControlPanel = document.getElementById('play-bot-time-control-panel'); + #timeControlButton = document.getElementById('play-bot-time-control-button'); + #timeControlLabel = document.getElementById('play-bot-time-control-label'); + #timeControlBackButton = document.getElementById('play-bot-time-control-back-button'); + #modalTitle = document.getElementById('play-bot-modal-title'); + constructor() { super(); this.#optionDivs = getElementsByClassNameArray(BOT_OPTION_BUTTON_CLASS); @@ -85,6 +98,21 @@ class PlayBotModalHandler extends ModalHandler { this.#handleCreateGameClickEvent(); }); + this.#timeControlButton.addEventListener('click', () => { + this.#showTimeControlPanel(); + }); + this.#timeControlBackButton.addEventListener('click', () => { + this.#showMainPanel(); + }); + this.#optionDivs + .filter(item => item.classList.contains(BOT_TIME_CONTROL_OPTION_GROUP)) + .forEach(item => { + item.addEventListener('click', () => { + this.#updateTimeControlLabel(); + this.#showMainPanel(); + }); + }); + // Auto-detect Manchu variant from FEN: if piece section contains an 'M', select Manchu this.#startFenInput.addEventListener('input', () => { const piecePart = this.#startFenInput.value.split(' ')[0]; @@ -140,6 +168,7 @@ class PlayBotModalHandler extends ModalHandler { validateStartFen(startFenValue); } this.#startFenInputSetValid(true); + const {base: timeControlBase, increment: timeControlIncrement} = this.#getSelectedTimeControl(); const body = { 'color': color, 'depth': depth, @@ -147,6 +176,8 @@ class PlayBotModalHandler extends ModalHandler { 'startFen': startFenValue, 'openingMode': openingMode, 'variant': variant, + 'timeControlBase': timeControlBase, + 'timeControlIncrement': timeControlIncrement, }; postAndHandle('/api/botgame/create', body, json => { window.open('/playbot?id=' + json.gameId, '_self'); @@ -283,4 +314,46 @@ class PlayBotModalHandler extends ModalHandler { } } + #showTimeControlPanel() { + this.#mainPanel.style.display = 'none'; + this.#timeControlPanel.style.display = ''; + this.#playBotButton.style.display = 'none'; + this.#timeControlBackButton.style.display = ''; + this.#modalTitle.innerText = 'Time control'; + } + + #showMainPanel() { + this.#mainPanel.style.display = ''; + this.#timeControlPanel.style.display = 'none'; + this.#playBotButton.style.display = ''; + this.#timeControlBackButton.style.display = 'none'; + this.#modalTitle.innerText = 'Play Bot'; + } + + #getSelectedTimeControlButton() { + return this.#optionDivs + .filter(item => item.classList.contains(BOT_TIME_CONTROL_OPTION_GROUP)) + .find(item => item.classList.contains(BOT_OPTION_BUTTON_SELECTED_CLASS)); + } + + #updateTimeControlLabel() { + const selected = this.#getSelectedTimeControlButton(); + if (selected != null) { + this.#timeControlLabel.innerText = selected.dataset.tcLabel; + } + } + + /** + * @return {{base: number|null, increment: number|null}} + */ + #getSelectedTimeControl() { + const selected = this.#getSelectedTimeControlButton(); + if (selected == null) { + return {base: null, increment: null}; + } + const base = selected.dataset.tcBase === '' ? null : Number(selected.dataset.tcBase); + const increment = selected.dataset.tcIncrement === '' ? null : Number(selected.dataset.tcIncrement); + return {base, increment}; + } + }