Merge branch 'Card-Forge:master' into master

forge-game/src/main/java/forge/game/ability/effects/ChangeCombatantsEffect.java

@@ -49,8 +49,10 @@ public class ChangeCombatantsEffect extends SpellAbilityEffect {
 
             final Combat combat = game.getCombat();
             final GameEntity originalDefender = combat.getDefenderByAttacker(c);
-            final FCollection<GameEntity> defs = new FCollection<>();
+            final FCollection<GameEntity> defs = new FCollection<>(combat.getDefendingPlayers());
-            defs.addAll(sa.hasParam("PlayerOnly") ? combat.getDefendingPlayers() : combat.getDefenders());
+            if (!sa.hasParam("PlayerOnly")) {
+                defs.addAll(combat.getDefendingPlaneswalkers());
+            }
 
             String title = Localizer.getInstance().getMessage("lblChooseDefenderToAttackWithCard", cardString);
             Map<String, Object> params = Maps.newHashMap();

forge-game/src/main/java/forge/game/combat/CombatUtil.java

@@ -236,7 +236,7 @@ public class CombatUtil {
             // attacker got goaded by defender or defender is not player
             if (goadedByDefender || !(defender instanceof Player)) {
                 for (GameEntity ge : getAllPossibleDefenders(attacker.getController())) {
-                    if (!defender.equals(ge) && ge instanceof Player) {
+                    if (!ge.equals(defender) && ge instanceof Player) {
                         // found a player which does not goad that creature
                         // and creature can attack this player or planeswalker
                         if (!attacker.isGoadedBy((Player) ge) && !ge.hasKeyword("Creatures your opponents control attack a player other than you if able.") && canAttack(attacker, ge)) {
@@ -250,7 +250,7 @@ public class CombatUtil {
         // Quasi-goad logic for "Kardur, Doomscourge" etc. that isn't goad but behaves the same
         if (defender != null && defender.hasKeyword("Creatures your opponents control attack a player other than you if able.")) {
             for (GameEntity ge : getAllPossibleDefenders(attacker.getController())) {
-                if (!defender.equals(ge) && ge instanceof Player) {
+                if (!ge.equals(defender) && ge instanceof Player) {
                     if (!ge.hasKeyword("Creatures your opponents control attack a player other than you if able.") && canAttack(attacker, ge)) {
                         return false;
                     }

forge-game/src/main/java/forge/game/trigger/TriggerCounterAddedOnce.java

@@ -55,12 +55,6 @@ public class TriggerCounterAddedOnce extends Trigger {
      * @param runParams*/
     @Override
     public final boolean performTest(final Map<AbilityKey, Object> runParams) {
-        if (hasParam("FirstTime")) {
-            if (!(boolean) runParams.get(AbilityKey.FirstTime)) {
-                return false;
-            }
-        }
-
         if (hasParam("CounterType")) {
             final CounterType addedType = (CounterType) runParams.get(AbilityKey.CounterType);
             final String type = getParam("CounterType");
@@ -83,6 +77,12 @@ public class TriggerCounterAddedOnce extends Trigger {
             return false;
         }
 
+        if (hasParam("FirstTime")) {
+            if (!(boolean) runParams.get(AbilityKey.FirstTime)) {
+                return false;
+            }
+        }
+
         return true;
     }
 

forge-gui/res/cardsfolder/a/assembled_alphas.txt

@@ -4,9 +4,10 @@ Types:Creature Wolf
 PT:5/5
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Creature | ValidBlocker$ Card.Self | Execute$ TrigDamageAttacker | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 3 damage to that creature and 3 damage to that creature's controller.
 T:Mode$ AttackerBlockedByCreature | ValidCard$ Card.Self | ValidBlocker$ Creature | Execute$ TrigDamageBlocker | Secondary$ True | TriggerDescription$ Whenever CARDNAME blocks or becomes blocked by a creature, CARDNAME deals 3 damage to that creature and 3 damage to that creature's controller.
-SVar:TrigDamageAttacker:DB$ DealDamage | Defined$ TriggeredAttackerLKICopy | NumDmg$ 3 | SubAbility$ DBDamageAtk
+SVar:TrigDamageAttacker:DB$ DealDamage | Defined$ TriggeredAttackerLKICopy | NumDmg$ 3 | DamapeMap$ True | SubAbility$ DBDamageAtk
-SVar:TrigDamageBlocker:DB$ DealDamage | Defined$ TriggeredBlockerLKICopy | NumDmg$ 3 | SubAbility$ DBDamageBlk
+SVar:TrigDamageBlocker:DB$ DealDamage | Defined$ TriggeredBlockerLKICopy | NumDmg$ 3 | DamapeMap$ True | SubAbility$ DBDamageBlk
-SVar:DBDamageAtk:DB$ DealDamage | Defined$ TriggeredAttackerController | NumDmg$ 3
+SVar:DBDamageAtk:DB$ DealDamage | Defined$ TriggeredAttackerController | NumDmg$ 3 | SubAbility$ DBDamageResolve
-SVar:DBDamageBlk:DB$ DealDamage | Defined$ TriggeredBlockerController | NumDmg$ 3
+SVar:DBDamageBlk:DB$ DealDamage | Defined$ TriggeredBlockerController | NumDmg$ 3 | SubAbility$ DBDamageResolve
+SVar:DBDamageResolve:DB$ DamageResolve
 SVar:HasCombatEffect:TRUE
 Oracle:Whenever Assembled Alphas blocks or becomes blocked by a creature, Assembled Alphas deals 3 damage to that creature and 3 damage to that creature's controller.

forge-gui/res/cardsfolder/e/ellyn_harbreeze_busybody.txt

@@ -3,7 +3,7 @@ ManaCost:3 W
 Types:Legendary Creature Human Peasant
 PT:2/4
 A:AB$ Dig | Cost$ T | DigNum$ X | RestRandomOrder$ True | SpellDescription$ Look at the top X cards of your library, where X is the number of tokens you created this turn. Put one of those cards into your hand and the rest on the bottom of your library in a random order.
-SVar:X:Count$ThisTurnEntered_Battlefield_Card.token+YouOwn
+SVar:X:Count$ThisTurnEntered_Battlefield_Card.tokenCreated+YouOwn
 DeckNeeds:Ability$Token
 K:Choose a Background
 Oracle:{T}: Look at the top X cards of your library, where X is the number of tokens you created this turn. Put one of those cards into your hand and the rest on the bottom of your library in a random order.\nChoose a Background (You can have a Background as a second commander.)

forge-gui/res/cardsfolder/r/reins_of_power.txt

@@ -1,10 +1,9 @@
 Name:Reins of Power
 ManaCost:2 U U
 Types:Instant
-A:SP$ UntapAll | Cost$ 2 U U | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | ValidCards$ Creature | RememberTargets$ True | RememberUntapped$ True | SubAbility$ DBUnTapYours | SpellDescription$ Untap all creatures you control and all creatures target opponent controls. You and that opponent each gain control of all creatures the other controls until end of turn. Those creatures gain haste until end of turn.
+A:SP$ UntapAll | Cost$ 2 U U | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | ValidCards$ Creature.YouCtrl,Creature.TargetedPlayerCtrl | SubAbility$ DBGainCtrl | SpellDescription$ Untap all creatures you control and all creatures target opponent controls. You and that opponent each gain control of all creatures the other controls until end of turn. Those creatures gain haste until end of turn.
-SVar:DBUnTapYours:DB$ UntapAll | ValidCards$ Creature.YouCtrl | RememberUntapped$ True | SubAbility$ DBGainCtrl
+SVar:DBGainCtrl:DB$ GainControl | AllValid$ Creature.TargetedPlayerCtrl | AddKWs$ Haste | NewController$ You | LoseControl$ EOT | RememberControlled$ True | StackDescription$ None | SubAbility$ DBGainCtrlOpp
-SVar:DBGainCtrl:DB$ GainControl | AllValid$ Creature.IsRemembered+RememberedPlayerCtrl | AddKWs$ Haste | NewController$ You | LoseControl$ EOT | ForgetControlled$ True | StackDescription$ None | SubAbility$ DBGainCtrlOpp
+SVar:DBGainCtrlOpp:DB$ GainControl | AllValid$ Creature.IsNotRemembered+YouCtrl | AddKWs$ Haste | NewController$ Targeted | LoseControl$ EOT | StackDescription$ None | SubAbility$ DBCleanup
-SVar:DBGainCtrlOpp:DB$ GainControl | AllValid$ Creature.IsRemembered+YouCtrl | AddKWs$ Haste | NewController$ Player.IsRemembered | LoseControl$ EOT | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
 Oracle:Untap all creatures you control and all creatures target opponent controls. You and that opponent each gain control of all creatures the other controls until end of turn. Those creatures gain haste until end of turn.

forge-gui/res/cardsfolder/t/twist_allegiance.txt

@@ -1,8 +1,8 @@
 Name:Twist Allegiance
 ManaCost:6 R
 Types:Sorcery
-A:SP$ GainControl | Cost$ 6 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | AllValid$ Creature.TargetedPlayerCtrl | RememberTargets$ True | AddKWs$ Haste | Untap$ True | NewController$ You | LoseControl$ EOT | RememberControlled$ True | StackDescription$ SpellDescription | SubAbility$ DBGainCtrlOpp | SpellDescription$ You and target opponent each gain control of all creatures the other controls until end of turn. Untap those creatures. Those creatures gain haste until end of turn.
+A:SP$ GainControl | Cost$ 6 R | ValidTgts$ Opponent | TgtPrompt$ Select target opponent | AllValid$ Creature.TargetedPlayerCtrl | AddKWs$ Haste | Untap$ True | NewController$ You | LoseControl$ EOT | RememberControlled$ True | StackDescription$ SpellDescription | SubAbility$ DBGainCtrlOpp | SpellDescription$ You and target opponent each gain control of all creatures the other controls until end of turn. Untap those creatures. Those creatures gain haste until end of turn.
-SVar:DBGainCtrlOpp:DB$ GainControl | AllValid$ Creature.IsNotRemembered+YouCtrl | AddKWs$ Haste | NewController$ Player.IsRemembered | Untap$ True | LoseControl$ EOT | StackDescription$ None | SubAbility$ DBCleanup
+SVar:DBGainCtrlOpp:DB$ GainControl | AllValid$ Creature.IsNotRemembered+YouCtrl | AddKWs$ Haste | NewController$ Targeted | Untap$ True | LoseControl$ EOT | StackDescription$ None | SubAbility$ DBCleanup
 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
 AI:RemoveDeck:All
 Oracle:You and target opponent each gain control of all creatures the other controls until end of turn. Untap those creatures. Those creatures gain haste until end of turn.

forge-gui/res/cube/MTGO Vintage Cube February 2022.dck

@@ -1,5 +1,5 @@
 [metadata]
-Name=MTGO Vintage Cube Februrary 2022
+Name=MTGO Vintage Cube February 2022
 [main]
 1 Abbot of Keral Keep|ORI
 1 Abrade|DBL

forge-gui/res/cube/MTGO Vintage Cube May 2023.dck

@@ -0,0 +1,539 @@
+[metadata]
+Name=MTGO Vintage Cube May 2023
+[main]
+1 Abrade|VOW
+1 Acidic Slime|M13
+1 Adanto Vanguard|XLN
+1 Aetherflux Reservoir|KLD
+1 Agent of Treachery|M20
+1 Ancestral Recall|VMA
+1 Ancestral Vision|TSR
+1 Ancient Tomb|UMA
+1 Angel of Sanctions|AKH
+1 Animate Dead|EMA
+1 Arbor Elf|A25
+1 Arcane Proxy|BRO
+1 Archon of Cruelty|MH2
+1 Arena Rector|BBD
+1 Arid Mesa|MM3
+1 Armageddon|A25
+1 Ashen Rider|2X2
+1 Atraxa, Grand Unifier|ONE
+1 Augur of Autumn|MID
+1 Avalanche Riders|TSB
+1 Avenger of Zendikar|2XM
+1 Azorius Signet|MM3
+1 Badlands|ME2
+1 Balance|EMA
+1 Baleful Strix|2XM
+1 Baral, Chief of Compliance|TSR
+1 Basalt Monolith|2XM
+1 Batterskull|2XM
+1 Bayou|ME3
+1 Bazaar of Baghdad|ME3
+1 Birds of Paradise|M12
+1 Birgi, God of Storytelling|KHM
+1 Birthing Pod|NPH
+1 Bitterblossom|2X2
+1 Black Lotus|VMA
+1 Blackcleave Cliffs|SOM
+1 Blade Splicer|2XM
+1 Blightsteel Colossus|2XM
+1 Blood Artist|2X2
+1 Blood Crypt|RNA
+1 Bloodchief's Thirst|ZNR
+1 Bloodfeather Phoenix|MOM
+1 Bloodghast|IMA
+1 Bloodstained Mire|KTK
+1 Blooming Marsh|KLD
+1 Bolas's Citadel|WAR
+1 Bomat Courier|KLD
+1 Bone Shards|MH2
+1 Bonecrusher Giant|ELD
+1 Boros Signet|MM3
+1 Boseiju, Who Endures|NEO
+1 Botanical Sanctum|KLD
+1 Braids, Arisen Nightmare|DMU
+1 Braids, Cabal Minion|EMA
+1 Brain Freeze|VMA
+1 Braingeyser|ME4
+1 Brainstorm|2XM
+1 Brazen Borrower|ELD
+1 Breeding Pool|RNA
+1 Bribery|8ED
+1 Burst Lightning|MM2
+1 Cabal Ritual|VMA
+1 Cabal Therapy|EMA
+1 Candelabra of Tawnos|ME4
+1 Cathar Commando|MID
+1 Celestial Colonnade|UMA
+1 Chain Lightning|EMA
+1 Chain of Vapor|C16
+1 Chandra, Acolyte of Flame|M20
+1 Chandra, Torch of Defiance|KLD
+1 Channel|IMA
+1 Char|RAV
+1 Chart a Course|XLN
+1 City of Traitors|TPR
+1 Coalition Relic|TSR
+1 Coercive Portal|VMA
+1 Collective Brutality|EMN
+1 Concealed Courtyard|KLD
+1 Consecrated Sphinx|2X2
+1 Consider|MID
+1 Containment Priest|TSR
+1 Copperline Gorge|SOM
+1 Council's Judgment|2XM
+1 Counterspell|A25
+1 Courser of Kruphix|TSR
+1 Court of Bounty|CMR
+1 Craterhoof Behemoth|MM3
+1 Crop Rotation|2XM
+1 Crucible of Worlds|2X2
+1 Cryptic Command|IMA
+1 Custodi Lich|NCC
+1 Dack Fayden|EMA
+1 Damn|MH2
+1 Damnation|2X2
+1 Daretti, Ingenious Iconoclast|MPS_GRN
+1 Daretti, Scrap Savant|C21
+1 Dark Confidant|2XM
+1 Dark Depths|2XM
+1 Dark Ritual|A25
+1 Darkslick Shores|SOM
+1 Dauthi Voidwalker|MH2
+1 Daze|EMA
+1 Deathrite Shaman|EMA
+1 Deceiver Exarch|NPH
+1 Deep Forest Hermit|H1R
+1 Demonic Tutor|UMA
+1 Deranged Hermit|VMA
+1 Desperate Ritual|UMA
+1 Devoted Druid|2X2
+1 Dig Through Time|UMA
+1 Dimir Signet|MM3
+1 Dire Fleet Daredevil|RIX
+1 Dismember|TSR
+1 Displacer Kitten|CLB
+1 Dreadbore|RTR
+1 Dream Halls|TPR
+1 Duress|MID
+1 Echo of Eons|MH1
+1 Edric, Spymaster of Trest|C16
+1 Eidolon of the Great Revel|A25
+1 Eladamri's Call|A25
+1 Elesh Norn, Grand Cenobite|IMA
+1 Elesh Norn, Mother of Machines|ONE
+1 Elite Spellbinder|STX
+1 Elspeth Conquers Death|THB
+1 Elspeth, Knight-Errant|MMA
+1 Elspeth, Sun's Champion|THS
+1 Elvish Mystic|TSR
+1 Elvish Reclaimer|M20
+1 Embercleave|ELD
+1 Embereth Shieldbreaker|ELD
+1 Emrakul, the Aeons Torn|2X2
+1 Emry, Lurker of the Loch|ELD
+1 Endurance|MH2
+1 Enlightened Tutor|EMA
+1 Entomb|UMA
+1 Ephemerate|H1R
+1 Escape to the Wilds|ELD
+1 Esper Sentinel|MH2
+1 Eternal Witness|2X2
+1 Eureka|MED
+1 Everflowing Chalice|TSR
+1 Exhume|TD2
+1 Expressive Iteration|STX
+1 Fable of the Mirror-Breaker|NEO
+1 Fact or Fiction|EMA
+1 Faithless Looting|UMA
+1 Fallen Shinobi|NCC
+1 Fastbond|ME4
+1 Fatal Push|2XM
+1 Fiend Artisan|IKO
+1 Fiery Confluence|SS3
+1 Fiery Islet|MH1
+1 Figure of Destiny|2X2
+1 Finale of Devastation|WAR
+1 Fireblast|DMR
+1 Firebolt|EMA
+1 Flickerwisp|2X2
+1 Flooded Strand|KTK
+1 Force of Negation|2X2
+1 Force of Vigor|H1R
+1 Force of Will|2XM
+1 Fractured Identity|SLD
+1 Frantic Search|UMA
+1 Fury|MH2
+1 Gaea's Cradle|USG
+1 Garruk Wildspeaker|M11
+1 Gideon Jura|M12
+1 Gideon, Ally of Zendikar|BFZ
+1 Gitaxian Probe|NPH
+1 Giver of Runes|H1R
+1 Glen Elendra Archmage|UMA
+1 Glorybringer|AKH
+1 Goblin Bombardment|C13
+1 Goblin Electromancer|GRN
+1 Goblin Guide|2XM
+1 Goblin Rabblemaster|M15
+1 Goblin Welder|C14
+1 Godless Shrine|RNA
+1 Golgari Signet|MM3
+1 Golos, Tireless Pilgrim|M20
+1 Goryo's Vengeance|UMA
+1 Grave Titan|M12
+1 Graveyard Trespasser|MID
+1 Green Sun's Zenith|2X2
+1 Grief|MH2
+1 Grim Lavamancer|2XM
+1 Grim Monolith|ULG
+1 Griselbrand|MM3
+1 Grist, the Hunger Tide|MH2
+1 Gruul Signet|MM3
+1 Guardian of Ghirapur|MOM
+1 Hallowed Fountain|RNA
+1 Hangarback Walker|ORI
+1 Heartbeat of Spring|2XM
+1 Hellrider|MM3
+1 Helm of Awakening|DMR
+1 Hero of Bladehold|MBS
+1 Hero's Downfall|VOW
+1 Hexdrinker|SLD
+1 High Tide|DMR
+1 Horizon Canopy|IMA
+1 Hornet Queen|M15
+1 Huntmaster of the Fells|DKA
+1 Hydroid Krasis|2X2
+1 Hymn to Tourach|EMA
+1 Ignoble Hierarch|MH2
+1 Imperial Recruiter|2XM
+1 Imperial Seal|2X2
+1 Incinerate|M12
+1 Indatha Triome|IKO
+1 Infernal Grasp|MID
+1 Inferno Titan|M12
+1 Inkwell Leviathan|2XM
+1 Inquisition of Kozilek|2X2
+1 Inspiring Vantage|KLD
+1 Intrepid Adversary|MID
+1 Iona, Shield of Emeria|MM2
+1 Izzet Signet|MM3
+1 Jace, the Mind Sculptor|2XM
+1 Jace, Vryn's Prodigy|ORI
+1 Jadar, Ghoulcaller of Nephalia|MID
+1 Jeska's Will|CLB
+1 Jetmir's Garden|SNC
+1 Joraga Treespeaker|ROE
+1 Kaldra Compleat|MH2
+1 Karakas|UMA
+1 Kari Zev, Skyship Raider|AER
+1 Karn Liberated|2XM
+1 Karn, Scion of Urza|DOM
+1 Karplusan Forest|DMU
+1 Kenrith, the Returned King|ELD
+1 Ketria Triome|IKO
+1 Kiki-Jiki, Mirror Breaker|TSR
+1 Kitchen Finks|UMA
+1 Knight of Autumn|GRN
+1 Knight of the Reliquary|TSR
+1 Kogla, the Titan Ape|IKO
+1 Kolaghan's Command|2X2
+1 Koma, Cosmos Serpent|KHM
+1 Laelia, the Blade Reforged|CLB
+1 Ledger Shredder|SNC
+1 Leonin Relic-Warder|MBS
+1 Leovold, Emissary of Trest|UMA
+1 Library of Alexandria|ME4
+1 Light Up the Stage|RNA
+1 Lightning Bolt|2X2
+1 Lightning Helix|2X2
+1 Liliana of the Veil|DMU
+1 Liliana, the Last Hope|2X2
+1 Lingering Souls|TSR
+1 Lion Sash|NEO
+1 Lion's Eye Diamond|VMA
+1 Llanowar Elves|M19
+1 Lodestone Golem|MM2
+1 Loran of the Third Path|BRO
+1 Lotus Bloom|TSR
+1 Lotus Petal|FVE
+1 Loyal Retainers|MPS_AKH
+1 Lurrus of the Dream-Den|IKO
+1 Maelstrom Pulse|2XM
+1 Magda, Brazen Outlaw|KHM
+1 Makeshift Mannequin|LRW
+1 Mana Crypt|2XM
+1 Mana Drain|2X2
+1 Mana Flare|MED
+1 Mana Leak|2X2
+1 Mana Tithe|TSR
+1 Mana Vault|2X2
+1 Manamorphose|2XM
+1 March of Otherworldly Light|NEO
+1 Marsh Flats|MM3
+1 Mayhem Devil|WAR
+1 Memory Jar|FVR
+1 Mesmeric Fiend|A25
+1 Metalworker|UDS
+1 Midnight Reaper|GRN
+1 Mind Twist|ME3
+1 Mind's Desire|VMA
+1 Mindslaver|SOM
+1 Minsc & Boo, Timeless Heroes|CLB
+1 Mirari's Wake|TD0
+1 Miscalculation|ULG
+1 Mishra's Bauble|2XM
+1 Mishra's Factory|2XM
+1 Mishra's Workshop|ME4
+1 Misty Rainforest|MM3
+1 Mizzium Mortars|MM3
+1 Monastery Mentor|MOM
+1 Monastery Swiftspear|BRO
+1 Mother of Runes|EMA
+1 Mox Diamond|FVR
+1 Mox Emerald|VMA
+1 Mox Jet|VMA
+1 Mox Pearl|VMA
+1 Mox Ruby|VMA
+1 Mox Sapphire|VMA
+1 Mulldrifter|2X2
+1 Murderous Rider|ELD
+1 Mutavault|M14
+1 Myr Battlesphere|2XM
+1 Mystic Confluence|TSR
+1 Mystical Tutor|EMA
+1 Nahiri, the Harbinger|SOI
+1 Narset, Parter of Veils|WAR
+1 Natural Order|EMA
+1 Necromancy|VIS
+1 Night's Whisper|EMA
+1 Nissa, Who Shakes the World|WAR
+1 Niv-Mizzet Reborn|WAR
+1 Noble Hierarch|2XM
+1 Nurturing Peatland|MH1
+1 Oath of Druids|VMA
+1 Oblivion Stone|2XM
+1 Oko, Thief of Crowns|ELD
+1 Omnath, Locus of Creation|ZNR
+1 Oona's Prowler|2X2
+1 Ophiomancer|CC2
+1 Opposition|DMR
+1 Oracle of Mul Daya|2X2
+1 Orcish Lumberjack|ME2
+1 Orzhov Signet|MM3
+1 Oust|ROE
+1 Overgrown Tomb|GRN
+1 Palace Jailer|TSR
+1 Palinchron|VMA
+1 Paradoxical Outcome|TSR
+1 Parallax Wave|VMA
+1 Past in Flames|TSR
+1 Path to Exile|2X2
+1 Pattern of Rebirth|UMA
+1 Pest Infestation|C21
+1 Pestermite|MMA
+1 Phantasmal Image|MM3
+1 Phyrexian Metamorph|2XM
+1 Phyrexian Revoker|2XM
+1 Phyrexian Tower|UMA
+1 Plateau|ME3
+1 Plow Under|8ED
+1 Polluted Delta|KTK
+1 Ponder|TSR
+1 Porcelain Legionnaire|NPH
+1 Preordain|M11
+1 Primal Command|MM3
+1 Primeval Titan|TSR
+1 Prismatic Vista|H1R
+1 Purphoros's Intervention|THB
+1 Putrid Imp|PD3
+1 Pyretic Ritual|M11
+1 Questing Beast|ELD
+1 Raffine's Tower|SNC
+1 Ragavan, Nimble Pilferer|MH2
+1 Rakdos Signet|MM3
+1 Ramunap Excavator|HOU
+1 Raugrin Triome|IKO
+1 Ravages of War|ME2
+1 Ravenous Chupacabra|A25
+1 Razorverge Thicket|SOM
+1 Reanimate|UMA
+1 Reclamation Sage|TSR
+1 Recruiter of the Guard|MB1
+1 Recurring Nightmare|VMA
+1 Red Elemental Blast|A25
+1 Regrowth|A25
+1 Rekindling Phoenix|RIX
+1 Relic of Progenitus|EMA
+1 Remand|TSR
+1 Restoration Angel|2X2
+1 Retrofitter Foundry|C18
+1 Riftwing Cloudskate|TSR
+1 Rishadan Port|A25
+1 Robber of the Rich|ELD
+1 Rofellos, Llanowar Emissary|VMA
+1 Rona, Herald of Invasion|MOM
+1 Rotting Regisaur|M20
+1 Runaway Steam-Kin|GRN
+1 Sacred Foundry|GRN
+1 Saheeli, Sublime Artificer|WAR
+1 Sakura-Tribe Elder|CHK
+1 Satyr Wayfinder|UMA
+1 Savai Triome|IKO
+1 Savannah|ME2
+1 Scalding Tarn|MM3
+1 Scavenging Ooze|M21
+1 Scrubland|ME3
+1 Seachrome Coast|SOM
+1 Seal from Existence|MOM
+1 Seasoned Pyromancer|2X2
+1 Seething Song|9ED
+1 Selesnya Signet|MM3
+1 Selfless Spirit|EMN
+1 Sensei's Divining Top|2X2
+1 Shallow Grave|MIR
+1 Shark Typhoon|IKO
+1 Shelldock Isle|LRW
+1 Sheoldred, the Apocalypse|DMU
+1 Showdown of the Skalds|KHM
+1 Shriekmaw|TSR
+1 Silent Clearing|MH1
+1 Simic Signet|MM3
+1 Skullclamp|DST
+1 Skyclave Apparition|ZNR
+1 Smuggler's Copter|KLD
+1 Snapcaster Mage|UMA
+1 Sneak Attack|2XM
+1 Snuff Out|DDD
+1 Sol Ring|FVR
+1 Solemn Simulacrum|TSR
+1 Solitude|MH2
+1 Soulherder|H1R
+1 Sower of Temptation|LRW
+1 Spara's Headquarters|SNC
+1 Spectral Procession|MM2
+1 Spell Pierce|2X2
+1 Spell Queller|EMN
+1 Spellseeker|SLD
+1 Sphinx of the Steel Wind|EMA
+1 Spirebluff Canal|KLD
+1 Splinter Twin|MM2
+1 Springbloom Druid|KHC
+1 Steam Vents|GRN
+1 Stomping Ground|RNA
+1 Stoneforge Mystic|2XM
+1 Strip Mine|FVE
+1 Student of Warfare|ROE
+1 Sulfuric Vortex|EMA
+1 Sulfurous Springs|DMU
+1 Sunbaked Canyon|MH1
+1 Sundering Titan|2XM
+1 Survival of the Fittest|VMA
+1 Suspicious Stowaway|MID
+1 Sword of Feast and Famine|2XM
+1 Sword of Fire and Ice|2XM
+1 Swords to Plowshares|A25
+1 Sylvan Caryatid|THS
+1 Sylvan Library|EMA
+1 Taiga|ME2
+1 Teferi, Hero of Dominaria|DOM
+1 Teferi, Time Raveler|WAR
+1 Temple Garden|GRN
+1 Temporary Lockdown|DMU
+1 Tendrils of Agony|VMA
+1 Terastodon|2XM
+1 Teshar, Ancestor's Apostle|DOM
+1 Tezzeret, Agent of Bolas|MBS
+1 Thalia, Guardian of Thraben|VOW
+1 Thassa's Oracle|THB
+1 The Meathook Massacre|MID
+1 The Scarab God|2XM
+1 The Wandering Emperor|NEO
+1 Thespian's Stage|2XM
+1 Thief of Sanity|GRN
+1 Thieving Skydiver|ZNR
+1 Third Path Iconoclast|BRO
+1 Thirst for Discovery|VOW
+1 Thoughtseize|TSR
+1 Thraben Inspector|TSR
+1 Thragtusk|TSR
+1 Thran Dynamo|IMA
+1 Through the Breach|UMA
+1 Thundermaw Hellkite|IMA
+1 Tidehollow Sculler|TSR
+1 Time of Need|TSR
+1 Time Spiral|USG
+1 Time Walk|VMA
+1 Time Warp|M10
+1 Timeless Lotus|DMU
+1 Timetwister|VMA
+1 Tinker|FVE
+1 Tireless Tracker|SOI
+1 Tithe Taker|RNA
+1 Tolarian Academy|VMA
+1 Tooth and Nail|MMA
+1 Toski, Bearer of Secrets|KHM
+1 Toxic Deluge|2XM
+1 Treachery|UDS
+1 Treasure Cruise|TSR
+1 Trinket Mage|TSR
+1 Tropical Island|ME3
+1 Tundra|ME2
+1 Turnabout|DMR
+1 Ugin, the Spirit Dragon|M21
+1 Ulamog, the Ceaseless Hunger|BFZ
+1 Ulamog, the Infinite Gyre|2X2
+1 Umezawa's Jitte|BOK
+1 Underground River|BRO
+1 Underground Sea|ME2
+1 Underworld Breach|THB
+1 Upheaval|VMA
+1 Uro, Titan of Nature's Wrath|THB
+1 Urza's Saga|MH2
+1 Urza, Lord High Artificer|H1R
+1 Usher of the Fallen|KHM
+1 Utopia Sprawl|A25
+1 Valki, God of Lies|KHM
+1 Vampire Hexmage|TSR
+1 Vampiric Tutor|EMA
+1 Vendilion Clique|A25
+1 Venser, Shaper Savant|2X2
+1 Verdant Catacombs|MM3
+1 Vindicate|A25
+1 Volcanic Island|ME3
+1 Vorinclex|MOM
+1 Vraska, Golgari Queen|GRN
+1 Walking Ballista|2XM
+1 Wall of Omens|2X2
+1 Wall of Roots|IMA
+1 Wasteland|EMA
+1 Waterlogged Grove|MH1
+1 Watery Grave|GRN
+1 Wear // Tear|DGM
+1 Wheel of Fortune|ME4
+1 Whisperwood Elemental|FRF
+1 White Plume Adventurer|CLB
+1 Winds of Abandon|MH1
+1 Windswept Heath|KTK
+1 Winter Orb|EMA
+1 Wishclaw Talisman|ELD
+1 Woe Strider|THB
+1 Wooded Foothills|KTK
+1 Woodfall Primus|UMA
+1 Worldly Tutor|DMR
+1 Worn Powerstone|EMA
+1 Wrath of God|2XM
+1 Wrenn and Realmbreaker|MOM
+1 Wrenn and Six|2X2
+1 Wurmcoil Engine|2XM
+1 Xander's Lounge|SNC
+1 Xenagos, God of Revels|BNG
+1 Yawgmoth's Will|VMA
+1 Yawgmoth, Thran Physician|TSR
+1 Young Pyromancer|2X2
+1 Zagoth Triome|IKO
+1 Zealous Conscripts|TSR
+1 Ziatora's Proving Ground|SNC
+1 Zuran Orb|MED

forge-gui/res/draft/MTGO Vintage Cube February 2022.draft

@@ -0,0 +1,6 @@
+Name:MTGO Vintage Cube February 2022
+DeckFile:MTGO Vintage Cube February 2022
+Singleton:True
+
+Booster: 15 Any
+NumPacks: 3

forge-gui/res/draft/MTGO Vintage Cube Februrary 2022.draft

@@ -1,6 +0,0 @@
-Name:MTGO Vintage Cube Februrary 2022
-DeckFile:MTGO Vintage Cube Februrary 2022
-Singleton:True
-
-Booster: 15 Any
-NumPacks: 3

forge-gui/res/draft/MTGO Vintage Cube May 2023.draft

@@ -0,0 +1,6 @@
+Name:MTGO Vintage Cube May 2023
+DeckFile:MTGO Vintage Cube May 2023
+Singleton:True
+
+Booster: 15 Any
+NumPacks: 3

forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth Commander.txt

@@ -29,7 +29,6 @@ ScryfallCode=LTC
 306 C Evolving Wilds @Pavel Kolomeyets
 308 U Field of Ruin @Shahab Alizadeh
 316 U Graypelt Refuge @Erikas Perl
-337 M Yavimaya, Cradle of Growth @Samuel Perin
 348 M The Great Henge @Jeremy Paillotin
 349 M Cloudstone Curio @Erikas Perl
 350 M Ensnaring Bridge @Stephen Stark
@@ -44,6 +43,7 @@ ScryfallCode=LTC
 365 M Homeward Path @Erikas Perl
 369 M Minamo, School at Water's Edge @Stephen Stark
 376 M Wasteland @Hristo D. Chukov
+377 M Yavimaya, Cradle of Growth @Samuel Perin
 378 M The Great Henge @Jeremy Paillotin
 380 M Ensnaring Bridge @Stephen Stark
 406 M Wasteland @Hristo D. Chukov

forge-gui/res/editions/The Lord of the Rings Tales of Middle-earth.txt

@@ -21,33 +21,42 @@ ScryfallCode=LTR
 27 U Rosie Cotton of South Lane @Claudiu-Antoniu Magherusan
 28 U Samwise the Stouthearted @Irvin Rodriguez
 29 C Second Breakfast @Christina Kraus
+31 C Slip On the Ring @Iga Oliwiak
 34 U Tale of Tinuviel @Anthony Devine
 36 R War of the Last Alliance @Alexander Forssberg
 37 C Westfold Rider @Anastasia Balakchina
 38 U You Cannot Pass! @Leonardo Borazio
 39 C Arwen's Gift @Wangjie Li
-42 U Bill Ferny, Bree Swindler @
+40 U The Bath Song @JB Casacop
-48 U Council's Deliberation @
+42 U Bill Ferny, Bree Swindler @Hristo D. Chukov
+44 R Borne Upon a Wind @Alexander Mokhov
+46 U Council's Deliberation @
 50 U Gandalf, Friend of the Shire @Dmitry Burmak
-56 U Ioreth of the Houses of Healing @Wei Guan
+56 U Ioreth of the Healing House @Wei Guan
 59 C Knights of Dol Amroth @Eelis Kyttanen
+62 U Meneldor, Swift Savior @Axel Sauerwald
+65 R Press the Enemy @Valera Lutfullina
 67 U Saruman the White @Matt Stewart
 68 U Saruman's Trickery @Yongjae Choi
+71 U Stern Scolding @Valera Lutfullina
 72 M Storm of Saruman @Lorenzo Lanfranconi
 74 C Treason of Isengard @Pavel Kolomeyets
+77 U Bitter Downfall @John Di Giovanni
 79 R Call of the Ring @Anato Finnstark
 82 C Dunland Crebain @Alexander Ostrowski
 83 C Easterling Vanguard @Javier Charro
 84 U Gollum, Patient Plotter @Lorenzo Mastroianni
 85 U Gollum's Bite @Anton Solovianchyk
 87 U Gothmog, Morgul Lieutenant @Ilker Yildiz
+88 U Gríma Wormtongue @Alex Brock
 89 U Grond, the Gatebreaker @Ramazan Kazaliev
 93 R Lobelia Sackville-Baggins @Hristo D. Chukov
+94 U March from the Black Gate @Victor Harmatiuk
 95 C Mirkwood Bats @John Tedrick
 97 C Mordor Trebuchet @Alexander Forssberg
 98 C Morgul-Knife Wound @Axel Sauerwald
 99 C Nasty End @Valera Lutfullina
-100 U Nazgul @Igor Kieryluk
+100 U Nazgul @Igor Krstic
 102 R One Ring to Rule Them All @L J Koh
 103 R Orcish Bowmasters @Maxim Kostin
 106 R Sauron, the Necromancer @Yongjae Choi
@@ -55,6 +64,7 @@ ScryfallCode=LTR
 108 C Shelob's Ambush @Simon Dominic
 109 C Snarling Warg @Tomas Duchek
 110 C The Torment of Gollum @Nino Is
+111 C Troll of Khazad-dum @Simon Dominic
 113 U Voracious Fell Beast @John Tedrick
 114 M Witch-king of Angmar @Anato Finnstark
 116 U Book of Mazarbul @Randy Gallegos
@@ -63,6 +73,9 @@ ScryfallCode=LTR
 120 R Eomer, Marshal of Rohan @Jesper Ejsing
 127 C Fire of Orthanc @Jeremy Paillotin
 128 U Foray of Orcs @Yuriy Chemezov
+129 U Gimli, Counter of Kills @Viko Menezes
+130 C Gimli's Axe @Pablo Mendoza
+131 C Gimli's Fury @John Di Giovanni
 133 U Goblin Fireleaper @Javier Charro
 134 U Grishnakh, Brash Instigator @Victor Harmatiuk
 136 M Hew the Entwood @Manuel Castañón
@@ -97,10 +110,13 @@ ScryfallCode=LTR
 197 U Butterbur, Bree Innkeeper @Ryan Yee
 199 R Doors of Durin @Marc Simonetti
 201 R Eowyn, Fearless Knight @Magali Villeneuve
+202 R Faramir, Prince of Ithilien @Tomas Duchek
 204 U Friendly Rivalry @Marc Simonetti
 205 U Frodo Baggins @Ekaterina Burmak
 207 R Gandalf the Grey @Aaron Miller
 209 R Gimli, Mournful Avenger @Bartlomiej Gawel
+212 U Legolas, Counter of Kills @Yongjae Choi
+213 R Lotho, Corrupt Shirriff @Ilker Yildiz
 214 U Mauhur, Uruk-hai Captain @Javier Charro
 215 R Merry, Esquire of Rohan @Tomas Duchek
 218 R Pippin, Guard of the Citadel @Bartlomiej Gawel
@@ -111,12 +127,15 @@ ScryfallCode=LTR
 224 M Sauron, the Dark Lord @Kieran Yanner
 227 U Shadowfax, Lord of Horses @Valera Lutfullina
 232 U Strider, Ranger of the North @Jarel Threat
+233 U Theoden, King of Rohan @Kieran Yanner
 234 M Tom Bombadil @Dmitry Burmak
 235 U Ugluk of the White Hand @Bartlomiej Gawel
+237 U Barrow-Blade @Alexander Mokhov
 240 R Horn of Gondor @Yigit Koroglu
 246 M The One Ring @Veli Nyström
 252 C Wizard's Rockets @Yuriy Chemezov
 253 R Barad-dur @Sean Vo
+254 C Great Hall of the Citadel @Campbell White
 256 R Minas Tirith @
 257 R Mines of Moria @Arthur Yuan
 258 M Mount Doom @Jonas De Ro
@@ -156,13 +175,16 @@ ScryfallCode=LTR
 309 U Gollum, Patient Plotter @Dominik Mayer
 310 R Sauron, the Necromancer @Anato Finnstark
 311 M Witch-king of Angmar @Marko Manev
+312 U Gimli, Counter of Kills @Dominik Mayer
 313 R Legolas, Master Archer @Dominik Mayer
 314 U Meriadoc Brandybuck @Marko Manev
 315 U Peregrin Took @Anato Finnstark
 317 M Aragorn, the Uniter @Dominik Mayer
+319 R Faramir, Prince of Ithilien
 320 U Frodo Baggins @Dominik Mayer
 322 R Gandalf the Grey @Anato Finnstark
 323 R Gimli, Mournful Avenger @Marko Manev
+324 U Legolas, Counter of Kills @Anato Finnstark
 325 R Merry, Esquire of Rohan @Dominik Mayer
 326 R Pippin, Guard of the Citadel @Anato Finnstark
 327 R Samwise Gamgee @
@@ -188,6 +210,8 @@ ScryfallCode=LTR
 363 R Delighted Halfling @Inka Schulz
 380 M The One Ring @Veli Nyström
 388 R Frodo, Determined Hero @Magali Villeneuve
+389 R Gandalf, White Rider @Ekaterina Burmak
+390 R Gollum, Scheming Guide @Dmitry Burmak
 391 R Witch-king, Bringer of Ruin @Denman Rooke
 392 R Fires of Mount Doom @Shahab Alizadeh
 394 M Aragorn and Arwen, Wed @Magali Villeneuve
@@ -223,7 +247,7 @@ ScryfallCode=LTR
 435 R Legolas, Master Archer @Tyler Jacobson
 436 R Gimli, Mournful Avenger @
 437 R Merry, Esquire of Rohan @Tyler Jacobson
-438 R Pippin, Guard of the Citadel @Martina Fackova
+438 R Pippin, Guard of the Citadel @Martina Fačková
 440 U Rosie Cotton of South Lane @Martina Fačková
 442 M Gandalf the White @Kieran Yanner
 445 C Many Partings @Kieran Yanner
@@ -233,3 +257,4 @@ ScryfallCode=LTR
 451 M The One Ring @Marta Nael
 753 R Mines of Moria @
 760 R Forge Anew @Craig J Spearing
+763 R Press the Enemy @