From a9b8488b7515aa6c94e9cf15096ed5de39e30c57 Mon Sep 17 00:00:00 2001 From: Christian 'ketura' McCarty Date: Sun, 16 Oct 2022 15:10:48 -0500 Subject: [PATCH] Fixing TS, Movie, and All Booster Choice IDs being mangled --- .../src/main/web/js/gemp-022/jCards.js | 6 +++--- .../src/main/resources/product/old/packs.txt | 6 +++--- .../com/gempukku/lotro/league/FixedLeaguePrizes.java | 8 ++++---- .../gempukku/lotro/league/SealedLeagueProduct.java | 12 ++++++------ .../lotro/tournament/DailyTournamentPrizes.java | 2 +- .../tournament/SingleEliminationOnDemandPrizes.java | 6 +++--- .../gempukku/lotro/library/ProductLibraryTests.java | 6 +++--- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js index d2dd8c478..243a17da1 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/jCards.js @@ -37,9 +37,9 @@ var packBlueprints = { "(S)SH - Tengwar": "/gemp-lotr/images/boosters/sh_tengwar_selection.png", "(S)Tengwar": "/gemp-lotr/images/boosters/tengwar_selection.png", - "(S)Booster Choice": "/gemp-lotr/images/boosters/booster_selection.png", - "(S)Movie Booster Choice": "/gemp-lotr/images/boosters/booster_selection.png", - "(S)TSBoosterChoice": "/gemp-lotr/images/boosters/booster_selection.png", + "(S)All Decipher Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png", + "(S)Movie Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png", + "(S)TS Choice - Booster": "/gemp-lotr/images/boosters/booster_selection.png", "FotR - League Starter": "/gemp-lotr/images/boosters/fotr_league_starter.png", "Random FotR Foil Common": "/gemp-lotr/images/boosters/random_foil.png", diff --git a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/old/packs.txt b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/old/packs.txt index c3ca09b38..1d1d6138b 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/resources/product/old/packs.txt +++ b/gemp-lotr/gemp-lotr-cards/src/main/resources/product/old/packs.txt @@ -19,7 +19,7 @@ BoHD - Legolas Starter EoF - Faramir Starter EoF - Witch-king Starter (S)TTT - Starter -(S)Booster Choice +(S)All Decipher Choice - Booster (S)BoHD - Starter (S)EoF - Starter (S)FotR - Starter @@ -79,7 +79,7 @@ Special-09 (S)Special-1-3 (S)Special-4-6 (S)Special-7-9 -(S)Movie Booster Choice +(S)Movie Choice - Booster Expanded Wraith AgesEnd @@ -95,4 +95,4 @@ TSSealedS3D3 (S)TSSealed-S1 (S)TSSealed-S2 (S)TSSealed-S3 -(S)TSBoosterChoice +(S)TS Choice - Booster 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 d5abfd9fa..3bb5e8b12 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 @@ -31,7 +31,7 @@ public class FixedLeaguePrizes implements LeaguePrizes { public CardCollection getPrizeForLeagueMatchWinner(int winCountThisSerie, int totalGamesPlayedThisSerie) { DefaultCardCollection winnerPrize = new DefaultCardCollection(); if (winCountThisSerie % 2 == 1) { - winnerPrize.addItem("(S)Booster Choice", 1); + winnerPrize.addItem("(S)All Decipher Choice - Booster", 1); } else { if (winCountThisSerie <= 4) { winnerPrize.addItem(getRandom(_commons) + "*", 1); @@ -80,7 +80,7 @@ public class FixedLeaguePrizes implements LeaguePrizes { //65th-128th - 5 boosters 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)All Decipher Choice - Booster", getSealedBoosterCount(position)); addPrizes(prize, getRandomFoil(_rares, getRandomRareFoilCount(position))); if (prize.getAll().iterator().hasNext()) return prize; @@ -112,7 +112,7 @@ public class FixedLeaguePrizes implements LeaguePrizes { //17th-32nd - 2 boosters 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)All Decipher Choice - Booster", getCollectorsBoosterCount(position)); addPrizes(prize, getRandomFoil(_rares, getRandomRareFoilCount(position))); if (prize.getAll().iterator().hasNext()) return prize; @@ -140,7 +140,7 @@ public class FixedLeaguePrizes implements LeaguePrizes { //17th-32nd - 1 boosters 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)All Decipher Choice - Booster", getConstructedBoosterCount(position)); addPrizes(prize, getRandomFoil(_rares, getRandomRareFoilCount(position))); if (prize.getAll().iterator().hasNext()) return prize; diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java index 018e0e533..3a455d625 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/league/SealedLeagueProduct.java @@ -121,7 +121,7 @@ public class SealedLeagueProduct { firstWeek.addItem("FotR - Booster", 1); firstWeek.addItem("TTT - Booster", 1); firstWeek.addItem("RotK - Booster", 1); - firstWeek.addItem("(S)Movie Booster Choice", 3); + firstWeek.addItem("(S)Movie Choice - Booster", 3); movieSpecialBlock.add(firstWeek); MutableCardCollection secondWeek = new DefaultCardCollection(); @@ -140,7 +140,7 @@ public class SealedLeagueProduct { MutableCardCollection fourthWeek = new DefaultCardCollection(); fourthWeek.addItem("REF - Booster", 1); - fourthWeek.addItem("(S)Movie Booster Choice", 5); + fourthWeek.addItem("(S)Movie Choice - Booster", 5); movieSpecialBlock.add(fourthWeek); _collections.put(SealedLeagueType.MOVIE_SPECIAL_BLOCK.getSealedCode(), movieSpecialBlock); @@ -153,25 +153,25 @@ public class SealedLeagueProduct { firstWeek.addItem("(S)TSSealed-S1", 1); firstWeek.addItem("FotR - Booster", 2); firstWeek.addItem("TTT - Booster", 2); - firstWeek.addItem("(S)TSBoosterChoice", 2); + firstWeek.addItem("(S)TS Choice - Booster", 2); tsSpecialBlock.add(firstWeek); MutableCardCollection secondWeek = new DefaultCardCollection(); secondWeek.addItem("(S)TSSealed-S2", 1); secondWeek.addItem("MoM - Booster", 1); secondWeek.addItem("BoHD - Booster", 1); - secondWeek.addItem("(S)TSBoosterChoice", 1); + secondWeek.addItem("(S)TS Choice - Booster", 1); tsSpecialBlock.add(secondWeek); MutableCardCollection thirdWeek = new DefaultCardCollection(); thirdWeek.addItem("(S)TSSealed-S3", 1); thirdWeek.addItem("RotEL - Booster", 1); thirdWeek.addItem("EoF - Booster", 1); - thirdWeek.addItem("(S)TSBoosterChoice", 1); + thirdWeek.addItem("(S)TS Choice - Booster", 1); tsSpecialBlock.add(thirdWeek); MutableCardCollection fourthWeek = new DefaultCardCollection(); - fourthWeek.addItem("(S)TSBoosterChoice", 6); + fourthWeek.addItem("(S)TS Choice - Booster", 6); tsSpecialBlock.add(fourthWeek); _collections.put(SealedLeagueType.TS_SPECIAL_BLOCK.getSealedCode(), tsSpecialBlock); 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 03de737a4..0b496e274 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 @@ -25,7 +25,7 @@ public class DailyTournamentPrizes implements TournamentPrizes { @Override public CardCollection getPrizeForTournament(PlayerStanding playerStanding, int playersCount) { DefaultCardCollection tournamentPrize = new DefaultCardCollection(); - tournamentPrize.addItem("(S)Booster Choice", playerStanding.getPoints()); + tournamentPrize.addItem("(S)All Decipher Choice - Booster", playerStanding.getPoints()); if (playerStanding.getPlayerWins() + playerStanding.getPlayerByes() >= 2) tournamentPrize.addItem(getRandom(_promos), 1); diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java index c1051a3ff..548e75d8b 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/tournament/SingleEliminationOnDemandPrizes.java @@ -26,12 +26,12 @@ public class SingleEliminationOnDemandPrizes implements TournamentPrizes{ public CardCollection getPrizeForTournament(PlayerStanding playerStanding, int playersCount) { DefaultCardCollection tournamentPrize = new DefaultCardCollection(); if (playerStanding.getPoints() == 4) { - tournamentPrize.addItem("(S)Booster Choice", 2); + tournamentPrize.addItem("(S)All Decipher Choice - Booster", 2); tournamentPrize.addItem(getRandom(_promos), 1); } else if (playerStanding.getPoints() == 3) { - tournamentPrize.addItem("(S)Booster Choice", 2); + tournamentPrize.addItem("(S)All Decipher Choice - Booster", 2); } else { - tournamentPrize.addItem("(S)Booster Choice", 1); + tournamentPrize.addItem("(S)All Decipher Choice - Booster", 1); } if (!tournamentPrize.getAll().iterator().hasNext()) diff --git a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/library/ProductLibraryTests.java b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/library/ProductLibraryTests.java index 8766923a9..091835c04 100644 --- a/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/library/ProductLibraryTests.java +++ b/gemp-lotr/gemp-lotr-server/src/test/java/com/gempukku/lotro/library/ProductLibraryTests.java @@ -23,7 +23,7 @@ public class ProductLibraryTests extends AbstractAtTest { "(S)BoHD - Starter", "BoHD - Eowyn Starter", "BoHD - Legolas Starter", - "(S)Booster Choice", + "(S)All Decipher Choice - Booster", "(S)BR - Starter", "BR - Mouth Starter", "BR - Saruman Starter", @@ -42,7 +42,7 @@ public class ProductLibraryTests extends AbstractAtTest { "(S)MoM - Starter", "MoM - Gandalf Starter", "MoM - Gimli Starter", - "(S)Movie Booster Choice", + "(S)Movie Choice - Booster", "(S)RoS - Starter", "RoS - Uruk Rampage Starter", "RoS - Evil Man Starter", @@ -60,7 +60,7 @@ public class ProductLibraryTests extends AbstractAtTest { "(S)SoG - Starter", "SoG - Merry Starter", "SoG - Pippin Starter", - "(S)TSBoosterChoice", + "(S)TS Choice - Booster", "(S)TTT - Starter", "TTT - Aragorn Starter", "TTT - Theoden Starter",