From b88f0ca630ff99b47253d3ac1e0af69f16580d4f Mon Sep 17 00:00:00 2001 From: marcins78 Date: Thu, 9 Jan 2014 15:45:46 +0000 Subject: [PATCH] Tengwar cards for leagues are awarded to the "Trophy" collection. --- .../com/gempukku/lotro/league/ConstructedLeagueData.java | 2 +- .../java/com/gempukku/lotro/league/FixedLeaguePrizes.java | 7 ++++--- .../gempukku/lotro/league/NewConstructedLeagueData.java | 2 +- .../com/gempukku/lotro/league/NewSealedLeagueData.java | 2 +- .../java/com/gempukku/lotro/league/SealedLeagueData.java | 2 +- 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java index b2797b97f..ba7415316 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/ConstructedLeagueData.java @@ -68,7 +68,7 @@ public class ConstructedLeagueData implements LeagueData { collectionsManager.addItemsToPlayerCollection(true, "End of league prizes", leagueStanding.getPlayerName(), _prizeCollectionType, leaguePrize.getAll().values()); final CardCollection leagueTrophies = _leaguePrizes.getTrophiesForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesCount, _collectionType); if (leagueTrophies != null) - collectionsManager.addItemsToPlayerCollection(true, "End of league prizes", leagueStanding.getPlayerName(), CollectionType.TROPHY, leagueTrophies.getAll().values()); + collectionsManager.addItemsToPlayerCollection(true, "End of league trophies", leagueStanding.getPlayerName(), CollectionType.TROPHY, leagueTrophies.getAll().values()); } status++; } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/FixedLeaguePrizes.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/FixedLeaguePrizes.java index 65fbcb439..1947d40e2 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/FixedLeaguePrizes.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/FixedLeaguePrizes.java @@ -58,6 +58,10 @@ public class FixedLeaguePrizes implements LeaguePrizes { @Override public CardCollection getTrophiesForLeague(int position, int playersCount, int gamesPlayed, int maxGamesPlayed, CollectionType collectionType) { + DefaultCardCollection prize = new DefaultCardCollection(); + prize.addItem("(S)Tengwar", getTengwarCount(position)); + if (prize.getAll().size() > 0) + return prize; return null; } @@ -73,7 +77,6 @@ public class FixedLeaguePrizes implements LeaguePrizes { private CardCollection getPrizeForSealedLeague(int position, int playersCount, int gamesPlayed, int maxGamesPlayed) { DefaultCardCollection prize = new DefaultCardCollection(); prize.addItem("(S)Booster Choice", getSealedBoosterCount(position)); - prize.addItem("(S)Tengwar", getTengwarCount(position)); addPrizes(prize, getRandomFoil(_rares, getRandomRareFoilCount(position))); if (prize.getAll().size() > 0) return prize; @@ -106,7 +109,6 @@ public class FixedLeaguePrizes implements LeaguePrizes { private CardCollection getPrizeForCollectorsLeague(int position, int playersCount, int gamesPlayed, int maxGamesPlayed) { DefaultCardCollection prize = new DefaultCardCollection(); prize.addItem("(S)Booster Choice", getCollectorsBoosterCount(position)); - prize.addItem("(S)Tengwar", getTengwarCount(position)); addPrizes(prize, getRandomFoil(_rares, getRandomRareFoilCount(position))); if (prize.getAll().size() > 0) return prize; @@ -135,7 +137,6 @@ public class FixedLeaguePrizes implements LeaguePrizes { private CardCollection getPrizeForConstructedLeague(int position, int playersCount, int gamesPlayed, int maxGamesPlayed) { DefaultCardCollection prize = new DefaultCardCollection(); prize.addItem("(S)Booster Choice", getConstructedBoosterCount(position)); - prize.addItem("(S)Tengwar", getTengwarCount(position)); addPrizes(prize, getRandomFoil(_rares, getRandomRareFoilCount(position))); if (prize.getAll().size() > 0) return prize; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java index b85d6da5a..dc51d0809 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewConstructedLeagueData.java @@ -72,7 +72,7 @@ public class NewConstructedLeagueData implements LeagueData { collectionsManager.addItemsToPlayerCollection(true, "End of league prizes", leagueStanding.getPlayerName(), _prizeCollectionType, leaguePrize.getAll().values()); final CardCollection leagueTrophies = _leaguePrizes.getTrophiesForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesPlayed, _collectionType); if (leagueTrophies != null) - collectionsManager.addItemsToPlayerCollection(true, "End of league prizes", leagueStanding.getPlayerName(), CollectionType.TROPHY, leagueTrophies.getAll().values()); + collectionsManager.addItemsToPlayerCollection(true, "End of league trophies", leagueStanding.getPlayerName(), CollectionType.TROPHY, leagueTrophies.getAll().values()); } status++; } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java index 66fd105ef..3d765c608 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/NewSealedLeagueData.java @@ -95,7 +95,7 @@ public class NewSealedLeagueData implements LeagueData { collectionsManager.addItemsToPlayerCollection(true, "End of league prizes", leagueStanding.getPlayerName(), _prizeCollectionType, leaguePrize.getAll().values()); final CardCollection leagueTrophies = _leaguePrizes.getTrophiesForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesTotal, _collectionType); if (leagueTrophies != null) - collectionsManager.addItemsToPlayerCollection(true, "End of league prizes", leagueStanding.getPlayerName(), CollectionType.TROPHY, leagueTrophies.getAll().values()); + collectionsManager.addItemsToPlayerCollection(true, "End of league trophies", leagueStanding.getPlayerName(), CollectionType.TROPHY, leagueTrophies.getAll().values()); } status++; } diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java index 3e37461ad..a66d572a9 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueData.java @@ -96,7 +96,7 @@ public class SealedLeagueData implements LeagueData { collectionsManager.addItemsToPlayerCollection(true, "End of league prizes", leagueStanding.getPlayerName(), _prizeCollectionType, leaguePrize.getAll().values()); final CardCollection leagueTrophies = _leaguePrizes.getTrophiesForLeague(leagueStanding.getStanding(), leagueStandings.size(), leagueStanding.getGamesPlayed(), maxGamesPlayed, _collectionType); if (leagueTrophies != null) - collectionsManager.addItemsToPlayerCollection(true, "End of league prizes", leagueStanding.getPlayerName(), CollectionType.TROPHY, leagueTrophies.getAll().values()); + collectionsManager.addItemsToPlayerCollection(true, "End of league trophies", leagueStanding.getPlayerName(), CollectionType.TROPHY, leagueTrophies.getAll().values()); } status++; }