Skip to content

fix(draft): conspiracy cards work in custom cube drafts #10372

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
billyhewlett wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −3
Open

fix(draft): conspiracy cards work in custom cube drafts #10372

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions forge-gui-mobile/src/forge/deck/FDeckEditor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1806,7 +1806,7 @@ else if(parentScreen.shouldEnforceConformity()) //If we have a commander, filter
@Override
protected void onCardActivated(PaperCard card) {
DeckSection destination = DeckSection.matchingSection(card);
final DeckSectionPage destinationPage = parentScreen.getPageForSection(destination);
final DeckSectionPage destinationPage = parentScreen.getPageForSection(destination, true);
if(destinationPage == null) {
System.err.println("Unable to quick-move card (no page for destination) - " + card + " -> " + destination);
return; //Shouldn't happen?
Expand Down Expand Up @@ -1835,7 +1835,7 @@ protected void buildMenu(final FDropDownMenu menu, final PaperCard card) {
return;

DeckSection destination = DeckSection.matchingSection(card);
final DeckSectionPage destinationPage = parentScreen.getPageForSection(destination);
final DeckSectionPage destinationPage = parentScreen.getPageForSection(destination, true);

if (!needsCommander() && !canOnlyBePartnerCommander(card) && destinationPage != null) {
addMoveCardMenuItem(menu, card, this, destinationPage);
Expand Down
12 changes: 11 additions & 1 deletion forge-gui/src/main/java/forge/gamemodes/limited/CustomLimited.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import forge.deck.CardPool;
import forge.deck.Deck;
import forge.deck.DeckBase;
import forge.deck.DeckSection;
import forge.item.PaperCard;
import forge.item.SealedTemplate;
import forge.model.FModel;
Expand Down Expand Up @@ -121,7 +122,16 @@ public static CustomLimited parse(final List<String> dfData, final IStorage<Deck
cd.numPlayers = data.getInt("NumPlayers");
cd.customRankingsFile = data.get("CustomRankings", "rankings_cubecobra.txt");
final Deck deckCube = cubes.get(data.get("DeckFile"));
cd.cardPool = deckCube == null ? ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getUniqueCards(), PaperCard.class) : deckCube.getMain();
if (deckCube == null) {
cd.cardPool = ItemPool.createFrom(FModel.getMagicDb().getCommonCards().getUniqueCards(), PaperCard.class);
} else {
// Include conspiracy cards (e.g. Backup Plan) in the draft pool alongside regular cards
CardPool pool = new CardPool(deckCube.getMain());
if (deckCube.has(DeckSection.Conspiracy)) {
pool.addAll(deckCube.get(DeckSection.Conspiracy));
}
cd.cardPool = pool;
}

return cd;
}
Expand Down
4 changes: 4 additions & 0 deletions forge-gui/src/main/java/forge/gamemodes/limited/GauntletMini.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,10 @@ private void startRound() {
starter.add(human);
starter.add(aiOpponents.get(currentRound - 1).setPlayer(GamePlayerUtil.createAiPlayer()));

for (final RegisteredPlayer pl : starter) {
pl.assignConspiracies();
}

hostedMatch = GuiBase.getInterface().hostMatch();
hostedMatch.startMatch(gauntletType, null, starter, human, GuiBase.getInterface().getNewGuiGame());
}
Expand Down