From 51e0fbe2e6482db45aa14b2e4f09c1f1e4fc552e Mon Sep 17 00:00:00 2001 From: Agetian Date: Mon, 17 Apr 2017 06:50:09 +0000 Subject: [PATCH] - Attempting to implement Masterpiece Series for Amonkhet (using MPS_xxx code names). Needs further testing. --- .gitattributes | 2 + forge-gui/res/blockdata/printsheets.txt | 140 ++++++++++------- forge-gui/res/draft/rankings.txt | 141 +++++++++++------- forge-gui/res/editions/Aether Revolt.txt | 4 +- forge-gui/res/editions/Amonkhet.txt | 4 +- forge-gui/res/editions/Kaladesh.txt | 2 +- .../Masterpiece Series - Amonkhet.txt | 38 +++++ .../Masterpiece Series - Kaladesh.txt | 62 ++++++++ 8 files changed, 279 insertions(+), 114 deletions(-) create mode 100644 forge-gui/res/editions/Masterpiece Series - Amonkhet.txt create mode 100644 forge-gui/res/editions/Masterpiece Series - Kaladesh.txt diff --git a/.gitattributes b/.gitattributes index 0573d5e67f3..ab5a2cc1f2e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18862,6 +18862,8 @@ forge-gui/res/editions/Magic[!!-~]2013.txt -text forge-gui/res/editions/Magic[!!-~]2014.txt -text forge-gui/res/editions/Magic[!!-~]2015.txt -text forge-gui/res/editions/Magic[!!-~]Origins.txt -text +forge-gui/res/editions/Masterpiece[!!-~]Series[!!-~]-[!!-~]Amonkhet.txt -text +forge-gui/res/editions/Masterpiece[!!-~]Series[!!-~]-[!!-~]Kaladesh.txt -text forge-gui/res/editions/Masterpiece[!!-~]Series.txt -text forge-gui/res/editions/Masters[!!-~]Edition[!!-~]II.txt -text forge-gui/res/editions/Masters[!!-~]Edition[!!-~]III.txt -text diff --git a/forge-gui/res/blockdata/printsheets.txt b/forge-gui/res/blockdata/printsheets.txt index 5fb2f83c349..c48b55f5992 100644 --- a/forge-gui/res/blockdata/printsheets.txt +++ b/forge-gui/res/blockdata/printsheets.txt @@ -1045,62 +1045,62 @@ Verdant Crescendo Woodland Stream [MPS Kaladesh Inventions] -Cataclysmic Gearhulk|MPS -Torrential Gearhulk|MPS -Noxious Gearhulk|MPS -Combustible Gearhulk|MPS -Verdurous Gearhulk|MPS -AEther Vial|MPS -Champion's Helm|MPS -Chromatic Lantern|MPS -Chrome Mox|MPS -Cloudstone Curio|MPS -Crucible of Worlds|MPS -Gauntlet of Power|MPS -Hangarback Walker|MPS -Lightning Greaves|MPS -Lotus Petal|MPS -Mana Crypt|MPS -Mana Vault|MPS -Mind's Eye|MPS -Mox Opal|MPS -Painter's Servant|MPS -Rings of Brighthearth|MPS -Scroll Rack|MPS -Sculpting Steel|MPS -Sol Ring|MPS -Solemn Simulacrum|MPS -Static Orb|MPS -Steel Overseer|MPS -Sword of Feast and Famine|MPS -Sword of Fire and Ice|MPS -Sword of Light and Shadow|MPS +Cataclysmic Gearhulk|MPS_KLD +Torrential Gearhulk|MPS_KLD +Noxious Gearhulk|MPS_KLD +Combustible Gearhulk|MPS_KLD +Verdurous Gearhulk|MPS_KLD +AEther Vial|MPS_KLD +Champion's Helm|MPS_KLD +Chromatic Lantern|MPS_KLD +Chrome Mox|MPS_KLD +Cloudstone Curio|MPS_KLD +Crucible of Worlds|MPS_KLD +Gauntlet of Power|MPS_KLD +Hangarback Walker|MPS_KLD +Lightning Greaves|MPS_KLD +Lotus Petal|MPS_KLD +Mana Crypt|MPS_KLD +Mana Vault|MPS_KLD +Mind's Eye|MPS_KLD +Mox Opal|MPS_KLD +Painter's Servant|MPS_KLD +Rings of Brighthearth|MPS_KLD +Scroll Rack|MPS_KLD +Sculpting Steel|MPS_KLD +Sol Ring|MPS_KLD +Solemn Simulacrum|MPS_KLD +Static Orb|MPS_KLD +Steel Overseer|MPS_KLD +Sword of Feast and Famine|MPS_KLD +Sword of Fire and Ice|MPS_KLD +Sword of Light and Shadow|MPS_KLD [MPS Aether Revolt Inventions] -Arcbound Ravager|MPS -Black Vise|MPS -Chalice of the Void|MPS -Defense Grid|MPS -Duplicant|MPS -Engineered Explosives|MPS -Ensnaring Bridge|MPS -Extraplanar Lens|MPS -Grindstone|MPS -Meekstone|MPS -Oblivion Stone|MPS -Ornithopter|MPS -Paradox Engine|MPS -Pithing Needle|MPS -Planar Bridge|MPS -Platinum Angel|MPS -Sphere of Resistance|MPS -Staff of Domination|MPS -Sundering Titan|MPS -Sword of Body and Mind|MPS -Sword of War and Peace|MPS -Trinisphere|MPS -Vedalken Shackles|MPS -Wurmcoil Engine|MPS +Arcbound Ravager|MPS_KLD +Black Vise|MPS_KLD +Chalice of the Void|MPS_KLD +Defense Grid|MPS_KLD +Duplicant|MPS_KLD +Engineered Explosives|MPS_KLD +Ensnaring Bridge|MPS_KLD +Extraplanar Lens|MPS_KLD +Grindstone|MPS_KLD +Meekstone|MPS_KLD +Oblivion Stone|MPS_KLD +Ornithopter|MPS_KLD +Paradox Engine|MPS_KLD +Pithing Needle|MPS_KLD +Planar Bridge|MPS_KLD +Platinum Angel|MPS_KLD +Sphere of Resistance|MPS_KLD +Staff of Domination|MPS_KLD +Sundering Titan|MPS_KLD +Sword of Body and Mind|MPS_KLD +Sword of War and Peace|MPS_KLD +Trinisphere|MPS_KLD +Vedalken Shackles|MPS_KLD +Wurmcoil Engine|MPS_KLD [AER Planeswalker Decks] Ajani, Valiant Protector @@ -1113,3 +1113,35 @@ Tezzeret's Betrayal Tezzeret's Simulacrum Pendulum of Patterns Submerged Boneyard + +[MPS Amonkhet Invocations] +Austere Command|MPS_AKH +Aven Mindcensor|MPS_AKH +Containment Priest|MPS_AKH +Loyal Retainers|MPS_AKH +Oketra the True|MPS_AKH +Worship|MPS_AKH +Wrath of God|MPS_AKH +Consecrated Sphinx|MPS_AKH +Counterbalance|MPS_AKH +Counterspell|MPS_AKH +Cryptic Command|MPS_AKH +Daze|MPS_AKH +Divert|MPS_AKH +Force of Will|MPS_AKH +Kefnet the Mindful|MPS_AKH +Pact of Negation|MPS_AKH +Spell Pierce|MPS_AKH +Stifle|MPS_AKH +Attrition|MPS_AKH +Bontu the Glorified|MPS_AKH +Dark Ritual|MPS_AKH +Diabolic Intent|MPS_AKH +Entomb|MPS_AKH +Mind Twist|MPS_AKH +Aggravated Assault|MPS_AKH +Chain Lightning|MPS_AKH +Hazoret the Fervent|MPS_AKH +Rhonas the Indomitable|MPS_AKH +Maelstrom Pulse|MPS_AKH +Vindicate|MPS_AKH diff --git a/forge-gui/res/draft/rankings.txt b/forge-gui/res/draft/rankings.txt index aead1ea9914..6253eba2960 100644 --- a/forge-gui/res/draft/rankings.txt +++ b/forge-gui/res/draft/rankings.txt @@ -1,4 +1,35 @@ //Rank|Name|Rarity|Set +#1|Austere Command|M|MPS_AKH +#1|Aven Mindcensor|M|MPS_AKH +#1|Containment Priest|M|MPS_AKH +#1|Loyal Retainers|M|MPS_AKH +#1|Oketra the True|M|MPS_AKH +#1|Worship|M|MPS_AKH +#1|Wrath of God|M|MPS_AKH +#1|Consecrated Sphinx|M|MPS_AKH +#1|Counterbalance|M|MPS_AKH +#1|Counterspell|M|MPS_AKH +#1|Cryptic Command|M|MPS_AKH +#1|Daze|M|MPS_AKH +#1|Divert|M|MPS_AKH +#1|Force of Will|M|MPS_AKH +#1|Kefnet the Mindful|M|MPS_AKH +#1|Pact of Negation|M|MPS_AKH +#1|Spell Pierce|M|MPS_AKH +#1|Stifle|M|MPS_AKH +#1|Attrition|M|MPS_AKH +#1|Bontu the Glorified|M|MPS_AKH +#1|Dark Ritual|M|MPS_AKH +#1|Diabolic Intent|M|MPS_AKH +#1|Entomb|M|MPS_AKH +#1|Mind Twist|M|MPS_AKH +#1|Aggravated Assault|M|MPS_AKH +#1|Chain Lightning|M|MPS_AKH +#1|Hazoret the Fervent|M|MPS_AKH +#1|Rhonas the Indomitable|M|MPS_AKH +#1|Maelstrom Pulse|M|MPS_AKH +#1|Vindicate|M|MPS_AKH +//Rank|Name|Rarity|Set #1|Bonfire of the Damned|M|MM3 #2|Mizzium Mortars|R|MM3 #3|Niv-Mizzet, Dracogenius|R|MM3 @@ -249,61 +280,61 @@ #248|Past in Flames|M|MM3 #249|Pyromancer Ascension|R|MM3 //Rank|Name|Rarity|Set -#1|Cataclysmic Gearhulk|M|MPS -#1|Torrential Gearhulk|M|MPS -#1|Noxious Gearhulk|M|MPS -#1|Combustible Gearhulk|M|MPS -#1|Verdurous Gearhulk|M|MPS -#1|AEther Vial|M|MPS -#1|Champion's Helm|M|MPS -#1|Chromatic Lantern|M|MPS -#1|Chrome Mox|M|MPS -#1|Cloudstone Curio|M|MPS -#1|Crucible of Worlds|M|MPS -#1|Gauntlet of Power|M|MPS -#1|Hangarback Walker|M|MPS -#1|Lightning Greaves|M|MPS -#1|Lotus Petal|M|MPS -#1|Mana Crypt|M|MPS -#1|Mana Vault|M|MPS -#1|Mind's Eye|M|MPS -#1|Mox Opal|M|MPS -#1|Painter's Servant|M|MPS -#1|Rings of Brighthearth|M|MPS -#1|Scroll Rack|M|MPS -#1|Sculpting Steel|M|MPS -#1|Sol Ring|M|MPS -#1|Solemn Simulacrum|M|MPS -#1|Static Orb|M|MPS -#1|Steel Overseer|M|MPS -#1|Sword of Feast and Famine|M|MPS -#1|Sword of Fire and Ice|M|MPS -#1|Sword of Light and Shadow|M|MPS -#1|Arcbound Ravager|M|MPS -#1|Black Vise|M|MPS -#1|Chalice of the Void|M|MPS -#1|Defense Grid|M|MPS -#1|Duplicant|M|MPS -#1|Engineered Explosives|M|MPS -#1|Ensnaring Bridge|M|MPS -#1|Extraplanar Lens|M|MPS -#1|Grindstone|M|MPS -#1|Meekstone|M|MPS -#1|Oblivion Stone|M|MPS -#1|Ornithopter|M|MPS -#1|Paradox Engine|M|MPS -#1|Pithing Needle|M|MPS -#1|Planar Bridge|M|MPS -#1|Platinum Angel|M|MPS -#1|Sphere of Resistance|M|MPS -#1|Staff of Domination|M|MPS -#1|Sundering Titan|M|MPS -#1|Sword of Body and Mind|M|MPS -#1|Sword of War and Peace|M|MPS -#1|Trinisphere|M|MPS -#1|Vedalken Shackles|M|MPS -#1|Wurmcoil Engine|M|MPS -#100|Dummy Card|M|MPS +#1|Cataclysmic Gearhulk|M|MPS_KLD +#1|Torrential Gearhulk|M|MPS_KLD +#1|Noxious Gearhulk|M|MPS_KLD +#1|Combustible Gearhulk|M|MPS_KLD +#1|Verdurous Gearhulk|M|MPS_KLD +#1|AEther Vial|M|MPS_KLD +#1|Champion's Helm|M|MPS_KLD +#1|Chromatic Lantern|M|MPS_KLD +#1|Chrome Mox|M|MPS_KLD +#1|Cloudstone Curio|M|MPS_KLD +#1|Crucible of Worlds|M|MPS_KLD +#1|Gauntlet of Power|M|MPS_KLD +#1|Hangarback Walker|M|MPS_KLD +#1|Lightning Greaves|M|MPS_KLD +#1|Lotus Petal|M|MPS_KLD +#1|Mana Crypt|M|MPS_KLD +#1|Mana Vault|M|MPS_KLD +#1|Mind's Eye|M|MPS_KLD +#1|Mox Opal|M|MPS_KLD +#1|Painter's Servant|M|MPS_KLD +#1|Rings of Brighthearth|M|MPS_KLD +#1|Scroll Rack|M|MPS_KLD +#1|Sculpting Steel|M|MPS_KLD +#1|Sol Ring|M|MPS_KLD +#1|Solemn Simulacrum|M|MPS_KLD +#1|Static Orb|M|MPS_KLD +#1|Steel Overseer|M|MPS_KLD +#1|Sword of Feast and Famine|M|MPS_KLD +#1|Sword of Fire and Ice|M|MPS_KLD +#1|Sword of Light and Shadow|M|MPS_KLD +#1|Arcbound Ravager|M|MPS_KLD +#1|Black Vise|M|MPS_KLD +#1|Chalice of the Void|M|MPS_KLD +#1|Defense Grid|M|MPS_KLD +#1|Duplicant|M|MPS_KLD +#1|Engineered Explosives|M|MPS_KLD +#1|Ensnaring Bridge|M|MPS_KLD +#1|Extraplanar Lens|M|MPS_KLD +#1|Grindstone|M|MPS_KLD +#1|Meekstone|M|MPS_KLD +#1|Oblivion Stone|M|MPS_KLD +#1|Ornithopter|M|MPS_KLD +#1|Paradox Engine|M|MPS_KLD +#1|Pithing Needle|M|MPS_KLD +#1|Planar Bridge|M|MPS_KLD +#1|Platinum Angel|M|MPS_KLD +#1|Sphere of Resistance|M|MPS_KLD +#1|Staff of Domination|M|MPS_KLD +#1|Sundering Titan|M|MPS_KLD +#1|Sword of Body and Mind|M|MPS_KLD +#1|Sword of War and Peace|M|MPS_KLD +#1|Trinisphere|M|MPS_KLD +#1|Vedalken Shackles|M|MPS_KLD +#1|Wurmcoil Engine|M|MPS_KLD +#100|Dummy Card|M|MPS_KLD //Rank|Name|Rarity|Set #1|Herald of Anguish|M|AER #2|Ajani Unyielding|M|AER diff --git a/forge-gui/res/editions/Aether Revolt.txt b/forge-gui/res/editions/Aether Revolt.txt index beafb4047f8..ae7eaf265a5 100644 --- a/forge-gui/res/editions/Aether Revolt.txt +++ b/forge-gui/res/editions/Aether Revolt.txt @@ -7,7 +7,7 @@ Type=Expansion MciCode=aer Booster=10 Common:!fromSheet("AER Planeswalker Decks"), 3 Uncommon:!fromSheet("AER Planeswalker Decks"), 1 RareMythic:!fromSheet("AER Planeswalker Decks"), 1 BasicLand KLD AdditionalSheetForFoils=fromSheet("MPS Aether Revolt Inventions") -AdditionalSetUnlockedInQuest=MPS +AdditionalSetUnlockedInQuest=MPS_KLD [cards] 1 U Aerial Modification @@ -203,4 +203,4 @@ AdditionalSetUnlockedInQuest=MPS 191 R Tezzeret's Betrayal 192 U Tezzeret's Simulacrum 193 C Pendulum of Patterns -194 C Submerged Boneyard \ No newline at end of file +194 C Submerged Boneyard diff --git a/forge-gui/res/editions/Amonkhet.txt b/forge-gui/res/editions/Amonkhet.txt index dfd0b5ce89d..4f54655416b 100644 --- a/forge-gui/res/editions/Amonkhet.txt +++ b/forge-gui/res/editions/Amonkhet.txt @@ -7,8 +7,8 @@ Type=Expansion MciCode=akh #Booster=10 Common:!fromSheet("AKH Planeswalker Decks"), 3 Uncommon:!fromSheet("AKH Planeswalker Decks"), 1 RareMythic:!fromSheet("AKH Planeswalker Decks"), 1 BasicLand AKH Booster=10 Common, 3 Uncommon, 1 RareMythic, 1 BasicLand AKH -#AdditionalSheetForFoils=fromSheet("MPS Amonkhet Invocations") -AdditionalSetUnlockedInQuest=MPS +AdditionalSheetForFoils=fromSheet("MPS Amonkhet Invocations") +AdditionalSetUnlockedInQuest=MPS_AKH [cards] 1 M Angel of Sanctions diff --git a/forge-gui/res/editions/Kaladesh.txt b/forge-gui/res/editions/Kaladesh.txt index 00f9f3d089b..b4173125960 100644 --- a/forge-gui/res/editions/Kaladesh.txt +++ b/forge-gui/res/editions/Kaladesh.txt @@ -8,7 +8,7 @@ MciCode=kld BoosterCovers=3 Booster=10 Common:!fromSheet("KLD Planeswalker Decks"), 3 Uncommon:!fromSheet("KLD Planeswalker Decks"), 1 RareMythic:!fromSheet("KLD Planeswalker Decks"), 1 BasicLand AdditionalSheetForFoils=fromSheet("MPS Kaladesh Inventions") -AdditionalSetUnlockedInQuest=MPS +AdditionalSetUnlockedInQuest=MPS_KLD [cards] 1 C Acrobatic Maneuver diff --git a/forge-gui/res/editions/Masterpiece Series - Amonkhet.txt b/forge-gui/res/editions/Masterpiece Series - Amonkhet.txt new file mode 100644 index 00000000000..44e38fe43bc --- /dev/null +++ b/forge-gui/res/editions/Masterpiece Series - Amonkhet.txt @@ -0,0 +1,38 @@ +[metadata] +Code=MPS_AKH +Date=2017-04-28 +Name=Masterpiece Series - Amonkhet +MciCode=mps +Type=Other + +[cards] +1 M Austere Command +2 M Aven Mindcensor +3 M Containment Priest +4 M Loyal Retainers +5 M Oketra the True +6 M Worship +7 M Wrath of God +8 M Consecrated Sphinx +9 M Counterbalance +10 M Counterspell +11 M Cryptic Command +12 M Daze +13 M Divert +14 M Force of Will +15 M Kefnet the Mindful +16 M Pact of Negation +17 M Spell Pierce +18 M Stifle +19 M Attrition +20 M Bontu the Glorified +21 M Dark Ritual +22 M Diabolic Intent +23 M Entomb +24 M Mind Twist +25 M Aggravated Assault +26 M Chain Lightning +27 M Hazoret the Fervent +28 M Rhonas the Indomitable +29 M Maelstrom Pulse +30 M Vindicate diff --git a/forge-gui/res/editions/Masterpiece Series - Kaladesh.txt b/forge-gui/res/editions/Masterpiece Series - Kaladesh.txt new file mode 100644 index 00000000000..4e14384239f --- /dev/null +++ b/forge-gui/res/editions/Masterpiece Series - Kaladesh.txt @@ -0,0 +1,62 @@ +[metadata] +Code=MPS_KLD +Date=2016-09-30 +Name=Masterpiece Series - Kaladesh +MciCode=mps +Type=Other + +[cards] +1 M Cataclysmic Gearhulk +2 M Torrential Gearhulk +3 M Noxious Gearhulk +4 M Combustible Gearhulk +5 M Verdurous Gearhulk +6 M AEther Vial +7 M Champion's Helm +8 M Chromatic Lantern +9 M Chrome Mox +10 M Cloudstone Curio +11 M Crucible of Worlds +12 M Gauntlet of Power +13 M Hangarback Walker +14 M Lightning Greaves +15 M Lotus Petal +16 M Mana Crypt +17 M Mana Vault +18 M Mind's Eye +19 M Mox Opal +20 M Painter's Servant +21 M Rings of Brighthearth +22 M Scroll Rack +23 M Sculpting Steel +24 M Sol Ring +25 M Solemn Simulacrum +26 M Static Orb +27 M Steel Overseer +28 M Sword of Feast and Famine +29 M Sword of Fire and Ice +30 M Sword of Light and Shadow +31 M Arcbound Ravager +32 M Black Vise +33 M Chalice of the Void +34 M Defense Grid +35 M Duplicant +36 M Engineered Explosives +37 M Ensnaring Bridge +38 M Extraplanar Lens +39 M Grindstone +40 M Meekstone +41 M Oblivion Stone +42 M Ornithopter +43 M Paradox Engine +44 M Pithing Needle +45 M Planar Bridge +46 M Platinum Angel +47 M Sphere of Resistance +48 M Staff of Domination +49 M Sundering Titan +50 M Sword of Body and Mind +51 M Sword of War and Peace +52 M Trinisphere +53 M Vedalken Shackles +54 M Wurmcoil Engine