ambidextrous/gemp-lotr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'phallen/patch-1' into v2-cards

Browse Source 
# Conflicts:
#	gemp-lotr/gemp-lotr-async/src/main/web/includes/admin/leagueAdmin.html
Adjusted the above into an alteration for tournamentAdmin.html, where the relevant function was moved.
This commit is contained in:
Christian 'ketura' McCarty
2024-11-16 21:59:23 -06:00
parent d5bc1492b9 7cb5711c80
commit 83327dec8e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gemp-lotr/gemp-lotr-async/src/main/web/hall.html
View File

@@ -250,10 +250,10 @@
<select id="supportedFormatsSelect" ></select>
<select id="decksSelect" ></select>
<select id="timerSelect">
<option value="default">Default (80m/5m)</option>
<option value="blitz">Blitz! (30m/5m)</option>
<option value="slow">Slow (2h/10m)</option>
<option value="glacial">Glacial (3d/1d)</option>
<option value="default">Default (45m/6m)</option>
<option value="blitz">Blitz! (25m/3m)</option>
<option value="slow">Slow (80m/10m)</option>
<option value="glacial">Glacial (1d/1d)</option>
</select>
<input id='tableDescInput' type='text' maxlength='100' placeHolder='Description (or player to invite)'>
<div class="checkboxes">

6
gemp-lotr/gemp-lotr-async/src/main/web/includes/admin/tournamentAdmin.html
View File

@@ -532,9 +532,9 @@ function tourneyErrorMap(outputControl, callback=null) {
<option value="Competitive">Competitive (40/5)</option>
<option value="WC">Championship (20/10)</option>
<option value="WC_Expanded">Championship Expanded (25/10)</option>
<option value="Blitz!">Blitz (30/5)</option>
<option value="Default">Default (80/5)</option>
<option value="Slow">Slow (120/10)</option>
<option value="Blitz!">Blitz (25/3)</option>
<option value="Default">Default (45/6)</option>
<option value="Slow">Slow (80/10)</option>
</select><br/>
</div>

8
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/GameTimer.java
View File

@@ -2,10 +2,10 @@ package com.gempukku.lotro.hall;
public record GameTimer(boolean longGame, String name, int maxSecondsPerPlayer, int maxSecondsPerDecision) {
public static final GameTimer DEFAULT_TIMER = new GameTimer(false, "Default", 60 * 80, 60 * 5);
public static final GameTimer BLITZ_TIMER = new GameTimer(false, "Blitz!", 60 * 30, 60 * 5);
public static final GameTimer SLOW_TIMER = new GameTimer(false, "Slow", 60 * 120, 60 * 10);
public static final GameTimer GLACIAL_TIMER = new GameTimer(true, "Glacial", 60 * 60 * 24 * 3, 60 * 60 * 24);
public static final GameTimer DEFAULT_TIMER = new GameTimer(false, "Default", 60 * 45, 60 * 6);
public static final GameTimer BLITZ_TIMER = new GameTimer(false, "Blitz!", 60 * 25, 60 * 3);
public static final GameTimer SLOW_TIMER = new GameTimer(false, "Slow", 60 * 80, 60 * 10);
public static final GameTimer GLACIAL_TIMER = new GameTimer(true, "Glacial", 60 * 60 * 24, 60 * 60 * 24);
// 5 minutes timeout, 40 minutes per game per player
public static final GameTimer COMPETITIVE_TIMER = new GameTimer(false, "Competitive", 60 * 40, 60 * 5);
public static final GameTimer CHAMPIONSHIP_TIMER = new GameTimer(false, "WC", 60 * 20, 60 * 10);