Merge pull request #5501 from hitch17/add-cockatrice-deck-format-5493

UI: add cockatrice deck format support for import (*.cod)
This commit is contained in:
Oleg Agafonov 2019-01-11 07:17:48 +04:00 committed by GitHub
commit 11f93cf762
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
24 changed files with 584 additions and 162 deletions

View file

@ -6,7 +6,7 @@ import mage.abilities.Ability;
import mage.cards.Card;
import mage.cards.decks.Deck;
import mage.cards.decks.DeckCardLists;
import mage.cards.decks.importer.DeckImporterUtil;
import mage.cards.decks.importer.DeckImporter;
import mage.cards.repository.CardInfo;
import mage.cards.repository.CardRepository;
import mage.cards.repository.CardScanner;
@ -189,7 +189,7 @@ public abstract class CardTestPlayerAPIImpl extends MageTestPlayerBase implement
if (loadedDeckCardLists.containsKey(deckName)) {
list = loadedDeckCardLists.get(deckName);
} else {
list = DeckImporterUtil.importDeck(deckName);
list = DeckImporter.importDeckFromFile(deckName);
loadedDeckCardLists.put(deckName, list);
}
Deck deck = Deck.load(list, false, false);