diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java index 188086095..279a86ac7 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java @@ -141,6 +141,9 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen String startableStr = getFormParameterSafely(postDecoder, "startable"); boolean startable = Throw400IfNullOrNonBoolean("startable", startableStr); + String readyCheckStr = getFormParameterSafely(postDecoder, "readyCheck"); + int readyCheck = Throw400IfNullOrNonInteger("readyCheck", readyCheckStr); + String sealedFormatCodeStr = getFormParameterSafely(postDecoder, "sealedFormatCode"); String soloDraftFormatCodeStr = getFormParameterSafely(postDecoder, "soloDraftFormatCode"); @@ -161,13 +164,10 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen var params = new TournamentParams(); - String casualPrefix = "Casual "; String competitivePrefix = "Competitive "; String prefix = competitive ? competitivePrefix : casualPrefix; - //TODO ready check, ready check time - if(type == Tournament.TournamentType.SEALED) { var sealedParams = new SealedTournamentParams(); sealedParams.type = Tournament.TournamentType.SEALED; @@ -266,7 +266,7 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen return; } - if (_hallServer.addPlayerMadeLimitedQueue(info, resourceOwner, startable, -1)) { + if (_hallServer.addPlayerMadeLimitedQueue(info, resourceOwner, startable, readyCheck)) { responseWriter.sendJsonOK(); } else { Throw400IfValidationFails("Error", "Error", false, "Error while creating queue or joining"); diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/communication.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/communication.js index 0ab981073..7a0f4f098 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/communication.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/communication.js @@ -1445,7 +1445,7 @@ var GempLotrCommunication = Class.extend({ }); }, createTournament:function (type, maxPlayers, sealedFormatCode, soloDraftFormatCode, tableDraftFormatCode, tableDraftTimer, - playoff, deckbuildingDuration, competitive, startable, callback, errorMap) { + playoff, deckbuildingDuration, competitive, startable, readyCheck, callback, errorMap) { $.ajax({ type:"POST", url:this.url + "/tournament/create", @@ -1461,6 +1461,7 @@ var GempLotrCommunication = Class.extend({ deckbuildingDuration:deckbuildingDuration, competitive:competitive, startable:startable, + readyCheck:readyCheck, participantId:getUrlParam("participantId") }, success:this.deliveryCheck(callback), diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js index 31c20afd6..aa552cfc1 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js @@ -187,10 +187,12 @@ var GempLotrHallUI = Class.extend({ const draftTimer = $("#draftTimer").val(); const competitive = $("#competitiveSelect").val(); const startableEarly = $("#startableEarlySelect").val(); + const readyCheck = $("#readyCheckSelect").val(); const validPlayerCount = Number.isInteger(playerCount) && playerCount >= 1; const validDeckDuration = Number.isInteger(deckDuration) && deckDuration >= 5; const draftValid = gameType !== "table_draft" || draftTimer; + const validPlayerReadyCombo = playerCount > 2 || readyCheck < 0; const allValid = gameType && @@ -200,6 +202,8 @@ var GempLotrHallUI = Class.extend({ validDeckDuration && competitive && startableEarly && + readyCheck && + validPlayerReadyCombo && draftValid; $("#createTournamentButton").prop("disabled", !allValid); @@ -283,6 +287,16 @@ var GempLotrHallUI = Class.extend({ .append($("