From 54874a59b0b462cb9d176ea1ac29693e26dd08de Mon Sep 17 00:00:00 2001 From: xenohedron Date: Sun, 1 Sep 2024 01:08:26 -0400 Subject: [PATCH] refactor: rename "remixed" to "reshuffled" (#12755) --- .../client/dialog/NewTournamentDialog.java | 24 ++++++++-------- .../dialog/RandomPacksSelectorDialog.java | 10 +++---- .../java/mage/view/TournamentTypeView.java | 8 +++--- ...ledBoosterDraftEliminationTournament.java} | 8 +++--- ...oosterDraftEliminationTournamentType.java} | 8 +++--- ...eshuffledBoosterDraftSwissTournament.java} | 8 +++--- ...ffledBoosterDraftSwissTournamentType.java} | 8 +++--- Mage.Server/config/config.xml | 4 +-- Mage.Server/release/config/config.xml | 4 +-- .../server/tournament/TournamentFactory.java | 4 +-- Mage.Server/src/test/data/config_error.xml | 4 +-- .../mage/test/sets/BoosterGenerationTest.java | 6 ++-- .../mage/game/draft/RemixedBoosterDraft.java | 28 ------------------- .../game/draft/ReshuffledBoosterDraft.java | 28 +++++++++++++++++++ .../{RemixedSet.java => ReshuffledSet.java} | 8 +++--- .../mage/game/tournament/LimitedOptions.java | 10 +++---- .../mage/game/tournament/TournamentType.java | 6 ++-- 17 files changed, 88 insertions(+), 88 deletions(-) rename Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/{RemixedBoosterDraftEliminationTournament.java => ReshuffledBoosterDraftEliminationTournament.java} (65%) rename Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/{RemixedBoosterDraftEliminationTournamentType.java => ReshuffledBoosterDraftEliminationTournamentType.java} (58%) rename Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/{RemixedBoosterDraftSwissTournament.java => ReshuffledBoosterDraftSwissTournament.java} (67%) rename Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/{RemixedBoosterDraftSwissTournamentType.java => ReshuffledBoosterDraftSwissTournamentType.java} (58%) delete mode 100644 Mage/src/main/java/mage/game/draft/RemixedBoosterDraft.java create mode 100644 Mage/src/main/java/mage/game/draft/ReshuffledBoosterDraft.java rename Mage/src/main/java/mage/game/draft/{RemixedSet.java => ReshuffledSet.java} (96%) diff --git a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java index 54d5ab49192..394d92b6bdf 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java @@ -52,7 +52,7 @@ public class NewTournamentDialog extends MageDialog { private static final int CONSTRUCTION_TIME_MAX = 30; private boolean isRandom = false; private boolean isRichMan = false; - private boolean isRemixed = false; + private boolean isReshuffled = false; private String cubeFromDeckFilename = ""; private String jumpstartPacksFilename = ""; private boolean automaticChange = false; @@ -664,7 +664,7 @@ public class NewTournamentDialog extends MageDialog { // CHECKS TournamentTypeView tournamentType = (TournamentTypeView) cbTournamentType.getSelectedItem(); - if (tournamentType.isRandom() || tournamentType.isRichMan() || tournamentType.isRemixed()) { + if (tournamentType.isRandom() || tournamentType.isRichMan() || tournamentType.isReshuffled()) { if (tOptions.getLimitedOptions().getSetCodes().size() < 1) { JOptionPane.showMessageDialog( MageFrame.getDesktop(), @@ -905,8 +905,8 @@ public class NewTournamentDialog extends MageDialog { if (tournamentType.isLimited()) { this.isRandom = tournamentType.isRandom(); this.isRichMan = tournamentType.isRichMan(); - this.isRemixed = tournamentType.isRemixed(); - if (this.isRandom || this.isRichMan || this.isRemixed) { + this.isReshuffled = tournamentType.isReshuffled(); + if (this.isRandom || this.isRichMan || this.isReshuffled) { createRandomPacks(); } else { createPacks(tournamentType.getNumBoosters()); @@ -951,7 +951,7 @@ public class NewTournamentDialog extends MageDialog { this.lblPacks.setVisible(false); this.pnlPacks.setVisible(false); this.pnlRandomPacks.setVisible(false); - } else if (tournamentType.isRandom() || tournamentType.isRichMan() || tournamentType.isRemixed()) { + } else if (tournamentType.isRandom() || tournamentType.isRichMan() || tournamentType.isReshuffled()) { this.lblDraftCube.setVisible(false); this.cbDraftCube.setVisible(false); this.lblPacks.setVisible(true); @@ -1035,7 +1035,7 @@ public class NewTournamentDialog extends MageDialog { } private void showRandomPackSelectorDialog() { - randomPackSelector.showDialog(isRandom, isRichMan, isRemixed); + randomPackSelector.showDialog(isRandom, isRichMan, isReshuffled); this.txtRandomPacks.setText(String.join(";", randomPackSelector.getSelectedPacks())); this.pack(); this.revalidate(); @@ -1237,7 +1237,7 @@ public class NewTournamentDialog extends MageDialog { if (tournamentType.isLimited()) { tOptions.getLimitedOptions().setConstructionTime((Integer) this.spnConstructTime.getValue() * 60); tOptions.getLimitedOptions().setIsRandom(tournamentType.isRandom()); - tOptions.getLimitedOptions().setIsRemixed(tournamentType.isRemixed()); + tOptions.getLimitedOptions().setIsReshuffled(tournamentType.isReshuffled()); tOptions.getLimitedOptions().setIsRichMan(tournamentType.isRichMan()); tOptions.getLimitedOptions().setIsJumpstart(tournamentType.isJumpstart()); @@ -1273,7 +1273,7 @@ public class NewTournamentDialog extends MageDialog { } else if (tournamentType.isRandom() || tournamentType.isRichMan()) { this.isRandom = tournamentType.isRandom(); this.isRichMan = tournamentType.isRichMan(); - this.isRemixed = tournamentType.isRemixed(); + this.isReshuffled = tournamentType.isReshuffled(); tOptions.getLimitedOptions().getSetCodes().clear(); java.util.List selected = randomPackSelector.getSelectedPacks(); Collections.shuffle(selected); @@ -1290,10 +1290,10 @@ public class NewTournamentDialog extends MageDialog { } else { tOptions.getLimitedOptions().getSetCodes().addAll(selected); } - } else if (tournamentType.isRemixed()) { + } else if (tournamentType.isReshuffled()) { this.isRandom = tournamentType.isRandom(); this.isRichMan = tournamentType.isRichMan(); - this.isRemixed = tournamentType.isRemixed(); + this.isReshuffled = tournamentType.isReshuffled(); tOptions.getLimitedOptions().getSetCodes().clear(); tOptions.getLimitedOptions().getSetCodes().addAll(randomPackSelector.getSelectedPacks()); } else { @@ -1389,7 +1389,7 @@ public class NewTournamentDialog extends MageDialog { numPlayers = Integer.parseInt(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PLAYERS_DRAFT + versionStr, "4")); prepareTourneyView(numPlayers); - if (tournamentType.isRandom() || tournamentType.isRichMan() || tournamentType.isRemixed()) { + if (tournamentType.isRandom() || tournamentType.isRichMan() || tournamentType.isReshuffled()) { loadRandomPacks(version); } else { loadBoosterPacks(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PACKS_DRAFT + versionStr, "")); @@ -1450,7 +1450,7 @@ public class NewTournamentDialog extends MageDialog { if (deckFile != null && !deckFile.isEmpty()) { PreferencesDialog.saveValue(PreferencesDialog.KEY_NEW_TABLE_DECK_FILE + versionStr, deckFile); } - if (tOptions.getLimitedOptions().getIsRandom() || tOptions.getLimitedOptions().getIsRichMan() || tOptions.getLimitedOptions().getIsRemixed()) { + if (tOptions.getLimitedOptions().getIsRandom() || tOptions.getLimitedOptions().getIsRichMan() || tOptions.getLimitedOptions().getIsReshuffled()) { PreferencesDialog.saveValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PACKS_RANDOM_DRAFT + versionStr, String.join(";", this.randomPackSelector.getSelectedPacks())); } } diff --git a/Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java b/Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java index 03c71a4bb9e..07306f8ea97 100644 --- a/Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java +++ b/Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java @@ -27,22 +27,22 @@ public class RandomPacksSelectorDialog extends javax.swing.JDialog { boxesCreated = false; } - private void setType(boolean isRandomDraft, boolean isRichManDraft, boolean isRemixedDraft) { + private void setType(boolean isRandomDraft, boolean isRichManDraft, boolean isReshuffledDraft) { String title; if (isRandomDraft) { title = "Random Booster Draft Packs Selector"; } else if (isRichManDraft) { title = "Rich Man Booster Draft Packs Selector"; - } else if (isRemixedDraft) { - title = "Chaos Remixed Draft Set Selector"; + } else if (isReshuffledDraft) { + title = "Chaos Reshuffled Draft Set Selector"; } else { title = "Booster Draft Packs Selector"; } setTitle(title); } - public void showDialog(boolean isRandomDraft, boolean isRichManDraft, boolean isRemixedDraft) { - setType(isRandomDraft, isRichManDraft, isRemixedDraft); + public void showDialog(boolean isRandomDraft, boolean isRichManDraft, boolean isReshuffledDraft) { + setType(isRandomDraft, isRichManDraft, isReshuffledDraft); createCheckboxes(); pnlPacks.setVisible(true); pnlPacks.revalidate(); diff --git a/Mage.Common/src/main/java/mage/view/TournamentTypeView.java b/Mage.Common/src/main/java/mage/view/TournamentTypeView.java index 8430259db2d..9a2f92ae700 100644 --- a/Mage.Common/src/main/java/mage/view/TournamentTypeView.java +++ b/Mage.Common/src/main/java/mage/view/TournamentTypeView.java @@ -21,7 +21,7 @@ public class TournamentTypeView implements Serializable { private final boolean cubeBooster; private final boolean elimination; private final boolean random; - private final boolean remixed; + private final boolean reshuffled; private final boolean richMan; private final boolean jumpstart; @@ -35,7 +35,7 @@ public class TournamentTypeView implements Serializable { this.cubeBooster = tournamentType.isCubeBooster(); this.elimination = tournamentType.isElimination(); this.random = tournamentType.isRandom(); - this.remixed = tournamentType.isRemixed(); + this.reshuffled = tournamentType.isReshuffled(); this.richMan = tournamentType.isRichMan(); this.jumpstart = tournamentType.isJumpstart(); } @@ -81,8 +81,8 @@ public class TournamentTypeView implements Serializable { return random; } - public boolean isRemixed() { - return remixed; + public boolean isReshuffled() { + return reshuffled; } public boolean isRichMan() { diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftEliminationTournament.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftEliminationTournament.java similarity index 65% rename from Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftEliminationTournament.java rename to Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftEliminationTournament.java index 21f7351e940..ff601a47612 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftEliminationTournament.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftEliminationTournament.java @@ -2,21 +2,21 @@ package mage.tournament; import mage.constants.TournamentPlayerState; import mage.game.draft.DraftOptions; -import mage.game.draft.RemixedBoosterDraft; +import mage.game.draft.ReshuffledBoosterDraft; import mage.game.events.TableEvent; import mage.game.tournament.TournamentOptions; import mage.game.tournament.TournamentPlayer; -public class RemixedBoosterDraftEliminationTournament extends BoosterDraftEliminationTournament { +public class ReshuffledBoosterDraftEliminationTournament extends BoosterDraftEliminationTournament { - public RemixedBoosterDraftEliminationTournament(TournamentOptions options) { + public ReshuffledBoosterDraftEliminationTournament(TournamentOptions options) { super(options); currentStep = TournamentStep.START; } @Override protected void draft() { - draft = new RemixedBoosterDraft((DraftOptions) options.getLimitedOptions(), getSets()); + draft = new ReshuffledBoosterDraft((DraftOptions) options.getLimitedOptions(), getSets()); for (TournamentPlayer player: players.values()) { draft.addPlayer(player.getPlayer()); player.setState(TournamentPlayerState.DRAFTING); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftEliminationTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftEliminationTournamentType.java similarity index 58% rename from Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftEliminationTournamentType.java rename to Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftEliminationTournamentType.java index 4c285875818..efd978ae4b0 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftEliminationTournamentType.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftEliminationTournamentType.java @@ -8,10 +8,10 @@ import mage.game.tournament.TournamentType; * * @author BetaSteward_at_googlemail.com */ -public class RemixedBoosterDraftEliminationTournamentType extends TournamentType { +public class ReshuffledBoosterDraftEliminationTournamentType extends TournamentType { - public RemixedBoosterDraftEliminationTournamentType() { - this.name = "Booster Draft Elimination (Remixed)"; + public ReshuffledBoosterDraftEliminationTournamentType() { + this.name = "Booster Draft Elimination (Reshuffled)"; this.maxPlayers = 16; this.minPlayers = 4; this.numBoosters = 3; @@ -19,7 +19,7 @@ public class RemixedBoosterDraftEliminationTournamentType extends TournamentType this.limited = true; this.cubeBooster = false; this.elimination = true; - this.isRemixed = true; + this.isReshuffled = true; } } diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftSwissTournament.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftSwissTournament.java similarity index 67% rename from Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftSwissTournament.java rename to Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftSwissTournament.java index 9249ed2775a..e68b0c3289d 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftSwissTournament.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftSwissTournament.java @@ -2,21 +2,21 @@ package mage.tournament; import mage.constants.TournamentPlayerState; import mage.game.draft.DraftOptions; -import mage.game.draft.RemixedBoosterDraft; +import mage.game.draft.ReshuffledBoosterDraft; import mage.game.events.TableEvent; import mage.game.tournament.TournamentOptions; import mage.game.tournament.TournamentPlayer; -public class RemixedBoosterDraftSwissTournament extends BoosterDraftSwissTournament { +public class ReshuffledBoosterDraftSwissTournament extends BoosterDraftSwissTournament { - public RemixedBoosterDraftSwissTournament(TournamentOptions options) { + public ReshuffledBoosterDraftSwissTournament(TournamentOptions options) { super(options); currentStep = BoosterDraftSwissTournament.TournamentStep.START; } @Override protected void draft() { - draft = new RemixedBoosterDraft((DraftOptions) options.getLimitedOptions(), getSets()); + draft = new ReshuffledBoosterDraft((DraftOptions) options.getLimitedOptions(), getSets()); for (TournamentPlayer player: players.values()) { draft.addPlayer(player.getPlayer()); player.setState(TournamentPlayerState.DRAFTING); diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftSwissTournamentType.java b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftSwissTournamentType.java similarity index 58% rename from Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftSwissTournamentType.java rename to Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftSwissTournamentType.java index eaf4aa936da..c21e3c5c902 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftSwissTournamentType.java +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftSwissTournamentType.java @@ -8,10 +8,10 @@ import mage.game.tournament.TournamentType; * * @author LevelX2 */ -public class RemixedBoosterDraftSwissTournamentType extends TournamentType { +public class ReshuffledBoosterDraftSwissTournamentType extends TournamentType { - public RemixedBoosterDraftSwissTournamentType() { - this.name = "Booster Draft Swiss (Remixed)"; + public ReshuffledBoosterDraftSwissTournamentType() { + this.name = "Booster Draft Swiss (Reshuffled)"; this.maxPlayers = 16; this.minPlayers = 4; this.numBoosters = 3; @@ -19,7 +19,7 @@ public class RemixedBoosterDraftSwissTournamentType extends TournamentType { this.limited = true; this.cubeBooster = false; this.elimination = false; - this.isRemixed = true; + this.isReshuffled = true; } } diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml index 6e85074e835..bb39136505b 100644 --- a/Mage.Server/config/config.xml +++ b/Mage.Server/config/config.xml @@ -95,13 +95,13 @@ - + - + diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml index 7735a2aa95a..e19d19ca6dd 100644 --- a/Mage.Server/release/config/config.xml +++ b/Mage.Server/release/config/config.xml @@ -89,13 +89,13 @@ - + - + diff --git a/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java b/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java index 1e0d67ecd83..e7749b83539 100644 --- a/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java +++ b/Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java @@ -61,8 +61,8 @@ public enum TournamentFactory { rv.append(';'); } tournament.setBoosterInfo(rv.toString()); - } else if (tournament.getTournamentType().isRemixed()) { - StringBuilder rv = new StringBuilder( "Chaos Remixed Draft using sets: "); + } else if (tournament.getTournamentType().isReshuffled()) { + StringBuilder rv = new StringBuilder( "Chaos Reshuffled Draft using sets: "); for (Map.Entry entry: setInfo.entrySet()){ rv.append(entry.getKey()); rv.append(';'); diff --git a/Mage.Server/src/test/data/config_error.xml b/Mage.Server/src/test/data/config_error.xml index 433918072d4..517fc0f9328 100644 --- a/Mage.Server/src/test/data/config_error.xml +++ b/Mage.Server/src/test/data/config_error.xml @@ -61,13 +61,13 @@ - + - + diff --git a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java index a3db14468a0..a1272a2f066 100644 --- a/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java @@ -10,7 +10,7 @@ import mage.cards.repository.CardInfo; import mage.cards.repository.CardScanner; import mage.constants.Rarity; import mage.constants.SubType; -import mage.game.draft.RemixedSet; +import mage.game.draft.ReshuffledSet; import mage.sets.*; import mage.util.CardUtil; import org.junit.Assert; @@ -541,12 +541,12 @@ public class BoosterGenerationTest extends MageTestPlayerBase { @Ignore // debug only @Test - public void test_RemixedBoosterStats() { + public void test_ReshuffledBoosterStats() { List sets = new ArrayList<>(); sets.add(ScarsOfMirrodin.getInstance()); sets.add(MirrodinBesieged.getInstance()); sets.add(NewPhyrexia.getInstance()); - RemixedSet setToAnalyse = new RemixedSet(sets, 10, 3, 1); + ReshuffledSet setToAnalyse = new ReshuffledSet(sets, 10, 3, 1); int openBoosters = 10000; Map resRatio = new HashMap<>(); diff --git a/Mage/src/main/java/mage/game/draft/RemixedBoosterDraft.java b/Mage/src/main/java/mage/game/draft/RemixedBoosterDraft.java deleted file mode 100644 index b7b2250eada..00000000000 --- a/Mage/src/main/java/mage/game/draft/RemixedBoosterDraft.java +++ /dev/null @@ -1,28 +0,0 @@ -package mage.game.draft; - -import mage.cards.ExpansionSet; - -import java.util.List; - -public class RemixedBoosterDraft extends BoosterDraft { - - final RemixedSet remixedSet; - - public RemixedBoosterDraft(DraftOptions options, List sets) { - super(options, sets); - if (sets.isEmpty()){ - throw new RuntimeException("At least one set must be selected for remixed booster draft"); - } - remixedSet = new RemixedSet(sets, 10, 3, 1); - } - - @Override - protected void openBooster() { - if (boosterNum <= numberBoosters) { - for (DraftPlayer player: players.values()) { - player.setBooster(remixedSet.createBooster()); - } - } - } - -} diff --git a/Mage/src/main/java/mage/game/draft/ReshuffledBoosterDraft.java b/Mage/src/main/java/mage/game/draft/ReshuffledBoosterDraft.java new file mode 100644 index 00000000000..7fd747d449d --- /dev/null +++ b/Mage/src/main/java/mage/game/draft/ReshuffledBoosterDraft.java @@ -0,0 +1,28 @@ +package mage.game.draft; + +import mage.cards.ExpansionSet; + +import java.util.List; + +public class ReshuffledBoosterDraft extends BoosterDraft { + + final ReshuffledSet reshuffledSet; + + public ReshuffledBoosterDraft(DraftOptions options, List sets) { + super(options, sets); + if (sets.isEmpty()){ + throw new IllegalStateException("At least one set must be selected for reshuffled booster draft"); + } + reshuffledSet = new ReshuffledSet(sets, 10, 3, 1); + } + + @Override + protected void openBooster() { + if (boosterNum <= numberBoosters) { + for (DraftPlayer player: players.values()) { + player.setBooster(reshuffledSet.createBooster()); + } + } + } + +} diff --git a/Mage/src/main/java/mage/game/draft/RemixedSet.java b/Mage/src/main/java/mage/game/draft/ReshuffledSet.java similarity index 96% rename from Mage/src/main/java/mage/game/draft/RemixedSet.java rename to Mage/src/main/java/mage/game/draft/ReshuffledSet.java index ac64a38353f..7558f41b55c 100644 --- a/Mage/src/main/java/mage/game/draft/RemixedSet.java +++ b/Mage/src/main/java/mage/game/draft/ReshuffledSet.java @@ -16,7 +16,7 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; -public class RemixedSet implements Serializable { +public class ReshuffledSet implements Serializable { protected final int numBoosterCommons; protected final int numBoosterUncommons; @@ -29,11 +29,11 @@ public class RemixedSet implements Serializable { protected final List specials; protected final double chanceMythic; - public RemixedSet (List sets, int c, int u, int r) { + public ReshuffledSet(List sets, int c, int u, int r) { this(sets, c, u, r, 0); } - public RemixedSet(List sets, int c, int u, int r, int special) { + public ReshuffledSet(List sets, int c, int u, int r, int special) { this.numBoosterCommons = c; this.numBoosterUncommons = u; this.numBoosterRares = r; @@ -58,7 +58,7 @@ public class RemixedSet implements Serializable { List cardInfos = CardRepository.instance.findCards(new CardCriteria() .setCodes(set.getCode()) .rarities(rarity) - .maxCardNumber(set.getMaxCardNumberInBooster())); // TODO: Make sure this parameter is set appropriately where needed + .maxCardNumber(set.getMaxCardNumberInBooster())); cardInfos.removeIf(next -> ( next.getCardNumber().contains("*") diff --git a/Mage/src/main/java/mage/game/tournament/LimitedOptions.java b/Mage/src/main/java/mage/game/tournament/LimitedOptions.java index 476eacb0ae1..6bb520863bd 100644 --- a/Mage/src/main/java/mage/game/tournament/LimitedOptions.java +++ b/Mage/src/main/java/mage/game/tournament/LimitedOptions.java @@ -17,7 +17,7 @@ public class LimitedOptions implements Serializable { protected DraftCube draftCube; protected int numberBoosters; protected boolean isRandom; - protected boolean isRemixed; + protected boolean isReshuffled; protected boolean isRichMan; protected Deck cubeFromDeck; @@ -96,12 +96,12 @@ public class LimitedOptions implements Serializable { this.isRandom = isRandom; } - public boolean getIsRemixed() { - return isRemixed; + public boolean getIsReshuffled() { + return isReshuffled; } - public void setIsRemixed(boolean isRemixed) { - this.isRemixed = isRemixed; + public void setIsReshuffled(boolean isReshuffled) { + this.isReshuffled = isReshuffled; } public boolean getIsRichMan() { diff --git a/Mage/src/main/java/mage/game/tournament/TournamentType.java b/Mage/src/main/java/mage/game/tournament/TournamentType.java index 4a61e9b5173..ccea8178620 100644 --- a/Mage/src/main/java/mage/game/tournament/TournamentType.java +++ b/Mage/src/main/java/mage/game/tournament/TournamentType.java @@ -18,7 +18,7 @@ public class TournamentType implements Serializable { protected boolean limited; // else Constructed protected boolean elimination; // else Swiss protected boolean isRandom; // chaos draft - protected boolean isRemixed; // boosters generated containing cards from multiple sets + protected boolean isReshuffled; // boosters generated containing cards from multiple sets protected boolean isRichMan; // new boosters generated for each pick protected boolean isJumpstart; @@ -66,8 +66,8 @@ public class TournamentType implements Serializable { return this.isRandom; } - public boolean isRemixed() { - return this.isRemixed; + public boolean isReshuffled() { + return this.isReshuffled; } public boolean isRichMan() {