From 780bf9f5d5f9cf33c2f164c9ecb382de2bf16a1d Mon Sep 17 00:00:00 2001 From: paulsnoops Date: Thu, 18 Aug 2022 18:55:16 +0100 Subject: [PATCH 1/6] WIP: DMU, editions updates & new editions --- .../res/editions/30th Anniversary Promos.txt | 3 ++ .../res/editions/Dominaria Remastered.txt | 16 +++++++++ forge-gui/res/editions/Dominaria United.txt | 33 +++++++++++++++++++ forge-gui/res/editions/Warhammer 40,000.txt | 4 +++ 4 files changed, 56 insertions(+) create mode 100644 forge-gui/res/editions/Dominaria Remastered.txt diff --git a/forge-gui/res/editions/30th Anniversary Promos.txt b/forge-gui/res/editions/30th Anniversary Promos.txt index a4a7f084061..e777646b022 100644 --- a/forge-gui/res/editions/30th Anniversary Promos.txt +++ b/forge-gui/res/editions/30th Anniversary Promos.txt @@ -11,3 +11,6 @@ ScryfallCode=P30A F1★ R Richard Garfield, Ph.D. @Dave Dorman 2 R Ball Lightning @Trevor Claxton 3 R Fyndhorn Elves @Igor Kieryluk +4 R Wall of Roots @Matt Stewart +5 R Wood Elves @Rebecca Guay +6 R Windfall @Pete Venters diff --git a/forge-gui/res/editions/Dominaria Remastered.txt b/forge-gui/res/editions/Dominaria Remastered.txt new file mode 100644 index 00000000000..0e7825a4449 --- /dev/null +++ b/forge-gui/res/editions/Dominaria Remastered.txt @@ -0,0 +1,16 @@ +[metadata] +Code=DMR +Date=2022-09-09 +Name=Dominaria Remastered +Code2=DMR +MciCode=dmr +Type=Reprint +ScryfallCode=DMR + +[cards] +50 M Force of Will @Donato Giancola +149 R Arboria @Uriah Voth +284 M Force of Will @Donato Giancola +335 R Arboria @Uriah Voth +418 M Force of Will @Richard Kane Ferguson +438 R Arboria @Dave Kendall diff --git a/forge-gui/res/editions/Dominaria United.txt b/forge-gui/res/editions/Dominaria United.txt index e2f1c8008c3..ab2922b32c9 100644 --- a/forge-gui/res/editions/Dominaria United.txt +++ b/forge-gui/res/editions/Dominaria United.txt @@ -8,22 +8,55 @@ Type=Expansion ScryfallCode=DMU [cards] +3 R Archangel of Wrath @Miguel Mercado +19 R Guardian of New Benalia @Ernanda Souza +54 C Impede Momentum @Igor Kieryluk +59 R The Phasing of Zhalfir @LA Draws +84 R Braids, Arisen Nightmare @Heonhwa Choe 93 R Evolved Sleeper @Jason A. Engle +97 M Liliana of the Veil @Martina Fackova +103 R The Raven Man @Chris Rahn 133 M Jaya, Fiery Negotiator @Marta Nael 143 M Shivan Devastator @Brent Hollowell +146 R Squee, Dubious Monarch @Zoltan Boros 147 R Temporal Firestorm @Nestor Ossandon Leal 170 R Llanowar Loamspeaker @Zara Alfonso +174 U Nishoba Brawler @ +184 U Territorial Maro @Simon Dominic +189 M The World Spell @Adam Paquette +192 M Ajani, Sleeper Agent @Matt Stewart +243 R Adarkar Wastes @Piotr Dura +256 R Sulfurous Springs @Bruce Brenneise 277 L Plains @Magali Villeneuve 278 L Island @Magali Villeneuve 279 L Swamp @Magali Villeneuve 280 L Mountain @Magali Villeneuve 281 L Forest @Magali Villeneuve +288 R Braids, Arisen Nightmare @Dibujante Nocturno +289 R The Raven Man @David Curtis +290 M Sheoldred, the Apocalypse @Chris Rahn +291 R Squee, Dubious Monarch @ +330 R The Raven Man @David Curtis +331 M Sheoldred, the Apocalypse @Joe Esposito +332 R Squee, Dubious Monarch @ +369 M Sheoldred, the Apocalypse @Chris Rahn +370 M Ajani, Sleeper Agent @Victor Adame Minguez +371 M Ajani, Sleeper Agent @Victor Adame Minguez +373 M Liliana of the Veil @Brom +375 M Ajani, Sleeper Agent @Adam Rex +376 M Ajani, Sleeper Agent @Thomas M. Baxa +377 R Adarkar Wastes @Rob Alexander 374 M Jaya, Fiery Negotiator @Scott M. Fischer +381 R Sulfurous Springs @Mark Tedin +384 R Archangel of Wrath @Miguel Mercado +386 R Guardian of New Benalia @Ernanda Souza 402 R Evolved Sleeper @Jason A. Engle 410 M Shivan Devastator @Brent Hollowell 411 R Temporal Firestorm @Nestor Ossandon Leal 416 R Llanowar Loamspeaker @Zara Alfonso 428 R Llanowar Loamspeaker @Volkan Baǵa +429 P Herd Migration @Antonio José Manzanedo +434 U Nishoba Brawler @ [tokens] r_1_1_monk_prowess diff --git a/forge-gui/res/editions/Warhammer 40,000.txt b/forge-gui/res/editions/Warhammer 40,000.txt index a2d668fa8ac..5d235c05c61 100644 --- a/forge-gui/res/editions/Warhammer 40,000.txt +++ b/forge-gui/res/editions/Warhammer 40,000.txt @@ -11,3 +11,7 @@ ScryfallCode=40K 108 C Blood for the Blood God! @Artur Nakhodkin 171 M Abaddon the Despoiler @Johan Grenier 181 R Fabricate @Johan Grenier +249 U Sol Ring @ +250 U Sol Ring @Kekai Kotaki +251 U Sol Ring @ +252 U Sol Ring @ From 48589fd06b89d808a1d99734f59d18d11c03f724 Mon Sep 17 00:00:00 2001 From: paulsnoops Date: Thu, 18 Aug 2022 19:27:34 +0100 Subject: [PATCH 2/6] more cards --- .../editions/Dominaria United Commander.txt | 10 +++++++ forge-gui/res/editions/Dominaria United.txt | 28 ++++++++++++++++--- forge-gui/res/editions/Warhammer 40,000.txt | 6 ++-- 3 files changed, 37 insertions(+), 7 deletions(-) diff --git a/forge-gui/res/editions/Dominaria United Commander.txt b/forge-gui/res/editions/Dominaria United Commander.txt index 25a684733e9..4ee5f1e20c8 100644 --- a/forge-gui/res/editions/Dominaria United Commander.txt +++ b/forge-gui/res/editions/Dominaria United Commander.txt @@ -6,9 +6,19 @@ Type=Commander ScryfallCode=DMC [cards] +1 M Dihada, Binder of Wills @Nestor Ossandon Leal +2 M Jared Carthalion @Manuel Castañón +32 R Hazezon, Shaper of Sand @Bryan Sola 33 U Jasmine Boreal of the Seven @Bastien L. Deharme +34 M Jedit Ojanen, Mercenary @Ilse Gort 38 U Ramirez DePietro, Pillager @Anna Steinbauer +39 R Ramses, Assassin Lord @Manuel Castañón 46 U Tor Wauki the Younger @Karl Kopinski +54 R Hazezon, Shaper of Sand @Bryan Sola 55 U Jasmine Boreal of the Seven @Bastien L. Deharme +56 M Jedit Ojanen, Mercenary @Ilse Gort 60 U Ramirez DePietro, Pillager @Anna Steinbauer +61 R Ramses, Assassin Lord @Manuel Castañón +64 R Stangg, Echo Warrior @Randy Vargas +65 M Sivitri, Dragon Master @Livia Prima 68 U Tor Wauki the Younger @Karl Kopinski diff --git a/forge-gui/res/editions/Dominaria United.txt b/forge-gui/res/editions/Dominaria United.txt index ab2922b32c9..69b34d46d64 100644 --- a/forge-gui/res/editions/Dominaria United.txt +++ b/forge-gui/res/editions/Dominaria United.txt @@ -9,24 +9,39 @@ ScryfallCode=DMU [cards] 3 R Archangel of Wrath @Miguel Mercado +8 C Benalish Sleeper @Josu Hernaiz +10 C Charismatic Vanguard @David Palumbo 19 R Guardian of New Benalia @Ernanda Souza +33 U Shalai's Acolyte @Zara Alfonso +46 R Defiler of Dreams @Ryan Pancoast 54 C Impede Momentum @Igor Kieryluk 59 R The Phasing of Zhalfir @LA Draws 84 R Braids, Arisen Nightmare @Heonhwa Choe 93 R Evolved Sleeper @Jason A. Engle 97 M Liliana of the Veil @Martina Fackova 103 R The Raven Man @Chris Rahn +107 M Sheoldred, the Apocalypse @Chris Rahn 133 M Jaya, Fiery Negotiator @Marta Nael +141 R Radha's Firebrand @Angelo Bortolini 143 M Shivan Devastator @Brent Hollowell 146 R Squee, Dubious Monarch @Zoltan Boros 147 R Temporal Firestorm @Nestor Ossandon Leal 170 R Llanowar Loamspeaker @Zara Alfonso -174 U Nishoba Brawler @ +174 U Nishoba Brawler @Valera Lutfullina 184 U Territorial Maro @Simon Dominic 189 M The World Spell @Adam Paquette 192 M Ajani, Sleeper Agent @Matt Stewart +202 R Jhoira, Ageless Innovator @Justyna Gil +212 U Raff, Weatherlight Stalwart @Eelis Kyttanen +219 M Sol'Kanar the Tainted @Filip Burburan +220 M Soul of Windgrace @Liiga Smilshkalne +228 M Zur, Eternal Schemer @Jesper Ejsing 243 R Adarkar Wastes @Piotr Dura +244 R Caves of Koilos @Julian Kok Joon Wen +250 R Karplusan Forest @Sam Burley +255 R Shivan Reef @Andrew Mar 256 R Sulfurous Springs @Bruce Brenneise +261 R Yavimaya Coast @Jesper Ejsing 277 L Plains @Magali Villeneuve 278 L Island @Magali Villeneuve 279 L Swamp @Magali Villeneuve @@ -36,6 +51,7 @@ ScryfallCode=DMU 289 R The Raven Man @David Curtis 290 M Sheoldred, the Apocalypse @Chris Rahn 291 R Squee, Dubious Monarch @ +311 U Raff, Weatherlight Stalwart @Ivan Shavrin 330 R The Raven Man @David Curtis 331 M Sheoldred, the Apocalypse @Joe Esposito 332 R Squee, Dubious Monarch @ @@ -43,11 +59,15 @@ ScryfallCode=DMU 370 M Ajani, Sleeper Agent @Victor Adame Minguez 371 M Ajani, Sleeper Agent @Victor Adame Minguez 373 M Liliana of the Veil @Brom +374 M Jaya, Fiery Negotiator @Scott M. Fischer 375 M Ajani, Sleeper Agent @Adam Rex 376 M Ajani, Sleeper Agent @Thomas M. Baxa 377 R Adarkar Wastes @Rob Alexander -374 M Jaya, Fiery Negotiator @Scott M. Fischer +378 R Caves of Koilos @Lars Grant-West +379 R Karplusan Forest @Randy Gallegos +380 R Shivan Reef @Donato Giancola 381 R Sulfurous Springs @Mark Tedin +382 R Yavimaya Coast @Mark Poole 384 R Archangel of Wrath @Miguel Mercado 386 R Guardian of New Benalia @Ernanda Souza 402 R Evolved Sleeper @Jason A. Engle @@ -55,8 +75,8 @@ ScryfallCode=DMU 411 R Temporal Firestorm @Nestor Ossandon Leal 416 R Llanowar Loamspeaker @Zara Alfonso 428 R Llanowar Loamspeaker @Volkan Baǵa -429 P Herd Migration @Antonio José Manzanedo -434 U Nishoba Brawler @ +429 R Herd Migration @Antonio José Manzanedo +434 U Nishoba Brawler @Valera Lutfullina [tokens] r_1_1_monk_prowess diff --git a/forge-gui/res/editions/Warhammer 40,000.txt b/forge-gui/res/editions/Warhammer 40,000.txt index 5d235c05c61..9031a4c4f8f 100644 --- a/forge-gui/res/editions/Warhammer 40,000.txt +++ b/forge-gui/res/editions/Warhammer 40,000.txt @@ -11,7 +11,7 @@ ScryfallCode=40K 108 C Blood for the Blood God! @Artur Nakhodkin 171 M Abaddon the Despoiler @Johan Grenier 181 R Fabricate @Johan Grenier -249 U Sol Ring @ +249 U Sol Ring @Teodora Dumitriu 250 U Sol Ring @Kekai Kotaki -251 U Sol Ring @ -252 U Sol Ring @ +251 U Sol Ring @Oleg Shekhovtsov +252 U Sol Ring @Lucas Terryn From 12975c512b197227084b3e7826b50d9795c49529 Mon Sep 17 00:00:00 2001 From: paulsnoops Date: Thu, 18 Aug 2022 19:28:33 +0100 Subject: [PATCH 3/6] date --- forge-gui/res/editions/Dominaria Remastered.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/editions/Dominaria Remastered.txt b/forge-gui/res/editions/Dominaria Remastered.txt index 0e7825a4449..195166d6392 100644 --- a/forge-gui/res/editions/Dominaria Remastered.txt +++ b/forge-gui/res/editions/Dominaria Remastered.txt @@ -1,6 +1,6 @@ [metadata] Code=DMR -Date=2022-09-09 +Date=2023-01-13 Name=Dominaria Remastered Code2=DMR MciCode=dmr From 34e7bba2c105cc048c32f1954ffecbf38b46153e Mon Sep 17 00:00:00 2001 From: paulsnoops Date: Thu, 18 Aug 2022 19:46:06 +0100 Subject: [PATCH 4/6] more cards --- forge-gui/res/editions/Dominaria United Commander.txt | 5 +++++ forge-gui/res/editions/Dominaria United.txt | 7 ++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/forge-gui/res/editions/Dominaria United Commander.txt b/forge-gui/res/editions/Dominaria United Commander.txt index 4ee5f1e20c8..db6c87ae4ba 100644 --- a/forge-gui/res/editions/Dominaria United Commander.txt +++ b/forge-gui/res/editions/Dominaria United Commander.txt @@ -13,6 +13,7 @@ ScryfallCode=DMC 34 M Jedit Ojanen, Mercenary @Ilse Gort 38 U Ramirez DePietro, Pillager @Anna Steinbauer 39 R Ramses, Assassin Lord @Manuel Castañón +41 R Rohgahh, Kher Keep Overlord @Chris Seaman 46 U Tor Wauki the Younger @Karl Kopinski 54 R Hazezon, Shaper of Sand @Bryan Sola 55 U Jasmine Boreal of the Seven @Bastien L. Deharme @@ -22,3 +23,7 @@ ScryfallCode=DMC 64 R Stangg, Echo Warrior @Randy Vargas 65 M Sivitri, Dragon Master @Livia Prima 68 U Tor Wauki the Younger @Karl Kopinski + +[tokens] +rgw_1_1_sand_warrior +stangg_twin diff --git a/forge-gui/res/editions/Dominaria United.txt b/forge-gui/res/editions/Dominaria United.txt index 69b34d46d64..9d03c14c426 100644 --- a/forge-gui/res/editions/Dominaria United.txt +++ b/forge-gui/res/editions/Dominaria United.txt @@ -50,8 +50,12 @@ ScryfallCode=DMU 288 R Braids, Arisen Nightmare @Dibujante Nocturno 289 R The Raven Man @David Curtis 290 M Sheoldred, the Apocalypse @Chris Rahn -291 R Squee, Dubious Monarch @ +291 R Squee, Dubious Monarch @Daniel Lieske +301 R Jhoira, Ageless Innovator @Lisa Heidhoff 311 U Raff, Weatherlight Stalwart @Ivan Shavrin +318 M Sol'Kanar the Tainted @Lisa Heidhoff +319 M Soul of Windgrace @Ivan Shavrin +327 M Zur, Eternal Schemer @Dan Mumford 330 R The Raven Man @David Curtis 331 M Sheoldred, the Apocalypse @Joe Esposito 332 R Squee, Dubious Monarch @ @@ -70,6 +74,7 @@ ScryfallCode=DMU 382 R Yavimaya Coast @Mark Poole 384 R Archangel of Wrath @Miguel Mercado 386 R Guardian of New Benalia @Ernanda Souza +396 M Sphinx of Clear Skies @Valera Lutfullina 402 R Evolved Sleeper @Jason A. Engle 410 M Shivan Devastator @Brent Hollowell 411 R Temporal Firestorm @Nestor Ossandon Leal From 6b937c358f27063255ac5f4905451eb914d850e6 Mon Sep 17 00:00:00 2001 From: paulsnoops Date: Thu, 18 Aug 2022 19:51:05 +0100 Subject: [PATCH 5/6] couple more cards --- forge-gui/res/editions/Dominaria United Commander.txt | 1 + forge-gui/res/editions/Dominaria United.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/forge-gui/res/editions/Dominaria United Commander.txt b/forge-gui/res/editions/Dominaria United Commander.txt index db6c87ae4ba..a27c1b77e7c 100644 --- a/forge-gui/res/editions/Dominaria United Commander.txt +++ b/forge-gui/res/editions/Dominaria United Commander.txt @@ -8,6 +8,7 @@ ScryfallCode=DMC [cards] 1 M Dihada, Binder of Wills @Nestor Ossandon Leal 2 M Jared Carthalion @Manuel Castañón +31 U General Marhault Elsdragon @ 32 R Hazezon, Shaper of Sand @Bryan Sola 33 U Jasmine Boreal of the Seven @Bastien L. Deharme 34 M Jedit Ojanen, Mercenary @Ilse Gort diff --git a/forge-gui/res/editions/Dominaria United.txt b/forge-gui/res/editions/Dominaria United.txt index 9d03c14c426..e53ce37bb09 100644 --- a/forge-gui/res/editions/Dominaria United.txt +++ b/forge-gui/res/editions/Dominaria United.txt @@ -32,6 +32,7 @@ ScryfallCode=DMU 189 M The World Spell @Adam Paquette 192 M Ajani, Sleeper Agent @Matt Stewart 202 R Jhoira, Ageless Innovator @Justyna Gil +209 R Nemata, Primeval Ward @Andrew Mar 212 U Raff, Weatherlight Stalwart @Eelis Kyttanen 219 M Sol'Kanar the Tainted @Filip Burburan 220 M Soul of Windgrace @Liiga Smilshkalne From 7dcae6e98cfbf61266c1d6bdb45ace1326d5f2fc Mon Sep 17 00:00:00 2001 From: paulsnoops Date: Thu, 18 Aug 2022 20:05:35 +0100 Subject: [PATCH 6/6] tokens --- forge-gui/res/editions/Dominaria United.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/forge-gui/res/editions/Dominaria United.txt b/forge-gui/res/editions/Dominaria United.txt index e53ce37bb09..8f42556570a 100644 --- a/forge-gui/res/editions/Dominaria United.txt +++ b/forge-gui/res/editions/Dominaria United.txt @@ -85,4 +85,5 @@ ScryfallCode=DMU 434 U Nishoba Brawler @Valera Lutfullina [tokens] +b_1_1_bird_flying_noblock r_1_1_monk_prowess