From 6c98a112a820bde112b3e8e46df1c406cdbe97b2 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 21 Aug 2013 14:07:59 +0000 Subject: [PATCH] - Only two daily tournaments per day (one for EU, one for US). - Dropping prize support for Daily tournaments to Top 4 competitors. --- .../gemp-lotr-async/src/main/web/includes/changeLog.html | 4 ++++ .../src/main/java/com/gempukku/lotro/hall/HallServer.java | 6 +++--- .../gempukku/lotro/tournament/DailyTournamentPrizes.java | 4 +--- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html index bde8255a3..fb0ab483d 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html +++ b/gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html @@ -1,4 +1,8 @@
+21 Jul. 2013
+- Only two daily tournaments per day (one for EU, one for US).
+- Dropping prize support for Daily tournaments to Top 4 competitors.
+
 20 Jul. 2013
 - "War and Valor" from Second Edition now applies to Gondor Man, not Gondor Ranger (per card text).
 - "Curse Their Foul Feet!" now discards only cards if the hand could be revealed.
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 bb5e99b18..17ef3f47e 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
@@ -29,7 +29,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
 public class HallServer extends AbstractServer {
     private final int _playerInactivityPeriod = 1000 * 20; // 20 seconds
     private final long _scheduledTournamentLoadTime = 1000 * 60 * 60 * 24 * 7; // Week
-    private final long _repeatTournaments = 1000 * 60 * 60 * 24 * 2;
+    private final long _repeatTournaments = 1000 * 60 * 60 * 24 * 3;
 
     private ChatServer _chatServer;
     private LeagueService _leagueService;
@@ -105,10 +105,10 @@ public class HallServer extends AbstractServer {
             _tournamentQueues.put("movie_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-17 00:30:00").getTime(), _repeatTournaments, "movieDailyUs-", "Daily Rohan Movie Block", 0,
                     true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
                     "movie", 8));
-            _tournamentQueues.put("exp_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-16 19:30:00").getTime(), _repeatTournaments, "expDailyEu-", "Daily Gondor Expanded", 0,
+            _tournamentQueues.put("exp_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-17 19:30:00").getTime(), _repeatTournaments, "expDailyEu-", "Daily Gondor Expanded", 0,
                     true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
                     "expanded", 8));
-            _tournamentQueues.put("exp_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-17 00:30:00").getTime(), _repeatTournaments, "expDailyUs-", "Daily Rohan Expanded", 0,
+            _tournamentQueues.put("exp_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-18 00:30:00").getTime(), _repeatTournaments, "expDailyUs-", "Daily Rohan Expanded", 0,
                     true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
                     "expanded", 8));
         } catch (ParseException exp) {
diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java
index 0ba0f5424..515c9658d 100644
--- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java
+++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java
@@ -20,8 +20,6 @@ public class DailyTournamentPrizes implements TournamentPrizes {
             tournamentPrize.addItem("(S)Booster Choice", 8);
         } else if (playerStanding.getStanding() <=4) {
             tournamentPrize.addItem("(S)Booster Choice", 5);
-        } else if (playerStanding.getStanding()<=8) {
-            tournamentPrize.addItem("(S)Booster Choice", 2);
         }
 
         if (tournamentPrize.getAll().size() == 0)
@@ -36,6 +34,6 @@ public class DailyTournamentPrizes implements TournamentPrizes {
 
     @Override
     public String getPrizeDescription() {
-        return "
10-8-5-2
"; + return "
10-8-5
"; } }