From 9886d067907724c7229a2b4fc3b73d7d11110f86 Mon Sep 17 00:00:00 2001 From: jjayers99 <56438137+jjayers99@users.noreply.github.com> Date: Sun, 23 Apr 2023 22:41:11 -0400 Subject: [PATCH 1/4] Addition of MOM Jumpstart packs, integration into Adventure Mode start options --- .../src/forge/adventure/util/CardUtil.java | 2 +- forge-gui/res/adventure/Shandalar/config.json | 4 +- forge-gui/res/blockdata/boosters-special.txt | 14 +- forge-gui/res/blockdata/printsheets.txt | 226 ++++++++++++++++++ 4 files changed, 243 insertions(+), 3 deletions(-) diff --git a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java index 2324f18ac70..6fcc0655bd0 100644 --- a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java +++ b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java @@ -350,7 +350,7 @@ public class CardUtil { public static Deck generateDeck(GeneratedDeckData data, CardEdition starterEdition, boolean discourageDuplicates) { - List editionCodes = (starterEdition != null)?Arrays.asList(starterEdition.getCode(), starterEdition.getCode2()):Arrays.asList("JMP", "J22", "DMU","BRO"); + List editionCodes = (starterEdition != null)?Arrays.asList(starterEdition.getCode(), starterEdition.getCode2()):Arrays.asList("JMP", "J22", "DMU","BRO","ONE","MOM"); Deck deck= new Deck(data.name); if(data.mainDeck!=null) { diff --git a/forge-gui/res/adventure/Shandalar/config.json b/forge-gui/res/adventure/Shandalar/config.json index d0bf57d7681..2e25dd89bcc 100644 --- a/forge-gui/res/adventure/Shandalar/config.json +++ b/forge-gui/res/adventure/Shandalar/config.json @@ -203,6 +203,7 @@ "BRO", "J22", "ONE", + "MOM", "(All)" ], "starterEditionNames": [ @@ -211,7 +212,8 @@ "Brother's War", "Jumpstart 22", "Phyrexia: ONE", - "(All)" + "MOM", + "(All)" ] } diff --git a/forge-gui/res/blockdata/boosters-special.txt b/forge-gui/res/blockdata/boosters-special.txt index 6e62aac7a58..8338a28cf11 100644 --- a/forge-gui/res/blockdata/boosters-special.txt +++ b/forge-gui/res/blockdata/boosters-special.txt @@ -309,4 +309,16 @@ ONE Corruption 2: 1 wholeSheet("ONE Corruption 2"), 1 RareMythic:fromSheet("ONE ONE Rebellious 1: 1 wholeSheet("ONE Rebellious 1"), 1 RareMythic:fromSheet("ONE Red Inserts") ONE Rebellious 2: 1 wholeSheet("ONE Rebellious 2"), 1 RareMythic:fromSheet("ONE Red Inserts") ONE Toxic 1: 1 wholeSheet("ONE Toxic 1"), 1 RareMythic:fromSheet("ONE Green Inserts") -ONE Toxic 2: 1 wholeSheet("ONE Toxic 2"), 1 RareMythic:fromSheet("ONE Green Inserts") \ No newline at end of file +ONE Toxic 2: 1 wholeSheet("ONE Toxic 2"), 1 RareMythic:fromSheet("ONE Green Inserts") + +# MOM Jumpstart +MOM Brood 1: 1 wholeSheet("MOM Brood 1"), 1 RareMythic:fromSheet("MOM White Inserts") +MOM Brood 2: 1 wholeSheet("MOM Brood 2"), 1 RareMythic:fromSheet("MOM White Inserts") +MOM Overachiever 1: 1 wholeSheet("MOM Overachiever 1"), 1 RareMythic:fromSheet("MOM Blue Inserts") +MOM Overachiever 2: 1 wholeSheet("MOM Overachiever 2"), 1 RareMythic:fromSheet("MOM Blue Inserts") +MOM Expendable 1: 1 wholeSheet("MOM Expendable 1"), 1 RareMythic:fromSheet("MOM Black Inserts") +MOM Expendable 2: 1 wholeSheet("MOM Expendable 2"), 1 RareMythic:fromSheet("MOM Black Inserts") +MOM Reinforcement 1: 1 wholeSheet("MOM Reinforcement 1"), 1 RareMythic:fromSheet("MOM Red Inserts") +MOM Reinforcement 2: 1 wholeSheet("MOM Reinforcement 2"), 1 RareMythic:fromSheet("MOM Red Inserts") +MOM Buff 1: 1 wholeSheet("MOM Buff 1"), 1 RareMythic:fromSheet("MOM Green Inserts") +MOM Buff 2: 1 wholeSheet("MOM Buff 2"), 1 RareMythic:fromSheet("MOM Green Inserts") \ No newline at end of file diff --git a/forge-gui/res/blockdata/printsheets.txt b/forge-gui/res/blockdata/printsheets.txt index a53d15e85ac..968d15cf895 100644 --- a/forge-gui/res/blockdata/printsheets.txt +++ b/forge-gui/res/blockdata/printsheets.txt @@ -5995,3 +5995,229 @@ Kaya, Ghost Assassin|CN2|2 1 Elesh Norn, Mother of Machines|ONE 1 Mondrak, Glory Dominus|ONE 1 Phyrexian Vindicator|ONE + + +[MOM Brood 1] +1 Essence of Orthodoxy +1 Norn's Inquisitor +1 Phyrexian Pegasus +1 Alabaster Host Sanctifier +1 Infected Defector +1 Alabaster Host Intercessor +1 Seedpod Caretaker +1 Tiller of Flesh +1 Sunder the Gateway +1 Angelic Intervention +1 Cut Short +8 Plains + +[MOM Brood 2] +1 Essence of Orthodoxy +1 Phyrexian Pegasus +1 Seedpod Caretaker +1 Norn's Inquisitor +1 Alabaster Host Sanctifier +1 Infected Defector +1 Alabaster Host Intercessor +1 Tiller of Flesh +1 Aerial Boost +1 Inspired Charge +1 Seal from Existence +8 Plains + +[MOM Overachiever 1] +1 Zephyr Winder +1 Expedition Lookout +1 Preening Champion +1 Thunderhead Squadron +1 Tidal Terror +1 Referee Squad +1 Oracle of Tragedy +1 Interdisciplinary Mascot +1 Temporal Cleansing +1 Ephara's Dispersal +1 Meeting of Minds +8 Island + +[MOM Overachiever 2] +1 Zephyr Winder +1 Expedition Lookout +1 Xerex Strobe-Knight +1 Thunderhead Squadron +1 Tidal Terror +1 Referee Squad +1 Oracle of Tragedy +1 Interdisciplinary Mascot +1 Ephara's Dispersal +1 Wicked Slumber +1 Astral Wingspan +8 Island + +[MOM Expendable 1] +1 Terror of Towashi|MOM +1 Seer of Stolen Sight|MOM +1 Injector Crocodile|MOM +1 Dreg Recycler|MOM +1 Etched Familiar|MOM +1 Ichor Shade|MOM +1 Scorn-Blade Berserker|MOM +1 Final Flourish|MOM +1 Unseal the Necropolis|MOM +1 Deadly Derision|MOM +1 Gift of Compleation|MOM +8 Swamp|MOM + +[MOM Expendable 2] +1 Terror of Towashi|MOM +1 Injector Crocodile|MOM +1 Seer of Stolen Sight|MOM +1 Dreg Recycler|MOM +1 Etched Familiar|MOM +1 Scorn-Blade Berserker|MOM +1 Compleated Huntmaster|MOM +1 Corrupted Conviction|MOM +1 Deadly Derision|MOM +1 Failed Conversion|MOM +1 Gift of Compleation|MOM +8 Swamp|MOM + +[MOM Reinforcement 1] +1 Orthion, Hero of Lavabrink|MOM +1 Axgard Artisan|MOM +1 Cragsmasher Yeti|MOM +1 Fearless Skald|MOM +1 Karsus Depthguard|MOM +1 Hangar Scrounger|MOM +1 Redcap Heelslasher|MOM +1 Ral's Reinforcements|MOM +1 Coming In Hot|MOM +1 Volcanic Spite|MOM +8 Mountain|MOM + +[MOM Reinforcement 2] +1 Orthion, Hero of Lavabrink|MOM +1 Axgard Artisan|MOM +1 Cragsmasher Yeti|MOM +1 Trailblazing Historian|MOM +1 Karsus Depthguard|MOM +1 Hangar Scrounger|MOM +1 Redcap Heelslasher|MOM +1 Fearless Skald|MOM +1 Mirran Banesplitter|MOM +1 Volcanic Spite|MOM +1 Shatter the Source|MOM +8 Mountain|MOM + +[MOM Buff 1] +1 Surrak and Goreclaw|MOM +1 Fairgrounds Trumpeter|MOM +1 Ruins Recluse|MOM +1 Placid Rottentail|MOM +1 Wary Thespian|MOM +1 Converter Beast|MOM +1 Timberland Ancient|MOM +1 Kami of Whispered Hopes|MOM +1 Arachnoid Adaptation|MOM +1 Cosmic Hunger|MOM +1 Fertilid's Favor|MOM +8 Forest + +[MOM Buff 2] +1 Surrak and Goreclaw|MOM +1 Fairgrounds Trumpeter|MOM +1 Placid Rottentail|MOM +1 Wary Thespian|MOM +1 Converter Beast|MOM +1 Timberland Ancient|MOM +1 Ruins Recluse|MOM +1 Kami of Whispered Hopes|MOM +1 Arachnoid Adaptation|MOM +1 Tandem Takedown|MOM +1 Blighted Burgeoning|MOM +8 Forest|MOM + +[MOM Black Inserts] +1 Archpriest of Shadows|MOM +1 Ayara, Widow of the Realm|MOM +1 Bloated Processor|MOM +1 Breach the Multiverse|MOM +1 Grafted Butcher|MOM +1 Hoarding Broodlord|MOM +1 Invasion of Fiora|MOM +1 Pile On|MOM +1 Realmbreaker, the Invasion Tree|MOM +1 Terror of Towashi|MOM +1 Invasion of Innistrad|MOM +1 Invasion of Ravnica|MOM +1 Sheoldred|MOM +1 Sword of Once and Future|MOM + +[MOM Blue Inserts] +1 Chrome Host Seedshark|MOM +1 Complete the Circuit|MOM +1 Faerie Mastermind|MOM +1 Interdisciplinary Mascot|MOM +1 Invasion of Arcavios|MOM +1 Invasion of Segovia|MOM +1 Realmbreaker, the Invasion Tree|MOM +1 Rona, Herald of Invasion|MOM +1 See Double|MOM +1 Transcendent Message|MOM +1 Zephyr Singer|MOM +1 Invasion of Ravnica|MOM +1 Jin-Gitaxias|MOM +1 Sword of Once and Future|MOM + +[MOM Green Inserts] +1 Ancient Imperiosaur|MOM +1 Deeproot Wayfinder|MOM +1 Doomskar Warrior|MOM +1 Glistening Dawn|MOM +1 Invasion of Ikoria|MOM +1 Invasion of Ixalan|MOM +1 Ozolith, the Shattered Spire|MOM +1 Polukranos Reborn|MOM +1 Realmbreaker, the Invasion Tree|MOM +1 Surrak and Goreclaw|MOM +1 Tribute to the World Tree|MOM +1 Invasion of Ravnica|MOM +1 Invasion of Shandalar|MOM +1 Sword of Once and Future|MOM +1 Vorinclex|MOM +1 Wrenn and Realmbreaker|MOM + +[MOM Red Inserts] +1 Bloodfeather Phoenix|MOM +1 City on Fire|MOM +1 Etali, Primal Conquerer|MOM +1 Into the Fire|MOM +1 Invasion of Kaladheim|MOM +1 Invasion of Karsus|MOM +1 Nahiri's Warcrafting|MOM +1 Orthion, Hero of Lavabrink|MOM +1 Rampaging Raptor|MOM +1 Realmbreaker, the Invasion Tree|MOM +1 Voldaren Thrillseeker|MOM +1 Chandra, Hope's Beacon|MOM +1 Invasion of Ravnica|MOM +1 Invasion of Tarkir|MOM +1 Sword of Once and Future|MOM +1 Urabrask|MOM + +[MOM White Inserts] +1 Boon-Bringer Valkyrie|MOM +1 Dusk Legion Duelist|MOM +1 Essence of Orthodoxy|MOM +1 Guardian of Ghirapur|MOM +1 Heliod, the Radiant Dawn|MOM +1 Invasion of Gobakhan|MOM +1 Invasion of Theros|MOM +1 Knight-Errant of Eos|MOM +1 Realmbreaker, the Invasion Tree|MOM +1 Progenitor Exarch|MOM +1 Sunfall|MOM +1 Archangel Elspeth|MOM +1 Elesh Norn|MOM +1 Invasion of Ravnica|MOM +1 Monastery Mentor|MOM +1 Sword of Once and Future|MOM \ No newline at end of file From f11329c103aa3b193e2c35874e04860a1c978604 Mon Sep 17 00:00:00 2001 From: TabletopGeneral <56438137+jjayers99@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:08:56 -0400 Subject: [PATCH 2/4] Clean up config file layout --- forge-gui/res/adventure/Shandalar/config.json | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/forge-gui/res/adventure/Shandalar/config.json b/forge-gui/res/adventure/Shandalar/config.json index 2e25dd89bcc..aa5fac61fdf 100644 --- a/forge-gui/res/adventure/Shandalar/config.json +++ b/forge-gui/res/adventure/Shandalar/config.json @@ -84,8 +84,8 @@ "pileDecks": { "W":"decks/starter/pile_white_e.json", "B":"decks/starter/pile_black_e.json", - "U":"decks/starter/pile_blue_e.json", - "R":"decks/starter/pile_red_e.json", + "U":"decks/starter/pile_blue_e.json", + "R":"decks/starter/pile_red_e.json", "G":"decks/starter/pile_green_e.json" }, "startItems": [ @@ -122,8 +122,8 @@ "pileDecks": { "W":"decks/starter/pile_white_n.json", "B":"decks/starter/pile_black_n.json", - "U":"decks/starter/pile_blue_n.json", - "R":"decks/starter/pile_red_n.json", + "U":"decks/starter/pile_blue_n.json", + "R":"decks/starter/pile_red_n.json", "G":"decks/starter/pile_green_n.json" }, "startItems": [ @@ -191,8 +191,8 @@ "pileDecks": { "W":"decks/starter/pile_white_h.json", "B":"decks/starter/pile_black_h.json", - "U":"decks/starter/pile_blue_h.json", - "R":"decks/starter/pile_red_h.json", + "U":"decks/starter/pile_blue_h.json", + "R":"decks/starter/pile_red_h.json", "G":"decks/starter/pile_green_h.json" } } @@ -203,7 +203,7 @@ "BRO", "J22", "ONE", - "MOM", + "MOM", "(All)" ], "starterEditionNames": [ @@ -213,7 +213,7 @@ "Jumpstart 22", "Phyrexia: ONE", "MOM", - "(All)" + "(All)" ] } From 68b06f5225d23539838426a2afa38e4977106254 Mon Sep 17 00:00:00 2001 From: TabletopGeneral <56438137+jjayers99@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:09:50 -0400 Subject: [PATCH 3/4] Spacing update --- forge-gui/res/blockdata/printsheets.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/forge-gui/res/blockdata/printsheets.txt b/forge-gui/res/blockdata/printsheets.txt index 968d15cf895..471c19d3397 100644 --- a/forge-gui/res/blockdata/printsheets.txt +++ b/forge-gui/res/blockdata/printsheets.txt @@ -5996,7 +5996,6 @@ Kaya, Ghost Assassin|CN2|2 1 Mondrak, Glory Dominus|ONE 1 Phyrexian Vindicator|ONE - [MOM Brood 1] 1 Essence of Orthodoxy 1 Norn's Inquisitor @@ -6220,4 +6219,4 @@ Kaya, Ghost Assassin|CN2|2 1 Elesh Norn|MOM 1 Invasion of Ravnica|MOM 1 Monastery Mentor|MOM -1 Sword of Once and Future|MOM \ No newline at end of file +1 Sword of Once and Future|MOM From 6cdd7f8dba1fdc63fde64583bb1a31ad59cb09fa Mon Sep 17 00:00:00 2001 From: TabletopGeneral <56438137+jjayers99@users.noreply.github.com> Date: Mon, 24 Apr 2023 08:11:02 -0400 Subject: [PATCH 4/4] Style updates --- forge-gui-mobile/src/forge/adventure/util/CardUtil.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java index 6fcc0655bd0..a86a2df61d6 100644 --- a/forge-gui-mobile/src/forge/adventure/util/CardUtil.java +++ b/forge-gui-mobile/src/forge/adventure/util/CardUtil.java @@ -350,7 +350,7 @@ public class CardUtil { public static Deck generateDeck(GeneratedDeckData data, CardEdition starterEdition, boolean discourageDuplicates) { - List editionCodes = (starterEdition != null)?Arrays.asList(starterEdition.getCode(), starterEdition.getCode2()):Arrays.asList("JMP", "J22", "DMU","BRO","ONE","MOM"); + List editionCodes = (starterEdition != null)?Arrays.asList(starterEdition.getCode(), starterEdition.getCode2()):Arrays.asList("JMP", "J22", "DMU", "BRO", "ONE", "MOM"); Deck deck= new Deck(data.name); if(data.mainDeck!=null) {