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

- Only two daily tournaments per day (one for EU, one for US).

Browse Source 
- Dropping prize support for Daily tournaments to Top 4 competitors.
This commit is contained in:
marcins78
2013-08-21 14:07:59 +00:00
parent 4a9f10bffd
commit 6c98a112a8
3 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gemp-lotr/gemp-lotr-async/src/main/web/includes/changeLog.html
View File

@@ -1,4 +1,8 @@
<pre style="font-size:80%"> <pre style="font-size:80%">
<b>21 Jul. 2013</b>
- Only two daily tournaments per day (one for EU, one for US).
- Dropping prize support for Daily tournaments to Top 4 competitors.
<b>20 Jul. 2013</b> <b>20 Jul. 2013</b>
- "War and Valor" from Second Edition now applies to Gondor Man, not Gondor Ranger (per card text). - "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. - "Curse Their Foul Feet!" now discards only cards if the hand could be revealed.

6
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/hall/HallServer.java
View File

@@ -29,7 +29,7 @@ import java.util.concurrent.locks.ReentrantReadWriteLock;
public class HallServer extends AbstractServer { public class HallServer extends AbstractServer {
private final int _playerInactivityPeriod = 1000 * 20; // 20 seconds private final int _playerInactivityPeriod = 1000 * 20; // 20 seconds
private final long _scheduledTournamentLoadTime = 1000 * 60 * 60 * 24 * 7; // Week 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 ChatServer _chatServer;
private LeagueService _leagueService; 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, _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"), true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
"movie", 8)); "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"), true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
"expanded", 8)); "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"), true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
"expanded", 8)); "expanded", 8));
} catch (ParseException exp) { } catch (ParseException exp) {

4
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/DailyTournamentPrizes.java
View File

@@ -20,8 +20,6 @@ public class DailyTournamentPrizes implements TournamentPrizes {
tournamentPrize.addItem("(S)Booster Choice", 8); tournamentPrize.addItem("(S)Booster Choice", 8);
} else if (playerStanding.getStanding() <=4) { } else if (playerStanding.getStanding() <=4) {
tournamentPrize.addItem("(S)Booster Choice", 5); tournamentPrize.addItem("(S)Booster Choice", 5);
} else if (playerStanding.getStanding()<=8) {
tournamentPrize.addItem("(S)Booster Choice", 2);
} }
if (tournamentPrize.getAll().size() == 0) if (tournamentPrize.getAll().size() == 0)
@@ -36,6 +34,6 @@ public class DailyTournamentPrizes implements TournamentPrizes {
@Override @Override
public String getPrizeDescription() { public String getPrizeDescription() {
return "<div class='prizeHint' value='1st place - 10 boosters, 2nd place - 8 boosters, 3rd and 4th place - 5 boosters, 5th-8th - 2 boosters each'>10-8-5-2</div>"; return "<div class='prizeHint' value='1st place - 10 boosters, 2nd place - 8 boosters, 3rd and 4th place - 5 boosters'>10-8-5</div>";
} }
} }