From 9fdf5f8cbab63d11c0c5a1db235fdf6a74db6145 Mon Sep 17 00:00:00 2001 From: "marcin.sciesinski" Date: Fri, 9 Aug 2019 11:33:16 -0700 Subject: [PATCH] Slow timer now has 10m timeout --- gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/hallUi.js | 2 +- .../com/gempukku/lotro/logic/cardtype/AbstractAttachable.java | 2 -- .../src/main/java/com/gempukku/lotro/hall/HallServer.java | 2 +- 3 files changed, 2 insertions(+), 4 deletions(-) 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 678d82075..fcc3aa4f8 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 @@ -94,7 +94,7 @@ var GempLotrHallUI = Class.extend({ this.timerSelect = $(""); this.addTimer("default", "Default Speed (80m/5m)"); this.addTimer("blitz", "Blitz! (30m/2m)"); - this.addTimer("slow", "Slow (2h/5m)"); + this.addTimer("slow", "Slow (2h/10m)"); this.addTimer("glacial", "Glacial (3d/1d)"); this.buttonsDiv.append(this.supportedFormatsSelect); diff --git a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java index d0c959501..9a3e2c12f 100644 --- a/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java +++ b/gemp-lotr/gemp-lotr-logic/src/main/java/com/gempukku/lotro/logic/cardtype/AbstractAttachable.java @@ -4,10 +4,8 @@ import com.gempukku.lotro.common.*; import com.gempukku.lotro.filters.Filter; import com.gempukku.lotro.filters.Filters; import com.gempukku.lotro.game.PhysicalCard; -import com.gempukku.lotro.game.state.GameState; import com.gempukku.lotro.game.state.LotroGame; import com.gempukku.lotro.logic.actions.AttachPermanentAction; -import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; import com.gempukku.lotro.logic.timing.*; import java.util.*; 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 af6d9e71d..8c602bbf0 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 @@ -303,7 +303,7 @@ public class HallServer extends AbstractServer { } else if (timer.equals("blitz")) { return new GameTimer(false, "Blitz!", 60 * 30, 60 * 2); } else if (timer.equals("slow")) { - return new GameTimer(false, "Slow", 60 * 120, 60 * 5); + return new GameTimer(false, "Slow", 60 * 120, 60 * 10); } else if (timer.equals("glacial")) { return new GameTimer(false, "Glacial", 60 * 60 * 24 * 3, 60 * 60 * 24); }