From b08ad7b7ec7f96b50979ce9d5ae708035b701c0c Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Thu, 8 Aug 2019 14:29:05 -0700 Subject: [PATCH] Added game speed settings --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js | 4 ++-- .../src/main/java/com/gempukku/lotro/hall/HallServer.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js index d99d89f00..482993cd9 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js @@ -91,8 +91,8 @@ var GempLotrHallUI = Class.extend({ this.decksSelect = $(""); this.decksSelect.hide(); - this.timerSelect = $(""); - this.addTimer("default", "Default"); + this.timerSelect = $(""); + this.addTimer("default", "Default Speed"); this.addTimer("blitz", "Blitz!"); this.addTimer("slow", "Slow"); this.addTimer("glacial", "Glacial"); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java index 6073223d5..2e60fff3a 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java @@ -301,7 +301,7 @@ public class HallServer extends AbstractServer { if (timer.equals("default")) { return new GameTimer(false, "Default", 60 * 80, 60 * 5); } else if (timer.equals("blitz")) { - return new GameTimer(false, "Blitz", 60 * 40, 60 * 5); + return new GameTimer(false, "Blitz", 60 * 30, 60 * 2); } else if (timer.equals("slow")) { return new GameTimer(false, "Slow", 60 * 120, 60 * 5); } else if (timer.equals("glacial")) { @@ -699,7 +699,7 @@ public class HallServer extends AbstractServer { if (league != null) return league.getName() + " - " + table.getGameSettings().getLeagueSerie().getName(); else - return "Casual " + table.getGameSettings().getTimerName(); + return "Casual - " + table.getGameSettings().getTimerName(); } private void createGameFromAwaitingTable(String tableId, AwaitingTable awaitingTable) {