From 6b734d488c4d678861bedb0032ecdaf418759fb1 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Thu, 8 Aug 2019 14:38:56 -0700 Subject: [PATCH] Added game speed settings --- .../gemp-lotr-async/src/main/web/js/gemp-021/hallUi.js | 8 ++++---- .../src/main/java/com/gempukku/lotro/hall/HallServer.java | 2 +- 2 files changed, 5 insertions(+), 5 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 482993cd9..678d82075 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 @@ -92,10 +92,10 @@ var GempLotrHallUI = Class.extend({ this.decksSelect.hide(); this.timerSelect = $(""); - this.addTimer("default", "Default Speed"); - this.addTimer("blitz", "Blitz!"); - this.addTimer("slow", "Slow"); - this.addTimer("glacial", "Glacial"); + this.addTimer("default", "Default Speed (80m/5m)"); + this.addTimer("blitz", "Blitz! (30m/2m)"); + this.addTimer("slow", "Slow (2h/5m)"); + this.addTimer("glacial", "Glacial (3d/1d)"); this.buttonsDiv.append(this.supportedFormatsSelect); this.buttonsDiv.append(this.decksSelect); 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 2e60fff3a..8cec2630c 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 * 30, 60 * 2); + 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")) {