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

deck editor: improved support of mtgjson decks (added import of commander decks);

Browse source
This commit is contained in:
Oleg Agafonov 2024-05-29 23:34:37 +04:00
parent a3282ee6a1
commit d6a3e3b82c
3 changed files with 15589 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Mage/src/main/java/mage/cards/decks/importer/MtgjsonDeckImporter.java
View file

@ -42,6 +42,11 @@ public class MtgjsonDeckImporter extends JsonDeckImporter {
JsonArray sideBoard = JsonUtil.getAsArray(data, "sideBoard");
List<mage.cards.decks.DeckCardInfo> sideDeckList = deckList.getSideboard();
addBoardToList(sideBoard, sideDeckList, deckSet);
// commander go to sideboard too
JsonArray commander = JsonUtil.getAsArray(data, "commander");
List<mage.cards.decks.DeckCardInfo> commanderDeckList = deckList.getSideboard();
addBoardToList(commander, commanderDeckList, deckSet);
}
private void addBoardToList(JsonArray board, List<mage.cards.decks.DeckCardInfo> list, String deckSet) {

15473
Mage/src/test/data/importer/testdeckCommander.json Normal file
View file

File diff suppressed because it is too large Load diff

114
Mage/src/test/java/mage/cards/decks/importer/MtgjsonDeckImportTest.java
View file

@ -6,14 +6,12 @@ import org.junit.Test;
import java.nio.file.Paths;
import static org.junit.Assert.assertEquals;
public class MtgjsonDeckImportTest {
private static final FakeCardLookup LOOKUP = new FakeCardLookup();
@Test
public void testImport() {
public void testImport_Normal() {
StringBuilder errors = new StringBuilder();
MtgjsonDeckImporter importer = new MtgjsonDeckImporter() {
@Override
@ -61,4 +59,114 @@ public class MtgjsonDeckImportTest {
.verify(deck, 60, 15);
}
@Test
public void testImport_Commander() {
StringBuilder errors = new StringBuilder();
MtgjsonDeckImporter importer = new MtgjsonDeckImporter() {
@Override
public CardLookup getCardLookup() {
return LOOKUP;
}
};
// offline deck from https://mtgjson.com/api/v5/decks/GrandLarceny_OTC.json
DeckCardLists deck = importer.importDeck(
Paths.get("src", "test", "data", "importer", "testdeckCommander.json").toString(),
errors,
false
);
Assert.assertEquals("Desert Bloom", deck.getName());
Assert.assertEquals("", errors.toString());
TestDeckChecker.checker()
.addSide("Yuma, Proud Protector", 1) // commander
//
.addMain("Kirri, Talented Sprout", 1)
.addMain("Scavenger Grounds", 1)
.addMain("Sun Titan", 1)
.addMain("Omnath, Locus of Rage", 1)
.addMain("Descend upon the Sinful", 1)
.addMain("Chromatic Lantern", 1)
.addMain("Marshal's Anthem", 1)
.addMain("Sheltered Thicket", 1)
.addMain("Scute Swarm", 1)
.addMain("Hour of Promise", 1)
.addMain("Oracle of Mul Daya", 1)
.addMain("Ramunap Excavator", 1)
.addMain("Scattered Groves", 1)
.addMain("World Shaper", 1)
.addMain("Nesting Dragon", 1)
.addMain("Turntimber Sower", 1)
.addMain("Sevinne's Reclamation", 1)
.addMain("Ancient Greenwarden", 1)
.addMain("Titania, Protector of Argoth", 1)
.addMain("Return of the Wildspeaker", 1)
.addMain("Perennial Behemoth", 1)
.addMain("Avenger of Zendikar", 1)
.addMain("Hazezon, Shaper of Sand", 1)
.addMain("Escape to the Wilds", 1)
.addMain("Heaven // Earth", 1)
.addMain("Genesis Hydra", 1)
.addMain("Sunscorched Divide", 1)
.addMain("The Mending of Dominaria", 1)
.addMain("Decimate", 1)
.addMain("Sand Scout", 1)
.addMain("Embrace the Unknown", 1)
.addMain("Dune Chanter", 1)
.addMain("Cataclysmic Prospecting", 1)
.addMain("Vengeful Regrowth", 1)
.addMain("Angel of Indemnity", 1)
.addMain("Cactus Preserve", 1)
.addMain("Rumbleweed", 1)
.addMain("Terramorphic Expanse", 1)
.addMain("Evolving Wilds", 1)
.addMain("Swiftfoot Boots", 1)
.addMain("Explore", 1)
.addMain("Sol Ring", 1)
.addMain("Satyr Wayfinder", 1)
.addMain("Perpetual Timepiece", 1)
.addMain("Crawling Sensation", 1)
.addMain("Painted Bluffs", 1)
.addMain("Command Tower", 1)
.addMain("Magmatic Insight", 1)
.addMain("Krosan Verge", 1)
.addMain("Desert of the True", 1)
.addMain("Skullwinder", 1)
.addMain("Desert of the Indomitable", 1)
.addMain("Jungle Shrine", 1)
.addMain("Bitter Reunion", 1)
.addMain("Desert of the Fervent", 1)
.addMain("Valorous Stance", 1)
.addMain("Dunes of the Dead", 1)
.addMain("Shefet Dunes", 1)
.addMain("Hashep Oasis", 1)
.addMain("Elvish Rejuvenator", 1)
.addMain("Winding Way", 1)
.addMain("Springbloom Druid", 1)
.addMain("Arcane Signet", 1)
.addMain("Unholy Heat", 1)
.addMain("Thrilling Discovery", 1)
.addMain("Electric Revelation", 1)
.addMain("Eccentric Farmer", 1)
.addMain("Harrow", 1)
.addMain("Ramunap Ruins", 1)
.addMain("Path to Exile", 1)
.addMain("Requisition Raid", 1)
.addMain("Bovine Intervention", 1)
.addMain("Map the Frontier", 1)
.addMain("Conduit Pylons", 1)
.addMain("Mirage Mesa", 1)
.addMain("Wreck and Rebuild", 1)
.addMain("Angel of the Ruins", 1)
.addMain("Bristling Backwoods", 1)
.addMain("Creosote Heath", 1)
.addMain("Abraded Bluffs", 1)
.addMain("Scaretiller", 1)
.addMain("Nantuko Cultivator", 1)
.addMain("Plains", 6)
.addMain("Mountain", 4)
.addMain("Forest", 7)
//
.verify(deck, 99, 1);
}
}