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

On demand and daily tournaments prices and prize changes.

Browse Source
This commit is contained in:
marcins78
2014-01-09 16:30:01 +00:00
parent 0746010f49
commit 47769e4f4a
3 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -33,7 +33,8 @@ 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 * 3;
// Repeat tournaments every 2 days
private final long _repeatTournaments = 1000 * 60 * 60 * 24 * 2;
private ChatServer _chatServer;
private LeagueService _leagueService;
@@ -123,13 +124,13 @@ public class HallServer extends AbstractServer {
}
});
_tournamentQueues.put("fotr_queue", new ImmediateRecurringQueue(635, "fotr_block",
_tournamentQueues.put("fotr_queue", new ImmediateRecurringQueue(1000, "fotr_block",
CollectionType.ALL_CARDS, "fotrQueue-", "Fellowship Block", 8,
true, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "onDemand"), _pairingMechanismRegistry.getPairingMechanism("singleElimination")));
_tournamentQueues.put("movie_queue", new ImmediateRecurringQueue(635, "movie",
_tournamentQueues.put("movie_queue", new ImmediateRecurringQueue(1000, "movie",
CollectionType.ALL_CARDS, "movieQueue-", "Movie Block", 8,
true, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "onDemand"), _pairingMechanismRegistry.getPairingMechanism("singleElimination")));
_tournamentQueues.put("expanded_queue", new ImmediateRecurringQueue(635, "expanded",
_tournamentQueues.put("expanded_queue", new ImmediateRecurringQueue(1000, "expanded",
CollectionType.ALL_CARDS, "expandedQueue-", "Expanded", 8,
true, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "onDemand"), _pairingMechanismRegistry.getPairingMechanism("singleElimination")));
@@ -137,24 +138,18 @@ public class HallServer extends AbstractServer {
sdf.setTimeZone(TimeZone.getTimeZone("GMT"));
try {
_tournamentQueues.put("fotr_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-15 19:30:00").getTime(), _repeatTournaments, "fotrDailyEu-", "Daily Gondor Fellowship Block", 0,
_tournamentQueues.put("fotr_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-15 19:30:00").getTime(), _repeatTournaments, "fotrDailyEu-", "Daily Gondor Fellowship Block", 1000,
true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
"fotr_block", 8));
_tournamentQueues.put("fotr_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-16 00:30:00").getTime(), _repeatTournaments, "fotrDailyUs-", "Daily Rohan Fellowship Block", 0,
_tournamentQueues.put("fotr_daily_us", new RecurringScheduledQueue(sdf.parse("2013-01-16 00:30:00").getTime(), _repeatTournaments, "fotrDailyUs-", "Daily Rohan Fellowship Block", 1000,
true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
"fotr_block", 8));
_tournamentQueues.put("movie_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-16 19:30:00").getTime(), _repeatTournaments, "movieDailyEu-", "Daily Gondor Movie Block", 0,
_tournamentQueues.put("movie_daily_eu", new RecurringScheduledQueue(sdf.parse("2013-01-16 19:30:00").getTime(), _repeatTournaments, "movieDailyEu-", "Daily Gondor Movie Block", 1000,
true, CollectionType.MY_CARDS, tournamentService, _tournamentPrizeSchemeRegistry.getTournamentPrizes(cardSets, "daily"), _pairingMechanismRegistry.getPairingMechanism("swiss"),
"movie", 8));
_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", 1000,
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-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-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) {
// Ignore, can't happen
}

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

@@ -20,6 +20,10 @@ 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);
} else {
tournamentPrize.addItem("(S)Booster Choice", 1);
}
if (tournamentPrize.getAll().size() == 0)
@@ -39,6 +43,6 @@ public class DailyTournamentPrizes implements TournamentPrizes {
@Override
public String getPrizeDescription() {
return "<div class='prizeHint' value='1st place - 10 boosters, 2nd place - 8 boosters, 3rd and 4th place - 5 boosters'>10-8-5</div>";
return "<div class='prizeHint' value='1st place - 10 boosters, 2nd place - 8 boosters, 3rd and 4th place - 5 boosters, 5th to 8th place - 2 boosters, all remaining players - 1 booster'>10-8-5-2-1</div>";
}
}

9
gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java
View File

@@ -26,13 +26,16 @@ public class SingleEliminationOnDemandPrizes implements TournamentPrizes{
public CardCollection getPrizeForTournament(PlayerStanding playerStanding, int playersCount) {
DefaultCardCollection tournamentPrize = new DefaultCardCollection();
if (playerStanding.getPoints() == 6) {
tournamentPrize.addItem("(S)Booster Choice", 2);
tournamentPrize.addItem("(S)Booster Choice", 3);
tournamentPrize.addItem(getRandom(_promos), 1);
} else if (playerStanding.getPoints() == 5) {
tournamentPrize.addItem("(S)Booster Choice", 1);
tournamentPrize.addItem("(S)Booster Choice", 2);
tournamentPrize.addItem(getRandom(_promos), 1);
} else if (playerStanding.getPoints() == 3) {
tournamentPrize.addItem("(S)Booster Choice", 1);
tournamentPrize.addItem(getRandom(_promos), 1);
} else {
tournamentPrize.addItem("(S)Booster Choice", 1);
}
if (tournamentPrize.getAll().size() == 0)
@@ -56,6 +59,6 @@ public class SingleEliminationOnDemandPrizes implements TournamentPrizes{
@Override
public String getPrizeDescription() {
return "<div class='prizeHint' value='3 wins - 2 boosters and a random promo, 2 wins - 1 booster and a random promo, 1 win - 1 booster'>(2+promo)-(1+promo)-1-1</div>";
return "<div class='prizeHint' value='3 wins - 3 boosters and a random promo, 2 wins - 2 boosters and a random promo, 1 win - 1 booster and a random promo, 0 wins - 1 booster'>(3+promo)-(2+promo)-(1+promo)-1</div>";
}
}