From 2078c03d312f89a4cf61b551855b4bfb9151ecc0 Mon Sep 17 00:00:00 2001 From: marcins78 Date: Wed, 9 Jul 2014 14:49:23 +0000 Subject: [PATCH] Added support for sale of Alternate Art card types, so that merchant does not break. --- .../java/com/gempukku/lotro/merchant/RarityBasedMerchant.java | 2 +- .../com/gempukku/lotro/tournament/DailyTournamentPrizes.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/RarityBasedMerchant.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/RarityBasedMerchant.java index 1f1443b33..ac259dd73 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/RarityBasedMerchant.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/merchant/RarityBasedMerchant.java @@ -77,7 +77,7 @@ public class RarityBasedMerchant implements Merchant { return 50; else if (cardRarity.equals("U") || cardRarity.equals("S")) return 100; - else if (cardRarity.equals("R") || cardRarity.equals("P")) + else if (cardRarity.equals("R") || cardRarity.equals("P") || cardRarity.equals("A")) return 1000; else if (cardRarity.equals("X")) return 2000; 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 2c2568e96..ffe4954ce 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 @@ -14,7 +14,7 @@ public class DailyTournamentPrizes implements TournamentPrizes { @Override public CardCollection getPrizeForTournament(PlayerStanding playerStanding, int playersCount) { DefaultCardCollection tournamentPrize = new DefaultCardCollection(); - tournamentPrize.addItem("(S)Booster Choice", (playerStanding.getPlayerWins() + playerStanding.getPlayerByes()) * 2); + tournamentPrize.addItem("(S)Booster Choice", playerStanding.getPoints()); if (tournamentPrize.getAll().size() == 0) { return null; @@ -34,6 +34,6 @@ public class DailyTournamentPrizes implements TournamentPrizes { @Override public String getPrizeDescription() { - return "2 boosters per win (or bye), max 3 rounds"; + return "2 boosters per win (or bye), 1 per loss, max 3 rounds"; } }