External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-20 02:30:08 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: rename "remixed" to "reshuffled" (#12755)

Browse source
This commit is contained in:
xenohedron 2024-09-01 01:08:26 -04:00 • committed by GitHub
parent d7fa7f673d
commit 54874a59b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
17 changed files with 88 additions and 88 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Mage.Client/src/main/java/mage/client/dialog/NewTournamentDialog.java
View file

@ -52,7 +52,7 @@ public class NewTournamentDialog extends MageDialog {
private static final int CONSTRUCTION_TIME_MAX = 30; private static final int CONSTRUCTION_TIME_MAX = 30;
private boolean isRandom = false; private boolean isRandom = false;
private boolean isRichMan = false; private boolean isRichMan = false;
private boolean isRemixed = false; private boolean isReshuffled = false;
private String cubeFromDeckFilename = ""; private String cubeFromDeckFilename = "";
private String jumpstartPacksFilename = ""; private String jumpstartPacksFilename = "";
private boolean automaticChange = false; private boolean automaticChange = false;
@ -664,7 +664,7 @@ public class NewTournamentDialog extends MageDialog {
// CHECKS // CHECKS
TournamentTypeView tournamentType = (TournamentTypeView) cbTournamentType.getSelectedItem(); 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) { if (tOptions.getLimitedOptions().getSetCodes().size() < 1) {
JOptionPane.showMessageDialog( JOptionPane.showMessageDialog(
MageFrame.getDesktop(), MageFrame.getDesktop(),
@ -905,8 +905,8 @@ public class NewTournamentDialog extends MageDialog {
if (tournamentType.isLimited()) { if (tournamentType.isLimited()) {
this.isRandom = tournamentType.isRandom(); this.isRandom = tournamentType.isRandom();
this.isRichMan = tournamentType.isRichMan(); this.isRichMan = tournamentType.isRichMan();
this.isRemixed = tournamentType.isRemixed(); this.isReshuffled = tournamentType.isReshuffled();
if (this.isRandom || this.isRichMan || this.isRemixed) { if (this.isRandom || this.isRichMan || this.isReshuffled) {
createRandomPacks(); createRandomPacks();
} else { } else {
createPacks(tournamentType.getNumBoosters()); createPacks(tournamentType.getNumBoosters());
@ -951,7 +951,7 @@ public class NewTournamentDialog extends MageDialog {
this.lblPacks.setVisible(false); this.lblPacks.setVisible(false);
this.pnlPacks.setVisible(false); this.pnlPacks.setVisible(false);
this.pnlRandomPacks.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.lblDraftCube.setVisible(false);
this.cbDraftCube.setVisible(false); this.cbDraftCube.setVisible(false);
this.lblPacks.setVisible(true); this.lblPacks.setVisible(true);
@ -1035,7 +1035,7 @@ public class NewTournamentDialog extends MageDialog {
} }
private void showRandomPackSelectorDialog() { private void showRandomPackSelectorDialog() {
randomPackSelector.showDialog(isRandom, isRichMan, isRemixed); randomPackSelector.showDialog(isRandom, isRichMan, isReshuffled);
this.txtRandomPacks.setText(String.join(";", randomPackSelector.getSelectedPacks())); this.txtRandomPacks.setText(String.join(";", randomPackSelector.getSelectedPacks()));
this.pack(); this.pack();
this.revalidate(); this.revalidate();
@ -1237,7 +1237,7 @@ public class NewTournamentDialog extends MageDialog {
if (tournamentType.isLimited()) { if (tournamentType.isLimited()) {
tOptions.getLimitedOptions().setConstructionTime((Integer) this.spnConstructTime.getValue() * 60); tOptions.getLimitedOptions().setConstructionTime((Integer) this.spnConstructTime.getValue() * 60);
tOptions.getLimitedOptions().setIsRandom(tournamentType.isRandom()); tOptions.getLimitedOptions().setIsRandom(tournamentType.isRandom());
tOptions.getLimitedOptions().setIsRemixed(tournamentType.isRemixed()); tOptions.getLimitedOptions().setIsReshuffled(tournamentType.isReshuffled());
tOptions.getLimitedOptions().setIsRichMan(tournamentType.isRichMan()); tOptions.getLimitedOptions().setIsRichMan(tournamentType.isRichMan());
tOptions.getLimitedOptions().setIsJumpstart(tournamentType.isJumpstart()); tOptions.getLimitedOptions().setIsJumpstart(tournamentType.isJumpstart());
@ -1273,7 +1273,7 @@ public class NewTournamentDialog extends MageDialog {
} else if (tournamentType.isRandom() || tournamentType.isRichMan()) { } else if (tournamentType.isRandom() || tournamentType.isRichMan()) {
this.isRandom = tournamentType.isRandom(); this.isRandom = tournamentType.isRandom();
this.isRichMan = tournamentType.isRichMan(); this.isRichMan = tournamentType.isRichMan();
this.isRemixed = tournamentType.isRemixed(); this.isReshuffled = tournamentType.isReshuffled();
tOptions.getLimitedOptions().getSetCodes().clear(); tOptions.getLimitedOptions().getSetCodes().clear();
java.util.List<String> selected = randomPackSelector.getSelectedPacks(); java.util.List<String> selected = randomPackSelector.getSelectedPacks();
Collections.shuffle(selected); Collections.shuffle(selected);
@ -1290,10 +1290,10 @@ public class NewTournamentDialog extends MageDialog {
} else { } else {
tOptions.getLimitedOptions().getSetCodes().addAll(selected); tOptions.getLimitedOptions().getSetCodes().addAll(selected);
} }
} else if (tournamentType.isRemixed()) { } else if (tournamentType.isReshuffled()) {
this.isRandom = tournamentType.isRandom(); this.isRandom = tournamentType.isRandom();
this.isRichMan = tournamentType.isRichMan(); this.isRichMan = tournamentType.isRichMan();
this.isRemixed = tournamentType.isRemixed(); this.isReshuffled = tournamentType.isReshuffled();
tOptions.getLimitedOptions().getSetCodes().clear(); tOptions.getLimitedOptions().getSetCodes().clear();
tOptions.getLimitedOptions().getSetCodes().addAll(randomPackSelector.getSelectedPacks()); tOptions.getLimitedOptions().getSetCodes().addAll(randomPackSelector.getSelectedPacks());
} else { } else {
@ -1389,7 +1389,7 @@ public class NewTournamentDialog extends MageDialog {
numPlayers = Integer.parseInt(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PLAYERS_DRAFT + versionStr, "4")); numPlayers = Integer.parseInt(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PLAYERS_DRAFT + versionStr, "4"));
prepareTourneyView(numPlayers); prepareTourneyView(numPlayers);
if (tournamentType.isRandom() || tournamentType.isRichMan() || tournamentType.isRemixed()) { if (tournamentType.isRandom() || tournamentType.isRichMan() || tournamentType.isReshuffled()) {
loadRandomPacks(version); loadRandomPacks(version);
} else { } else {
loadBoosterPacks(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PACKS_DRAFT + versionStr, "")); loadBoosterPacks(PreferencesDialog.getCachedValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PACKS_DRAFT + versionStr, ""));
@ -1450,7 +1450,7 @@ public class NewTournamentDialog extends MageDialog {
if (deckFile != null && !deckFile.isEmpty()) { if (deckFile != null && !deckFile.isEmpty()) {
PreferencesDialog.saveValue(PreferencesDialog.KEY_NEW_TABLE_DECK_FILE + versionStr, deckFile); 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())); PreferencesDialog.saveValue(PreferencesDialog.KEY_NEW_TOURNAMENT_PACKS_RANDOM_DRAFT + versionStr, String.join(";", this.randomPackSelector.getSelectedPacks()));
} }
} }

10
Mage.Client/src/main/java/mage/client/dialog/RandomPacksSelectorDialog.java
View file

@ -27,22 +27,22 @@ public class RandomPacksSelectorDialog extends javax.swing.JDialog {
boxesCreated = false; boxesCreated = false;
} }
private void setType(boolean isRandomDraft, boolean isRichManDraft, boolean isRemixedDraft) { private void setType(boolean isRandomDraft, boolean isRichManDraft, boolean isReshuffledDraft) {
String title; String title;
if (isRandomDraft) { if (isRandomDraft) {
title = "Random Booster Draft Packs Selector"; title = "Random Booster Draft Packs Selector";
} else if (isRichManDraft) { } else if (isRichManDraft) {
title = "Rich Man Booster Draft Packs Selector"; title = "Rich Man Booster Draft Packs Selector";
} else if (isRemixedDraft) { } else if (isReshuffledDraft) {
title = "Chaos Remixed Draft Set Selector"; title = "Chaos Reshuffled Draft Set Selector";
} else { } else {
title = "Booster Draft Packs Selector"; title = "Booster Draft Packs Selector";
} }
setTitle(title); setTitle(title);
} }
public void showDialog(boolean isRandomDraft, boolean isRichManDraft, boolean isRemixedDraft) { public void showDialog(boolean isRandomDraft, boolean isRichManDraft, boolean isReshuffledDraft) {
setType(isRandomDraft, isRichManDraft, isRemixedDraft); setType(isRandomDraft, isRichManDraft, isReshuffledDraft);
createCheckboxes(); createCheckboxes();
pnlPacks.setVisible(true); pnlPacks.setVisible(true);
pnlPacks.revalidate(); pnlPacks.revalidate();

8
Mage.Common/src/main/java/mage/view/TournamentTypeView.java
View file

@ -21,7 +21,7 @@ public class TournamentTypeView implements Serializable {
private final boolean cubeBooster; private final boolean cubeBooster;
private final boolean elimination; private final boolean elimination;
private final boolean random; private final boolean random;
private final boolean remixed; private final boolean reshuffled;
private final boolean richMan; private final boolean richMan;
private final boolean jumpstart; private final boolean jumpstart;
@ -35,7 +35,7 @@ public class TournamentTypeView implements Serializable {
this.cubeBooster = tournamentType.isCubeBooster(); this.cubeBooster = tournamentType.isCubeBooster();
this.elimination = tournamentType.isElimination(); this.elimination = tournamentType.isElimination();
this.random = tournamentType.isRandom(); this.random = tournamentType.isRandom();
this.remixed = tournamentType.isRemixed(); this.reshuffled = tournamentType.isReshuffled();
this.richMan = tournamentType.isRichMan(); this.richMan = tournamentType.isRichMan();
this.jumpstart = tournamentType.isJumpstart(); this.jumpstart = tournamentType.isJumpstart();
} }
@ -81,8 +81,8 @@ public class TournamentTypeView implements Serializable {
return random; return random;
} }
public boolean isRemixed() { public boolean isReshuffled() {
return remixed; return reshuffled;
} }
public boolean isRichMan() { public boolean isRichMan() {

8
Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftEliminationTournament.java → Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftEliminationTournament.java
View file

@ -2,21 +2,21 @@ package mage.tournament;
import mage.constants.TournamentPlayerState; import mage.constants.TournamentPlayerState;
import mage.game.draft.DraftOptions; import mage.game.draft.DraftOptions;
import mage.game.draft.RemixedBoosterDraft; import mage.game.draft.ReshuffledBoosterDraft;
import mage.game.events.TableEvent; import mage.game.events.TableEvent;
import mage.game.tournament.TournamentOptions; import mage.game.tournament.TournamentOptions;
import mage.game.tournament.TournamentPlayer; 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); super(options);
currentStep = TournamentStep.START; currentStep = TournamentStep.START;
} }
@Override @Override
protected void draft() { protected void draft() {
draft = new RemixedBoosterDraft((DraftOptions) options.getLimitedOptions(), getSets()); draft = new ReshuffledBoosterDraft((DraftOptions) options.getLimitedOptions(), getSets());
for (TournamentPlayer player: players.values()) { for (TournamentPlayer player: players.values()) {
draft.addPlayer(player.getPlayer()); draft.addPlayer(player.getPlayer());
player.setState(TournamentPlayerState.DRAFTING); player.setState(TournamentPlayerState.DRAFTING);

8
Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftEliminationTournamentType.java → Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftEliminationTournamentType.java
View file

@ -8,10 +8,10 @@ import mage.game.tournament.TournamentType;
* *
* @author BetaSteward_at_googlemail.com * @author BetaSteward_at_googlemail.com
*/ */
public class RemixedBoosterDraftEliminationTournamentType extends TournamentType { public class ReshuffledBoosterDraftEliminationTournamentType extends TournamentType {
public RemixedBoosterDraftEliminationTournamentType() { public ReshuffledBoosterDraftEliminationTournamentType() {
this.name = "Booster Draft Elimination (Remixed)"; this.name = "Booster Draft Elimination (Reshuffled)";
this.maxPlayers = 16; this.maxPlayers = 16;
this.minPlayers = 4; this.minPlayers = 4;
this.numBoosters = 3; this.numBoosters = 3;
@ -19,7 +19,7 @@ public class RemixedBoosterDraftEliminationTournamentType extends TournamentType
this.limited = true; this.limited = true;
this.cubeBooster = false; this.cubeBooster = false;
this.elimination = true; this.elimination = true;
this.isRemixed = true; this.isReshuffled = true;
} }
} }

8
Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftSwissTournament.java → Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftSwissTournament.java
View file

@ -2,21 +2,21 @@ package mage.tournament;
import mage.constants.TournamentPlayerState; import mage.constants.TournamentPlayerState;
import mage.game.draft.DraftOptions; import mage.game.draft.DraftOptions;
import mage.game.draft.RemixedBoosterDraft; import mage.game.draft.ReshuffledBoosterDraft;
import mage.game.events.TableEvent; import mage.game.events.TableEvent;
import mage.game.tournament.TournamentOptions; import mage.game.tournament.TournamentOptions;
import mage.game.tournament.TournamentPlayer; 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); super(options);
currentStep = BoosterDraftSwissTournament.TournamentStep.START; currentStep = BoosterDraftSwissTournament.TournamentStep.START;
} }
@Override @Override
protected void draft() { protected void draft() {
draft = new RemixedBoosterDraft((DraftOptions) options.getLimitedOptions(), getSets()); draft = new ReshuffledBoosterDraft((DraftOptions) options.getLimitedOptions(), getSets());
for (TournamentPlayer player: players.values()) { for (TournamentPlayer player: players.values()) {
draft.addPlayer(player.getPlayer()); draft.addPlayer(player.getPlayer());
player.setState(TournamentPlayerState.DRAFTING); player.setState(TournamentPlayerState.DRAFTING);

8
Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/RemixedBoosterDraftSwissTournamentType.java → Mage.Server.Plugins/Mage.Tournament.BoosterDraft/src/mage/tournament/ReshuffledBoosterDraftSwissTournamentType.java
View file

@ -8,10 +8,10 @@ import mage.game.tournament.TournamentType;
* *
* @author LevelX2 * @author LevelX2
*/ */
public class RemixedBoosterDraftSwissTournamentType extends TournamentType { public class ReshuffledBoosterDraftSwissTournamentType extends TournamentType {
public RemixedBoosterDraftSwissTournamentType() { public ReshuffledBoosterDraftSwissTournamentType() {
this.name = "Booster Draft Swiss (Remixed)"; this.name = "Booster Draft Swiss (Reshuffled)";
this.maxPlayers = 16; this.maxPlayers = 16;
this.minPlayers = 4; this.minPlayers = 4;
this.numBoosters = 3; this.numBoosters = 3;
@ -19,7 +19,7 @@ public class RemixedBoosterDraftSwissTournamentType extends TournamentType {
this.limited = true; this.limited = true;
this.cubeBooster = false; this.cubeBooster = false;
this.elimination = false; this.elimination = false;
this.isRemixed = true; this.isReshuffled = true;
} }
} }

4
Mage.Server/config/config.xml
View file

@ -95,13 +95,13 @@
<tournamentType name="Booster Draft Elimination" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/> <tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
<tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Remixed)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RemixedBoosterDraftEliminationTournament" typeName="mage.tournament.RemixedBoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Reshuffled)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.ReshuffledBoosterDraftEliminationTournament" typeName="mage.tournament.ReshuffledBoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Swiss" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/> <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
<tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Remixed)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RemixedBoosterDraftSwissTournament" typeName="mage.tournament.RemixedBoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Reshuffled)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.ReshuffledBoosterDraftSwissTournament" typeName="mage.tournament.ReshuffledBoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftSwissTournament" typeName="mage.tournament.RichManDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftSwissTournament" typeName="mage.tournament.RichManDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftSwissTournament" typeName="mage.tournament.RichManCubeDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftSwissTournament" typeName="mage.tournament.RichManCubeDraftSwissTournamentType"/>
<tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/> <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>

4
Mage.Server/release/config/config.xml
View file

@ -89,13 +89,13 @@
<tournamentType name="Booster Draft Elimination" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/> <tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
<tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Remixed)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RemixedBoosterDraftEliminationTournament" typeName="mage.tournament.RemixedBoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Reshuffled)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.ReshuffledBoosterDraftEliminationTournament" typeName="mage.tournament.ReshuffledBoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Swiss" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/> <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
<tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Remixed)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.RemixedBoosterDraftSwissTournament" typeName="mage.tournament.RemixedBoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Reshuffled)" jar="mage-tournament-boosterdraft-${project.version}.jar" className="mage.tournament.ReshuffledBoosterDraftSwissTournament" typeName="mage.tournament.ReshuffledBoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftSwissTournament" typeName="mage.tournament.RichManDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftSwissTournament" typeName="mage.tournament.RichManDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftSwissTournament" typeName="mage.tournament.RichManCubeDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftSwissTournament" typeName="mage.tournament.RichManCubeDraftSwissTournamentType"/>
<tournamentType name="Sealed Elimination" jar="mage-tournament-sealed-${project.version}.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/> <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed-${project.version}.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>

4
Mage.Server/src/main/java/mage/server/tournament/TournamentFactory.java
View file

@ -61,8 +61,8 @@ public enum TournamentFactory {
rv.append(';'); rv.append(';');
} }
tournament.setBoosterInfo(rv.toString()); tournament.setBoosterInfo(rv.toString());
} else if (tournament.getTournamentType().isRemixed()) { } else if (tournament.getTournamentType().isReshuffled()) {
StringBuilder rv = new StringBuilder( "Chaos Remixed Draft using sets: "); StringBuilder rv = new StringBuilder( "Chaos Reshuffled Draft using sets: ");
for (Map.Entry<String, Integer> entry: setInfo.entrySet()){ for (Map.Entry<String, Integer> entry: setInfo.entrySet()){
rv.append(entry.getKey()); rv.append(entry.getKey());
rv.append(';'); rv.append(';');

4
Mage.Server/src/test/data/config_error.xml
View file

@ -61,13 +61,13 @@
<tournamentType name="Booster Draft Elimination" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/> <tournamentType name="Booster Draft Elimination (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftEliminationTournament" typeName="mage.tournament.BoosterDraftEliminationCubeTournamentType"/>
<tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftEliminationTournament" typeName="mage.tournament.RandomBoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Remixed)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RemixedBoosterDraftEliminationTournament" typeName="mage.tournament.RemixedBoosterDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Reshuffled)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.ReshuffledBoosterDraftEliminationTournament" typeName="mage.tournament.ReshuffledBoosterDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftEliminationTournament" typeName="mage.tournament.RichManDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/> <tournamentType name="Booster Draft Elimination (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftEliminationTournament" typeName="mage.tournament.RichManCubeDraftEliminationTournamentType"/>
<tournamentType name="Booster Draft Swiss" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/> <tournamentType name="Booster Draft Swiss (Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.BoosterDraftSwissTournament" typeName="mage.tournament.BoosterDraftSwissCubeTournamentType"/>
<tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Random)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RandomBoosterDraftSwissTournament" typeName="mage.tournament.RandomBoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Remixed)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RemixedBoosterDraftSwissTournament" typeName="mage.tournament.RemixedBoosterDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Reshuffled)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.ReshuffledBoosterDraftSwissTournament" typeName="mage.tournament.ReshuffledBoosterDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftSwissTournament" typeName="mage.tournament.RichManDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Rich Man)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManDraftSwissTournament" typeName="mage.tournament.RichManDraftSwissTournamentType"/>
<tournamentType name="Booster Draft Swiss (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftSwissTournament" typeName="mage.tournament.RichManCubeDraftSwissTournamentType"/> <tournamentType name="Booster Draft Swiss (Rich Man Cube)" jar="mage-tournament-booster-draft.jar" className="mage.tournament.RichManCubeDraftSwissTournament" typeName="mage.tournament.RichManCubeDraftSwissTournamentType"/>
<tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/> <tournamentType name="Sealed Elimination" jar="mage-tournament-sealed.jar" className="mage.tournament.SealedEliminationTournament" typeName="mage.tournament.SealedEliminationTournamentType"/>

6
Mage.Tests/src/test/java/org/mage/test/sets/BoosterGenerationTest.java
View file

@ -10,7 +10,7 @@ import mage.cards.repository.CardInfo;
import mage.cards.repository.CardScanner; import mage.cards.repository.CardScanner;
import mage.constants.Rarity; import mage.constants.Rarity;
import mage.constants.SubType; import mage.constants.SubType;
import mage.game.draft.RemixedSet; import mage.game.draft.ReshuffledSet;
import mage.sets.*; import mage.sets.*;
import mage.util.CardUtil; import mage.util.CardUtil;
import org.junit.Assert; import org.junit.Assert;
@ -541,12 +541,12 @@ public class BoosterGenerationTest extends MageTestPlayerBase {
@Ignore // debug only @Ignore // debug only
@Test @Test
public void test_RemixedBoosterStats() { public void test_ReshuffledBoosterStats() {
List<ExpansionSet> sets = new ArrayList<>(); List<ExpansionSet> sets = new ArrayList<>();
sets.add(ScarsOfMirrodin.getInstance()); sets.add(ScarsOfMirrodin.getInstance());
sets.add(MirrodinBesieged.getInstance()); sets.add(MirrodinBesieged.getInstance());
sets.add(NewPhyrexia.getInstance()); sets.add(NewPhyrexia.getInstance());
RemixedSet setToAnalyse = new RemixedSet(sets, 10, 3, 1); ReshuffledSet setToAnalyse = new ReshuffledSet(sets, 10, 3, 1);
int openBoosters = 10000; int openBoosters = 10000;
Map<String, Integer> resRatio = new HashMap<>(); Map<String, Integer> resRatio = new HashMap<>();

28
Mage/src/main/java/mage/game/draft/RemixedBoosterDraft.java
View file

@ -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<ExpansionSet> 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());
}
}
}
}

28
Mage/src/main/java/mage/game/draft/ReshuffledBoosterDraft.java Normal file
View file

@ -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<ExpansionSet> 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());
}
}
}
}

