diff --git a/.gitattributes b/.gitattributes index 7aa88e20412..d2231bac268 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18245,6 +18245,7 @@ forge-gui/res/conquest/planes/Alara/The[!!-~]Maelstrom/Maelstrom[!!-~]Five[!!-~] forge-gui/res/conquest/planes/Alara/The[!!-~]Maelstrom/Maelstrom[!!-~]Wanderer.dck -text forge-gui/res/conquest/planes/Alara/The[!!-~]Maelstrom/Maelstroms[!!-~]Gold.dck -text forge-gui/res/conquest/planes/Alara/The[!!-~]Maelstrom/_events.txt -text +forge-gui/res/conquest/planes/Alara/banned_cards.txt -text forge-gui/res/conquest/planes/Alara/cards.txt -text forge-gui/res/conquest/planes/Alara/plane_cards.txt -text forge-gui/res/conquest/planes/Alara/regions.txt -text @@ -18310,6 +18311,7 @@ forge-gui/res/conquest/planes/Innistrad/Stensia/Nekrataal.dck -text forge-gui/res/conquest/planes/Innistrad/Stensia/Olivia,[!!-~]Mobilized[!!-~]for[!!-~]War.dck -text forge-gui/res/conquest/planes/Innistrad/Stensia/Sorin,[!!-~]Lord[!!-~]of[!!-~]Innistrad.dck -text forge-gui/res/conquest/planes/Innistrad/Stensia/_events.txt -text +forge-gui/res/conquest/planes/Innistrad/banned_cards.txt -text forge-gui/res/conquest/planes/Innistrad/cards.txt -text forge-gui/res/conquest/planes/Innistrad/plane_cards.txt -text forge-gui/res/conquest/planes/Innistrad/regions.txt -text @@ -18406,6 +18408,7 @@ forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Wanderwine[!!-~]Hub/Sygg,[!!-~]R forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Wanderwine[!!-~]Hub/Wanderwine[!!-~]Rogues.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Wanderwine[!!-~]Hub/Wizards[!!-~]of[!!-~]Wanderwine[!!-~]Hub.dck -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/Wanderwine[!!-~]Hub/_events.txt -text +forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/banned_cards.txt -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/cards.txt -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/plane_cards.txt -text forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/regions.txt -text diff --git a/forge-gui/res/conquest/planes/Alara/banned_cards.txt b/forge-gui/res/conquest/planes/Alara/banned_cards.txt new file mode 100644 index 00000000000..542e390c983 --- /dev/null +++ b/forge-gui/res/conquest/planes/Alara/banned_cards.txt @@ -0,0 +1 @@ +Fractured Powerstone \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Alara/cards.txt b/forge-gui/res/conquest/planes/Alara/cards.txt index 4ebae903743..a1a5be6b165 100644 --- a/forge-gui/res/conquest/planes/Alara/cards.txt +++ b/forge-gui/res/conquest/planes/Alara/cards.txt @@ -1,7 +1,4 @@ Unstable Obelisk -Baleful Strix -Shardless Agent -Etherium-Horn Sorcerer Patron of the Valiant Sublime Archangel Naya Soulbeast @@ -27,9 +24,6 @@ Cathedral of War Meren of Clan Nel Toth Jazal Goldmane Jhessian Thief -Maelstrom Wanderer -Preyseizer Dragon -Thromok the Insatiable Restore Rhox Faithmender Rhox Pikemaster diff --git a/forge-gui/res/conquest/planes/Alara/sets.txt b/forge-gui/res/conquest/planes/Alara/sets.txt index 86d1e124969..a28b43687aa 100644 --- a/forge-gui/res/conquest/planes/Alara/sets.txt +++ b/forge-gui/res/conquest/planes/Alara/sets.txt @@ -1,3 +1,5 @@ ALA CON -ARB \ No newline at end of file +ARB +HOP +PCA \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Innistrad/banned_cards.txt b/forge-gui/res/conquest/planes/Innistrad/banned_cards.txt new file mode 100644 index 00000000000..bdb32882040 --- /dev/null +++ b/forge-gui/res/conquest/planes/Innistrad/banned_cards.txt @@ -0,0 +1,22 @@ +Akiri, Line-Slinger +Atraxa, Praetors' Voice +Breya, Etherium Shaper +Bruse Tarl, Boorish Herder +Cruel Entertainment +Curse of Vengeance +Ikra Shidiqi, the Usurper +Ishai, Ojutai Dragonspeaker +Kraum, Ludevic's Opus +Kydele, Chosen of Kruphix +Kynaios and Tiro of Meletis +Ludevic, Necro-Alchemist +Ravos, Soultender +Reyhan, Last of the Abzan +Saskia the Unyielding +Sidar Kondo of Jamuraa +Silas Renn, Seeker Adept +Tana, the Bloodsower +Thrasios, Triton Hero +Tymna the Weaver +Vial Smasher the Fierce +Yidris, Maelstrom Wielder diff --git a/forge-gui/res/conquest/planes/Innistrad/cards.txt b/forge-gui/res/conquest/planes/Innistrad/cards.txt index f46bd8162dc..f5d6566d9d3 100644 --- a/forge-gui/res/conquest/planes/Innistrad/cards.txt +++ b/forge-gui/res/conquest/planes/Innistrad/cards.txt @@ -24,7 +24,6 @@ Malicious Affliction Predator's Howl Geist of the Moors Ghoulcaller Gisa -Hushwing Gryff Possessed Skaab Predator's Howl Sign in Blood diff --git a/forge-gui/res/conquest/planes/Innistrad/sets.txt b/forge-gui/res/conquest/planes/Innistrad/sets.txt index b3fe9ffd1cc..51536975f3b 100644 --- a/forge-gui/res/conquest/planes/Innistrad/sets.txt +++ b/forge-gui/res/conquest/planes/Innistrad/sets.txt @@ -2,4 +2,5 @@ ISD DKA AVR SOI -EMN \ No newline at end of file +EMN +C16 \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/banned_cards.txt b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/banned_cards.txt new file mode 100644 index 00000000000..0eebc36a8c9 --- /dev/null +++ b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/banned_cards.txt @@ -0,0 +1,26 @@ +Aether Searcher +Agent of Acquisitions +Animus of Predation +Arcane Savant +Archdemon of Paliano +Caller of the Untamed +Canal Dredger +Cogwork Grinder +Cogwork Librarian +Cogwork Spy +Custodi Peacekeeper +Deal Broker +Garbage Fire +Illusionary Informant +Leovold's Operative +Lore Seeker +Lurking Automaton +Noble Banneret +Paliano Vanguard +Paliano, the High City +Pyretic Hunter +Regicide +Smuggler Captain +Spire Phantasm +Volatile Chimera +Whispergear Sneak \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/sets.txt b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/sets.txt index 85c4456e866..5bbf5a6d17e 100644 --- a/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/sets.txt +++ b/forge-gui/res/conquest/planes/Lorwyn-Shadowmoor/sets.txt @@ -1,4 +1,6 @@ LRW MOR SHM -EVE \ No newline at end of file +EVE +CNS +CN2 \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Ravnica/cards.txt b/forge-gui/res/conquest/planes/Ravnica/cards.txt index 1982242b801..93ee871397e 100644 --- a/forge-gui/res/conquest/planes/Ravnica/cards.txt +++ b/forge-gui/res/conquest/planes/Ravnica/cards.txt @@ -3,8 +3,6 @@ Gem of Becoming Obelisk of Urd Will-Forged Golem Seraph of the Masses -Avatar of Slaughter -Basandra, Battle Seraph Soul of Ravnica Duskhunter Bat Shattergang Brothers @@ -38,7 +36,6 @@ Mizzix of the Izmagnus Karlov of the Ghost Council Mazirek, Kraul Death Priest Fungal Sprouting -Ghave, Guru of Spores Jade Mage Sporemound Jace, the Living Guildpact diff --git a/forge-gui/res/conquest/planes/Ravnica/sets.txt b/forge-gui/res/conquest/planes/Ravnica/sets.txt index 9ace2fc555b..8bcc1424d90 100644 --- a/forge-gui/res/conquest/planes/Ravnica/sets.txt +++ b/forge-gui/res/conquest/planes/Ravnica/sets.txt @@ -3,4 +3,6 @@ GPT DIS RTR GTC -DGM \ No newline at end of file +DGM +CMD +CM1 \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Tarkir/sets.txt b/forge-gui/res/conquest/planes/Tarkir/sets.txt index 2d06a5171a0..d0333c5f06b 100644 --- a/forge-gui/res/conquest/planes/Tarkir/sets.txt +++ b/forge-gui/res/conquest/planes/Tarkir/sets.txt @@ -1,3 +1,4 @@ KTK FRF -DTK \ No newline at end of file +DTK +C14 \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Theros/sets.txt b/forge-gui/res/conquest/planes/Theros/sets.txt index 7f03f0a48c2..e6520cb8259 100644 --- a/forge-gui/res/conquest/planes/Theros/sets.txt +++ b/forge-gui/res/conquest/planes/Theros/sets.txt @@ -1,3 +1,4 @@ THS BNG -JOU \ No newline at end of file +JOU +C13 \ No newline at end of file diff --git a/forge-gui/res/conquest/planes/Zendikar/sets.txt b/forge-gui/res/conquest/planes/Zendikar/sets.txt index d420ac370aa..c3063445038 100644 --- a/forge-gui/res/conquest/planes/Zendikar/sets.txt +++ b/forge-gui/res/conquest/planes/Zendikar/sets.txt @@ -2,4 +2,5 @@ ZEN WWK ROE BFZ -OGW \ No newline at end of file +OGW +C15 \ No newline at end of file