diff --git a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java index fb9a3ee19be..1d6b5532257 100644 --- a/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java +++ b/forge-gui-desktop/src/main/java/forge/screens/match/CMatchUI.java @@ -1042,7 +1042,7 @@ public final class CMatchUI if (delayedReveal != null) { reveal(delayedReveal.getMessagePrefix(), delayedReveal.getCards()); //TODO: Merge this into search dialog } - return (List) order(title,"Selected", min, max, optionList, null, null, false); + return (List) order(title,"Selected", optionList.size() - max, optionList.size() - min, optionList, null, null, false); } @Override diff --git a/forge-gui/release-files/CHANGES.txt b/forge-gui/release-files/CHANGES.txt index 05f0bf1829e..e0db99a6c8a 100644 --- a/forge-gui/release-files/CHANGES.txt +++ b/forge-gui/release-files/CHANGES.txt @@ -1,2 +1,5 @@ - Bug fixes - As always, this release of Forge features an assortment of bug fixes and improvements based on user feedback during the previous release run. + +- Random Modern World - +Just like the random standard world, there is now also a random modern world for quest mode that includes randomly generated deck archetypes and is limited to the modern card pool diff --git a/forge-gui/res/blockdata/printsheets.txt b/forge-gui/res/blockdata/printsheets.txt index 6e41fb2118b..800c2b01023 100644 --- a/forge-gui/res/blockdata/printsheets.txt +++ b/forge-gui/res/blockdata/printsheets.txt @@ -1481,20 +1481,46 @@ Vivien, Nature's Avenger Ethereal Elk Gnarlback Rhino Vivien's Crocodile +Angelic Guardian +Bastion Enforcer +Concordia Pegasus +Haazda Officer Impassioned Orator Imperial Outrider +Ironclad Krovod +Prowling Caracal Serra's Guardian +Show of Valor +Siege Mastodon +Take Vengeance +Trusted Pegasus +Coral Merfolk +Phantom Warrior Riddlemaster Sphinx +Snapping Drake +Bartizan Bats +Bogstomper Dark Remedy +Disentomb Gravewaker +Skeleton Archer Sorin's Thirst Vampire Opportunist +Walking Corpse Engulfing Eruption +Fearless Halberdier +Goblin Assailant +Hostile Minotaur Immortal Phoenix Nimble Birdsticker Rubblebelt Recluse Shivan Dragon +Volcanic Dragon Aggressive Mammoth Bristling Boar +Canopy Spider +Frilled Sandwalla +Oakenform Prized Unicorn Titanic Growth +Woodland Mystic diff --git a/forge-gui/res/cardsfolder/upcoming/aerial_assault.txt b/forge-gui/res/cardsfolder/a/aerial_assault.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aerial_assault.txt rename to forge-gui/res/cardsfolder/a/aerial_assault.txt diff --git a/forge-gui/res/cardsfolder/upcoming/aether_gust.txt b/forge-gui/res/cardsfolder/a/aether_gust.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/aether_gust.txt rename to forge-gui/res/cardsfolder/a/aether_gust.txt diff --git a/forge-gui/res/cardsfolder/upcoming/agent_of_treachery.txt b/forge-gui/res/cardsfolder/a/agent_of_treachery.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/agent_of_treachery.txt rename to forge-gui/res/cardsfolder/a/agent_of_treachery.txt diff --git a/forge-gui/res/cardsfolder/upcoming/agonizing_syphon.txt b/forge-gui/res/cardsfolder/a/agonizing_syphon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/agonizing_syphon.txt rename to forge-gui/res/cardsfolder/a/agonizing_syphon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ajani_inspiring_leader.txt b/forge-gui/res/cardsfolder/a/ajani_inspiring_leader.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ajani_inspiring_leader.txt rename to forge-gui/res/cardsfolder/a/ajani_inspiring_leader.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ajani_strength_of_the_pride.txt b/forge-gui/res/cardsfolder/a/ajani_strength_of_the_pride.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ajani_strength_of_the_pride.txt rename to forge-gui/res/cardsfolder/a/ajani_strength_of_the_pride.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ancestral_blade.txt b/forge-gui/res/cardsfolder/a/ancestral_blade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ancestral_blade.txt rename to forge-gui/res/cardsfolder/a/ancestral_blade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/angel_of_vitality.txt b/forge-gui/res/cardsfolder/a/angel_of_vitality.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/angel_of_vitality.txt rename to forge-gui/res/cardsfolder/a/angel_of_vitality.txt diff --git a/forge-gui/res/cardsfolder/upcoming/apostle_of_purifying_light.txt b/forge-gui/res/cardsfolder/a/apostle_of_purifying_light.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/apostle_of_purifying_light.txt rename to forge-gui/res/cardsfolder/a/apostle_of_purifying_light.txt diff --git a/forge-gui/res/cardsfolder/upcoming/atemsis_all_seeing.txt b/forge-gui/res/cardsfolder/a/atemsis_all_seeing.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/atemsis_all_seeing.txt rename to forge-gui/res/cardsfolder/a/atemsis_all_seeing.txt diff --git a/forge-gui/res/cardsfolder/upcoming/audacious_thief.txt b/forge-gui/res/cardsfolder/a/audacious_thief.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/audacious_thief.txt rename to forge-gui/res/cardsfolder/a/audacious_thief.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bag_of_holding.txt b/forge-gui/res/cardsfolder/b/bag_of_holding.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bag_of_holding.txt rename to forge-gui/res/cardsfolder/b/bag_of_holding.txt diff --git a/forge-gui/res/cardsfolder/upcoming/barkhide_troll.txt b/forge-gui/res/cardsfolder/b/barkhide_troll.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/barkhide_troll.txt rename to forge-gui/res/cardsfolder/b/barkhide_troll.txt diff --git a/forge-gui/res/cardsfolder/upcoming/battalion_foot_soldier.txt b/forge-gui/res/cardsfolder/b/battalion_foot_soldier.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/battalion_foot_soldier.txt rename to forge-gui/res/cardsfolder/b/battalion_foot_soldier.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bishop_of_wings.txt b/forge-gui/res/cardsfolder/b/bishop_of_wings.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bishop_of_wings.txt rename to forge-gui/res/cardsfolder/b/bishop_of_wings.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blightbeetle.txt b/forge-gui/res/cardsfolder/b/blightbeetle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blightbeetle.txt rename to forge-gui/res/cardsfolder/b/blightbeetle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blood_burglar.txt b/forge-gui/res/cardsfolder/b/blood_burglar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blood_burglar.txt rename to forge-gui/res/cardsfolder/b/blood_burglar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/blood_for_bones.txt b/forge-gui/res/cardsfolder/b/blood_for_bones.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/blood_for_bones.txt rename to forge-gui/res/cardsfolder/b/blood_for_bones.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bloodsoaked_altar.txt b/forge-gui/res/cardsfolder/b/bloodsoaked_altar.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bloodsoaked_altar.txt rename to forge-gui/res/cardsfolder/b/bloodsoaked_altar.txt diff --git a/forge-gui/res/cardsfolder/upcoming/bloodthirsty_aerialist.txt b/forge-gui/res/cardsfolder/b/bloodthirsty_aerialist.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/bloodthirsty_aerialist.txt rename to forge-gui/res/cardsfolder/b/bloodthirsty_aerialist.txt diff --git a/forge-gui/res/cardsfolder/upcoming/boneclad_necromancer.txt b/forge-gui/res/cardsfolder/b/boneclad_necromancer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/boneclad_necromancer.txt rename to forge-gui/res/cardsfolder/b/boneclad_necromancer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/boreal_elemental.txt b/forge-gui/res/cardsfolder/b/boreal_elemental.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/boreal_elemental.txt rename to forge-gui/res/cardsfolder/b/boreal_elemental.txt diff --git a/forge-gui/res/cardsfolder/upcoming/brightwood_tracker.txt b/forge-gui/res/cardsfolder/b/brightwood_tracker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/brightwood_tracker.txt rename to forge-gui/res/cardsfolder/b/brightwood_tracker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/brineborn_cutthroat.txt b/forge-gui/res/cardsfolder/b/brineborn_cutthroat.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/brineborn_cutthroat.txt rename to forge-gui/res/cardsfolder/b/brineborn_cutthroat.txt diff --git a/forge-gui/res/cardsfolder/upcoming/brought_back.txt b/forge-gui/res/cardsfolder/b/brought_back.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/brought_back.txt rename to forge-gui/res/cardsfolder/b/brought_back.txt diff --git a/forge-gui/res/cardsfolder/b/budoka_gardener_dokai_weaver_of_life.txt b/forge-gui/res/cardsfolder/b/budoka_gardener_dokai_weaver_of_life.txt index f9feb724c73..b4843a72e6f 100644 --- a/forge-gui/res/cardsfolder/b/budoka_gardener_dokai_weaver_of_life.txt +++ b/forge-gui/res/cardsfolder/b/budoka_gardener_dokai_weaver_of_life.txt @@ -15,7 +15,7 @@ ManaCost:1 G Colors:green Types:Legendary Creature Human Monk PT:3/3 -A:AB$Token | Cost$ 4 G G T | TokenAmount$ 1 | TokenScript$ g_x_x_elemental | LegacyImage$ g x x elemental chk | TokenOwner$ You | SpellDescription$ Create an X/X green Elemental creature token, where X is the number of lands you control. +A:AB$Token | Cost$ 4 G G T | TokenAmount$ 1 | TokenScript$ g_x_x_elemental | LegacyImage$ g x x elemental chk | TokenPower$ X | TokenToughness$ X | References$ X | TokenOwner$ You | SpellDescription$ Create an X/X green Elemental creature token, where X is the number of lands you control. SVar:X:Count$Valid Land.YouCtrl SVar:Picture:http://www.wizards.com/global/images/magic/general/dokai_weaver_of_life.jpg Oracle:{4}{G}{G}, {T}: Create an X/X green Elemental creature token, where X is the number of lands you control. diff --git a/forge-gui/res/cardsfolder/upcoming/captivating_gyre.txt b/forge-gui/res/cardsfolder/c/captivating_gyre.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/captivating_gyre.txt rename to forge-gui/res/cardsfolder/c/captivating_gyre.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cavalier_of_dawn.txt b/forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cavalier_of_dawn.txt rename to forge-gui/res/cardsfolder/c/cavalier_of_dawn.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cavalier_of_flame.txt b/forge-gui/res/cardsfolder/c/cavalier_of_flame.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cavalier_of_flame.txt rename to forge-gui/res/cardsfolder/c/cavalier_of_flame.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cavalier_of_gales.txt b/forge-gui/res/cardsfolder/c/cavalier_of_gales.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cavalier_of_gales.txt rename to forge-gui/res/cardsfolder/c/cavalier_of_gales.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cavalier_of_night.txt b/forge-gui/res/cardsfolder/c/cavalier_of_night.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cavalier_of_night.txt rename to forge-gui/res/cardsfolder/c/cavalier_of_night.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cavalier_of_thorns.txt b/forge-gui/res/cardsfolder/c/cavalier_of_thorns.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cavalier_of_thorns.txt rename to forge-gui/res/cardsfolder/c/cavalier_of_thorns.txt diff --git a/forge-gui/res/cardsfolder/upcoming/celestial_messenger.txt b/forge-gui/res/cardsfolder/c/celestial_messenger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/celestial_messenger.txt rename to forge-gui/res/cardsfolder/c/celestial_messenger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cerulean_drake.txt b/forge-gui/res/cardsfolder/c/cerulean_drake.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cerulean_drake.txt rename to forge-gui/res/cardsfolder/c/cerulean_drake.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandra_acolyte_of_flame.txt b/forge-gui/res/cardsfolder/c/chandra_acolyte_of_flame.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandra_acolyte_of_flame.txt rename to forge-gui/res/cardsfolder/c/chandra_acolyte_of_flame.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandra_awakened_inferno.txt b/forge-gui/res/cardsfolder/c/chandra_awakened_inferno.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandra_awakened_inferno.txt rename to forge-gui/res/cardsfolder/c/chandra_awakened_inferno.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandra_flames_fury.txt b/forge-gui/res/cardsfolder/c/chandra_flames_fury.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandra_flames_fury.txt rename to forge-gui/res/cardsfolder/c/chandra_flames_fury.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandra_novice_pyromancer.txt b/forge-gui/res/cardsfolder/c/chandra_novice_pyromancer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandra_novice_pyromancer.txt rename to forge-gui/res/cardsfolder/c/chandra_novice_pyromancer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandras_embercat.txt b/forge-gui/res/cardsfolder/c/chandras_embercat.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandras_embercat.txt rename to forge-gui/res/cardsfolder/c/chandras_embercat.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandras_flame_wave.txt b/forge-gui/res/cardsfolder/c/chandras_flame_wave.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandras_flame_wave.txt rename to forge-gui/res/cardsfolder/c/chandras_flame_wave.txt diff --git a/forge-gui/res/cardsfolder/upcoming/chandras_regulator.txt b/forge-gui/res/cardsfolder/c/chandras_regulator.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/chandras_regulator.txt rename to forge-gui/res/cardsfolder/c/chandras_regulator.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cloudkin_seer.txt b/forge-gui/res/cardsfolder/c/cloudkin_seer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cloudkin_seer.txt rename to forge-gui/res/cardsfolder/c/cloudkin_seer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/colossus_hammer.txt b/forge-gui/res/cardsfolder/c/colossus_hammer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/colossus_hammer.txt rename to forge-gui/res/cardsfolder/c/colossus_hammer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/corpse_knight.txt b/forge-gui/res/cardsfolder/c/corpse_knight.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/corpse_knight.txt rename to forge-gui/res/cardsfolder/c/corpse_knight.txt diff --git a/forge-gui/res/cardsfolder/upcoming/creeping_trailblazer.txt b/forge-gui/res/cardsfolder/c/creeping_trailblazer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/creeping_trailblazer.txt rename to forge-gui/res/cardsfolder/c/creeping_trailblazer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/cryptic_caves.txt b/forge-gui/res/cardsfolder/c/cryptic_caves.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/cryptic_caves.txt rename to forge-gui/res/cardsfolder/c/cryptic_caves.txt diff --git a/forge-gui/res/cardsfolder/upcoming/daggersail_aeronaut.txt b/forge-gui/res/cardsfolder/d/daggersail_aeronaut.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/daggersail_aeronaut.txt rename to forge-gui/res/cardsfolder/d/daggersail_aeronaut.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dark_remedy.txt b/forge-gui/res/cardsfolder/d/dark_remedy.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dark_remedy.txt rename to forge-gui/res/cardsfolder/d/dark_remedy.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dawning_angel.txt b/forge-gui/res/cardsfolder/d/dawning_angel.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dawning_angel.txt rename to forge-gui/res/cardsfolder/d/dawning_angel.txt diff --git a/forge-gui/res/cardsfolder/upcoming/destructive_digger.txt b/forge-gui/res/cardsfolder/d/destructive_digger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/destructive_digger.txt rename to forge-gui/res/cardsfolder/d/destructive_digger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/devout_decree.txt b/forge-gui/res/cardsfolder/d/devout_decree.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/devout_decree.txt rename to forge-gui/res/cardsfolder/d/devout_decree.txt diff --git a/forge-gui/res/cardsfolder/upcoming/diamond_knight.txt b/forge-gui/res/cardsfolder/d/diamond_knight.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/diamond_knight.txt rename to forge-gui/res/cardsfolder/d/diamond_knight.txt diff --git a/forge-gui/res/cardsfolder/upcoming/diviners_lockbox.txt b/forge-gui/res/cardsfolder/d/diviners_lockbox.txt similarity index 91% rename from forge-gui/res/cardsfolder/upcoming/diviners_lockbox.txt rename to forge-gui/res/cardsfolder/d/diviners_lockbox.txt index 4fbdd00a174..53f4aa23bed 100644 --- a/forge-gui/res/cardsfolder/upcoming/diviners_lockbox.txt +++ b/forge-gui/res/cardsfolder/d/diviners_lockbox.txt @@ -2,7 +2,7 @@ Name:Diviner's Lockbox ManaCost:4 Types:Artifact A:AB$ NameCard | Cost$ 1 T | Defined$ You | SubAbility$ DBReveal | SorcerySpeed$ True | SpellDescription$ Choose a card name, then reveal the top card of your library. If that card has the chosen name, sacrifice CARDNAME and draw three cards. Activate this ability only any time you could cast a sorcery. -SVar:DBReveal:DB$ PeekAndReveal | NoPeek$ True | RememberRevealed$ True | SubAbility$ DBSac +SVar:DBReveal:DB$ PeekAndReveal | RememberRevealed$ True | SubAbility$ DBSac SVar:DBSac:DB$ Sacrifice | SacValid$ Self | ConditionDefined$ Remembered | ConditionPresent$ Card.NamedCard | ConditionCompare$ GE1 | SubAbility$ DBDraw SVar:DBDraw:DB$ Draw | NumCards$ 3 | ConditionDefined$ Remembered | ConditionPresent$ Card.NamedCard | ConditionCompare$ GE1 | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True diff --git a/forge-gui/res/cardsfolder/upcoming/drakuseth_maw_of_flames.txt b/forge-gui/res/cardsfolder/d/drakuseth_maw_of_flames.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/drakuseth_maw_of_flames.txt rename to forge-gui/res/cardsfolder/d/drakuseth_maw_of_flames.txt diff --git a/forge-gui/res/cardsfolder/upcoming/drawn_from_dreams.txt b/forge-gui/res/cardsfolder/d/drawn_from_dreams.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/drawn_from_dreams.txt rename to forge-gui/res/cardsfolder/d/drawn_from_dreams.txt diff --git a/forge-gui/res/cardsfolder/upcoming/dread_presence.txt b/forge-gui/res/cardsfolder/d/dread_presence.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/dread_presence.txt rename to forge-gui/res/cardsfolder/d/dread_presence.txt diff --git a/forge-gui/res/cardsfolder/upcoming/elvish_reclaimer.txt b/forge-gui/res/cardsfolder/e/elvish_reclaimer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/elvish_reclaimer.txt rename to forge-gui/res/cardsfolder/e/elvish_reclaimer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/embodiment_of_agonies.txt b/forge-gui/res/cardsfolder/e/embodiment_of_agonies.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/embodiment_of_agonies.txt rename to forge-gui/res/cardsfolder/e/embodiment_of_agonies.txt diff --git a/forge-gui/res/cardsfolder/upcoming/empyrean_eagle.txt b/forge-gui/res/cardsfolder/e/empyrean_eagle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/empyrean_eagle.txt rename to forge-gui/res/cardsfolder/e/empyrean_eagle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/engulfing_eruption.txt b/forge-gui/res/cardsfolder/e/engulfing_eruption.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/engulfing_eruption.txt rename to forge-gui/res/cardsfolder/e/engulfing_eruption.txt diff --git a/forge-gui/res/cardsfolder/upcoming/eternal_isolation.txt b/forge-gui/res/cardsfolder/e/eternal_isolation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/eternal_isolation.txt rename to forge-gui/res/cardsfolder/e/eternal_isolation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ethereal_elk.txt b/forge-gui/res/cardsfolder/e/ethereal_elk.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ethereal_elk.txt rename to forge-gui/res/cardsfolder/e/ethereal_elk.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ferocious_pup.txt b/forge-gui/res/cardsfolder/f/ferocious_pup.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ferocious_pup.txt rename to forge-gui/res/cardsfolder/f/ferocious_pup.txt diff --git a/forge-gui/res/cardsfolder/upcoming/field_of_the_dead.txt b/forge-gui/res/cardsfolder/f/field_of_the_dead.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/field_of_the_dead.txt rename to forge-gui/res/cardsfolder/f/field_of_the_dead.txt diff --git a/forge-gui/res/cardsfolder/upcoming/flame_sweep.txt b/forge-gui/res/cardsfolder/f/flame_sweep.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/flame_sweep.txt rename to forge-gui/res/cardsfolder/f/flame_sweep.txt diff --git a/forge-gui/res/cardsfolder/upcoming/flood_of_tears.txt b/forge-gui/res/cardsfolder/f/flood_of_tears.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/flood_of_tears.txt rename to forge-gui/res/cardsfolder/f/flood_of_tears.txt diff --git a/forge-gui/res/cardsfolder/upcoming/fry.txt b/forge-gui/res/cardsfolder/f/fry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/fry.txt rename to forge-gui/res/cardsfolder/f/fry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gargos_vicious_watcher.txt b/forge-gui/res/cardsfolder/g/gargos_vicious_watcher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gargos_vicious_watcher.txt rename to forge-gui/res/cardsfolder/g/gargos_vicious_watcher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gauntlets_of_light.txt b/forge-gui/res/cardsfolder/g/gauntlets_of_light.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gauntlets_of_light.txt rename to forge-gui/res/cardsfolder/g/gauntlets_of_light.txt diff --git a/forge-gui/res/cardsfolder/upcoming/glint_horn_buccaneer.txt b/forge-gui/res/cardsfolder/g/glint_horn_buccaneer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/glint_horn_buccaneer.txt rename to forge-gui/res/cardsfolder/g/glint_horn_buccaneer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gnarlback_rhino.txt b/forge-gui/res/cardsfolder/g/gnarlback_rhino.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gnarlback_rhino.txt rename to forge-gui/res/cardsfolder/g/gnarlback_rhino.txt diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_bird_grabber.txt b/forge-gui/res/cardsfolder/g/goblin_bird_grabber.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/goblin_bird_grabber.txt rename to forge-gui/res/cardsfolder/g/goblin_bird_grabber.txt diff --git a/forge-gui/res/cardsfolder/upcoming/goblin_smuggler.txt b/forge-gui/res/cardsfolder/g/goblin_smuggler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/goblin_smuggler.txt rename to forge-gui/res/cardsfolder/g/goblin_smuggler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/goldmane_griffin.txt b/forge-gui/res/cardsfolder/g/goldmane_griffin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/goldmane_griffin.txt rename to forge-gui/res/cardsfolder/g/goldmane_griffin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/golos_tireless_pilgrim.txt b/forge-gui/res/cardsfolder/g/golos_tireless_pilgrim.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/golos_tireless_pilgrim.txt rename to forge-gui/res/cardsfolder/g/golos_tireless_pilgrim.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gorging_vulture.txt b/forge-gui/res/cardsfolder/g/gorging_vulture.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gorging_vulture.txt rename to forge-gui/res/cardsfolder/g/gorging_vulture.txt diff --git a/forge-gui/res/cardsfolder/upcoming/growth_cycle.txt b/forge-gui/res/cardsfolder/g/growth_cycle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/growth_cycle.txt rename to forge-gui/res/cardsfolder/g/growth_cycle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/gruesome_scourger.txt b/forge-gui/res/cardsfolder/g/gruesome_scourger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/gruesome_scourger.txt rename to forge-gui/res/cardsfolder/g/gruesome_scourger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hanged_executioner.txt b/forge-gui/res/cardsfolder/h/hanged_executioner.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hanged_executioner.txt rename to forge-gui/res/cardsfolder/h/hanged_executioner.txt diff --git a/forge-gui/res/cardsfolder/upcoming/hard_cover.txt b/forge-gui/res/cardsfolder/h/hard_cover.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/hard_cover.txt rename to forge-gui/res/cardsfolder/h/hard_cover.txt diff --git a/forge-gui/res/cardsfolder/upcoming/healer_of_the_glade.txt b/forge-gui/res/cardsfolder/h/healer_of_the_glade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/healer_of_the_glade.txt rename to forge-gui/res/cardsfolder/h/healer_of_the_glade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/herald_of_the_sun.txt b/forge-gui/res/cardsfolder/h/herald_of_the_sun.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/herald_of_the_sun.txt rename to forge-gui/res/cardsfolder/h/herald_of_the_sun.txt diff --git a/forge-gui/res/cardsfolder/upcoming/howling_giant.txt b/forge-gui/res/cardsfolder/h/howling_giant.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/howling_giant.txt rename to forge-gui/res/cardsfolder/h/howling_giant.txt diff --git a/forge-gui/res/cardsfolder/upcoming/icon_of_ancestry.txt b/forge-gui/res/cardsfolder/i/icon_of_ancestry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/icon_of_ancestry.txt rename to forge-gui/res/cardsfolder/i/icon_of_ancestry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/imperial_outrider.txt b/forge-gui/res/cardsfolder/i/imperial_outrider.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/imperial_outrider.txt rename to forge-gui/res/cardsfolder/i/imperial_outrider.txt diff --git a/forge-gui/res/cardsfolder/upcoming/infuriate.txt b/forge-gui/res/cardsfolder/i/infuriate.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/infuriate.txt rename to forge-gui/res/cardsfolder/i/infuriate.txt diff --git a/forge-gui/res/cardsfolder/upcoming/ironroot_warlord.txt b/forge-gui/res/cardsfolder/i/ironroot_warlord.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ironroot_warlord.txt rename to forge-gui/res/cardsfolder/i/ironroot_warlord.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kethis_the_hidden_hand.txt b/forge-gui/res/cardsfolder/k/kethis_the_hidden_hand.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kethis_the_hidden_hand.txt rename to forge-gui/res/cardsfolder/k/kethis_the_hidden_hand.txt diff --git a/forge-gui/res/cardsfolder/upcoming/knight_of_the_ebon_legion.txt b/forge-gui/res/cardsfolder/k/knight_of_the_ebon_legion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/knight_of_the_ebon_legion.txt rename to forge-gui/res/cardsfolder/k/knight_of_the_ebon_legion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/kykar_winds_fury.txt b/forge-gui/res/cardsfolder/k/kykar_winds_fury.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/kykar_winds_fury.txt rename to forge-gui/res/cardsfolder/k/kykar_winds_fury.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lavakin_brawler.txt b/forge-gui/res/cardsfolder/l/lavakin_brawler.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lavakin_brawler.txt rename to forge-gui/res/cardsfolder/l/lavakin_brawler.txt diff --git a/forge-gui/res/cardsfolder/upcoming/leafkin_druid.txt b/forge-gui/res/cardsfolder/l/leafkin_druid.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/leafkin_druid.txt rename to forge-gui/res/cardsfolder/l/leafkin_druid.txt diff --git a/forge-gui/res/cardsfolder/upcoming/legions_end.txt b/forge-gui/res/cardsfolder/l/legions_end.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/legions_end.txt rename to forge-gui/res/cardsfolder/l/legions_end.txt diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_of_abundance.txt b/forge-gui/res/cardsfolder/l/leyline_of_abundance.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/leyline_of_abundance.txt rename to forge-gui/res/cardsfolder/l/leyline_of_abundance.txt diff --git a/forge-gui/res/cardsfolder/upcoming/leyline_of_combustion.txt b/forge-gui/res/cardsfolder/l/leyline_of_combustion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/leyline_of_combustion.txt rename to forge-gui/res/cardsfolder/l/leyline_of_combustion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lightning_stormkin.txt b/forge-gui/res/cardsfolder/l/lightning_stormkin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lightning_stormkin.txt rename to forge-gui/res/cardsfolder/l/lightning_stormkin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/lotus_field.txt b/forge-gui/res/cardsfolder/l/lotus_field.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/lotus_field.txt rename to forge-gui/res/cardsfolder/l/lotus_field.txt diff --git a/forge-gui/res/cardsfolder/upcoming/loxodon_lifechanter.txt b/forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/loxodon_lifechanter.txt rename to forge-gui/res/cardsfolder/l/loxodon_lifechanter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/manifold_key.txt b/forge-gui/res/cardsfolder/m/manifold_key.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/manifold_key.txt rename to forge-gui/res/cardsfolder/m/manifold_key.txt diff --git a/forge-gui/res/cardsfolder/upcoming/marauding_raptor.txt b/forge-gui/res/cardsfolder/m/marauding_raptor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/marauding_raptor.txt rename to forge-gui/res/cardsfolder/m/marauding_raptor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mask_of_immolation.txt b/forge-gui/res/cardsfolder/m/mask_of_immolation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mask_of_immolation.txt rename to forge-gui/res/cardsfolder/m/mask_of_immolation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/masterful_replication.txt b/forge-gui/res/cardsfolder/m/masterful_replication.txt similarity index 77% rename from forge-gui/res/cardsfolder/upcoming/masterful_replication.txt rename to forge-gui/res/cardsfolder/m/masterful_replication.txt index 32d25d929fa..865b7646d4c 100644 --- a/forge-gui/res/cardsfolder/upcoming/masterful_replication.txt +++ b/forge-gui/res/cardsfolder/m/masterful_replication.txt @@ -3,7 +3,7 @@ ManaCost:5 U Types:Instant A:SP$ Charm | Cost$ 5 U | Choices$ DBToken,DBCopy SVar:DBToken:DB$ Token | TokenAmount$ 2 | TokenScript$ c_3_3_a_golem | TokenOwner$ You | LegacyImage$ c 3 3 a golem m20 | SpellDescription$ Create two 3/3 colorless Golem artifact creature tokens. -SVar:DBCopy:DB$ Pump | ValidTgts$ Creature | ImprintCards$ Targeted | SubAbility$ DBRepeat | SpellDescription$ Choose target artifact you control. Each other artifact you control becomes a copy of that artifact until end of turn. +SVar:DBCopy:DB$ Pump | ValidTgts$ Artifact.YouCtrl | ImprintCards$ Targeted | SubAbility$ DBRepeat | SpellDescription$ Choose target artifact you control. Each other artifact you control becomes a copy of that artifact until end of turn. SVar:DBRepeat:DB$ RepeatEach | RepeatCards$ Artifact.YouCtrl+IsNotImprinted | RepeatSubAbility$ DBClone | SubAbility$ DBCleanup SVar:DBClone:DB$ Clone | Defined$ Imprinted | CloneTarget$ Remembered | Duration$ UntilEndOfTurn SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True | ClearImprinted$ True diff --git a/forge-gui/res/cardsfolder/upcoming/moat_piranhas.txt b/forge-gui/res/cardsfolder/m/moat_piranhas.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moat_piranhas.txt rename to forge-gui/res/cardsfolder/m/moat_piranhas.txt diff --git a/forge-gui/res/cardsfolder/upcoming/moldervine_reclamation.txt b/forge-gui/res/cardsfolder/m/moldervine_reclamation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/moldervine_reclamation.txt rename to forge-gui/res/cardsfolder/m/moldervine_reclamation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mu_yanling_celestial_wind.txt b/forge-gui/res/cardsfolder/m/mu_yanling_celestial_wind.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mu_yanling_celestial_wind.txt rename to forge-gui/res/cardsfolder/m/mu_yanling_celestial_wind.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mu_yanling_sky_dancer.txt b/forge-gui/res/cardsfolder/m/mu_yanling_sky_dancer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mu_yanling_sky_dancer.txt rename to forge-gui/res/cardsfolder/m/mu_yanling_sky_dancer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/mystic_forge.txt b/forge-gui/res/cardsfolder/m/mystic_forge.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/mystic_forge.txt rename to forge-gui/res/cardsfolder/m/mystic_forge.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nightpack_ambusher.txt b/forge-gui/res/cardsfolder/n/nightpack_ambusher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nightpack_ambusher.txt rename to forge-gui/res/cardsfolder/n/nightpack_ambusher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/nimble_birdsticker.txt b/forge-gui/res/cardsfolder/n/nimble_birdsticker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/nimble_birdsticker.txt rename to forge-gui/res/cardsfolder/n/nimble_birdsticker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/noxious_grasp.txt b/forge-gui/res/cardsfolder/n/noxious_grasp.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/noxious_grasp.txt rename to forge-gui/res/cardsfolder/n/noxious_grasp.txt diff --git a/forge-gui/res/cardsfolder/upcoming/octoprophet.txt b/forge-gui/res/cardsfolder/o/octoprophet.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/octoprophet.txt rename to forge-gui/res/cardsfolder/o/octoprophet.txt diff --git a/forge-gui/res/cardsfolder/o/octopus_umbra.txt b/forge-gui/res/cardsfolder/o/octopus_umbra.txt index 8d4ac4615ee..058fe02cc67 100644 --- a/forge-gui/res/cardsfolder/o/octopus_umbra.txt +++ b/forge-gui/res/cardsfolder/o/octopus_umbra.txt @@ -4,7 +4,7 @@ Types:Enchantment Aura K:Totem Armor K:Enchant creature A:SP$ Attach | Cost$ 3 U U | ValidTgts$ Creature | AILogic$ Animate -S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetPower$ 8 | SetToughness$ 8 | AddTrigger$ AttackTrigger | AddSVar$ TrigTap | Description$ Enchanted creature has "Whenever this creature attacks, you may tap or untap target permanent. +S:Mode$ Continuous | Affected$ Card.EnchantedBy | SetPower$ 8 | SetToughness$ 8 | AddTrigger$ AttackTrigger | AddSVar$ TrigTap | Description$ Enchanted creature has base power and toughness 8/8 and has "Whenever this creature attacks, you may tap target creature with power 8 or less." SVar:AttackTrigger:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigTap | TriggerZones$ Battlefield | TriggerDescription$ Whenever CARDNAME attacks, you may tap target creature with power 8 or less. SVar:TrigTap:DB$ Tap | ValidTgts$ Creature.powerLE8 | TgtPrompt$ Select target creature Oracle:Enchant creature\n Enchanted creature has base power and toughness 8/8 and has “Whenever this creature attacks, you may tap target creature with power 8 or less.”\nTotem armor (If enchanted creature would be destroyed, instead remove all damage from it and destroy this Aura.) \ No newline at end of file diff --git a/forge-gui/res/cardsfolder/upcoming/ogre_siegebreaker.txt b/forge-gui/res/cardsfolder/o/ogre_siegebreaker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/ogre_siegebreaker.txt rename to forge-gui/res/cardsfolder/o/ogre_siegebreaker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/omnath_locus_of_the_roil.txt b/forge-gui/res/cardsfolder/o/omnath_locus_of_the_roil.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/omnath_locus_of_the_roil.txt rename to forge-gui/res/cardsfolder/o/omnath_locus_of_the_roil.txt diff --git a/forge-gui/res/cardsfolder/upcoming/overgrowth_elemental.txt b/forge-gui/res/cardsfolder/o/overgrowth_elemental.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/overgrowth_elemental.txt rename to forge-gui/res/cardsfolder/o/overgrowth_elemental.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pack_mastiff.txt b/forge-gui/res/cardsfolder/p/pack_mastiff.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pack_mastiff.txt rename to forge-gui/res/cardsfolder/p/pack_mastiff.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pattern_matcher.txt b/forge-gui/res/cardsfolder/p/pattern_matcher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pattern_matcher.txt rename to forge-gui/res/cardsfolder/p/pattern_matcher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/portal_of_sanctuary.txt b/forge-gui/res/cardsfolder/p/portal_of_sanctuary.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/portal_of_sanctuary.txt rename to forge-gui/res/cardsfolder/p/portal_of_sanctuary.txt diff --git a/forge-gui/res/cardsfolder/upcoming/pyroclastic_elemental.txt b/forge-gui/res/cardsfolder/p/pyroclastic_elemental.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/pyroclastic_elemental.txt rename to forge-gui/res/cardsfolder/p/pyroclastic_elemental.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rapacious_dragon.txt b/forge-gui/res/cardsfolder/r/rapacious_dragon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rapacious_dragon.txt rename to forge-gui/res/cardsfolder/r/rapacious_dragon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/reckless_air_strike.txt b/forge-gui/res/cardsfolder/r/reckless_air_strike.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/reckless_air_strike.txt rename to forge-gui/res/cardsfolder/r/reckless_air_strike.txt diff --git a/forge-gui/res/cardsfolder/upcoming/repeated_reverberation.txt b/forge-gui/res/cardsfolder/r/repeated_reverberation.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/repeated_reverberation.txt rename to forge-gui/res/cardsfolder/r/repeated_reverberation.txt diff --git a/forge-gui/res/cardsfolder/upcoming/retributive_wand.txt b/forge-gui/res/cardsfolder/r/retributive_wand.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/retributive_wand.txt rename to forge-gui/res/cardsfolder/r/retributive_wand.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rienne_angel_of_rebirth.txt b/forge-gui/res/cardsfolder/r/rienne_angel_of_rebirth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rienne_angel_of_rebirth.txt rename to forge-gui/res/cardsfolder/r/rienne_angel_of_rebirth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/risen_reef.txt b/forge-gui/res/cardsfolder/r/risen_reef.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/risen_reef.txt rename to forge-gui/res/cardsfolder/r/risen_reef.txt diff --git a/forge-gui/res/cardsfolder/upcoming/rotting_regisaur.txt b/forge-gui/res/cardsfolder/r/rotting_regisaur.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/rotting_regisaur.txt rename to forge-gui/res/cardsfolder/r/rotting_regisaur.txt diff --git a/forge-gui/res/cardsfolder/upcoming/salvager_of_ruin.txt b/forge-gui/res/cardsfolder/s/salvager_of_ruin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/salvager_of_ruin.txt rename to forge-gui/res/cardsfolder/s/salvager_of_ruin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/savage_gorger.txt b/forge-gui/res/cardsfolder/s/savage_gorger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/savage_gorger.txt rename to forge-gui/res/cardsfolder/s/savage_gorger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/savannah_sage.txt b/forge-gui/res/cardsfolder/s/savannah_sage.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/savannah_sage.txt rename to forge-gui/res/cardsfolder/s/savannah_sage.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scampering_scorcher.txt b/forge-gui/res/cardsfolder/s/scampering_scorcher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scampering_scorcher.txt rename to forge-gui/res/cardsfolder/s/scampering_scorcher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scheming_symmetry.txt b/forge-gui/res/cardsfolder/s/scheming_symmetry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scheming_symmetry.txt rename to forge-gui/res/cardsfolder/s/scheming_symmetry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scholar_of_the_ages.txt b/forge-gui/res/cardsfolder/s/scholar_of_the_ages.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scholar_of_the_ages.txt rename to forge-gui/res/cardsfolder/s/scholar_of_the_ages.txt diff --git a/forge-gui/res/cardsfolder/upcoming/scorch_spitter.txt b/forge-gui/res/cardsfolder/s/scorch_spitter.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/scorch_spitter.txt rename to forge-gui/res/cardsfolder/s/scorch_spitter.txt diff --git a/forge-gui/res/cardsfolder/upcoming/season_of_growth.txt b/forge-gui/res/cardsfolder/s/season_of_growth.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/season_of_growth.txt rename to forge-gui/res/cardsfolder/s/season_of_growth.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sephara_skys_blade.txt b/forge-gui/res/cardsfolder/s/sephara_skys_blade.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sephara_skys_blade.txt rename to forge-gui/res/cardsfolder/s/sephara_skys_blade.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shared_summons.txt b/forge-gui/res/cardsfolder/s/shared_summons.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shared_summons.txt rename to forge-gui/res/cardsfolder/s/shared_summons.txt diff --git a/forge-gui/res/cardsfolder/upcoming/shifting_ceratops.txt b/forge-gui/res/cardsfolder/s/shifting_ceratops.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/shifting_ceratops.txt rename to forge-gui/res/cardsfolder/s/shifting_ceratops.txt diff --git a/forge-gui/res/cardsfolder/upcoming/silverback_shaman.txt b/forge-gui/res/cardsfolder/s/silverback_shaman.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/silverback_shaman.txt rename to forge-gui/res/cardsfolder/s/silverback_shaman.txt diff --git a/forge-gui/res/cardsfolder/upcoming/skyknight_vanguard.txt b/forge-gui/res/cardsfolder/s/skyknight_vanguard.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/skyknight_vanguard.txt rename to forge-gui/res/cardsfolder/s/skyknight_vanguard.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sorcerer_of_the_fang.txt b/forge-gui/res/cardsfolder/s/sorcerer_of_the_fang.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sorcerer_of_the_fang.txt rename to forge-gui/res/cardsfolder/s/sorcerer_of_the_fang.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sorin_imperious_bloodlord.txt b/forge-gui/res/cardsfolder/s/sorin_imperious_bloodlord.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sorin_imperious_bloodlord.txt rename to forge-gui/res/cardsfolder/s/sorin_imperious_bloodlord.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sorin_vampire_lord.txt b/forge-gui/res/cardsfolder/s/sorin_vampire_lord.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sorin_vampire_lord.txt rename to forge-gui/res/cardsfolder/s/sorin_vampire_lord.txt diff --git a/forge-gui/res/cardsfolder/upcoming/sorins_guide.txt b/forge-gui/res/cardsfolder/s/sorins_guide.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/sorins_guide.txt rename to forge-gui/res/cardsfolder/s/sorins_guide.txt diff --git a/forge-gui/res/cardsfolder/upcoming/spectral_sailor.txt b/forge-gui/res/cardsfolder/s/spectral_sailor.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/spectral_sailor.txt rename to forge-gui/res/cardsfolder/s/spectral_sailor.txt diff --git a/forge-gui/res/cardsfolder/upcoming/squad_captain.txt b/forge-gui/res/cardsfolder/s/squad_captain.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/squad_captain.txt rename to forge-gui/res/cardsfolder/s/squad_captain.txt diff --git a/forge-gui/res/cardsfolder/upcoming/starfield_mystic.txt b/forge-gui/res/cardsfolder/s/starfield_mystic.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/starfield_mystic.txt rename to forge-gui/res/cardsfolder/s/starfield_mystic.txt diff --git a/forge-gui/res/cardsfolder/upcoming/steadfast_sentry.txt b/forge-gui/res/cardsfolder/s/steadfast_sentry.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/steadfast_sentry.txt rename to forge-gui/res/cardsfolder/s/steadfast_sentry.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tales_end.txt b/forge-gui/res/cardsfolder/t/tales_end.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tales_end.txt rename to forge-gui/res/cardsfolder/t/tales_end.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thicket_crasher.txt b/forge-gui/res/cardsfolder/t/thicket_crasher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thicket_crasher.txt rename to forge-gui/res/cardsfolder/t/thicket_crasher.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thirsting_bloodlord.txt b/forge-gui/res/cardsfolder/t/thirsting_bloodlord.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thirsting_bloodlord.txt rename to forge-gui/res/cardsfolder/t/thirsting_bloodlord.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thought_distortion.txt b/forge-gui/res/cardsfolder/t/thought_distortion.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thought_distortion.txt rename to forge-gui/res/cardsfolder/t/thought_distortion.txt diff --git a/forge-gui/res/cardsfolder/upcoming/thunderkin_awakener.txt b/forge-gui/res/cardsfolder/t/thunderkin_awakener.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/thunderkin_awakener.txt rename to forge-gui/res/cardsfolder/t/thunderkin_awakener.txt diff --git a/forge-gui/res/cardsfolder/upcoming/tomebound_lich.txt b/forge-gui/res/cardsfolder/t/tomebound_lich.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/tomebound_lich.txt rename to forge-gui/res/cardsfolder/t/tomebound_lich.txt diff --git a/forge-gui/res/cardsfolder/upcoming/twinblade_paladin.txt b/forge-gui/res/cardsfolder/t/twinblade_paladin.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/twinblade_paladin.txt rename to forge-gui/res/cardsfolder/t/twinblade_paladin.txt diff --git a/forge-gui/res/cardsfolder/upcoming/unchained_berserker.txt b/forge-gui/res/cardsfolder/u/unchained_berserker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/unchained_berserker.txt rename to forge-gui/res/cardsfolder/u/unchained_berserker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/unholy_indenture.txt b/forge-gui/res/cardsfolder/u/unholy_indenture.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/unholy_indenture.txt rename to forge-gui/res/cardsfolder/u/unholy_indenture.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vampire_of_the_dire_moon.txt b/forge-gui/res/cardsfolder/v/vampire_of_the_dire_moon.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vampire_of_the_dire_moon.txt rename to forge-gui/res/cardsfolder/v/vampire_of_the_dire_moon.txt diff --git a/forge-gui/res/cardsfolder/upcoming/veil_of_summer.txt b/forge-gui/res/cardsfolder/v/veil_of_summer.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/veil_of_summer.txt rename to forge-gui/res/cardsfolder/v/veil_of_summer.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vengeful_warchief.txt b/forge-gui/res/cardsfolder/v/vengeful_warchief.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vengeful_warchief.txt rename to forge-gui/res/cardsfolder/v/vengeful_warchief.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vilis_broker_of_blood.txt b/forge-gui/res/cardsfolder/v/vilis_broker_of_blood.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vilis_broker_of_blood.txt rename to forge-gui/res/cardsfolder/v/vilis_broker_of_blood.txt diff --git a/forge-gui/res/cardsfolder/upcoming/vivien_arkbow_ranger.txt b/forge-gui/res/cardsfolder/v/vivien_arkbow_ranger.txt similarity index 91% rename from forge-gui/res/cardsfolder/upcoming/vivien_arkbow_ranger.txt rename to forge-gui/res/cardsfolder/v/vivien_arkbow_ranger.txt index f2658b863bb..110d9530b17 100644 --- a/forge-gui/res/cardsfolder/upcoming/vivien_arkbow_ranger.txt +++ b/forge-gui/res/cardsfolder/v/vivien_arkbow_ranger.txt @@ -5,7 +5,7 @@ Loyalty:4 A:AB$ PutCounter | Cost$ AddCounter<1/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature | TargetMin$ 0 | TargetMax$ 2 | CounterType$ P1P1 | CounterNum$ 2 | DividedAsYouChoose$ 2 | SubAbility$ DBPumpAll | SpellDescription$ Distribute two +1/+1 counters among up to two target creatures. They gain trample until end of turn. SVar:DBPumpAll:DB$ Pump | KW$ Trample | Defined$ Targeted A:AB$ Pump | Cost$ SubCounter<3/LOYALTY> | Planeswalker$ True | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | SubAbility$ SoulsDamage | StackDescription$ None | SpellDescription$ Target creature you control deals damage equal to its power to target creature or planeswalker. -SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | AILogic$ PowerDmg | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | References$ X | ConditionDefined$ Targeted | ConditionPresent$ Creature | ConditionCompare$ EQ1 | DamageSource$ ParentTarget +SVar:SoulsDamage:DB$ DealDamage | ValidTgts$ Creature,Planeswalker | AILogic$ PowerDmg | TgtPrompt$ Select target creature or planeswalker | NumDmg$ X | References$ X | DamageSource$ ParentTarget SVar:X:ParentTargeted$CardPower A:AB$ ChangeZone | Cost$ SubCounter<5/LOYALTY> | Planeswalker$ True | Origin$ Sideboard | Destination$ Hand | ChangeType$ Creature.YouOwn | ChangeNum$ 1 | SpellDescription$ You may choose a creature card you own from outside the game, reveal it, and put it into your hand. AI:RemoveDeck:Random diff --git a/forge-gui/res/cardsfolder/upcoming/vivien_natures_avenger.txt b/forge-gui/res/cardsfolder/v/vivien_natures_avenger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/vivien_natures_avenger.txt rename to forge-gui/res/cardsfolder/v/vivien_natures_avenger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/viviens_crocodile.txt b/forge-gui/res/cardsfolder/v/viviens_crocodile.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/viviens_crocodile.txt rename to forge-gui/res/cardsfolder/v/viviens_crocodile.txt diff --git a/forge-gui/res/cardsfolder/upcoming/voracious_hydra.txt b/forge-gui/res/cardsfolder/v/voracious_hydra.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/voracious_hydra.txt rename to forge-gui/res/cardsfolder/v/voracious_hydra.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wakeroot_elemental.txt b/forge-gui/res/cardsfolder/w/wakeroot_elemental.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wakeroot_elemental.txt rename to forge-gui/res/cardsfolder/w/wakeroot_elemental.txt diff --git a/forge-gui/res/cardsfolder/upcoming/waterkin_shaman.txt b/forge-gui/res/cardsfolder/w/waterkin_shaman.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/waterkin_shaman.txt rename to forge-gui/res/cardsfolder/w/waterkin_shaman.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wildfire_elemental.txt b/forge-gui/res/cardsfolder/w/wildfire_elemental.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wildfire_elemental.txt rename to forge-gui/res/cardsfolder/w/wildfire_elemental.txt diff --git a/forge-gui/res/cardsfolder/upcoming/winged_words.txt b/forge-gui/res/cardsfolder/w/winged_words.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/winged_words.txt rename to forge-gui/res/cardsfolder/w/winged_words.txt diff --git a/forge-gui/res/cardsfolder/upcoming/wolfriders_saddle.txt b/forge-gui/res/cardsfolder/w/wolfriders_saddle.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/wolfriders_saddle.txt rename to forge-gui/res/cardsfolder/w/wolfriders_saddle.txt diff --git a/forge-gui/res/cardsfolder/upcoming/yanlings_harbinger.txt b/forge-gui/res/cardsfolder/y/yanlings_harbinger.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/yanlings_harbinger.txt rename to forge-gui/res/cardsfolder/y/yanlings_harbinger.txt diff --git a/forge-gui/res/cardsfolder/upcoming/yarok_the_desecrated.txt b/forge-gui/res/cardsfolder/y/yarok_the_desecrated.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/yarok_the_desecrated.txt rename to forge-gui/res/cardsfolder/y/yarok_the_desecrated.txt diff --git a/forge-gui/res/cardsfolder/upcoming/yaroks_fenlurker.txt b/forge-gui/res/cardsfolder/y/yaroks_fenlurker.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/yaroks_fenlurker.txt rename to forge-gui/res/cardsfolder/y/yaroks_fenlurker.txt diff --git a/forge-gui/res/cardsfolder/upcoming/yaroks_wavecrasher.txt b/forge-gui/res/cardsfolder/y/yaroks_wavecrasher.txt similarity index 100% rename from forge-gui/res/cardsfolder/upcoming/yaroks_wavecrasher.txt rename to forge-gui/res/cardsfolder/y/yaroks_wavecrasher.txt diff --git a/forge-gui/res/editions/Magic 2020.txt b/forge-gui/res/editions/Magic 2020.txt index 80779225e8a..1270cac852c 100644 --- a/forge-gui/res/editions/Magic 2020.txt +++ b/forge-gui/res/editions/Magic 2020.txt @@ -309,38 +309,49 @@ Booster=10 Common:!fromSheet("M20 Secret Cards"), 3 Uncommon:!fromSheet("M20 Sec 299 R Ethereal Elk 300 U Gnarlback Rhino 301 C Vivien's Crocodile - -C Impassioned Orator - +302 R Angelic Guardian +303 C Bastion Enforcer +304 C Concordia Pegasus +305 C Haazda Officer +306 C Impassioned Orator 307 C Imperial Outrider - +308 C Ironclad Krovod +309 C Prowling Caracal 310 R Serra's Guardian - +311 C Show of Valor +312 C Siege Mastodon +313 C Take Vengeance +314 C Trusted Pegasus +315 C Coral Merfolk +316 C Phantom Warrior 317 R Riddlemaster Sphinx - +318 C Snapping Drake +319 C Bartizan Bats +320 C Bogstomper 321 C Dark Remedy - +322 C Disentomb 323 R Gravewaker - -C Sorin's Thirst - -C Vampire Opportunist - +324 C Skeleton Archer +325 C Sorin's Thirst +326 C Vampire Opportunist +327 C Walking Corpse 328 C Engulfing Eruption - +329 C Fearless Halberdier +330 C Goblin Assailant +331 C Hostile Minotaur 332 R Immortal Phoenix 333 C Nimble Birdsticker 334 C Rubblebelt Recluse - -R Shivan Dragon - +335 R Shivan Dragon +336 U Volcanic Dragon 337 R Aggressive Mammoth 338 C Bristling Boar - +339 C Canopy Spider +340 C Frilled Sandwalla +341 C Oakenform 342 C Prized Unicorn - -C Titanic Growth - +343 C Titanic Growth +344 C Woodland Mystic [tokens] ajanis_pridemate b_5_5_demon_flying