external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-19 20:28:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add Animus of Predation

Browse Source
This commit is contained in:
Chris H
2024-05-26 14:19:51 -04:00
parent 26ec757736
commit 66bd484f27
8 changed files with 136 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorDraftingProcess.java
View File

@@ -186,7 +186,9 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> i
deck.getOrCreate(DeckSection.Sideboard).addAll(this.getDeckManager().getPool());
return deck;
} // getPlayersDeck()
// Why don't we just do?
// return player.getDeck()
}
/**
* <p>
@@ -237,7 +239,22 @@ public class CEditorDraftingProcess extends ACEditorBase<PaperCard, DeckGroup> i
final DeckGroup finishedDraft = new DeckGroup(s);
final LimitedPlayer player = this.boosterDraft.getHumanPlayer();
// Why is human deck just imported from LimitedPlayer?
//Deck humanDeck = player.getDeck().copyTo(s);
// If we do the above, we shouldn't need remove from card pool below
Deck humanDeck = (Deck) this.getPlayersDeck().copyTo(s);
for(PaperCard card : player.getRemovedFromCardPool()) {
// This is awkward. We are duplicating the deck construction logic
// So we need to remove from the deck twice
// This may be problematic for trading cards from your card pool
humanDeck.get(DeckSection.Sideboard).remove(card);
// These cards need to be added to a quest deck if there is an associated quest
// Although quest Drafting process happened in #CEditorQuestDraftingProcess
// Probably need to make these files closer to each other
}
humanDeck.setDraftNotes(player.getSerializedDraftNotes());
finishedDraft.setHumanDeck(humanDeck);
finishedDraft.addAiDecks(computer);

13
forge-gui-desktop/src/main/java/forge/screens/deckeditor/controllers/CEditorQuestDraftingProcess.java
View File

@@ -17,8 +17,6 @@
*/
package forge.screens.deckeditor.controllers;
import java.util.Map.Entry;
import forge.deck.Deck;
import forge.deck.DeckGroup;
import forge.deck.DeckSection;
@@ -31,19 +29,15 @@ import forge.gui.framework.FScreen;
import forge.item.PaperCard;
import forge.itemmanager.CardManager;
import forge.itemmanager.ItemManagerConfig;
import forge.screens.deckeditor.views.VAllDecks;
import forge.screens.deckeditor.views.VBrawlDecks;
import forge.screens.deckeditor.views.VCommanderDecks;
import forge.screens.deckeditor.views.VCurrentDeck;
import forge.screens.deckeditor.views.VDeckgen;
import forge.screens.deckeditor.views.VOathbreakerDecks;
import forge.screens.deckeditor.views.VTinyLeadersDecks;
import forge.screens.deckeditor.views.*;
import forge.screens.home.quest.CSubmenuQuestDraft;
import forge.screens.home.quest.VSubmenuQuestDraft;
import forge.screens.match.controllers.CDetailPicture;
import forge.util.ItemPool;
import forge.util.Localizer;
import java.util.Map.Entry;
/**
* Updates the deck editor UI as necessary draft selection mode.
*
@@ -211,6 +205,7 @@ public class CEditorQuestDraftingProcess extends ACEditorBase<PaperCard, DeckGro
* </p>
*/
private void saveDraft() {
// This should be inheriting more from CEditorDraftingProcess
saved = true;