8
Mage/src/main/java/mage/game/draft/RemixedSet.java → Mage/src/main/java/mage/game/draft/ReshuffledSet.java
View file

@ -16,7 +16,7 @@ import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors; import java.util.stream.Collectors;
public class RemixedSet implements Serializable { public class ReshuffledSet implements Serializable {
protected final int numBoosterCommons; protected final int numBoosterCommons;
protected final int numBoosterUncommons; protected final int numBoosterUncommons;
@ -29,11 +29,11 @@ public class RemixedSet implements Serializable {
protected final List<CardInfo> specials; protected final List<CardInfo> specials;
protected final double chanceMythic; protected final double chanceMythic;
public RemixedSet (List<ExpansionSet> sets, int c, int u, int r) { public ReshuffledSet(List<ExpansionSet> sets, int c, int u, int r) {
this(sets, c, u, r, 0); this(sets, c, u, r, 0);
} }
public RemixedSet(List<ExpansionSet> sets, int c, int u, int r, int special) { public ReshuffledSet(List<ExpansionSet> sets, int c, int u, int r, int special) {
this.numBoosterCommons = c; this.numBoosterCommons = c;
this.numBoosterUncommons = u; this.numBoosterUncommons = u;
this.numBoosterRares = r; this.numBoosterRares = r;
@ -58,7 +58,7 @@ public class RemixedSet implements Serializable {
List<CardInfo> cardInfos = CardRepository.instance.findCards(new CardCriteria() List<CardInfo> cardInfos = CardRepository.instance.findCards(new CardCriteria()
.setCodes(set.getCode()) .setCodes(set.getCode())
.rarities(rarity) .rarities(rarity)
.maxCardNumber(set.getMaxCardNumberInBooster())); // TODO: Make sure this parameter is set appropriately where needed .maxCardNumber(set.getMaxCardNumberInBooster()));
cardInfos.removeIf(next -> ( cardInfos.removeIf(next -> (
next.getCardNumber().contains("*") next.getCardNumber().contains("*")

10
Mage/src/main/java/mage/game/tournament/LimitedOptions.java
View file

@ -17,7 +17,7 @@ public class LimitedOptions implements Serializable {
protected DraftCube draftCube; protected DraftCube draftCube;
protected int numberBoosters; protected int numberBoosters;
protected boolean isRandom; protected boolean isRandom;
protected boolean isRemixed; protected boolean isReshuffled;
protected boolean isRichMan; protected boolean isRichMan;
protected Deck cubeFromDeck; protected Deck cubeFromDeck;
@ -96,12 +96,12 @@ public class LimitedOptions implements Serializable {
this.isRandom = isRandom; this.isRandom = isRandom;
} }
public boolean getIsRemixed() { public boolean getIsReshuffled() {
return isRemixed; return isReshuffled;
} }
public void setIsRemixed(boolean isRemixed) { public void setIsReshuffled(boolean isReshuffled) {
this.isRemixed = isRemixed; this.isReshuffled = isReshuffled;
} }
public boolean getIsRichMan() { public boolean getIsRichMan() {

6
Mage/src/main/java/mage/game/tournament/TournamentType.java
View file

@ -18,7 +18,7 @@ public class TournamentType implements Serializable {
protected boolean limited; // else Constructed protected boolean limited; // else Constructed
protected boolean elimination; // else Swiss protected boolean elimination; // else Swiss
protected boolean isRandom; // chaos draft 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 isRichMan; // new boosters generated for each pick
protected boolean isJumpstart; protected boolean isJumpstart;
@ -66,8 +66,8 @@ public class TournamentType implements Serializable {
return this.isRandom; return this.isRandom;
} }
public boolean isRemixed() { public boolean isReshuffled() {
return this.isRemixed; return this.isReshuffled;
} }
public boolean isRichMan() { public boolean isRichMan() {