mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-19 12:18:00 +00:00
Implementation to make available (for Wild opponents) also the decks
stored in subfolders of the main "constructed" folder
This commit is contained in:
@@ -18,16 +18,15 @@ import org.apache.commons.lang3.StringUtils;
|
|||||||
|
|
||||||
import forge.ImageKeys;
|
import forge.ImageKeys;
|
||||||
import forge.deck.Deck;
|
import forge.deck.Deck;
|
||||||
|
import forge.deck.DeckProxy;
|
||||||
import forge.deck.io.DeckSerializer;
|
import forge.deck.io.DeckSerializer;
|
||||||
import forge.deck.io.DeckStorage;
|
import forge.deck.io.DeckStorage;
|
||||||
import forge.model.FModel;
|
|
||||||
import forge.quest.QuestEvent;
|
import forge.quest.QuestEvent;
|
||||||
import forge.quest.QuestEventDifficulty;
|
import forge.quest.QuestEventDifficulty;
|
||||||
import forge.quest.QuestEventDuel;
|
import forge.quest.QuestEventDuel;
|
||||||
import forge.util.FileSection;
|
import forge.util.FileSection;
|
||||||
import forge.util.FileUtil;
|
import forge.util.FileUtil;
|
||||||
import forge.util.TextUtil;
|
import forge.util.TextUtil;
|
||||||
import forge.util.storage.IStorage;
|
|
||||||
import forge.util.storage.StorageReaderFolder;
|
import forge.util.storage.StorageReaderFolder;
|
||||||
|
|
||||||
public class MainWorldDuelReader extends StorageReaderFolder<QuestEventDuel> {
|
public class MainWorldDuelReader extends StorageReaderFolder<QuestEventDuel> {
|
||||||
@@ -77,10 +76,11 @@ public class MainWorldDuelReader extends StorageReaderFolder<QuestEventDuel> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// then I add wild decks in constructed directory
|
// then I add wild decks in constructed directory
|
||||||
IStorage<Deck> constructedDecks = FModel.getDecks().getConstructed();
|
Iterable<DeckProxy> constructedDecks = DeckProxy.getAllConstructedDecks();
|
||||||
Iterator it = constructedDecks.iterator();
|
Iterator<DeckProxy> it = constructedDecks.iterator();
|
||||||
|
|
||||||
while(it.hasNext()) {
|
while(it.hasNext()) {
|
||||||
Deck currDeck = (Deck) it.next();
|
Deck currDeck = it.next().getDeck();
|
||||||
final QuestEventDuel newDeck = read(currDeck);
|
final QuestEventDuel newDeck = read(currDeck);
|
||||||
String newKey = keySelector.apply(newDeck);
|
String newKey = keySelector.apply(newDeck);
|
||||||
if (result.containsKey(newKey)) {
|
if (result.containsKey(newKey)) {
|
||||||
|
|||||||
Reference in New Issue
Block a user