From 26241e3ef89d0750b05add3ab924e6304a0200e9 Mon Sep 17 00:00:00 2001 From: swordshine Date: Sun, 25 Aug 2019 13:10:12 +0800 Subject: [PATCH 1/4] Add a ForceRevealToController param for Narset, Parter of Veils if no card is valid --- forge-gui/res/cardsfolder/n/narset_parter_of_veils.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forge-gui/res/cardsfolder/n/narset_parter_of_veils.txt b/forge-gui/res/cardsfolder/n/narset_parter_of_veils.txt index b402d8903a7..f3e54e728bc 100644 --- a/forge-gui/res/cardsfolder/n/narset_parter_of_veils.txt +++ b/forge-gui/res/cardsfolder/n/narset_parter_of_veils.txt @@ -3,5 +3,5 @@ ManaCost:1 U U Types:Legendary Planeswalker Narset Loyalty:5 S:Mode$ Continuous | Affected$ Opponent | AddKeyword$ You can't draw more than one card each turn. | Description$ Each opponent can't draw more than one card each turn. -A:AB$ Dig | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Card.nonCreature+nonLand | RestRandomOrder$ True | SpellDescription$ Look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. +A:AB$ Dig | Cost$ SubCounter<2/LOYALTY> | Planeswalker$ True | DigNum$ 4 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Card.nonCreature+nonLand | RestRandomOrder$ True | ForceRevealToController$ True | SpellDescription$ Look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. Oracle:Each opponent can't draw more than one card each turn.\n[-2]: Look at the top four cards of your library. You may reveal a noncreature, nonland card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. From 4931857b8ceee2ad2a6831dcb427e462f4c1f609 Mon Sep 17 00:00:00 2001 From: swordshine Date: Sun, 25 Aug 2019 21:19:55 +0800 Subject: [PATCH 2/4] Update Transmute Artifact --- forge-gui/res/cardsfolder/t/transmute_artifact.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/t/transmute_artifact.txt b/forge-gui/res/cardsfolder/t/transmute_artifact.txt index e50e51028e4..8ccedb74d00 100644 --- a/forge-gui/res/cardsfolder/t/transmute_artifact.txt +++ b/forge-gui/res/cardsfolder/t/transmute_artifact.txt @@ -6,8 +6,8 @@ SVar:StoreCanSearch:DB$ StoreSVar | SVar$ SackedCMC | Type$ Number | Expression$ SVar:StoreCMC:DB$ StoreSVar | SVar$ SackedCMC | Type$ Calculate | Expression$ Y | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 | SubAbility$ DBClear SVar:DBClear:DB$ Cleanup | ClearRemembered$ True | SubAbility$ SearchLibrary SVar:SearchLibrary:DB$ ChangeZone | Origin$ Library | Destination$ Library | ChangeType$ Artifact | ChangeNum$ 1 | SubAbility$ EqualTransmute | StackDescription$ None | RememberChanged$ True | ConditionCheckSVar$ SackedCMC | ConditionSVarCompare$ GE0 -SVar:EqualTransmute:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | NoLooking$ True | Mandatory$ True | Defined$ Remembered | ChangeNum$ 1 | ConditionCheckSVar$ SackedCMC | ConditionSVarCompare$ GEY | SubAbility$ PayForTransmute | StackDescription$ None -SVar:PayForTransmute:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | NoLooking$ True | Mandatory$ True | Defined$ Remembered | ChangeNum$ 1 | ConditionCheckSVar$ SackedCMC | ConditionSVarCompare$ LTY | UnlessCost$ X | UnlessPayer$ You | UnlessSwitched$ True | StackDescription$ None | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 +SVar:EqualTransmute:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | NoLooking$ True | Mandatory$ True | Defined$ Remembered | ChangeNum$ 1 | ConditionCheckSVar$ SackedCMC | ConditionSVarCompare$ GEY | References$ Y | SubAbility$ PayForTransmute | StackDescription$ None +SVar:PayForTransmute:DB$ ChangeZone | Origin$ Library | Destination$ Battlefield | NoLooking$ True | Mandatory$ True | Defined$ Remembered | ChangeNum$ 1 | ConditionCheckSVar$ SackedCMC | ConditionSVarCompare$ LTY | UnlessCost$ X | References$ X,Y | UnlessPayer$ You | UnlessSwitched$ True | StackDescription$ None | ConditionDefined$ Remembered | ConditionPresent$ Card | ConditionCompare$ GE1 # Everything working but when no artifact is sacrificed # SackedCMC to be overridden to see if a sacrifice actually happened SVar:Y:Remembered$CardManaCost From 01094fb4e50d4eae9900f010873e22da8c091380 Mon Sep 17 00:00:00 2001 From: swordshine Date: Sun, 1 Sep 2019 21:09:26 +0800 Subject: [PATCH 3/4] Add a "References$ X" param --- forge-gui/res/cardsfolder/l/lake_of_the_dead.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/forge-gui/res/cardsfolder/l/lake_of_the_dead.txt b/forge-gui/res/cardsfolder/l/lake_of_the_dead.txt index badb1aee8bc..215a4e90b95 100644 --- a/forge-gui/res/cardsfolder/l/lake_of_the_dead.txt +++ b/forge-gui/res/cardsfolder/l/lake_of_the_dead.txt @@ -5,8 +5,8 @@ A:AB$ Mana | Cost$ T | Produced$ B | SpellDescription$ Add {B}. A:AB$ Mana | Cost$ T Sac<1/Swamp> | Produced$ B | Amount$ 4 | SpellDescription$ Add {B}{B}{B}{B}. R:Event$ Moved | Destination$ Battlefield | ValidCard$ Card.Self | ReplaceWith$ PayBeforeETB | Description$ If CARDNAME would enter the battlefield, sacrifice a Swamp instead. If you do, put CARDNAME onto the battlefield. If you don't, put it into its owner's graveyard. SVar:PayBeforeETB:DB$ Sacrifice | SacValid$ Swamp | Defined$ You | RememberSacrificed$ True | SubAbility$ MoveToGraveyard -SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SubAbility$ MoveToBattlefield -SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | SubAbility$ DBCleanup +SVar:MoveToGraveyard:DB$ ChangeZone | Origin$ All | Destination$ Graveyard | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | References$ X | SubAbility$ MoveToBattlefield +SVar:MoveToBattlefield:DB$ ChangeZone | Origin$ All | Destination$ Battlefield | Defined$ ReplacedCard | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 | References$ X | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:X:Remembered$Amount AI:RemoveDeck:All From 1bb12a2ce6ab23de0c6ede4c699b59df130ac3b6 Mon Sep 17 00:00:00 2001 From: swordshine Date: Wed, 4 Sep 2019 13:43:50 +0800 Subject: [PATCH 4/4] CLeanup the upcoming folder for the ELD spoiler --- forge-gui/res/cardsfolder/{upcoming => a}/aeon_engine.txt | 0 forge-gui/res/cardsfolder/{upcoming => a}/anje_falkenrath.txt | 0 forge-gui/res/cardsfolder/{upcoming => a}/anjes_ravager.txt | 0 forge-gui/res/cardsfolder/{upcoming => a}/apex_altisaur.txt | 0 forge-gui/res/cardsfolder/{upcoming => a}/archfiend_of_spite.txt | 0 .../res/cardsfolder/{upcoming => a}/atla_palani_nest_tender.txt | 0 forge-gui/res/cardsfolder/{upcoming => b}/backdraft_hellkite.txt | 0 forge-gui/res/cardsfolder/{upcoming => b}/bloodthirsty_blade.txt | 0 forge-gui/res/cardsfolder/{upcoming => b}/bone_miser.txt | 0 .../res/cardsfolder/{upcoming => c}/chainer_nightmare_adept.txt | 0 forge-gui/res/cardsfolder/{upcoming => c}/cliffside_rescuer.txt | 0 forge-gui/res/cardsfolder/{upcoming => c}/commanders_insignia.txt | 0 .../res/cardsfolder/{upcoming => c}/curse_of_fools_wisdom.txt | 0 .../res/cardsfolder/{upcoming => d}/dockside_extortionist.txt | 0 forge-gui/res/cardsfolder/{upcoming => d}/doomed_artisan.txt | 0 .../res/cardsfolder/{upcoming => e}/elsha_of_the_infinite.txt | 0 .../res/cardsfolder/{upcoming => e}/empowered_autogenerator.txt | 0 forge-gui/res/cardsfolder/{upcoming => f}/full_flowering.txt | 0 .../res/cardsfolder/{upcoming => g}/gerrard_weatherlight_hero.txt | 0 .../res/cardsfolder/{upcoming => g}/ghired_conclave_exile.txt | 0 .../res/cardsfolder/{upcoming => g}/ghireds_belligerence.txt | 0 forge-gui/res/cardsfolder/{upcoming => g}/gift_of_doom.txt | 0 .../res/cardsfolder/{upcoming => g}/greven_predator_captain.txt | 0 .../res/cardsfolder/{upcoming => g}/grismold_the_dreadsower.txt | 0 forge-gui/res/cardsfolder/{upcoming => h}/hate_mirage.txt | 0 forge-gui/res/cardsfolder/{upcoming => i}/idol_of_oblivion.txt | 0 forge-gui/res/cardsfolder/{upcoming => i}/ignite_the_future.txt | 0 .../res/cardsfolder/{upcoming => k}/kadena_slinking_sorcerer.txt | 0 forge-gui/res/cardsfolder/{upcoming => k}/kadenas_silencer.txt | 0 .../res/cardsfolder/{upcoming => k}/krrik_son_of_yawgmoth.txt | 0 forge-gui/res/cardsfolder/{upcoming => l}/leadership_vacuum.txt | 0 forge-gui/res/cardsfolder/{upcoming => m}/mandate_of_peace.txt | 0 .../cardsfolder/{upcoming => m}/marisi_breaker_of_the_coil.txt | 0 forge-gui/res/cardsfolder/{upcoming => m}/mass_diminish.txt | 0 forge-gui/res/cardsfolder/{upcoming => m}/mire_in_misery.txt | 0 forge-gui/res/cardsfolder/{upcoming => n}/nightmare_unmaking.txt | 0 forge-gui/res/cardsfolder/{upcoming => o}/ohran_frostfang.txt | 0 .../res/cardsfolder/{upcoming => p}/pendant_of_prosperity.txt | 0 .../res/cardsfolder/{upcoming => p}/pramikon_sky_rampart.txt | 0 .../cardsfolder/{upcoming => r}/rayami_first_of_the_fallen.txt | 0 forge-gui/res/cardsfolder/{upcoming => r}/road_of_return.txt | 0 forge-gui/res/cardsfolder/{upcoming => s}/sanctum_of_eternity.txt | 0 forge-gui/res/cardsfolder/{upcoming => s}/scaretiller.txt | 0 forge-gui/res/cardsfolder/{upcoming => s}/scroll_of_fate.txt | 0 forge-gui/res/cardsfolder/{upcoming => s}/selesnya_eulogist.txt | 0 .../res/cardsfolder/{upcoming => s}/sevinne_the_chronoclasm.txt | 0 .../res/cardsfolder/{upcoming => s}/sevinnes_reclamation.txt | 0 forge-gui/res/cardsfolder/{upcoming => s}/skyfire_phoenix.txt | 0 .../res/cardsfolder/{upcoming => s}/song_of_the_worldsoul.txt | 0 .../res/cardsfolder/{upcoming => t}/tahngarth_first_mate.txt | 0 forge-gui/res/cardsfolder/{upcoming => t}/tectonic_hellion.txt | 0 forge-gui/res/cardsfolder/{upcoming => t}/thalias_geistcaller.txt | 0 forge-gui/res/cardsfolder/{upcoming => t}/thieving_amalgam.txt | 0 forge-gui/res/cardsfolder/{upcoming => t}/thought_sponge.txt | 0 forge-gui/res/cardsfolder/{upcoming => v}/voice_of_many.txt | 0 .../res/cardsfolder/{upcoming => v}/volrath_the_shapestealer.txt | 0 .../res/cardsfolder/{upcoming => w}/wall_of_stolen_identity.txt | 0 forge-gui/res/cardsfolder/{upcoming => w}/wildfire_devils.txt | 0 58 files changed, 0 insertions(+), 0 deletions(-) rename forge-gui/res/cardsfolder/{upcoming => a}/aeon_engine.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => a}/anje_falkenrath.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => a}/anjes_ravager.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => a}/apex_altisaur.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => a}/archfiend_of_spite.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => a}/atla_palani_nest_tender.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => b}/backdraft_hellkite.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => b}/bloodthirsty_blade.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => b}/bone_miser.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => c}/chainer_nightmare_adept.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => c}/cliffside_rescuer.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => c}/commanders_insignia.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => c}/curse_of_fools_wisdom.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => d}/dockside_extortionist.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => d}/doomed_artisan.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => e}/elsha_of_the_infinite.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => e}/empowered_autogenerator.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => f}/full_flowering.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => g}/gerrard_weatherlight_hero.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => g}/ghired_conclave_exile.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => g}/ghireds_belligerence.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => g}/gift_of_doom.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => g}/greven_predator_captain.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => g}/grismold_the_dreadsower.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => h}/hate_mirage.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => i}/idol_of_oblivion.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => i}/ignite_the_future.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => k}/kadena_slinking_sorcerer.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => k}/kadenas_silencer.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => k}/krrik_son_of_yawgmoth.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => l}/leadership_vacuum.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => m}/mandate_of_peace.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => m}/marisi_breaker_of_the_coil.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => m}/mass_diminish.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => m}/mire_in_misery.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => n}/nightmare_unmaking.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => o}/ohran_frostfang.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => p}/pendant_of_prosperity.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => p}/pramikon_sky_rampart.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => r}/rayami_first_of_the_fallen.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => r}/road_of_return.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => s}/sanctum_of_eternity.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => s}/scaretiller.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => s}/scroll_of_fate.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => s}/selesnya_eulogist.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => s}/sevinne_the_chronoclasm.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => s}/sevinnes_reclamation.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => s}/skyfire_phoenix.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => s}/song_of_the_worldsoul.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => t}/tahngarth_first_mate.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => t}/tectonic_hellion.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => t}/thalias_geistcaller.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => t}/thieving_amalgam.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => t}/thought_sponge.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => v}/voice_of_many.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => v}/volrath_the_shapestealer.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => w}/wall_of_stolen_identity.txt (100%) rename forge-gui/res/cardsfolder/{upcoming => w}/wildfire_devils.txt (100%) diff --git a/forge-gui/res/cardsfolder/upcoming/aeon_engine.txt b/forge-gui/res/cardsfolder/a/aeon_engine.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aeon_engine.txt rename to forge-gui/res/cardsfolder/a/aeon_engine.txt diff --git a/forge-gui/res/cardsfolder/upcoming/anje_falkenrath.txt b/forge-gui/res/cardsfolder/a/anje_falkenrath.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/anje_falkenrath.txt rename to forge-gui/res/cardsfolder/a/anje_falkenrath.txt diff --git a/forge-gui/res/cardsfolder/upcoming/anjes_ravager.txt b/forge-gui/res/cardsfolder/a/anjes_ravager.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/anjes_ravager.txt rename to forge-gui/res/cardsfolder/a/anjes_ravager.txt diff --git a/forge-gui/res/cardsfolder/upcoming/apex_altisaur.txt b/forge-gui/res/cardsfolder/a/apex_altisaur.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/apex_altisaur.txt rename to forge-gui/res/cardsfolder/a/apex_altisaur.txt diff --git a/forge-gui/res/cardsfolder/upcoming/archfiend_of_spite.txt b/forge-gui/res/cardsfolder/a/archfiend_of_spite.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/archfiend_of_spite.txt rename to forge-gui/res/cardsfolder/a/archfiend_of_spite.txt diff --git a/forge-gui/res/cardsfolder/upcoming/atla_palani_nest_tender.txt b/forge-gui/res/cardsfolder/a/atla_palani_nest_tender.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/atla_palani_nest_tender.txt rename to forge-gui/res/cardsfolder/a/atla_palani_nest_tender.txt diff --git a/forge-gui/res/cardsfolder/upcoming/backdraft_hellkite.txt b/forge-gui/res/cardsfolder/b/backdraft_hellkite.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/backdraft_hellkite.txt rename to forge-gui/res/cardsfolder/b/backdraft_hellkite.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt b/forge-gui/res/cardsfolder/b/bloodthirsty_blade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bloodthirsty_blade.txt rename to forge-gui/res/cardsfolder/b/bloodthirsty_blade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bone_miser.txt b/forge-gui/res/cardsfolder/b/bone_miser.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bone_miser.txt rename to forge-gui/res/cardsfolder/b/bone_miser.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chainer_nightmare_adept.txt b/forge-gui/res/cardsfolder/c/chainer_nightmare_adept.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chainer_nightmare_adept.txt rename to forge-gui/res/cardsfolder/c/chainer_nightmare_adept.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cliffside_rescuer.txt b/forge-gui/res/cardsfolder/c/cliffside_rescuer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cliffside_rescuer.txt rename to forge-gui/res/cardsfolder/c/cliffside_rescuer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/commanders_insignia.txt b/forge-gui/res/cardsfolder/c/commanders_insignia.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/commanders_insignia.txt rename to forge-gui/res/cardsfolder/c/commanders_insignia.txt diff --git a/forge-gui/res/cardsfolder/upcoming/curse_of_fools_wisdom.txt b/forge-gui/res/cardsfolder/c/curse_of_fools_wisdom.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/curse_of_fools_wisdom.txt rename to forge-gui/res/cardsfolder/c/curse_of_fools_wisdom.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dockside_extortionist.txt b/forge-gui/res/cardsfolder/d/dockside_extortionist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dockside_extortionist.txt rename to forge-gui/res/cardsfolder/d/dockside_extortionist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/doomed_artisan.txt b/forge-gui/res/cardsfolder/d/doomed_artisan.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/doomed_artisan.txt rename to forge-gui/res/cardsfolder/d/doomed_artisan.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elsha_of_the_infinite.txt b/forge-gui/res/cardsfolder/e/elsha_of_the_infinite.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elsha_of_the_infinite.txt rename to forge-gui/res/cardsfolder/e/elsha_of_the_infinite.txt diff --git a/forge-gui/res/cardsfolder/upcoming/empowered_autogenerator.txt b/forge-gui/res/cardsfolder/e/empowered_autogenerator.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/empowered_autogenerator.txt rename to forge-gui/res/cardsfolder/e/empowered_autogenerator.txt diff --git a/forge-gui/res/cardsfolder/upcoming/full_flowering.txt b/forge-gui/res/cardsfolder/f/full_flowering.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/full_flowering.txt rename to forge-gui/res/cardsfolder/f/full_flowering.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gerrard_weatherlight_hero.txt b/forge-gui/res/cardsfolder/g/gerrard_weatherlight_hero.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gerrard_weatherlight_hero.txt rename to forge-gui/res/cardsfolder/g/gerrard_weatherlight_hero.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ghired_conclave_exile.txt b/forge-gui/res/cardsfolder/g/ghired_conclave_exile.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ghired_conclave_exile.txt rename to forge-gui/res/cardsfolder/g/ghired_conclave_exile.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ghireds_belligerence.txt b/forge-gui/res/cardsfolder/g/ghireds_belligerence.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ghireds_belligerence.txt rename to forge-gui/res/cardsfolder/g/ghireds_belligerence.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gift_of_doom.txt b/forge-gui/res/cardsfolder/g/gift_of_doom.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gift_of_doom.txt rename to forge-gui/res/cardsfolder/g/gift_of_doom.txt diff --git a/forge-gui/res/cardsfolder/upcoming/greven_predator_captain.txt b/forge-gui/res/cardsfolder/g/greven_predator_captain.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/greven_predator_captain.txt rename to forge-gui/res/cardsfolder/g/greven_predator_captain.txt diff --git a/forge-gui/res/cardsfolder/upcoming/grismold_the_dreadsower.txt b/forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/grismold_the_dreadsower.txt rename to forge-gui/res/cardsfolder/g/grismold_the_dreadsower.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hate_mirage.txt b/forge-gui/res/cardsfolder/h/hate_mirage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hate_mirage.txt rename to forge-gui/res/cardsfolder/h/hate_mirage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/idol_of_oblivion.txt b/forge-gui/res/cardsfolder/i/idol_of_oblivion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/idol_of_oblivion.txt rename to forge-gui/res/cardsfolder/i/idol_of_oblivion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ignite_the_future.txt b/forge-gui/res/cardsfolder/i/ignite_the_future.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ignite_the_future.txt rename to forge-gui/res/cardsfolder/i/ignite_the_future.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kadena_slinking_sorcerer.txt b/forge-gui/res/cardsfolder/k/kadena_slinking_sorcerer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kadena_slinking_sorcerer.txt rename to forge-gui/res/cardsfolder/k/kadena_slinking_sorcerer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kadenas_silencer.txt b/forge-gui/res/cardsfolder/k/kadenas_silencer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kadenas_silencer.txt rename to forge-gui/res/cardsfolder/k/kadenas_silencer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/krrik_son_of_yawgmoth.txt b/forge-gui/res/cardsfolder/k/krrik_son_of_yawgmoth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/krrik_son_of_yawgmoth.txt rename to forge-gui/res/cardsfolder/k/krrik_son_of_yawgmoth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/leadership_vacuum.txt b/forge-gui/res/cardsfolder/l/leadership_vacuum.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/leadership_vacuum.txt rename to forge-gui/res/cardsfolder/l/leadership_vacuum.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mandate_of_peace.txt b/forge-gui/res/cardsfolder/m/mandate_of_peace.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mandate_of_peace.txt rename to forge-gui/res/cardsfolder/m/mandate_of_peace.txt diff --git a/forge-gui/res/cardsfolder/upcoming/marisi_breaker_of_the_coil.txt b/forge-gui/res/cardsfolder/m/marisi_breaker_of_the_coil.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/marisi_breaker_of_the_coil.txt rename to forge-gui/res/cardsfolder/m/marisi_breaker_of_the_coil.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mass_diminish.txt b/forge-gui/res/cardsfolder/m/mass_diminish.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mass_diminish.txt rename to forge-gui/res/cardsfolder/m/mass_diminish.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mire_in_misery.txt b/forge-gui/res/cardsfolder/m/mire_in_misery.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mire_in_misery.txt rename to forge-gui/res/cardsfolder/m/mire_in_misery.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nightmare_unmaking.txt b/forge-gui/res/cardsfolder/n/nightmare_unmaking.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nightmare_unmaking.txt rename to forge-gui/res/cardsfolder/n/nightmare_unmaking.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ohran_frostfang.txt b/forge-gui/res/cardsfolder/o/ohran_frostfang.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ohran_frostfang.txt rename to forge-gui/res/cardsfolder/o/ohran_frostfang.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pendant_of_prosperity.txt b/forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pendant_of_prosperity.txt rename to forge-gui/res/cardsfolder/p/pendant_of_prosperity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pramikon_sky_rampart.txt b/forge-gui/res/cardsfolder/p/pramikon_sky_rampart.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pramikon_sky_rampart.txt rename to forge-gui/res/cardsfolder/p/pramikon_sky_rampart.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rayami_first_of_the_fallen.txt b/forge-gui/res/cardsfolder/r/rayami_first_of_the_fallen.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rayami_first_of_the_fallen.txt rename to forge-gui/res/cardsfolder/r/rayami_first_of_the_fallen.txt diff --git a/forge-gui/res/cardsfolder/upcoming/road_of_return.txt b/forge-gui/res/cardsfolder/r/road_of_return.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/road_of_return.txt rename to forge-gui/res/cardsfolder/r/road_of_return.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sanctum_of_eternity.txt b/forge-gui/res/cardsfolder/s/sanctum_of_eternity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sanctum_of_eternity.txt rename to forge-gui/res/cardsfolder/s/sanctum_of_eternity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scaretiller.txt b/forge-gui/res/cardsfolder/s/scaretiller.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scaretiller.txt rename to forge-gui/res/cardsfolder/s/scaretiller.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scroll_of_fate.txt b/forge-gui/res/cardsfolder/s/scroll_of_fate.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scroll_of_fate.txt rename to forge-gui/res/cardsfolder/s/scroll_of_fate.txt diff --git a/forge-gui/res/cardsfolder/upcoming/selesnya_eulogist.txt b/forge-gui/res/cardsfolder/s/selesnya_eulogist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/selesnya_eulogist.txt rename to forge-gui/res/cardsfolder/s/selesnya_eulogist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sevinne_the_chronoclasm.txt b/forge-gui/res/cardsfolder/s/sevinne_the_chronoclasm.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sevinne_the_chronoclasm.txt rename to forge-gui/res/cardsfolder/s/sevinne_the_chronoclasm.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sevinnes_reclamation.txt b/forge-gui/res/cardsfolder/s/sevinnes_reclamation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sevinnes_reclamation.txt rename to forge-gui/res/cardsfolder/s/sevinnes_reclamation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/skyfire_phoenix.txt b/forge-gui/res/cardsfolder/s/skyfire_phoenix.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/skyfire_phoenix.txt rename to forge-gui/res/cardsfolder/s/skyfire_phoenix.txt diff --git a/forge-gui/res/cardsfolder/upcoming/song_of_the_worldsoul.txt b/forge-gui/res/cardsfolder/s/song_of_the_worldsoul.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/song_of_the_worldsoul.txt rename to forge-gui/res/cardsfolder/s/song_of_the_worldsoul.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tahngarth_first_mate.txt b/forge-gui/res/cardsfolder/t/tahngarth_first_mate.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tahngarth_first_mate.txt rename to forge-gui/res/cardsfolder/t/tahngarth_first_mate.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tectonic_hellion.txt b/forge-gui/res/cardsfolder/t/tectonic_hellion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tectonic_hellion.txt rename to forge-gui/res/cardsfolder/t/tectonic_hellion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thalias_geistcaller.txt b/forge-gui/res/cardsfolder/t/thalias_geistcaller.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thalias_geistcaller.txt rename to forge-gui/res/cardsfolder/t/thalias_geistcaller.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thieving_amalgam.txt b/forge-gui/res/cardsfolder/t/thieving_amalgam.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thieving_amalgam.txt rename to forge-gui/res/cardsfolder/t/thieving_amalgam.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thought_sponge.txt b/forge-gui/res/cardsfolder/t/thought_sponge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thought_sponge.txt rename to forge-gui/res/cardsfolder/t/thought_sponge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/voice_of_many.txt b/forge-gui/res/cardsfolder/v/voice_of_many.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/voice_of_many.txt rename to forge-gui/res/cardsfolder/v/voice_of_many.txt diff --git a/forge-gui/res/cardsfolder/upcoming/volrath_the_shapestealer.txt b/forge-gui/res/cardsfolder/v/volrath_the_shapestealer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/volrath_the_shapestealer.txt rename to forge-gui/res/cardsfolder/v/volrath_the_shapestealer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wall_of_stolen_identity.txt b/forge-gui/res/cardsfolder/w/wall_of_stolen_identity.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wall_of_stolen_identity.txt rename to forge-gui/res/cardsfolder/w/wall_of_stolen_identity.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wildfire_devils.txt b/forge-gui/res/cardsfolder/w/wildfire_devils.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wildfire_devils.txt rename to forge-gui/res/cardsfolder/w/wildfire_devils.txt