From dbb87a6a79d4e807adc71b13faa70f56d9776403 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 3 Jun 2021 12:33:52 -0400 Subject: [PATCH 1/7] blocks.txt add MH2 --- forge-gui/res/blockdata/blocks.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui/res/blockdata/blocks.txt b/forge-gui/res/blockdata/blocks.txt index d4635e51a4e..cdbf25e1ccc 100644 --- a/forge-gui/res/blockdata/blocks.txt +++ b/forge-gui/res/blockdata/blocks.txt @@ -96,3 +96,4 @@ Kaladesh Remastered, 3/6/KLR, KLR Kaldheim, 3/6/KHM, KHM Time Spiral Remastered, 3/6/KHM, TSR Strixhaven: School of Mages, 3/6/STX, STX +Modern Horizons 2, 3/6/MH2, MH2 From f0f7b9e6e423cf8b3e85608a438777af27c20812 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 3 Jun 2021 12:34:24 -0400 Subject: [PATCH 2/7] Modern Horizons 2.txt boosters (initial attempt) --- forge-gui/res/editions/Modern Horizons 2.txt | 147 +++++++++++++++++++ 1 file changed, 147 insertions(+) diff --git a/forge-gui/res/editions/Modern Horizons 2.txt b/forge-gui/res/editions/Modern Horizons 2.txt index 6d087357fa4..c951dfa65b5 100644 --- a/forge-gui/res/editions/Modern Horizons 2.txt +++ b/forge-gui/res/editions/Modern Horizons 2.txt @@ -5,6 +5,10 @@ Name=Modern Horizons 2 Code2=MH2 MciCode=mh2 Type=Other +Booster=10 Common:!fromSheet("MH2 Secret Cards"), 3 Uncommon:!fromSheet("MH2 Secret Cards"), 1 RareMythic:!fromSheet("MH2 Secret Cards"), 1 fromSheet("MH2 Lands") +BoosterReplaceSlotFromPrintSheet=MH2 NewToModern +BoosterBox=24 +ChaosDraftThemes=MASTERS_SET [cards] 1 U Abiding Grace @@ -310,6 +314,8 @@ Type=Other 301 M Cabal Coffers 302 U Mishra's Factory 303 R Riptide Laboratory + +[borderless] 304 M Dakkon, Shadow Slayer 305 M Geyadrone Dihada 306 M Grist, the Hunger Tide @@ -333,6 +339,8 @@ Type=Other 324 M Sword of Hearth and Home 325 M Cabal Coffers 326 R Mishra's Factory + +[showcase] 327 U Blossoming Calm 328 R Esper Sentinel 329 C Late to Dinner @@ -387,6 +395,8 @@ Type=Other 378 R Dermotaxi 379 M Kaldra Compleat 380 R Urza's Saga + +[old frame] 381 C Blacksmith's Skill 382 C Marble Gargoyle 383 R Out of Time @@ -448,6 +458,8 @@ Type=Other 439 R Scalding Tarn 440 R Verdant Catacombs 441 R Yavimaya, Cradle of Growth + +[extended art] 442 R Out of Time 443 R Resurgent Belief 444 R Sanctifier en-Vec @@ -487,6 +499,8 @@ Type=Other 478 R Scalding Tarn 479 R Verdant Catacombs 480 R Yavimaya, Cradle of Growth + +[promo] 481 L Plains 482 L Plains 483 L Island @@ -499,3 +513,136 @@ Type=Other 490 L Forest 491 M Sanctum Prelate 492 R Yusri, Fortune's Flame + +[Lands] +19 Arid Mesa|MH2|1 +1 Arid Mesa|MH2|2 +100 Darkmoss Bridge|MH2|1 +100 Drossforge Bridge|MH2|1 +100 Goldmire Bridge|MH2|1 +19 Marsh Flats|MH2|1 +1 Marsh Flats|MH2|2 +100 Mistvault Bridge|MH2|1 +19 Misty Rainforest|MH2|1 +1 Misty Rainforest|MH2|2 +60 Power Depot|MH2|1 +100 Razortide Bridge|MH2|1 +100 Rustvale Bridge|MH2|1 +19 Scalding Tarn|MH2|1 +1 Scalding Tarn|MH2|2 +100 Silverbluff Bridge|MH2|1 +100 Slagwoods Bridge|MH2|1 +100 Tanglepool Bridge|MH2|1 +100 Thornglint Bridge|MH2|1 +20 Urza's Saga|MH2|1 +19 Verdant Catacombs|MH2|1 +1 Verdant Catacombs|MH2|2 +20 Yavimaya, Cradle of Growth|MH2|1 +10 Cabal Coffers|MH2|1 +60 Mishra's Factory|MH2|1 +20 Riptide Laboratory|MH2|1 + +[NewToModern] +6 Angelic Curator|MH2 +2 Karmic Guide|MH2 +6 Seal of Cleansing|MH2 +2 Solitary Confinement|MH2 +6 Soul Snare|MH2 +6 Counterspell|MH2 +6 Sea Drake|MH2 +6 Seal of Removal|MH2 +2 Upheaval|MH2 +2 Wonder|MH2 +6 Bone Shredder|MH2 +2 Braids, Cabal Minion|MH2 +6 Greed|MH2 +2 Patriarch's Bidding|MH2 +6 Skirge Familiar|MH2 +2 Chance Encounter|MH2 +6 Flame Rift|MH2 +2 Goblin Bombardment|MH2 +6 Gorilla Shaman|MH2 +1 Imperial Recruiter|MH2 +6 Mogg Salvage|MH2 +2 Enchantress's Presence|MH2 +6 Hunting Pack|MH2 +6 Quirion Ranger|MH2 +2 Squirrel Mob|MH2 +1 Titania, Protector of Argoth|MH2 +6 Yavimaya Elder|MH2 +2 Chainer, Nightmare Adept|MH2 +2 Fire // Ice|MH2 +1 Mirari's Wake|MH2 +2 Shardless Agent|MH2 +2 Sterling Grove|MH2 +2 Vindicate|MH2 +2 Cursed Totem|MH2 +6 Extruder|MH2 +6 Millikin|MH2 +2 Nevinyrral's Disk|MH2 +6 Patchwork Gnomes|MH2 +6 Zuran Orb|MH2 + +[Secret Cards] +Arid Mesa +Darkmoss Bridge +Drossforge Bridge +Goldmire Bridge +Marsh Flats +Mistvault Bridge +Misty Rainforest +Power Depot +Razortide Bridge +Rustvale Bridge +Scalding Tarn +Silverbluff Bridge +Slagwoods Bridge +Tanglepool Bridge +Thornglint Bridge +Urza's Saga +Verdant Catacombs +Yavimaya, Cradle of Growth +Angelic Curator +Karmic Guide +Seal of Cleansing +Solitary Confinement +Soul Snare +Counterspell +Sea Drake +Seal of Removal +Upheaval +Wonder +Bone Shredder +Braids, Cabal Minion +Greed +Patriarch's Bidding +Skirge Familiar +Chance Encounter +Flame Rift +Goblin Bombardment +Gorilla Shaman +Imperial Recruiter +Mogg Salvage +Enchantress's Presence +Hunting Pack +Quirion Ranger +Squirrel Mob +Titania, Protector of Argoth +Yavimaya Elder +Chainer, Nightmare Adept +Fire // Ice +Mirari's Wake +Shardless Agent +Sterling Grove +Vindicate +Cursed Totem +Extruder +Millikin +Nevinyrral's Disk +Patchwork Gnomes +Zuran Orb +Cabal Coffers +Mishra's Factory +Riptide Laboratory + +[tokens] \ No newline at end of file From 77578174b7d56898afb85cb68873a4d0a0b69b95 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 3 Jun 2021 13:14:11 -0400 Subject: [PATCH 3/7] - improve booster --- forge-gui/res/editions/Modern Horizons 2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/editions/Modern Horizons 2.txt b/forge-gui/res/editions/Modern Horizons 2.txt index c951dfa65b5..ab837af7417 100644 --- a/forge-gui/res/editions/Modern Horizons 2.txt +++ b/forge-gui/res/editions/Modern Horizons 2.txt @@ -5,7 +5,7 @@ Name=Modern Horizons 2 Code2=MH2 MciCode=mh2 Type=Other -Booster=10 Common:!fromSheet("MH2 Secret Cards"), 3 Uncommon:!fromSheet("MH2 Secret Cards"), 1 RareMythic:!fromSheet("MH2 Secret Cards"), 1 fromSheet("MH2 Lands") +Booster=10 Common:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 3 Uncommon:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 1 RareMythic:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 1 fromSheet("MH2 Lands") BoosterReplaceSlotFromPrintSheet=MH2 NewToModern BoosterBox=24 ChaosDraftThemes=MASTERS_SET From 47291206aece3a84c7da0e869ea5ce70ae9e8c20 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 3 Jun 2021 16:58:42 -0400 Subject: [PATCH 4/7] 36 packs in box --- forge-gui/res/editions/Modern Horizons 2.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/editions/Modern Horizons 2.txt b/forge-gui/res/editions/Modern Horizons 2.txt index ab837af7417..8c182814f0d 100644 --- a/forge-gui/res/editions/Modern Horizons 2.txt +++ b/forge-gui/res/editions/Modern Horizons 2.txt @@ -7,7 +7,7 @@ MciCode=mh2 Type=Other Booster=10 Common:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 3 Uncommon:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 1 RareMythic:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 1 fromSheet("MH2 Lands") BoosterReplaceSlotFromPrintSheet=MH2 NewToModern -BoosterBox=24 +BoosterBox=36 ChaosDraftThemes=MASTERS_SET [cards] From fa68e989c43a6a52dddbeb189d7e3868aef90c52 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Thu, 3 Jun 2021 19:55:20 -0400 Subject: [PATCH 5/7] add preliminary MH2 rankings --- forge-gui/res/draft/rankings.txt | 303 +++++++++++++++++++++++++++++++ 1 file changed, 303 insertions(+) diff --git a/forge-gui/res/draft/rankings.txt b/forge-gui/res/draft/rankings.txt index 2f93a151984..2158b7e49db 100644 --- a/forge-gui/res/draft/rankings.txt +++ b/forge-gui/res/draft/rankings.txt @@ -1,4 +1,307 @@ //Rank|Name|Rarity|Set +#1|Fury|M|MH2 +#2|Grist, the Hunger Tide|M|MH2 +#3|Kaldra Compleat|M|MH2 +#4|Archon of Cruelty|M|MH2 +#5|Grief|M|MH2 +#6|Damn|R|MH2 +#7|Timeless Dragon|R|MH2 +#8|Murktide Regent|M|MH2 +#9|Svyelun of Sea and Sky|M|MH2 +#10|Solitude|M|MH2 +#11|Geyadrone Dihada|M|MH2 +#12|Dakkon, Shadow Slayer|M|MH2 +#13|Sword of Hearth and Home|M|MH2 +#14|Tourach, Dread Cantor|M|MH2 +#15|Nykthos Paragon|R|MH2 +#16|Karmic Guide|R|MH2 +#17|Serra's Emissary|M|MH2 +#18|Subtlety|M|MH2 +#19|Obsidian Charmaw|R|MH2 +#20|Chatterfang, Squirrel General|M|MH2 +#21|Thrasta, Tempest's Roar|M|MH2 +#22|General Ferrous Rokiric|R|MH2 +#23|Upheaval|R|MH2 +#24|Titania, Protector of Argoth|M|MH2 +#25|Chainer, Nightmare Adept|R|MH2 +#26|Flametongue Yearling|U|MH2 +#27|Scion of Draco|M|MH2 +#28|Endurance|M|MH2 +#29|Necrogoyf|R|MH2 +#30|Ignoble Hierarch|R|MH2 +#31|Inevitable Betrayal|R|MH2 +#32|Master of Death|R|MH2 +#33|Mirari's Wake|M|MH2 +#34|Yusri, Fortune's Flame|R|MH2 +#35|Priest of Fell Rites|R|MH2 +#36|Calibrated Blast|R|MH2 +#37|Flay Essence|U|MH2 +#38|Piru, the Volatile|R|MH2 +#39|Chitterspitter|R|MH2 +#40|Imperial Recruiter|M|MH2 +#41|Vindicate|R|MH2 +#42|Prismatic Ending|U|MH2 +#43|Aeve, Progenitor Ooze|R|MH2 +#44|Prophetic Titan|U|MH2 +#45|Ragavan, Nimble Pilferer|M|MH2 +#46|Kaleidoscorch|U|MH2 +#47|Nettlecyst|R|MH2 +#48|Sylvan Anthem|R|MH2 +#49|Timeless Witness|U|MH2 +#50|Dauthi Voidwalker|R|MH2 +#51|Search the Premises|R|MH2 +#52|Thought Monitor|R|MH2 +#53|Goblin Bombardment|R|MH2 +#54|Bone Shredder|U|MH2 +#55|Braids, Cabal Minion|R|MH2 +#56|Rise and Shine|R|MH2 +#57|Underworld Hermit|U|MH2 +#58|Breya's Apprentice|R|MH2 +#59|Graceful Restoration|U|MH2 +#60|Sythis, Harvest's Hand|R|MH2 +#61|Captured by Lagacs|C|MH2 +#62|Magus of the Bridge|R|MH2 +#63|Nevinyrral's Disk|R|MH2 +#64|Shardless Agent|R|MH2 +#65|Fire Ice|R|MH2 +#66|Profane Tutor|R|MH2 +#67|Garth One-Eye|M|MH2 +#68|Lonis, Cryptozoologist|R|MH2 +#69|Asmoranomardicadaistinaculdacar|R|MH2 +#70|Road Ruin|U|MH2 +#71|Sanctum Weaver|R|MH2 +#72|Arcus Acolyte|U|MH2 +#73|Rakdos Headliner|U|MH2 +#74|Sanctifier en-Vec|R|MH2 +#75|Lazotep Chancellor|U|MH2 +#76|Terminal Agony|C|MH2 +#77|Sol Talisman|R|MH2 +#78|Soul Snare|U|MH2 +#79|Squirrel Sanctuary|U|MH2 +#80|Arcbound Shikari|U|MH2 +#81|Junk Winder|U|MH2 +#82|Ethersworn Sphinx|U|MH2 +#83|Goblin Traprunner|U|MH2 +#84|Fractured Sanity|R|MH2 +#85|Squirrel Sovereign|U|MH2 +#86|Urza's Saga|R|MH2 +#87|Young Necromancer|U|MH2 +#88|Zabaz, the Glimmerwasp|R|MH2 +#89|Vectis Gloves|U|MH2 +#90|Ghost-Lit Drifter|U|MH2 +#91|Scurry Oak|U|MH2 +#92|Territorial Kavu|R|MH2 +#93|Raving Visionary|U|MH2 +#94|Vile Entomber|U|MH2 +#95|Mine Collapse|C|MH2 +#96|Smell Fear|C|MH2 +#97|Moderation|R|MH2 +#98|Combine Chrysalis|U|MH2 +#99|Wonder|R|MH2 +#100|Mishra's Factory|U|MH2 +#101|Filigree Attendant|U|MH2 +#102|Gaea's Will|R|MH2 +#103|Sweep the Skies|U|MH2 +#104|Herd Baloth|U|MH2 +#105|Archfiend of Sorrows|U|MH2 +#106|World-Weary|C|MH2 +#107|Barbed Spike|U|MH2 +#108|Specimen Collector|U|MH2 +#109|Radiant Epicure|U|MH2 +#110|Healer's Flock|U|MH2 +#111|Clattering Augur|U|MH2 +#112|Thraben Watcher|U|MH2 +#113|Glinting Creeper|U|MH2 +#114|Bannerhide Krushok|C|MH2 +#115|Tragic Fall|C|MH2 +#116|Squirrel Mob|R|MH2 +#117|Counterspell|U|MH2 +#118|Patriarch's Bidding|R|MH2 +#119|Yavimaya Elder|U|MH2 +#120|Rishadan Dockhand|R|MH2 +#121|Late to Dinner|C|MH2 +#122|Verdant Command|R|MH2 +#123|So Shiny|C|MH2 +#124|Arcbound Whelp|U|MH2 +#125|Phantasmal Dreadmaw|C|MH2 +#126|Rift Sower|C|MH2 +#127|Persist|R|MH2 +#128|Glorious Enforcer|U|MH2 +#129|Chrome Courier|C|MH2 +#130|Wren's Run Hydra|U|MH2 +#131|Goblin Anarchomancer|C|MH2 +#132|Said Done|U|MH2 +#133|Fast Furious|U|MH2 +#134|Unholy Heat|C|MH2 +#135|Wavesifter|C|MH2 +#136|Breathless Knight|C|MH2 +#137|Enchantress's Presence|R|MH2 +#138|Hunting Pack|U|MH2 +#139|Misty Rainforest|R|MH2 +#140|Scalding Tarn|R|MH2 +#141|Verdant Catacombs|R|MH2 +#142|Arid Mesa|R|MH2 +#143|Marsh Flats|R|MH2 +#144|Steel Dromedary|U|MH2 +#145|Drey Keeper|C|MH2 +#146|Chatterstorm|C|MH2 +#147|Chef's Kiss|R|MH2 +#148|Vedalken Infiltrator|U|MH2 +#149|Dragon's Rage Channeler|U|MH2 +#150|Bone Shards|C|MH2 +#151|Liquimetal Torque|U|MH2 +#152|Necromancer's Familiar|U|MH2 +#153|Esper Sentinel|R|MH2 +#154|Scuttletide|U|MH2 +#155|Legion Vanguard|U|MH2 +#156|Mental Journey|C|MH2 +#157|Harmonic Prodigy|R|MH2 +#158|Skyblade's Boon|U|MH2 +#159|Slag Strider|U|MH2 +#160|Captain Ripley Vance|U|MH2 +#161|Caprichrome|U|MH2 +#162|Tireless Provisioner|U|MH2 +#163|Arcbound Prototype|C|MH2 +#164|Arcbound Tracker|C|MH2 +#165|Hell Mongrel|C|MH2 +#166|Lightning Spear|C|MH2 +#167|Recalibrate|C|MH2 +#168|Piercing Rays|C|MH2 +#169|Revolutionist|C|MH2 +#170|Dihada's Ploy|C|MH2 +#171|Foundry Helix|C|MH2 +#172|Storm God's Oracle|C|MH2 +#173|Ornithopter of Paradise|C|MH2 +#174|Sea Drake|U|MH2 +#175|Ravenous Squirrel|U|MH2 +#176|Lucid Dreams|U|MH2 +#177|Step Through|C|MH2 +#178|Darkmoss Bridge|C|MH2 +#179|Drossforge Bridge|C|MH2 +#180|Goldmire Bridge|C|MH2 +#181|Mistvault Bridge|C|MH2 +#182|Razortide Bridge|C|MH2 +#183|Rustvale Bridge|C|MH2 +#184|Silverbluff Bridge|C|MH2 +#185|Slagwoods Bridge|C|MH2 +#186|Thornglint Bridge|C|MH2 +#187|Tanglepool Bridge|C|MH2 +#188|Mystic Redaction|U|MH2 +#189|Skophos Reaver|C|MH2 +#190|Constable of the Realm|U|MH2 +#191|Dermotaxi|R|MH2 +#192|Academy Manufactor|R|MH2 +#193|Landscaper Colos|C|MH2 +#194|Urban Daggertooth|C|MH2 +#195|Orchard Strider|C|MH2 +#196|Battle Plan|C|MH2 +#197|Lens Flare|C|MH2 +#198|Resurgent Belief|R|MH2 +#199|Scour the Desert|U|MH2 +#200|Blazing Rootwalla|U|MH2 +#201|Fairgrounds Patrol|C|MH2 +#202|Guardian Kirin|C|MH2 +#203|Loathsome Curator|C|MH2 +#204|Arcbound Slasher|C|MH2 +#205|Batterbone|U|MH2 +#206|Quirion Ranger|U|MH2 +#207|Solitary Confinement|R|MH2 +#208|Angelic Curator|U|MH2 +#209|Millikin|U|MH2 +#210|Diamond Lion|R|MH2 +#211|Spreading Insurrection|U|MH2 +#212|Carth the Lion|R|MH2 +#213|Jade Avenger|C|MH2 +#214|Monoskelion|U|MH2 +#215|Galvanic Relay|C|MH2 +#216|The Underworld Cookbook|U|MH2 +#217|Suspend|R|MH2 +#218|Sanctuary Raptor|U|MH2 +#219|Out of Time|R|MH2 +#220|Feast of Sanity|U|MH2 +#221|Fae Offering|U|MH2 +#222|Aeromoeba|C|MH2 +#223|Tide Shaper|U|MH2 +#224|Bloodbraid Marauder|R|MH2 +#225|Foundation Breaker|U|MH2 +#226|Arcbound Javelineer|U|MH2 +#227|Unbounded Potential|C|MH2 +#228|Sudden Edict|U|MH2 +#229|Strike it Rich|U|MH2 +#230|Disciple of the Sun|C|MH2 +#231|Burdened Aerialist|C|MH2 +#232|Cabal Initiate|C|MH2 +#233|Etherium Spinner|C|MH2 +#234|Gouged Zealot|C|MH2 +#235|Deepwood Denizen|C|MH2 +#236|Knighted Myr|C|MH2 +#237|Marble Gargoyle|C|MH2 +#238|Mount Velus Manticore|C|MH2 +#239|Jewel-Eyed Cobra|C|MH2 +#240|Lose Focus|C|MH2 +#241|Shattered Ego|C|MH2 +#242|Sinister Starfish|C|MH2 +#243|Faithless Salvaging|C|MH2 +#244|Gargadon|C|MH2 +#245|Altar of the Goyf|U|MH2 +#246|Abiding Grace|U|MH2 +#247|Extruder|U|MH2 +#248|Skirge Familiar|U|MH2 +#249|Seal of Removal|U|MH2 +#250|Greed|U|MH2 +#251|Patchwork Gnomes|U|MH2 +#252|Break Ties|C|MH2 +#253|Terramorph|U|MH2 +#254|Kitchen Imp|C|MH2 +#255|Tormod's Cryptkeeper|C|MH2 +#256|Arcbound Mouser|C|MH2 +#257|Abundant Harvest|C|MH2 +#258|Dress Down|R|MH2 +#259|Blossoming Calm|U|MH2 +#260|Gilt-Blade Prowler|C|MH2 +#261|Foul Watcher|C|MH2 +#262|Parcel Myr|C|MH2 +#263|Nested Shambler|C|MH2 +#264|Duskshell Crawler|C|MH2 +#265|Tizerus Charger|C|MH2 +#266|Flourishing Strike|C|MH2 +#267|Soul of Migration|C|MH2 +#268|Hard Evidence|C|MH2 +#269|Steelfin Whale|C|MH2 +#270|Vermin Gorger|C|MH2 +#271|Viashino Lashclaw|C|MH2 +#272|Funnel-Web Recluse|C|MH2 +#273|Fodder Tosser|C|MH2 +#274|Sojourner's Companion|C|MH2 +#275|Sterling Grove|R|MH2 +#276|Brainstone|U|MH2 +#277|Tourach's Canticle|C|MH2 +#278|Discerning Taste|C|MH2 +#279|Yavimaya, Cradle of Growth|R|MH2 +#280|Power Depot|U|MH2 +#281|Tavern Scoundrel|C|MH2 +#282|Floodhound|C|MH2 +#283|Echoing Return|C|MH2 +#284|Blacksmith's Skill|C|MH2 +#285|Glimmer Bairn|C|MH2 +#286|Zuran Orb|U|MH2 +#287|Unmarked Grave|R|MH2 +#288|Bottle Golems|C|MH2 +#289|Crack Open|C|MH2 +#290|Myr Scrapling|C|MH2 +#291|Flame Rift|U|MH2 +#292|Riptide Laboratory|R|MH2 +#293|Gorilla Shaman|U|MH2 +#294|Flame Blitz|U|MH2 +#295|Cabal Coffers|M|MH2 +#296|Mogg Salvage|U|MH2 +#297|Seal of Cleansing|U|MH2 +#298|Cursed Totem|R|MH2 +#299|Blessed Respite|U|MH2 +#300|Void Mirror|R|MH2 +#301|Glimpse of Tomorrow|R|MH2 +#302|Chance Encounter|R|MH2 +#303|Break the Ice|U|MH2 #1|Hofri Ghostforge|M|STX #2|Tanazir Quandrix|M|STX #3|Multiple Choice|R|STX From ca4e9c2ea5ee115c079170fc685b41896775c633 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 4 Jun 2021 12:56:57 -0400 Subject: [PATCH 6/7] add "alternate frame" and "bundle" to EditionSectionWithCollectorNumbers, tweak Edition --- .../src/main/java/forge/card/CardEdition.java | 2 + forge-gui/res/editions/Modern Horizons 2.txt | 86 ++++++++++--------- 2 files changed, 47 insertions(+), 41 deletions(-) diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java index 3d99ff61a87..336841b331d 100644 --- a/forge-core/src/main/java/forge/card/CardEdition.java +++ b/forge-core/src/main/java/forge/card/CardEdition.java @@ -125,8 +125,10 @@ public final class CardEdition implements Comparable { // immutable SHOWCASE("showcase"), EXTENDED_ART("extended art"), ALTERNATE_ART("alternate art"), + ALTERNATE_FRAME("alternate frame"), BUY_A_BOX("buy a box"), PROMO("promo"), + BUNDLE("bundle"), BOX_TOPPER("box topper"); private final String name; diff --git a/forge-gui/res/editions/Modern Horizons 2.txt b/forge-gui/res/editions/Modern Horizons 2.txt index 8c182814f0d..9d2bdb5ad1b 100644 --- a/forge-gui/res/editions/Modern Horizons 2.txt +++ b/forge-gui/res/editions/Modern Horizons 2.txt @@ -315,7 +315,7 @@ ChaosDraftThemes=MASTERS_SET 302 U Mishra's Factory 303 R Riptide Laboratory -[borderless] +[alternate art] 304 M Dakkon, Shadow Slayer 305 M Geyadrone Dihada 306 M Grist, the Hunger Tide @@ -396,7 +396,7 @@ ChaosDraftThemes=MASTERS_SET 379 M Kaldra Compleat 380 R Urza's Saga -[old frame] +[alternate frame] 381 C Blacksmith's Skill 382 C Marble Gargoyle 383 R Out of Time @@ -511,7 +511,11 @@ ChaosDraftThemes=MASTERS_SET 488 L Mountain 489 L Forest 490 L Forest + +[buy a box] 491 M Sanctum Prelate + +[bundle] 492 R Yusri, Fortune's Flame [Lands] @@ -543,45 +547,45 @@ ChaosDraftThemes=MASTERS_SET 20 Riptide Laboratory|MH2|1 [NewToModern] -6 Angelic Curator|MH2 -2 Karmic Guide|MH2 -6 Seal of Cleansing|MH2 -2 Solitary Confinement|MH2 -6 Soul Snare|MH2 -6 Counterspell|MH2 -6 Sea Drake|MH2 -6 Seal of Removal|MH2 -2 Upheaval|MH2 -2 Wonder|MH2 -6 Bone Shredder|MH2 -2 Braids, Cabal Minion|MH2 -6 Greed|MH2 -2 Patriarch's Bidding|MH2 -6 Skirge Familiar|MH2 -2 Chance Encounter|MH2 -6 Flame Rift|MH2 -2 Goblin Bombardment|MH2 -6 Gorilla Shaman|MH2 -1 Imperial Recruiter|MH2 -6 Mogg Salvage|MH2 -2 Enchantress's Presence|MH2 -6 Hunting Pack|MH2 -6 Quirion Ranger|MH2 -2 Squirrel Mob|MH2 -1 Titania, Protector of Argoth|MH2 -6 Yavimaya Elder|MH2 -2 Chainer, Nightmare Adept|MH2 -2 Fire // Ice|MH2 -1 Mirari's Wake|MH2 -2 Shardless Agent|MH2 -2 Sterling Grove|MH2 -2 Vindicate|MH2 -2 Cursed Totem|MH2 -6 Extruder|MH2 -6 Millikin|MH2 -2 Nevinyrral's Disk|MH2 -6 Patchwork Gnomes|MH2 -6 Zuran Orb|MH2 +6 Angelic Curator|MH2|1 +2 Karmic Guide|MH2|1 +6 Seal of Cleansing|MH2|1 +2 Solitary Confinement|MH2|1 +6 Soul Snare|MH2|1 +6 Counterspell|MH2|1 +6 Sea Drake|MH2|1 +6 Seal of Removal|MH2|1 +2 Upheaval|MH2|1 +2 Wonder|MH2|1 +6 Bone Shredder|MH2|1 +2 Braids, Cabal Minion|MH2|1 +6 Greed|MH2|1 +2 Patriarch's Bidding|MH2|1 +6 Skirge Familiar|MH2|1 +2 Chance Encounter|MH2|1 +6 Flame Rift|MH2|1 +2 Goblin Bombardment|MH2|1 +6 Gorilla Shaman|MH2|1 +1 Imperial Recruiter|MH2|1 +6 Mogg Salvage|MH2|1 +2 Enchantress's Presence|MH2|1 +6 Hunting Pack|MH2|1 +6 Quirion Ranger|MH2|1 +2 Squirrel Mob|MH2|1 +1 Titania, Protector of Argoth|MH2|1 +6 Yavimaya Elder|MH2|1 +2 Chainer, Nightmare Adept|MH2|1 +2 Fire // Ice|MH2|1 +1 Mirari's Wake|MH2|1 +2 Shardless Agent|MH2|1 +2 Sterling Grove|MH2|1 +2 Vindicate|MH2|1 +2 Cursed Totem|MH2|1 +6 Extruder|MH2|1 +6 Millikin|MH2|1 +2 Nevinyrral's Disk|MH2|1 +6 Patchwork Gnomes|MH2|1 +6 Zuran Orb|MH2|1 [Secret Cards] Arid Mesa From 7e682810fb290caad9008e3861f175443c44e5f7 Mon Sep 17 00:00:00 2001 From: Northmoc Date: Fri, 4 Jun 2021 15:11:39 -0400 Subject: [PATCH 7/7] final tweaks for now --- forge-core/src/main/java/forge/card/CardEdition.java | 1 + forge-gui/res/draft/rankings.txt | 2 +- forge-gui/res/editions/Modern Horizons 2.txt | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/forge-core/src/main/java/forge/card/CardEdition.java b/forge-core/src/main/java/forge/card/CardEdition.java index 336841b331d..e5b5e233a95 100644 --- a/forge-core/src/main/java/forge/card/CardEdition.java +++ b/forge-core/src/main/java/forge/card/CardEdition.java @@ -120,6 +120,7 @@ public final class CardEdition implements Comparable { // immutable // commonly used printsheets with collector number public enum EditionSectionWithCollectorNumbers { CARDS("cards"), + SPECIAL_SLOT("special slot"), //to help with convoluted boosters PRECON_PRODUCT("precon product"), BORDERLESS("borderless"), SHOWCASE("showcase"), diff --git a/forge-gui/res/draft/rankings.txt b/forge-gui/res/draft/rankings.txt index 2158b7e49db..9ce21b6f44c 100644 --- a/forge-gui/res/draft/rankings.txt +++ b/forge-gui/res/draft/rankings.txt @@ -227,7 +227,7 @@ #226|Arcbound Javelineer|U|MH2 #227|Unbounded Potential|C|MH2 #228|Sudden Edict|U|MH2 -#229|Strike it Rich|U|MH2 +#229|Strike It Rich|U|MH2 #230|Disciple of the Sun|C|MH2 #231|Burdened Aerialist|C|MH2 #232|Cabal Initiate|C|MH2 diff --git a/forge-gui/res/editions/Modern Horizons 2.txt b/forge-gui/res/editions/Modern Horizons 2.txt index 9d2bdb5ad1b..2f168d57e8e 100644 --- a/forge-gui/res/editions/Modern Horizons 2.txt +++ b/forge-gui/res/editions/Modern Horizons 2.txt @@ -5,7 +5,7 @@ Name=Modern Horizons 2 Code2=MH2 MciCode=mh2 Type=Other -Booster=10 Common:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 3 Uncommon:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 1 RareMythic:!fromSheet("MH2 Secret Cards"):fromSheet("MH2 cards"), 1 fromSheet("MH2 Lands") +Booster=10 Common:fromSheet("MH2 cards"), 3 Uncommon:fromSheet("MH2 cards"), 1 RareMythic:fromSheet("MH2 cards"), 1 fromSheet("MH2 Lands") BoosterReplaceSlotFromPrintSheet=MH2 NewToModern BoosterBox=36 ChaosDraftThemes=MASTERS_SET @@ -254,6 +254,8 @@ ChaosDraftThemes=MASTERS_SET 241 U Vectis Gloves 242 R Void Mirror 243 R Zabaz, the Glimmerwasp + +[special slot] 244 R Arid Mesa 245 C Darkmoss Bridge 246 C Drossforge Bridge