From ca32fa98c7bd4832f1c99b9bc929d5bb29f2b611 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Wed, 8 Feb 2023 21:01:58 +0100 Subject: [PATCH] More clean up --- .../src/main/java/forge/game/card/Card.java | 1 - .../res/cardsfolder/a/archangel_of_tithes.txt | 6 ++---- forge-gui/res/cardsfolder/b/bomber_corps.txt | 3 +-- forge-gui/res/cardsfolder/b/boros_elite.txt | 3 +-- forge-gui/res/cardsfolder/b/boros_mastiff.txt | 3 +-- forge-gui/res/cardsfolder/b/branded_brawlers.txt | 3 +-- .../res/cardsfolder/c/centaur_omenreader.txt | 3 +-- forge-gui/res/cardsfolder/c/cinder_cloud.txt | 2 +- forge-gui/res/cardsfolder/d/daring_skyjek.txt | 3 +-- .../res/cardsfolder/d/deathbringer_regent.txt | 3 +-- forge-gui/res/cardsfolder/d/demonic_rising.txt | 3 +-- forge-gui/res/cardsfolder/d/duplicant.txt | 2 +- forge-gui/res/cardsfolder/e/ebon_praetor.txt | 3 +-- forge-gui/res/cardsfolder/e/ebony_owl_netsuke.txt | 3 +-- .../res/cardsfolder/e/edifice_of_authority.txt | 2 +- forge-gui/res/cardsfolder/e/erg_raiders.txt | 3 +-- forge-gui/res/cardsfolder/e/ertais_trickery.txt | 3 +-- .../res/cardsfolder/f/falkenrath_torturer.txt | 5 ++--- .../res/cardsfolder/f/fearsome_awakening.txt | 3 +-- forge-gui/res/cardsfolder/f/firefist_striker.txt | 3 +-- forge-gui/res/cardsfolder/f/firemane_avenger.txt | 3 +-- .../res/cardsfolder/f/flames_of_the_raze_boar.txt | 3 +-- forge-gui/res/cardsfolder/f/flummoxed_cyclops.txt | 3 +-- forge-gui/res/cardsfolder/f/foundry_helix.txt | 3 +-- forge-gui/res/cardsfolder/f/frontline_medic.txt | 6 ++---- .../cardsfolder/g/gallia_of_the_endless_dance.txt | 3 +-- forge-gui/res/cardsfolder/g/ghirapur_orrery.txt | 3 +-- forge-gui/res/cardsfolder/g/ghitu_lavarunner.txt | 3 +-- forge-gui/res/cardsfolder/g/glacial_crasher.txt | 3 +-- forge-gui/res/cardsfolder/h/haazda_marshal.txt | 3 +-- forge-gui/res/cardsfolder/h/harbor_serpent.txt | 3 +-- .../res/cardsfolder/h/hollowborn_barghest.txt | 3 +-- forge-gui/res/cardsfolder/h/howlpack_wolf.txt | 4 +--- forge-gui/res/cardsfolder/j/jihad.txt | 3 +-- forge-gui/res/cardsfolder/k/kavu_runner.txt | 4 +--- forge-gui/res/cardsfolder/k/kumenas_speaker.txt | 5 +---- forge-gui/res/cardsfolder/l/lairwatch_giant.txt | 3 +-- .../l/legions_landing_adanto_the_first_fort.txt | 3 +-- forge-gui/res/cardsfolder/l/limited_resources.txt | 3 +-- .../res/cardsfolder/l/lurebound_scarecrow.txt | 3 +-- .../res/cardsfolder/l/lyzolda_the_blood_witch.txt | 6 ++---- .../res/cardsfolder/m/magmatic_channeler.txt | 3 +-- .../res/cardsfolder/m/magnigoth_treefolk.txt | 15 +++++---------- .../res/cardsfolder/m/makeshift_battalion.txt | 3 +-- .../res/cardsfolder/m/military_intelligence.txt | 3 +-- forge-gui/res/cardsfolder/m/misers_cage.txt | 3 +-- .../res/cardsfolder/n/nav_squad_commandos.txt | 3 +-- forge-gui/res/cardsfolder/o/ophiomancer.txt | 3 +-- forge-gui/res/cardsfolder/o/ordruun_veteran.txt | 3 +-- forge-gui/res/cardsfolder/p/paupers_cage.txt | 3 +-- forge-gui/res/cardsfolder/p/pay_tribute_to_me.txt | 3 +-- ...ilda_wanted_cutthroat_rahilda_feral_outlaw.txt | 6 ++---- .../r/reaper_of_night_harvest_fear.txt | 3 +-- forge-gui/res/cardsfolder/s/scuttling_butler.txt | 3 +-- ...search_for_azcanta_azcanta_the_sunken_ruin.txt | 3 +-- forge-gui/res/cardsfolder/s/serra_avenger.txt | 2 +- .../res/cardsfolder/s/shadows_of_the_past.txt | 3 +-- forge-gui/res/cardsfolder/s/shauku_endbringer.txt | 3 +-- .../cardsfolder/s/sigarda_champion_of_light.txt | 2 +- forge-gui/res/cardsfolder/s/skarrgan_firebird.txt | 2 +- forge-gui/res/cardsfolder/s/spectral_guardian.txt | 3 +-- .../res/cardsfolder/s/spelleater_wolverine.txt | 3 +-- forge-gui/res/cardsfolder/s/static_orb.txt | 3 +-- forge-gui/res/cardsfolder/s/storage_matrix.txt | 3 +-- .../cardsfolder/t/tajic_blade_of_the_legion.txt | 3 +-- forge-gui/res/cardsfolder/t/tenacious_hunter.txt | 3 +-- forge-gui/res/cardsfolder/t/thassas_oracle.txt | 4 ++-- forge-gui/res/cardsfolder/t/thunderstaff.txt | 3 +-- forge-gui/res/cardsfolder/t/tide_skimmer.txt | 3 +-- forge-gui/res/cardsfolder/t/toxic_stench.txt | 2 +- forge-gui/res/cardsfolder/t/track_down.txt | 3 +-- forge-gui/res/cardsfolder/t/training_drone.txt | 3 +-- forge-gui/res/cardsfolder/t/trinisphere.txt | 3 +-- forge-gui/res/cardsfolder/t/tromokratis.txt | 3 +-- forge-gui/res/cardsfolder/t/twinstrike.txt | 2 +- .../res/cardsfolder/v/vengeful_firebrand.txt | 3 +-- forge-gui/res/cardsfolder/v/veteran_brawlers.txt | 3 +-- forge-gui/res/cardsfolder/w/war_elemental.txt | 2 +- .../res/cardsfolder/w/warden_of_the_beyond.txt | 3 +-- forge-gui/res/cardsfolder/w/wardscale_dragon.txt | 3 +-- forge-gui/res/cardsfolder/w/warmind_infantry.txt | 3 +-- forge-gui/res/cardsfolder/w/windwright_mage.txt | 3 +-- forge-gui/res/cardsfolder/w/winter_orb.txt | 3 +-- forge-gui/res/cardsfolder/w/wirecat.txt | 3 +-- forge-gui/res/cardsfolder/w/wojek_halberdiers.txt | 3 +-- 85 files changed, 94 insertions(+), 181 deletions(-) diff --git a/forge-game/src/main/java/forge/game/card/Card.java b/forge-game/src/main/java/forge/game/card/Card.java index 311f1a252be..f46f4db2b94 100644 --- a/forge-game/src/main/java/forge/game/card/Card.java +++ b/forge-game/src/main/java/forge/game/card/Card.java @@ -4729,7 +4729,6 @@ public class Card extends GameEntity implements Comparable, IHasSVars { * Update the changed text of the intrinsic spell abilities and keywords. */ public void updateChangedText() { - // update type List toAdd = Lists.newArrayList(); List toRemove = Lists.newArrayList(); diff --git a/forge-gui/res/cardsfolder/a/archangel_of_tithes.txt b/forge-gui/res/cardsfolder/a/archangel_of_tithes.txt index c954f9f462b..87841ce460e 100644 --- a/forge-gui/res/cardsfolder/a/archangel_of_tithes.txt +++ b/forge-gui/res/cardsfolder/a/archangel_of_tithes.txt @@ -3,8 +3,6 @@ ManaCost:1 W W W Types:Creature Angel PT:3/5 K:Flying -S:Mode$ CantAttackUnless | CheckSVar$ X | SVarCompare$ EQ1 | ValidCard$ Creature | Target$ You,Planeswalker.YouCtrl | Cost$ 1 | Description$ As long as CARDNAME is untapped, creatures can't attack you or planeswalkers you control unless their controller pays {1} for each of those creatures. -SVar:X:Count$Valid Card.Self+untapped -S:Mode$ CantBlockUnless | CheckSVar$ Y | SVarCompare$ EQ1 | ValidCard$ Creature | Cost$ 1 | Description$ As long as CARDNAME is attacking, creatures can't block unless their controller pays {1} for each of those creatures. -SVar:Y:Count$Valid Card.Self+attacking +S:Mode$ CantAttackUnless | IsPresent$ Card.Self+untapped | ValidCard$ Creature | Target$ You,Planeswalker.YouCtrl | Cost$ 1 | Description$ As long as CARDNAME is untapped, creatures can't attack you or planeswalkers you control unless their controller pays {1} for each of those creatures. +S:Mode$ CantBlockUnless | IsPresent$ Card.Self+attacking | ValidCard$ Creature | Cost$ 1 | Description$ As long as CARDNAME is attacking, creatures can't block unless their controller pays {1} for each of those creatures. Oracle:Flying\nAs long as Archangel of Tithes is untapped, creatures can't attack you or planeswalkers you control unless their controller pays {1} for each of those creatures.\nAs long as Archangel of Tithes is attacking, creatures can't block unless their controller pays {1} for each of those creatures. diff --git a/forge-gui/res/cardsfolder/b/bomber_corps.txt b/forge-gui/res/cardsfolder/b/bomber_corps.txt index 77f3d6d2ecf..f77312be35f 100644 --- a/forge-gui/res/cardsfolder/b/bomber_corps.txt +++ b/forge-gui/res/cardsfolder/b/bomber_corps.txt @@ -2,7 +2,6 @@ Name:Bomber Corps ManaCost:1 R Types:Creature Human Soldier PT:1/2 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME deals 1 damage to any target. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigDmg | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME deals 1 damage to any target. SVar:TrigDmg:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Bomber Corps and at least two other creatures attack, Bomber Corps deals 1 damage to any target. diff --git a/forge-gui/res/cardsfolder/b/boros_elite.txt b/forge-gui/res/cardsfolder/b/boros_elite.txt index fff79e81b79..d0f3484e852 100644 --- a/forge-gui/res/cardsfolder/b/boros_elite.txt +++ b/forge-gui/res/cardsfolder/b/boros_elite.txt @@ -2,7 +2,6 @@ Name:Boros Elite ManaCost:W Types:Creature Human Soldier PT:1/1 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +2/+2 until end of turn. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +2/+2 until end of turn. SVar:TrigBattalionPump:DB$ Pump | Defined$ Self | NumAtt$ 2 | NumDef$ 2 -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Boros Elite and at least two other creatures attack, Boros Elite gets +2/+2 until end of turn. diff --git a/forge-gui/res/cardsfolder/b/boros_mastiff.txt b/forge-gui/res/cardsfolder/b/boros_mastiff.txt index 921364e10c8..30ebb910bea 100644 --- a/forge-gui/res/cardsfolder/b/boros_mastiff.txt +++ b/forge-gui/res/cardsfolder/b/boros_mastiff.txt @@ -2,7 +2,6 @@ Name:Boros Mastiff ManaCost:1 W Types:Creature Dog PT:2/2 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets lifelink until end of turn. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets lifelink until end of turn. SVar:TrigBattalionPump:DB$ Pump | Defined$ Self | KW$ Lifelink -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Boros Mastiff and at least two other creatures attack, Boros Mastiff gains lifelink until end of turn. (Damage dealt by a creature with lifelink also causes its controller to gain that much life.) diff --git a/forge-gui/res/cardsfolder/b/branded_brawlers.txt b/forge-gui/res/cardsfolder/b/branded_brawlers.txt index d2ed074c3b5..499a345cbb0 100644 --- a/forge-gui/res/cardsfolder/b/branded_brawlers.txt +++ b/forge-gui/res/cardsfolder/b/branded_brawlers.txt @@ -3,6 +3,5 @@ ManaCost:R Types:Creature Human Soldier PT:2/2 S:Mode$ CantAttack | ValidCard$ Card.Self | IfDefenderControls$ Land.untapped | Description$ CARDNAME can't attack if defending player controls an untapped land. -S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ Y | SVarCompare$ GE1 | Description$ CARDNAME can't block if you control an untapped land. -SVar:Y:Count$Valid Land.YouCtrl+untapped +S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | IsPresent$ Land.YouCtrl+untapped | Description$ CARDNAME can't block if you control an untapped land. Oracle:Branded Brawlers can't attack if defending player controls an untapped land.\nBranded Brawlers can't block if you control an untapped land. diff --git a/forge-gui/res/cardsfolder/c/centaur_omenreader.txt b/forge-gui/res/cardsfolder/c/centaur_omenreader.txt index 70fc533c562..c600104d16b 100644 --- a/forge-gui/res/cardsfolder/c/centaur_omenreader.txt +++ b/forge-gui/res/cardsfolder/c/centaur_omenreader.txt @@ -2,6 +2,5 @@ Name:Centaur Omenreader ManaCost:3 G Types:Snow Creature Centaur Shaman PT:3/3 -S:Mode$ ReduceCost | ValidCard$ Creature | Type$ Spell | Activator$ You | Amount$ 2 | CheckSVar$ X | SVarCompare$ GE1 | Description$ As long as CARDNAME is tapped, creature spells you cast cost {2} less to cast. -SVar:X:Count$Valid Card.Self+tapped +S:Mode$ ReduceCost | ValidCard$ Creature | Type$ Spell | Activator$ You | Amount$ 2 | IsPresent$ Card.Self+tapped | Description$ As long as CARDNAME is tapped, creature spells you cast cost {2} less to cast. Oracle:As long as Centaur Omenreader is tapped, creature spells you cast cost {2} less to cast. diff --git a/forge-gui/res/cardsfolder/c/cinder_cloud.txt b/forge-gui/res/cardsfolder/c/cinder_cloud.txt index ddca2e52761..67706b0104f 100644 --- a/forge-gui/res/cardsfolder/c/cinder_cloud.txt +++ b/forge-gui/res/cardsfolder/c/cinder_cloud.txt @@ -1,7 +1,7 @@ Name:Cinder Cloud ManaCost:3 R R Types:Instant -A:SP$ Destroy | Cost$ 3 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberLKI$ True | SubAbility$ DBDamage | SpellDescription$ Destroy target creature. If a white creature dies this way, Cinder Cloud deals damage to that creature's controller equal to the creature's power. +A:SP$ Destroy | Cost$ 3 R R | ValidTgts$ Creature | TgtPrompt$ Select target creature | RememberLKI$ True | SubAbility$ DBDamage | SpellDescription$ Destroy target creature. If a white creature dies this way, CARDNAME deals damage to that creature's controller equal to the creature's power. SVar:DBDamage:DB$ DealDamage | Defined$ RememberedController | NumDmg$ Z | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 SVar:Y:RememberedLKI$Valid Creature.White SVar:Z:RememberedLKI$CardPower diff --git a/forge-gui/res/cardsfolder/d/daring_skyjek.txt b/forge-gui/res/cardsfolder/d/daring_skyjek.txt index 6754390944d..af4d459da16 100644 --- a/forge-gui/res/cardsfolder/d/daring_skyjek.txt +++ b/forge-gui/res/cardsfolder/d/daring_skyjek.txt @@ -2,7 +2,6 @@ Name:Daring Skyjek ManaCost:1 W Types:Creature Human Knight PT:3/1 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gains flying until end of turn. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gains flying until end of turn. SVar:TrigBattalionPump:DB$ Pump | Defined$ Self | KW$ Flying -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Daring Skyjek and at least two other creatures attack, Daring Skyjek gains flying until end of turn. diff --git a/forge-gui/res/cardsfolder/d/deathbringer_regent.txt b/forge-gui/res/cardsfolder/d/deathbringer_regent.txt index 2d64fa9daba..eda86a8d817 100644 --- a/forge-gui/res/cardsfolder/d/deathbringer_regent.txt +++ b/forge-gui/res/cardsfolder/d/deathbringer_regent.txt @@ -3,8 +3,7 @@ ManaCost:5 B B Types:Creature Dragon PT:5/6 K:Flying -T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromYourHandByYou+Self | CheckSVar$ X | SVarCompare$ GE5 | Destination$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand and there are five or more other creatures on the battlefield, destroy all other creatures. +T:Mode$ ChangesZone | ValidCard$ Card.wasCastFromYourHandByYou+Self | IsPresent$ Creature.Other | PresentCompare$ GE5 | Destination$ Battlefield | Execute$ TrigDestroy | TriggerDescription$ When CARDNAME enters the battlefield, if you cast it from your hand and there are five or more other creatures on the battlefield, destroy all other creatures. SVar:TrigDestroy:DB$ DestroyAll | ValidCards$ Creature.Other -SVar:X:Count$Valid Creature.Other AI:RemoveDeck:Random Oracle:Flying\nWhen Deathbringer Regent enters the battlefield, if you cast it from your hand and there are five or more other creatures on the battlefield, destroy all other creatures. diff --git a/forge-gui/res/cardsfolder/d/demonic_rising.txt b/forge-gui/res/cardsfolder/d/demonic_rising.txt index 4348dfc1b30..c183ba59ab6 100644 --- a/forge-gui/res/cardsfolder/d/demonic_rising.txt +++ b/forge-gui/res/cardsfolder/d/demonic_rising.txt @@ -1,7 +1,6 @@ Name:Demonic Rising ManaCost:3 B B Types:Enchantment -T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ EQ1 | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if you control exactly one creature, create a 5/5 black Demon creature token with flying. +T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Creature.YouCtrl | PresentCompare$ EQ1 | Execute$ TrigToken | TriggerDescription$ At the beginning of your end step, if you control exactly one creature, create a 5/5 black Demon creature token with flying. SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_5_5_demon_flying | TokenOwner$ You -SVar:X:Count$Valid Creature.YouCtrl Oracle:At the beginning of your end step, if you control exactly one creature, create a 5/5 black Demon creature token with flying. diff --git a/forge-gui/res/cardsfolder/d/duplicant.txt b/forge-gui/res/cardsfolder/d/duplicant.txt index 38395c32791..2ee62677149 100644 --- a/forge-gui/res/cardsfolder/d/duplicant.txt +++ b/forge-gui/res/cardsfolder/d/duplicant.txt @@ -4,7 +4,7 @@ Types:Artifact Creature Shapeshifter PT:2/4 T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | OptionalDecider$ You | Execute$ TrigExile | TriggerDescription$ Imprint — When CARDNAME enters the battlefield, you may exile target nontoken creature. SVar:TrigExile:DB$ ChangeZone | Unimprint$ True | Imprint$ True | ImprintLast$ True | Origin$ Battlefield | Destination$ Exile | ValidTgts$ Creature.nonToken | TgtPrompt$ Select target nontoken creature -S:Mode$ Continuous | Affected$ Card.Self | AddType$ ImprintedCreatureType | CheckSVar$ Z | SVarCompare$ EQ1 | SetPower$ X | SetToughness$ Y | Description$ As long as a card exiled with Duplicant is a creature card, Duplicant has the power, toughness, and creature types of the last creature card exiled with Duplicant. It's still a Shapeshifter. +S:Mode$ Continuous | Affected$ Card.Self | AddType$ ImprintedCreatureType | CheckSVar$ Z | SVarCompare$ EQ1 | SetPower$ X | SetToughness$ Y | Description$ As long as a card exiled with CARDNAME is a creature card, CARDNAME has the power, toughness, and creature types of the last creature card exiled with CARDNAME. It's still a Shapeshifter. T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsImprinted | Execute$ DBCleanup T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.Self | Execute$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearImprinted$ True diff --git a/forge-gui/res/cardsfolder/e/ebon_praetor.txt b/forge-gui/res/cardsfolder/e/ebon_praetor.txt index 5efbf8c1ecd..2cd094246d0 100644 --- a/forge-gui/res/cardsfolder/e/ebon_praetor.txt +++ b/forge-gui/res/cardsfolder/e/ebon_praetor.txt @@ -7,8 +7,7 @@ K:Trample T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ At the beginning of your upkeep, put a -2/-2 counter on CARDNAME. SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ M2M2 | CounterNum$ 1 A:AB$ RemoveCounter | Cost$ Sac<1/Creature> | CounterType$ M2M2 | CounterNum$ 1 | ActivationPhases$ Upkeep | PlayerTurn$ True | ActivationLimit$ 1 | SubAbility$ DBPutCounter | SpellDescription$ Remove a -2/-2 counter from CARDNAME. If the sacrificed creature was a Thrull, put a +1/+0 counter on CARDNAME. Activate only during your upkeep and only once each turn. -SVar:DBPutCounter:DB$ PutCounter | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | CounterNum$ 1 | CounterType$ P1P0 -SVar:X:Sacrificed$Valid Thrull +SVar:DBPutCounter:DB$ PutCounter | ConditionDefined$ Sacrificed | ConditionPresent$ Thrull | CounterNum$ 1 | CounterType$ P1P0 SVar:AIPreference:SacCost$Creature.Thrull,Creature.token+powerLE4+toughnessLE4,Creature.cmcLE2+powerLE2+toughnessLE3 AI:RemoveDeck:Random DeckHints:Type$Thrull diff --git a/forge-gui/res/cardsfolder/e/ebony_owl_netsuke.txt b/forge-gui/res/cardsfolder/e/ebony_owl_netsuke.txt index a222d6ada85..ff5fdc297c2 100644 --- a/forge-gui/res/cardsfolder/e/ebony_owl_netsuke.txt +++ b/forge-gui/res/cardsfolder/e/ebony_owl_netsuke.txt @@ -1,7 +1,6 @@ Name:Ebony Owl Netsuke ManaCost:2 Types:Artifact -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | CheckSVar$ TrigCount | SVarCompare$ GE7 | Execute$ TrigDamageOpp | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, if that player has seven or more cards in hand, CARDNAME deals 4 damage to that player. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Card.ActivePlayerCtrl | PresentZone$ Hand | PresentCompare$ GE7 | Execute$ TrigDamageOpp | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, if that player has seven or more cards in hand, CARDNAME deals 4 damage to that player. SVar:TrigDamageOpp:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 4 -SVar:TrigCount:Count$ValidHand Card.ActivePlayerCtrl Oracle:At the beginning of each opponent's upkeep, if that player has seven or more cards in hand, Ebony Owl Netsuke deals 4 damage to that player. diff --git a/forge-gui/res/cardsfolder/e/edifice_of_authority.txt b/forge-gui/res/cardsfolder/e/edifice_of_authority.txt index 3fcca23f162..965899dc245 100644 --- a/forge-gui/res/cardsfolder/e/edifice_of_authority.txt +++ b/forge-gui/res/cardsfolder/e/edifice_of_authority.txt @@ -3,6 +3,6 @@ ManaCost:3 Types:Artifact A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't attack. | SubAbility$ DBPutCounter | IsCurse$ True | SpellDescription$ Target creature can't attack this turn. Put a brick counter on CARDNAME. SVar:DBPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ BRICK | CounterNum$ 1 -A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Duration$ UntilYourNextTurn | KW$ HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. | CheckSVar$ X | SVarCompare$ GE3 | IsCurse$ True | SpellDescription$ Until your next turn, target creature can't attack or block and its activated abilities can't be activated. Activate only if there are three or more brick counters on Edifice of Authority. +A:AB$ Pump | Cost$ 1 T | ValidTgts$ Creature | TgtPrompt$ Select target creature | Duration$ UntilYourNextTurn | KW$ HIDDEN CARDNAME can't attack or block. & HIDDEN CARDNAME's activated abilities can't be activated. | CheckSVar$ X | SVarCompare$ GE3 | IsCurse$ True | SpellDescription$ Until your next turn, target creature can't attack or block and its activated abilities can't be activated. Activate only if there are three or more brick counters on CARDNAME. SVar:X:Count$CardCounters.BRICK Oracle:{1}, {T}: Target creature can't attack this turn. Put a brick counter on Edifice of Authority.\n{1}, {T}: Until your next turn, target creature can't attack or block and its activated abilities can't be activated. Activate only if there are three or more brick counters on Edifice of Authority. diff --git a/forge-gui/res/cardsfolder/e/erg_raiders.txt b/forge-gui/res/cardsfolder/e/erg_raiders.txt index deb10c12bc4..da8667a3c76 100644 --- a/forge-gui/res/cardsfolder/e/erg_raiders.txt +++ b/forge-gui/res/cardsfolder/e/erg_raiders.txt @@ -3,7 +3,6 @@ ManaCost:1 B Types:Creature Human Warrior PT:2/3 T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigDamage | IsPresent$ Card.Self+notAttackedThisTurn | TriggerDescription$ At the beginning of your end step, if CARDNAME didn't attack this turn, CARDNAME deals 2 damage to you unless it came under your control this turn. -SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2 | ConditionCheckSVar$ ErgAttacked | ConditionSVarCompare$ EQ1 -SVar:ErgAttacked:Count$Valid Card.Self+notFirstTurnControlled +SVar:TrigDamage:DB$ DealDamage | Defined$ You | NumDmg$ 2 | ConditionPresent$ Card.Self+notFirstTurnControlled | ConditionCompare$ EQ1 SVar:MustAttack:True Oracle:At the beginning of your end step, if Erg Raiders didn't attack this turn, Erg Raiders deals 2 damage to you unless it came under your control this turn. diff --git a/forge-gui/res/cardsfolder/e/ertais_trickery.txt b/forge-gui/res/cardsfolder/e/ertais_trickery.txt index 033220a8856..ebed4071462 100644 --- a/forge-gui/res/cardsfolder/e/ertais_trickery.txt +++ b/forge-gui/res/cardsfolder/e/ertais_trickery.txt @@ -1,7 +1,6 @@ Name:Ertai's Trickery ManaCost:U Types:Instant -A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell if it was kicked | ValidTgts$ Card | ConditionCheckSVar$ ConditionKicked | ConditionSVarCompare$ EQ1 | SpellDescription$ Counter target spell if it was kicked. -SVar:ConditionKicked:Targeted$Valid Card.kicked +A:SP$ Counter | Cost$ U | TargetType$ Spell | TgtPrompt$ Select target spell if it was kicked | ValidTgts$ Card | ConditionDefined$ Targeted | ConditionPresent$ Spell.kicked | SpellDescription$ Counter target spell if it was kicked. AI:RemoveDeck:Random Oracle:Counter target spell if it was kicked. diff --git a/forge-gui/res/cardsfolder/f/falkenrath_torturer.txt b/forge-gui/res/cardsfolder/f/falkenrath_torturer.txt index debc98d3a4e..49a1cffe815 100644 --- a/forge-gui/res/cardsfolder/f/falkenrath_torturer.txt +++ b/forge-gui/res/cardsfolder/f/falkenrath_torturer.txt @@ -2,8 +2,7 @@ Name:Falkenrath Torturer ManaCost:2 B Types:Creature Vampire PT:2/1 -A:AB$ Pump | Cost$ Sac<1/Creature> | Defined$ Self | KW$ Flying | SubAbility$ DBPutCounter | SpellDescription$ CARDNAME gains flying until end of turn. If the sacrificed creature was a Human, put a +1/+1 counter on Falkenrath Torturer. -SVar:DBPutCounter:DB$ PutCounter | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | CounterNum$ 1 | CounterType$ P1P1 -SVar:X:Sacrificed$Valid Human +A:AB$ Pump | Cost$ Sac<1/Creature> | Defined$ Self | KW$ Flying | SubAbility$ DBPutCounter | SpellDescription$ CARDNAME gains flying until end of turn. If the sacrificed creature was a Human, put a +1/+1 counter on CARDNAME. +SVar:DBPutCounter:DB$ PutCounter | ConditionDefined$ Sacrificed | ConditionPresent$ Human | CounterNum$ 1 | CounterType$ P1P1 AI:RemoveDeck:All Oracle:Sacrifice a creature: Falkenrath Torturer gains flying until end of turn. If the sacrificed creature was a Human, put a +1/+1 counter on Falkenrath Torturer. diff --git a/forge-gui/res/cardsfolder/f/fearsome_awakening.txt b/forge-gui/res/cardsfolder/f/fearsome_awakening.txt index d54e611bd28..ffa7fa43cdc 100644 --- a/forge-gui/res/cardsfolder/f/fearsome_awakening.txt +++ b/forge-gui/res/cardsfolder/f/fearsome_awakening.txt @@ -2,8 +2,7 @@ Name:Fearsome Awakening ManaCost:4 B Types:Sorcery A:SP$ ChangeZone | Cost$ 4 B | Origin$ Graveyard | Destination$ Battlefield | TgtPrompt$ Choose target creature card in your graveyard | ValidTgts$ Creature.YouCtrl | RememberChanged$ True | SubAbility$ DBPutCounter | SpellDescription$ Return target creature card from your graveyard to the battlefield. If it's a Dragon, put two +1/+1 counters on it. -SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | Defined$ Remembered | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup +SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 2 | Defined$ Remembered | ConditionDefined$ Remembered | ConditionPresent$ Dragon | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Remembered$Valid Dragon DeckHints:Type$Dragon & Ability$Graveyard Oracle:Return target creature card from your graveyard to the battlefield. If it's a Dragon, put two +1/+1 counters on it. diff --git a/forge-gui/res/cardsfolder/f/firefist_striker.txt b/forge-gui/res/cardsfolder/f/firefist_striker.txt index 46884b43025..df907ab3a56 100644 --- a/forge-gui/res/cardsfolder/f/firefist_striker.txt +++ b/forge-gui/res/cardsfolder/f/firefist_striker.txt @@ -2,7 +2,6 @@ Name:Firefist Striker ManaCost:1 R Types:Creature Human Soldier PT:2/1 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, target creature can't block this turn. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigPump | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, target creature can't block this turn. SVar:TrigPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | KW$ HIDDEN CARDNAME can't block. | IsCurse$ True | SpellDescription$ Target creature can't block this turn. -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Firefist Striker and at least two other creatures attack, target creature can't block this turn. diff --git a/forge-gui/res/cardsfolder/f/firemane_avenger.txt b/forge-gui/res/cardsfolder/f/firemane_avenger.txt index 6bed87ddb98..d1400bd0e4c 100644 --- a/forge-gui/res/cardsfolder/f/firemane_avenger.txt +++ b/forge-gui/res/cardsfolder/f/firemane_avenger.txt @@ -3,8 +3,7 @@ ManaCost:2 R W Types:Creature Angel PT:3/3 K:Flying -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionDmg | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME deals 3 damage to any target and you gain 3 life. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionDmg | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME deals 3 damage to any target and you gain 3 life. SVar:TrigBattalionDmg:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SubAbility$ DBGainLife SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 3 -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Flying\nBattalion — Whenever Firemane Avenger and at least two other creatures attack, Firemane Avenger deals 3 damage to any target and you gain 3 life. diff --git a/forge-gui/res/cardsfolder/f/flames_of_the_raze_boar.txt b/forge-gui/res/cardsfolder/f/flames_of_the_raze_boar.txt index 7d0c5a30cb3..6600b4342b6 100644 --- a/forge-gui/res/cardsfolder/f/flames_of_the_raze_boar.txt +++ b/forge-gui/res/cardsfolder/f/flames_of_the_raze_boar.txt @@ -2,7 +2,6 @@ Name:Flames of the Raze-Boar ManaCost:5 R Types:Instant A:SP$ DealDamage | Cost$ 5 R | NumDmg$ 4 | ValidTgts$ Creature.OppCtrl | RememberTargets$ True | TgtPrompt$ Select target creature an opponent controls | SubAbility$ DBDealDamage | SpellDescription$ CARDNAME deals 4 damage to target creature an opponent controls. Then CARDNAME deals 2 damage to each other creature that player controls if you control a creature with power 4 or greater. -SVar:DBDealDamage:DB$ DamageAll | NumDmg$ 2 | ValidCards$ Creature.IsNotRemembered+ControlledBy TargetedOrController | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBCleanup +SVar:DBDealDamage:DB$ DamageAll | NumDmg$ 2 | ValidCards$ Creature.IsNotRemembered+ControlledBy TargetedOrController | ConditionPresent$ Creature.powerGE4+YouCtrl | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$Valid Creature.powerGE4+YouCtrl Oracle:Flames of the Raze-Boar deals 4 damage to target creature an opponent controls. Then Flames of the Raze-Boar deals 2 damage to each other creature that player controls if you control a creature with power 4 or greater. diff --git a/forge-gui/res/cardsfolder/f/flummoxed_cyclops.txt b/forge-gui/res/cardsfolder/f/flummoxed_cyclops.txt index e48ace4fe35..e89ba2a7b7b 100644 --- a/forge-gui/res/cardsfolder/f/flummoxed_cyclops.txt +++ b/forge-gui/res/cardsfolder/f/flummoxed_cyclops.txt @@ -3,7 +3,6 @@ ManaCost:3 R Types:Creature Cyclops PT:4/4 K:Reach -T:Mode$ AttackersDeclared | AttackingPlayer$ Player.Opponent | CheckSVar$ CheckAttackers | SVarCompare$ GE2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever two or more creatures your opponents control attack, CARDNAME can't block this combat. +T:Mode$ AttackersDeclared | AttackingPlayer$ Player.Opponent | IsPresent$ Creature.OppCtrl+attacking | PresentCompare$ GE2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever two or more creatures your opponents control attack, CARDNAME can't block this combat. SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ HIDDEN CARDNAME can't block. | Duration$ UntilEndOfCombat -SVar:CheckAttackers:Count$Valid Creature.OppCtrl+attacking Oracle:Reach\nWhenever two or more creatures your opponents control attack, Flummoxed Cyclops can't block this combat. diff --git a/forge-gui/res/cardsfolder/f/foundry_helix.txt b/forge-gui/res/cardsfolder/f/foundry_helix.txt index aae3b83227a..0485e356028 100644 --- a/forge-gui/res/cardsfolder/f/foundry_helix.txt +++ b/forge-gui/res/cardsfolder/f/foundry_helix.txt @@ -2,8 +2,7 @@ Name:Foundry Helix ManaCost:1 R W Types:Instant A:SP$ DealDamage | Cost$ 1 R W Sac<1/Permanent> | ValidTgts$ Creature,Planeswalker,Player | TgtPrompt$ Select any target | NumDmg$ 4 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 4 damage to any target. If the sacrificed permanent was an artifact, you gain 4 life. -SVar:DBGainLife:DB$ GainLife | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | LifeAmount$ 4 -SVar:X:Sacrificed$Valid Artifact +SVar:DBGainLife:DB$ GainLife | ConditionDefined$ Sacrificed | ConditionPresent$ Artifact | LifeAmount$ 4 DeckHints:Type$Artifact DeckHas:Ability$LifeGain Oracle:As an additional cost to cast this spell, sacrifice a permanent.\nFoundry Helix deals 4 damage to any target. If the sacrificed permanent was an artifact, you gain 4 life. diff --git a/forge-gui/res/cardsfolder/f/frontline_medic.txt b/forge-gui/res/cardsfolder/f/frontline_medic.txt index 73080913b85..b4bf3346597 100644 --- a/forge-gui/res/cardsfolder/f/frontline_medic.txt +++ b/forge-gui/res/cardsfolder/f/frontline_medic.txt @@ -2,9 +2,7 @@ Name:Frontline Medic ManaCost:2 W Types:Creature Human Cleric PT:3/3 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionEffect | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, creatures you control gain indestructible until end of turn. -SVar:TrigBattalionEffect:DB$ Effect | Name$ Frontline Medic Effect | StaticAbilities$ KWPump -SVar:KWPump:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Battlefield | Affected$ Creature.YouCtrl | AddKeyword$ Indestructible | Description$ Creatures you control gain indestructible until end of turn. -SVar:BattalionTest:Count$Valid Creature.attacking+Other +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionEffect | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, creatures you control gain indestructible until end of turn. +SVar:TrigBattalionEffect:DB$ PumpAll | ValidCards$ Creature.YouCtrl | KW$ Indestructible A:AB$ Counter | Cost$ Sac<1/CARDNAME> | TargetType$ Spell | TgtPrompt$ Select target spell with X in its mana cost | ValidTgts$ Card.hasXCost | UnlessCost$ 3 | SpellDescription$ Counter target spell with {X} in its mana cost unless its controller pays {3}. Oracle:Battalion — Whenever Frontline Medic and at least two other creatures attack, creatures you control gain indestructible until end of turn.\nSacrifice Frontline Medic: Counter target spell with {X} in its mana cost unless its controller pays {3}. diff --git a/forge-gui/res/cardsfolder/g/gallia_of_the_endless_dance.txt b/forge-gui/res/cardsfolder/g/gallia_of_the_endless_dance.txt index a20bd43f2cb..23d7217faf6 100644 --- a/forge-gui/res/cardsfolder/g/gallia_of_the_endless_dance.txt +++ b/forge-gui/res/cardsfolder/g/gallia_of_the_endless_dance.txt @@ -4,8 +4,7 @@ Types:Legendary Creature Satyr PT:2/2 K:Haste S:Mode$ Continuous | Affected$ Card.Satyr+Other+YouCtrl | AddPower$ 1 | AddToughness$ 1 | AddKeyword$ Haste | Description$ Other Satyrs you control get +1/+1 and have haste. -T:Mode$ AttackersDeclared | Execute$ TrigDiscard | CheckSVar$ AttackerCount | SVarCompare$ GE3 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with three or more creatures, you may discard a card at random. If you do, draw two cards. -SVar:AttackerCount:Count$Valid Creature.attacking +T:Mode$ AttackersDeclared | Execute$ TrigDiscard | IsPresent$ Creature.attacking | PresentCompare$ GE3 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with three or more creatures, you may discard a card at random. If you do, draw two cards. SVar:TrigDiscard:DB$ Draw | Defined$ You | NumCards$ 2 | UnlessCost$ Discard<1/Random> | UnlessPayer$ You | UnlessSwitched$ True DeckHints:Type$Satyr Oracle:Haste\nOther Satyrs you control get +1/+1 and have haste.\nWhenever you attack with three or more creatures, you may discard a card at random. If you do, draw two cards. diff --git a/forge-gui/res/cardsfolder/g/ghirapur_orrery.txt b/forge-gui/res/cardsfolder/g/ghirapur_orrery.txt index e2e8ba440c4..962f98a0bc7 100644 --- a/forge-gui/res/cardsfolder/g/ghirapur_orrery.txt +++ b/forge-gui/res/cardsfolder/g/ghirapur_orrery.txt @@ -2,7 +2,6 @@ Name:Ghirapur Orrery ManaCost:4 Types:Artifact S:Mode$ Continuous | Affected$ Player | AdjustLandPlays$ 1 | Description$ Each player may play an additional land on each of their turns. -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | CheckSVar$ TrigCount | SVarCompare$ EQ0 | Execute$ TrigDraw | TriggerDescription$ At the beginning of each player's upkeep, if that player has no cards in hand, that player draws three cards. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Player | TriggerZones$ Battlefield | ConditionPresent$ Card.ActivePlayerCtrl | PresentZone$ Hand | PresentCompare$ EQ0 | Execute$ TrigDraw | TriggerDescription$ At the beginning of each player's upkeep, if that player has no cards in hand, that player draws three cards. SVar:TrigDraw:DB$ Draw | NumCards$ 3 | Defined$ TriggeredPlayer -SVar:TrigCount:Count$ValidHand Card.ActivePlayerCtrl Oracle:Each player may play an additional land on each of their turns.\nAt the beginning of each player's upkeep, if that player has no cards in hand, that player draws three cards. diff --git a/forge-gui/res/cardsfolder/g/ghitu_lavarunner.txt b/forge-gui/res/cardsfolder/g/ghitu_lavarunner.txt index 7fc30769530..3543ec492a9 100644 --- a/forge-gui/res/cardsfolder/g/ghitu_lavarunner.txt +++ b/forge-gui/res/cardsfolder/g/ghitu_lavarunner.txt @@ -2,8 +2,7 @@ Name:Ghitu Lavarunner ManaCost:R Types:Creature Human Wizard PT:1/2 -S:Mode$ Continuous | Affected$ Card.Self | CheckSVar$ X | SVarCompare$ GE2 | AddPower$ 1 | AddKeyword$ Haste | Description$ As long as there are two or more instant and/or sorcery cards in your graveyard, CARDNAME gets +1/+0 and has haste. -SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn +S:Mode$ Continuous | Affected$ Card.Self | IsPresent$ Instant.YouOwn,Sorcery.YouOwn | PresentCompare$ GE2 | PresentZone$ Graveyard | AddPower$ 1 | AddKeyword$ Haste | Description$ As long as there are two or more instant and/or sorcery cards in your graveyard, CARDNAME gets +1/+0 and has haste. SVar:BuffedBy:Instant,Sorcery SVar:PlayMain1:TRUE DeckHints:Type$Instant|Sorcery diff --git a/forge-gui/res/cardsfolder/g/glacial_crasher.txt b/forge-gui/res/cardsfolder/g/glacial_crasher.txt index 276e645ff15..9c2e721f57a 100644 --- a/forge-gui/res/cardsfolder/g/glacial_crasher.txt +++ b/forge-gui/res/cardsfolder/g/glacial_crasher.txt @@ -3,8 +3,7 @@ ManaCost:4 U U Types:Creature Elemental PT:5/5 K:Trample -S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't attack unless there is a Mountain on the battlefield. -SVar:X:Count$Valid Mountain +S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | IsPresent$ Mountain | PresentCompare$ EQ0 | Description$ CARDNAME can't attack unless there is a Mountain on the battlefield. AI:RemoveDeck:Random DeckNeeds:Color$Red SVar:BuffedBy:Mountain diff --git a/forge-gui/res/cardsfolder/h/haazda_marshal.txt b/forge-gui/res/cardsfolder/h/haazda_marshal.txt index 6f811a34850..af69bcf96c9 100644 --- a/forge-gui/res/cardsfolder/h/haazda_marshal.txt +++ b/forge-gui/res/cardsfolder/h/haazda_marshal.txt @@ -2,8 +2,7 @@ Name:Haazda Marshal ManaCost:W Types:Creature Human Soldier PT:1/1 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ AttackerTest | SVarCompare$ GE2 | NoResolvingCheck$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME and at least two other creatures attack, create a 1/1 white Soldier creature token with lifelink. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | PresentCompare$ GE2 | NoResolvingCheck$ True | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME and at least two other creatures attack, create a 1/1 white Soldier creature token with lifelink. SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_soldier_lifelink -SVar:AttackerTest:Count$Valid Creature.attacking+Other DeckHas:Ability$Token|LifeGain Oracle:Whenever Haazda Marshal and at least two other creatures attack, create a 1/1 white Soldier creature token with lifelink. diff --git a/forge-gui/res/cardsfolder/h/harbor_serpent.txt b/forge-gui/res/cardsfolder/h/harbor_serpent.txt index 852eb2a4c11..79a758c270f 100644 --- a/forge-gui/res/cardsfolder/h/harbor_serpent.txt +++ b/forge-gui/res/cardsfolder/h/harbor_serpent.txt @@ -3,7 +3,6 @@ ManaCost:4 U U Types:Creature Serpent PT:5/5 K:Islandwalk -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ LT5 | Description$ CARDNAME can't attack unless there are five or more Islands on the battlefield. -SVar:X:Count$Valid Island +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ CARDNAME can't attack. | IsPresent$ Island | PresentCompare$ LT5 | Description$ CARDNAME can't attack unless there are five or more Islands on the battlefield. SVar:BuffedBy:Island Oracle:Islandwalk (This creature can't be blocked as long as defending player controls an Island.)\nHarbor Serpent can't attack unless there are five or more Islands on the battlefield. diff --git a/forge-gui/res/cardsfolder/h/hollowborn_barghest.txt b/forge-gui/res/cardsfolder/h/hollowborn_barghest.txt index d6b9eca42e0..9fc3fae041e 100644 --- a/forge-gui/res/cardsfolder/h/hollowborn_barghest.txt +++ b/forge-gui/res/cardsfolder/h/hollowborn_barghest.txt @@ -4,7 +4,6 @@ Types:Creature Demon Dog PT:7/6 T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Card.YouCtrl | PresentCompare$ EQ0 | PresentZone$ Hand | Execute$ TrigLoseLifeEachOpp | TriggerDescription$ At the beginning of your upkeep, if you have no cards in hand, each opponent loses 2 life. SVar:TrigLoseLifeEachOpp:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | CheckSVar$ TrigHand | SVarCompare$ EQ0 | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of each opponent's upkeep, if that player has no cards in hand, they lose 2 life. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | TriggerZones$ Battlefield | IsPresent$ Card.ActivePlayerCtrl | PresentCompare$ EQ0 | PresentZone$ Hand | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of each opponent's upkeep, if that player has no cards in hand, they lose 2 life. SVar:TrigLoseLife:DB$ LoseLife | Defined$ TriggeredPlayer | LifeAmount$ 2 -SVar:TrigHand:Count$ValidHand Card.ActivePlayerCtrl Oracle:At the beginning of your upkeep, if you have no cards in hand, each opponent loses 2 life.\nAt the beginning of each opponent's upkeep, if that player has no cards in hand, they lose 2 life. diff --git a/forge-gui/res/cardsfolder/h/howlpack_wolf.txt b/forge-gui/res/cardsfolder/h/howlpack_wolf.txt index 52f8648d1e6..1bdc461da5d 100644 --- a/forge-gui/res/cardsfolder/h/howlpack_wolf.txt +++ b/forge-gui/res/cardsfolder/h/howlpack_wolf.txt @@ -2,9 +2,7 @@ Name:Howlpack Wolf ManaCost:2 R Types:Creature Wolf PT:3/3 -S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME can't block unless you control another Wolf or Werewolf. -SVar:X:Count$Valid Wolf.Other+YouCtrl/Plus.Y -SVar:Y:Count$Valid Werewolf.Other+YouCtrl +S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | IsPresent$ Wolf.Other+YouCtrl,Werewolf.Other+YouCtrl | PresentCompare$ EQ0 | Description$ CARDNAME can't block unless you control another Wolf or Werewolf. SVar:BuffedBy:Wolf,Werewolf AI:RemoveDeck:Random DeckHints:Type$Wolf|Werewolf diff --git a/forge-gui/res/cardsfolder/j/jihad.txt b/forge-gui/res/cardsfolder/j/jihad.txt index df80b6c24c6..567fb21c589 100644 --- a/forge-gui/res/cardsfolder/j/jihad.txt +++ b/forge-gui/res/cardsfolder/j/jihad.txt @@ -4,9 +4,8 @@ Types:Enchantment K:ETBReplacement:Other:ChooseColor SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SubAbility$ ChooseP | AILogic$ MostProminentHumanControls | SpellDescription$ As CARDNAME enters the battlefield, choose a color and an opponent. SVar:ChooseP:DB$ ChoosePlayer | Defined$ You | Choices$ Player.Opponent -S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 2 | AddToughness$ 1 | CheckSVar$ X | Description$ White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color. +S:Mode$ Continuous | Affected$ Creature.White | AddPower$ 2 | AddToughness$ 1 | IsPresent$ Permanent.nonToken+ChosenColor+ChosenCtrl | Description$ White creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color. T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Permanent.nonToken+ChosenColor+ChosenCtrl | PresentCompare$ EQ0 | Execute$ TrigSac | TriggerDescription$ When the chosen player controls no nontoken permanents of the chosen color, sacrifice CARDNAME. SVar:TrigSac:DB$ Sacrifice -SVar:X:Count$Valid Permanent.nonToken+ChosenColor+ChosenCtrl SVar:NeedsToPlay:Permanent.nonColorless+OppCtrl Oracle:As Jihad enters the battlefield, choose a color and an opponent.\nWhite creatures get +2/+1 as long as the chosen player controls a nontoken permanent of the chosen color.\nWhen the chosen player controls no nontoken permanents of the chosen color, sacrifice Jihad. diff --git a/forge-gui/res/cardsfolder/k/kavu_runner.txt b/forge-gui/res/cardsfolder/k/kavu_runner.txt index 4cdb975a6ff..55d755fc4da 100644 --- a/forge-gui/res/cardsfolder/k/kavu_runner.txt +++ b/forge-gui/res/cardsfolder/k/kavu_runner.txt @@ -2,8 +2,6 @@ Name:Kavu Runner ManaCost:3 R Types:Creature Kavu PT:3/3 -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Haste | CheckSVar$ X | SVarCompare$ EQ0 | Description$ CARDNAME has haste as long as no opponent controls a white or blue creature. -SVar:X:Count$Valid Creature.White+OppCtrl/Plus.Y -SVar:Y:Count$Valid Creature.Blue+OppCtrl +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Haste | IsPresent$ Creature.White+OppCtrl,Creature.Blue+OppCtrl | PresentCompare$ EQ0 | Description$ CARDNAME has haste as long as no opponent controls a white or blue creature. SVar:AntiBuffedBy:Creature.White,Creature.Blue Oracle:Kavu Runner has haste as long as no opponent controls a white or blue creature. diff --git a/forge-gui/res/cardsfolder/k/kumenas_speaker.txt b/forge-gui/res/cardsfolder/k/kumenas_speaker.txt index 7089601e295..9de98ed0037 100644 --- a/forge-gui/res/cardsfolder/k/kumenas_speaker.txt +++ b/forge-gui/res/cardsfolder/k/kumenas_speaker.txt @@ -2,10 +2,7 @@ Name:Kumena's Speaker ManaCost:G Types:Creature Merfolk Shaman PT:1/1 -S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | CheckSVar$ TotalX | SVarCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control another Merfolk or an Island. -SVar:X1:Count$Valid Island.YouCtrl -SVar:X2:Count$Valid Creature.Merfolk+Other+YouCtrl -SVar:TotalX:SVar$X1/Plus.X2 +S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 1 | AddToughness$ 1 | IsPresent$ Island.YouCtrl,Creature.Merfolk+Other+YouCtrl| PresentCompare$ GE1 | Description$ CARDNAME gets +1/+1 as long as you control another Merfolk or an Island. SVar:BuffedBy:Island SVar:BuffedBy:Merfolk Oracle:Kumena's Speaker gets +1/+1 as long as you control another Merfolk or an Island. diff --git a/forge-gui/res/cardsfolder/l/lairwatch_giant.txt b/forge-gui/res/cardsfolder/l/lairwatch_giant.txt index e9482aaf3c4..2bfa251b0eb 100644 --- a/forge-gui/res/cardsfolder/l/lairwatch_giant.txt +++ b/forge-gui/res/cardsfolder/l/lairwatch_giant.txt @@ -3,7 +3,6 @@ ManaCost:5 W Types:Creature Giant Warrior PT:5/3 S:Mode$ Continuous | Affected$ Card.Self | CanBlockAmount$ 1 | Description$ CARDNAME can block an additional creature each combat. -T:Mode$ Blocks | ValidCard$ Card.Self | CheckSVar$ X | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks two or more creatures, it gains first strike until end of turn. +T:Mode$ Blocks | ValidCard$ Card.Self | IsPresent$ Creature.blockedBySource | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME blocks two or more creatures, it gains first strike until end of turn. SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ First Strike | SpellDescription$ CARDNAME gains first strike until end of turn. -SVar:X:Count$Valid Creature.blockedBySource Oracle:Lairwatch Giant can block an additional creature each combat.\nWhenever Lairwatch Giant blocks two or more creatures, it gains first strike until end of turn. diff --git a/forge-gui/res/cardsfolder/l/legions_landing_adanto_the_first_fort.txt b/forge-gui/res/cardsfolder/l/legions_landing_adanto_the_first_fort.txt index 768dff86028..caaeea425b8 100644 --- a/forge-gui/res/cardsfolder/l/legions_landing_adanto_the_first_fort.txt +++ b/forge-gui/res/cardsfolder/l/legions_landing_adanto_the_first_fort.txt @@ -3,9 +3,8 @@ ManaCost:W Types:Legendary Enchantment T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigToken | TriggerDescription$ When CARDNAME enters the battlefield, create a 1/1 white Vampire creature token with lifelink. SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ w_1_1_vampire_lifelink | TokenOwner$ You -T:Mode$ AttackersDeclared | Execute$ DBTransform | CheckSVar$ NumAttackers | SVarCompare$ GE3 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ When you attack with three or more creatures, transform CARDNAME. +T:Mode$ AttackersDeclared | Execute$ DBTransform | IsPresent$ Creature.attacking | PresentCompare$ GE3 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ When you attack with three or more creatures, transform CARDNAME. SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform -SVar:NumAttackers:Count$Valid Creature.attacking AlternateMode:DoubleFaced Oracle:When Legion's Landing enters the battlefield, create a 1/1 white Vampire creature token with lifelink.\nWhen you attack with three or more creatures, transform Legion's Landing. diff --git a/forge-gui/res/cardsfolder/l/limited_resources.txt b/forge-gui/res/cardsfolder/l/limited_resources.txt index 337980805a8..703b011086e 100644 --- a/forge-gui/res/cardsfolder/l/limited_resources.txt +++ b/forge-gui/res/cardsfolder/l/limited_resources.txt @@ -6,8 +6,7 @@ SVar:DBRepeatResources:DB$ RepeatEach | RepeatPlayers$ Player | RepeatSubAbility SVar:CardChoice:DB$ ChooseCard | Defined$ Remembered | Amount$ 5 | Choices$ Land.RememberedPlayerCtrl | ChoiceTitle$ Choose a land | RememberChosen$ True | SubAbility$ SacRest SVar:SacRest:DB$ SacrificeAll | ValidCards$ Land.RememberedPlayerCtrl+IsNotRemembered | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -S:Mode$ CantPlayLand | CheckSVar$ X | SVarCompare$ GE10 | Description$ Players can't play lands as long as ten or more lands are on the battlefield. -SVar:X:Count$Valid Land +S:Mode$ CantPlayLand | IsPresent$ Land | PresentCompare$ GE10 | Description$ Players can't play lands as long as ten or more lands are on the battlefield. SVar:NonStackingEffect:True AI:RemoveDeck:All AI:RemoveDeck:Random diff --git a/forge-gui/res/cardsfolder/l/lurebound_scarecrow.txt b/forge-gui/res/cardsfolder/l/lurebound_scarecrow.txt index 2b30a6b0e30..4f84148c29c 100644 --- a/forge-gui/res/cardsfolder/l/lurebound_scarecrow.txt +++ b/forge-gui/res/cardsfolder/l/lurebound_scarecrow.txt @@ -4,8 +4,7 @@ Types:Artifact Creature Scarecrow PT:4/4 K:ETBReplacement:Other:ChooseColor SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentComputerControls -T:Mode$ Always | CheckSVar$ X | SVarCompare$ EQ0 | TriggerZones$ Battlefield | Execute$ TrigSacrifice | TriggerDescription$ When you control no permanents of the chosen color, sacrifice CARDNAME. +T:Mode$ Always | IsPresent$ Permanent.YouCtrl+ChosenColor | PresentCompare$ EQ0 | TriggerZones$ Battlefield | Execute$ TrigSacrifice | TriggerDescription$ When you control no permanents of the chosen color, sacrifice CARDNAME. SVar:TrigSacrifice:AB$ Sacrifice | Cost$ 0 -SVar:X:Count$Valid Permanent.YouCtrl+ChosenColor SVar:NeedsToPlay:Permanent.nonColorless+YouCtrl Oracle:As Lurebound Scarecrow enters the battlefield, choose a color.\nWhen you control no permanents of the chosen color, sacrifice Lurebound Scarecrow. diff --git a/forge-gui/res/cardsfolder/l/lyzolda_the_blood_witch.txt b/forge-gui/res/cardsfolder/l/lyzolda_the_blood_witch.txt index ff1fa248a9b..849bd22f0b7 100644 --- a/forge-gui/res/cardsfolder/l/lyzolda_the_blood_witch.txt +++ b/forge-gui/res/cardsfolder/l/lyzolda_the_blood_witch.txt @@ -2,9 +2,7 @@ Name:Lyzolda, the Blood Witch ManaCost:1 B R Types:Legendary Creature Human Cleric PT:3/1 -A:AB$ DealDamage | Cost$ 2 Sac<1/Creature> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 2 damage to any target if the sacrificed creature was red. Draw a card if the sacrificed creature was black. -SVar:DBDraw:DB$ Draw | NumCards$ 1 | Defined$ You | ConditionCheckSVar$ Y | ConditionSVarCompare$ GE1 -SVar:X:Sacrificed$Valid Creature.Red -SVar:Y:Sacrificed$Valid Creature.Black +A:AB$ DealDamage | Cost$ 2 Sac<1/Creature> | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | ConditionDefined$ Sacrificed | ConditionPresent$ Card.Red | SubAbility$ DBDraw | SpellDescription$ CARDNAME deals 2 damage to any target if the sacrificed creature was red. Draw a card if the sacrificed creature was black. +SVar:DBDraw:DB$ Draw | NumCards$ 1 | Defined$ You | ConditionDefined$ Sacriciced | ConditionPresent$ Card.Black AI:RemoveDeck:All Oracle:{2}, Sacrifice a creature: Lyzolda, the Blood Witch deals 2 damage to any target if the sacrificed creature was red. Draw a card if the sacrificed creature was black. diff --git a/forge-gui/res/cardsfolder/m/magmatic_channeler.txt b/forge-gui/res/cardsfolder/m/magmatic_channeler.txt index 46920148981..49eafca97b9 100644 --- a/forge-gui/res/cardsfolder/m/magmatic_channeler.txt +++ b/forge-gui/res/cardsfolder/m/magmatic_channeler.txt @@ -2,8 +2,7 @@ Name:Magmatic Channeler ManaCost:1 R Types:Creature Human Wizard PT:1/3 -S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 1 | CheckSVar$ X | SVarCompare$ GE4 | Description$ As long as there are four or more instant and/or sorcery cards in your graveyard, CARDNAME gets +3/+1. -SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn +S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 3 | AddToughness$ 1 | IsPresent$ Instant.YouOwn,Sorcery.YouOwn | PresentZone$ Graveyard | PresentCompare$ GE4 | Description$ As long as there are four or more instant and/or sorcery cards in your graveyard, CARDNAME gets +3/+1. A:AB$ Dig | Cost$ T Discard<1/Card> | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBChoose | StackDescription$ SpellDescription | SpellDescription$ Exile the top two cards of your library, then choose one of them. You may play that card this turn. SVar:DBChoose:DB$ ChooseCard | Defined$ You | Amount$ 1 | Choices$ Card.IsRemembered | ChoiceZone$ Exile | ChoiceTitle$ Choose one of the exiled cards | SubAbility$ DBEffect SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | ExileOnMoved$ Exile | RememberObjects$ ChosenCard | SubAbility$ DBCleanup diff --git a/forge-gui/res/cardsfolder/m/magnigoth_treefolk.txt b/forge-gui/res/cardsfolder/m/magnigoth_treefolk.txt index b15871c8f0d..59e347a677a 100644 --- a/forge-gui/res/cardsfolder/m/magnigoth_treefolk.txt +++ b/forge-gui/res/cardsfolder/m/magnigoth_treefolk.txt @@ -2,14 +2,9 @@ Name:Magnigoth Treefolk ManaCost:4 G Types:Creature Treefolk PT:2/6 -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Plainswalk | CheckSVar$ P | SVarCompare$ GE1 | Description$ Domain — For each basic land type among lands you control, CARDNAME has landwalk of that type -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Islandwalk | CheckSVar$ I | SVarCompare$ GE1 -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Swampwalk | CheckSVar$ S | SVarCompare$ GE1 -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Mountainwalk | CheckSVar$ M | SVarCompare$ GE1 -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Forestwalk | CheckSVar$ F | SVarCompare$ GE1 -SVar:P:Count$Valid Plains.YouCtrl -SVar:I:Count$Valid Island.YouCtrl -SVar:S:Count$Valid Swamp.YouCtrl -SVar:M:Count$Valid Mountain.YouCtrl -SVar:F:Count$Valid Forest.YouCtrl +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Plainswalk | IsPresent$ Plains.YouCtrl | Description$ Domain — For each basic land type among lands you control, CARDNAME has landwalk of that type +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Islandwalk | IsPresent$ Island.YouCtrl +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Swampwalk | IsPresent$ Swamp.YouCtrl +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Mountainwalk | IsPresent$ Mountain.YouCtrl +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Forestwalk | IsPresent$ Forest.YouCtrl Oracle:Domain — For each basic land type among lands you control, Magnigoth Treefolk has landwalk of that type. (It can't be blocked as long as defending player controls a land of that type.) diff --git a/forge-gui/res/cardsfolder/m/makeshift_battalion.txt b/forge-gui/res/cardsfolder/m/makeshift_battalion.txt index 97fd762b6ec..ba70e5e585a 100644 --- a/forge-gui/res/cardsfolder/m/makeshift_battalion.txt +++ b/forge-gui/res/cardsfolder/m/makeshift_battalion.txt @@ -2,8 +2,7 @@ Name:Makeshift Battalion ManaCost:2 W Types:Creature Human Soldier PT:3/2 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ AttackerTest | SVarCompare$ GE2 | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME and at least two other creatures attack, put a +1/+1 counter on CARDNAME. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | PresentCompare$ GE2 | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME and at least two other creatures attack, put a +1/+1 counter on CARDNAME. SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ 1 -SVar:AttackerTest:Count$Valid Creature.attacking+Other DeckHas:Ability$Counters Oracle:Whenever Makeshift Battalion and at least two other creatures attack, put a +1/+1 counter on Makeshift Battalion. diff --git a/forge-gui/res/cardsfolder/m/military_intelligence.txt b/forge-gui/res/cardsfolder/m/military_intelligence.txt index 812cd15ac62..bd7d4bdde40 100644 --- a/forge-gui/res/cardsfolder/m/military_intelligence.txt +++ b/forge-gui/res/cardsfolder/m/military_intelligence.txt @@ -1,8 +1,7 @@ Name:Military Intelligence ManaCost:1 U Types:Enchantment -T:Mode$ AttackersDeclared | Execute$ TrigDraw | CheckSVar$ OverwhelmInstinct | SVarCompare$ GE2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more creatures, draw a card. +T:Mode$ AttackersDeclared | Execute$ TrigDraw | IsPresent$ Creature.attacking+YouCtrl | PresentCompare$ GE2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more creatures, draw a card. SVar:TrigDraw:DB$ Draw | NumCards$ 1 SVar:PlayMain1:TRUE -SVar:OverwhelmInstinct:Count$Valid Creature.attacking+YouCtrl Oracle:Whenever you attack with two or more creatures, draw a card. diff --git a/forge-gui/res/cardsfolder/m/misers_cage.txt b/forge-gui/res/cardsfolder/m/misers_cage.txt index 95d6392554d..e9e3e4d754e 100644 --- a/forge-gui/res/cardsfolder/m/misers_cage.txt +++ b/forge-gui/res/cardsfolder/m/misers_cage.txt @@ -1,7 +1,6 @@ Name:Misers' Cage ManaCost:3 Types:Artifact -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | CheckSVar$ CardsInHand | SVarCompare$ GE5 | Execute$ TrigDamageOpp | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, if that player has five or more cards in hand, CARDNAME deals 2 damage to that player. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Card.ActivePlayerCtrl | PresentZone$ Hand | PresentCompare$ GE5 | Execute$ TrigDamageOpp | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, if that player has five or more cards in hand, CARDNAME deals 2 damage to that player. SVar:TrigDamageOpp:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 2 -SVar:CardsInHand:Count$ValidHand Card.ActivePlayerCtrl Oracle:At the beginning of each opponent's upkeep, if that player has five or more cards in hand, Misers' Cage deals 2 damage to that player. diff --git a/forge-gui/res/cardsfolder/n/nav_squad_commandos.txt b/forge-gui/res/cardsfolder/n/nav_squad_commandos.txt index 40d4dafd369..e04ca53f660 100644 --- a/forge-gui/res/cardsfolder/n/nav_squad_commandos.txt +++ b/forge-gui/res/cardsfolder/n/nav_squad_commandos.txt @@ -2,8 +2,7 @@ Name:Nav Squad Commandos ManaCost:4 W Types:Creature Human Soldier PT:3/5 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +1/+1 until end of turn. Untap it. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +1/+1 until end of turn. Untap it. SVar:TrigBattalionPump:DB$ Pump | Defined$ Self | NumAtt$ 1 | NumDef$ 1 | SubAbility$ DBUntap SVar:DBUntap:DB$ Untap | Defined$ Self -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Nav Squad Commandos and at least two other creatures attack, Nav Squad Commandos gets +1/+1 until end of turn. Untap it. diff --git a/forge-gui/res/cardsfolder/o/ophiomancer.txt b/forge-gui/res/cardsfolder/o/ophiomancer.txt index 3f1fd2f7bdf..94346db5085 100644 --- a/forge-gui/res/cardsfolder/o/ophiomancer.txt +++ b/forge-gui/res/cardsfolder/o/ophiomancer.txt @@ -2,7 +2,6 @@ Name:Ophiomancer ManaCost:2 B Types:Creature Human Shaman PT:2/2 -T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigToken | CheckSVar$ X | SVarCompare$ EQ0 | TriggerDescription$ At the beginning of each upkeep, if you control no Snakes, create a 1/1 black Snake creature token with deathtouch. +T:Mode$ Phase | Phase$ Upkeep | TriggerZones$ Battlefield | Execute$ TrigToken | IsPresent$ Snake.YouCtrl | PresentCompare$ EQ0 | TriggerDescription$ At the beginning of each upkeep, if you control no Snakes, create a 1/1 black Snake creature token with deathtouch. SVar:TrigToken:DB$ Token | TokenAmount$ 1 | TokenScript$ b_1_1_snake_deathtouch | TokenOwner$ You -SVar:X:Count$Valid Snake.YouCtrl Oracle:At the beginning of each upkeep, if you control no Snakes, create a 1/1 black Snake creature token with deathtouch. diff --git a/forge-gui/res/cardsfolder/o/ordruun_veteran.txt b/forge-gui/res/cardsfolder/o/ordruun_veteran.txt index d9e5507106c..f79c418ea09 100644 --- a/forge-gui/res/cardsfolder/o/ordruun_veteran.txt +++ b/forge-gui/res/cardsfolder/o/ordruun_veteran.txt @@ -2,7 +2,6 @@ Name:Ordruun Veteran ManaCost:2 R W Types:Creature Minotaur Soldier PT:3/1 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gains double strike until end of turn. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gains double strike until end of turn. SVar:TrigBattalionPump:DB$ Pump | KW$ Double Strike | Defined$ Self -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Ordruun Veteran and at least two other creatures attack, Ordruun Veteran gains double strike until end of turn. (It deals both first-strike and regular combat damage.) diff --git a/forge-gui/res/cardsfolder/p/paupers_cage.txt b/forge-gui/res/cardsfolder/p/paupers_cage.txt index be9ed8f6618..cc67e00fbd3 100644 --- a/forge-gui/res/cardsfolder/p/paupers_cage.txt +++ b/forge-gui/res/cardsfolder/p/paupers_cage.txt @@ -1,7 +1,6 @@ Name:Paupers' Cage ManaCost:3 Types:Artifact -T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | CheckSVar$ CardsInHand | SVarCompare$ LE2 | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, CARDNAME deals 2 damage to that player. +T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ Opponent | IsPresent$ Card.ActivePlayerCtrl | PresentZone$ Hand | PresentCompare$ LE2 | Execute$ TrigDamage | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, CARDNAME deals 2 damage to that player. SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredPlayer | NumDmg$ 2 -SVar:CardsInHand:Count$ValidHand Card.ActivePlayerCtrl Oracle:At the beginning of each opponent's upkeep, if that player has two or fewer cards in hand, Paupers' Cage deals 2 damage to that player. diff --git a/forge-gui/res/cardsfolder/p/pay_tribute_to_me.txt b/forge-gui/res/cardsfolder/p/pay_tribute_to_me.txt index b47aadbde1e..73f3974b567 100644 --- a/forge-gui/res/cardsfolder/p/pay_tribute_to_me.txt +++ b/forge-gui/res/cardsfolder/p/pay_tribute_to_me.txt @@ -3,6 +3,5 @@ ManaCost:no cost Types:Scheme T:Mode$ SetInMotion | ValidCard$ Card.Self | Execute$ DBSac | TriggerZones$ Command | TriggerDescription$ When you set this scheme in motion, each opponent sacrifices a creature. If you control six or more lands, each opponent sacrifices another creature. SVar:DBSac:DB$ Sacrifice | SacValid$ Creature | Defined$ Player.Opponent | SubAbility$ DBSac2 -SVar:DBSac2:DB$ Sacrifice | SacValid$ Creature | Defined$ Player.Opponent | ConditionCheckSVar$ X | ConditionSVarCompare$ GE6 -SVar:X:Count$Valid Land.YouCtrl +SVar:DBSac2:DB$ Sacrifice | SacValid$ Creature | Defined$ Player.Opponent | ConditionPresent$ Land.YouCtrl | PresentCompare$ GE6 Oracle:When you set this scheme in motion, each opponent sacrifices a creature. If you control six or more lands, each opponent sacrifices another creature. diff --git a/forge-gui/res/cardsfolder/r/rahilda_wanted_cutthroat_rahilda_feral_outlaw.txt b/forge-gui/res/cardsfolder/r/rahilda_wanted_cutthroat_rahilda_feral_outlaw.txt index a1b464642ab..441ad30be14 100644 --- a/forge-gui/res/cardsfolder/r/rahilda_wanted_cutthroat_rahilda_feral_outlaw.txt +++ b/forge-gui/res/cardsfolder/r/rahilda_wanted_cutthroat_rahilda_feral_outlaw.txt @@ -8,8 +8,7 @@ SVar:TrigExile:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPl SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ExileOnMoved$ Exile | Duration$ Permanent SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreColor$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | CheckSVar$ X | Description$ During any turn you attacked with a Wolf or Werewolf, you may cast that card and you may spend mana as though it were mana of any color to cast that spell. SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$CreaturesAttackedThisTurn Creature.Wolf+YouCtrl/Plus.Y -SVar:Y:Count$CreaturesAttackedThisTurn Creature.Werewolf+YouCtrl +SVar:X:Count$CreaturesAttackedThisTurn Creature.Wolf+YouCtrl,Creature.Werewolf+YouCtrl K:Daybound DeckHints:Type$Wolf|Werewolf AlternateMode:DoubleFaced @@ -28,7 +27,6 @@ SVar:TrigExile:DB$ ChangeZone | Origin$ Library | Destination$ Exile | DefinedPl SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ STPlay | SubAbility$ DBCleanup | ExileOnMoved$ Exile | Duration$ Permanent SVar:STPlay:Mode$ Continuous | MayPlay$ True | MayPlayIgnoreColor$ True | EffectZone$ Command | Affected$ Card.IsRemembered+nonLand | AffectedZone$ Exile | CheckSVar$ X | Description$ During any turn you attacked with a Wolf or Werewolf, you may cast that card and you may spend mana as though it were mana of any color to cast that spell. SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:X:Count$CreaturesAttackedThisTurn Creature.Wolf+YouCtrl/Plus.Y -SVar:Y:Count$CreaturesAttackedThisTurn Creature.Werewolf+YouCtrl +SVar:X:Count$CreaturesAttackedThisTurn Creature.Wolf+YouCtrl,Creature.Werewolf+YouCtrl K:Nightbound Oracle:Double strike\nWhen Rahilda, Feral Outlaw deals combat damage to a player, exile a nonland card from their library at random. During any turn you attacked with a Wolf or Werewolf, you may cast that card and you may spend mana as though it were mana of any color to cast that spell.\nNightbound diff --git a/forge-gui/res/cardsfolder/r/reaper_of_night_harvest_fear.txt b/forge-gui/res/cardsfolder/r/reaper_of_night_harvest_fear.txt index fafe1aa4fb0..094b728c7b5 100644 --- a/forge-gui/res/cardsfolder/r/reaper_of_night_harvest_fear.txt +++ b/forge-gui/res/cardsfolder/r/reaper_of_night_harvest_fear.txt @@ -2,8 +2,7 @@ Name:Reaper of Night ManaCost:5 B B Types:Creature Specter PT:4/5 -T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | CheckSVar$ X | SVarCompare$ LE2 | TriggerDescription$ Whenever CARDNAME attacks, if defending player has two or fewer cards in hand, it gains flying until end of turn. -SVar:X:Count$ValidHand Card.DefenderCtrl +T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigPump | IsPresent$ Card.DefenderCtrl | PresentZone$ Hand | PresentCompare$ LE2 | TriggerDescription$ Whenever CARDNAME attacks, if defending player has two or fewer cards in hand, it gains flying until end of turn. SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Flying AlternateMode:Adventure Oracle:Whenever Reaper of Night attacks, if defending player has two or fewer cards in hand, it gains flying until end of turn. diff --git a/forge-gui/res/cardsfolder/s/scuttling_butler.txt b/forge-gui/res/cardsfolder/s/scuttling_butler.txt index fe4c7c940a9..23f59462099 100644 --- a/forge-gui/res/cardsfolder/s/scuttling_butler.txt +++ b/forge-gui/res/cardsfolder/s/scuttling_butler.txt @@ -2,7 +2,6 @@ Name:Scuttling Butler ManaCost:3 Types:Artifact Creature Construct PT:4/1 -T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE2 | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, if you control two or more multicolored permanents, CARDNAME gains double strike until end of turn. +T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | IsPresent$ Permanent.MultiColor+YouCtrl | PresentCompare$ GE2 | Execute$ TrigPump | TriggerDescription$ At the beginning of combat on your turn, if you control two or more multicolored permanents, CARDNAME gains double strike until end of turn. SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Double Strike -SVar:X:Count$Valid Permanent.MultiColor+YouCtrl Oracle:At the beginning of combat on your turn, if you control two or more multicolored permanents, Scuttling Butler gains double strike until end of turn. diff --git a/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt b/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt index 9076ff00823..043f4b4a49b 100644 --- a/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt +++ b/forge-gui/res/cardsfolder/s/search_for_azcanta_azcanta_the_sunken_ruin.txt @@ -3,8 +3,7 @@ ManaCost:1 U Types:Legendary Enchantment T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigSurveil | TriggerDescription$ At the beginning of your upkeep, surveil 1. Then if you have seven or more cards in your graveyard, you may transform CARDNAME. (Look at the top card of your library. You may put that card into your graveyard.) SVar:TrigSurveil:DB$ Surveil | Amount$ 1 | SubAbility$ DBTransform | SpellDescription$ Surveil 1. Then if you have seven or more cards in your graveyard, you may transform CARDNAME (Look at the top card of your library. You may put that card into your graveyard.) -SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform | Optional$ True | ConditionCheckSVar$ GraveCount | ConditionSVarCompare$ GE7 -SVar:GraveCount:Count$ValidGraveyard Card.YouOwn +SVar:DBTransform:DB$ SetState | Defined$ Self | Mode$ Transform | Optional$ True | IsPresent$ Card.YouOwn | PresentZone$ Graveyard | PresentCompare$ GE7 DeckHas:Ability$Surveil|Graveyard AlternateMode:DoubleFaced Oracle:At the beginning of your upkeep, surveil 1. Then if you have seven or more cards in your graveyard, you may transform Search for Azcanta. (Look at the top card of your library. You may put that card into your graveyard.) diff --git a/forge-gui/res/cardsfolder/s/serra_avenger.txt b/forge-gui/res/cardsfolder/s/serra_avenger.txt index ccaa2ccc470..afacb8d9ae9 100644 --- a/forge-gui/res/cardsfolder/s/serra_avenger.txt +++ b/forge-gui/res/cardsfolder/s/serra_avenger.txt @@ -4,6 +4,6 @@ Types:Creature Angel PT:3/3 K:Flying K:Vigilance -S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ All | CheckSVar$ X | SVarCompare$ LE3 | Description$ You can't play Serra Avenger during your first, second, or third turns of the game. +S:Mode$ CantBeCast | ValidCard$ Card.Self | EffectZone$ All | CheckSVar$ X | SVarCompare$ LE3 | Description$ You can't cast this spell during your first, second, or third turns of the game. SVar:X:Count$YourTurns Oracle:You can't cast this spell during your first, second, or third turns of the game.\nFlying, vigilance diff --git a/forge-gui/res/cardsfolder/s/shadows_of_the_past.txt b/forge-gui/res/cardsfolder/s/shadows_of_the_past.txt index f7b5ea3d1bb..db5349fc8c6 100644 --- a/forge-gui/res/cardsfolder/s/shadows_of_the_past.txt +++ b/forge-gui/res/cardsfolder/s/shadows_of_the_past.txt @@ -3,7 +3,6 @@ ManaCost:1 B Types:Enchantment T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature | TriggerZones$ Battlefield | Execute$ TrigScry | TriggerDescription$ Whenever a creature dies, scry 1. SVar:TrigScry:DB$ Scry | ScryNum$ 1 -A:AB$ LoseLife | Cost$ 4 B | Defined$ Player.Opponent | LifeAmount$ 2 | CheckSVar$ X | SVarCompare$ GE4 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 2 life and you gain 2 life. Activate only if there are four or more creature cards in your graveyard. +A:AB$ LoseLife | Cost$ 4 B | Defined$ Player.Opponent | LifeAmount$ 2 | IsPresent$ Creature.YouOwn | PresentZone$ Graveyard | PresentCompare$ GE4 | SubAbility$ DBGainLife | SpellDescription$ Each opponent loses 2 life and you gain 2 life. Activate only if there are four or more creature cards in your graveyard. SVar:DBGainLife:DB$ GainLife | Defined$ You | LifeAmount$ 2 -SVar:X:Count$ValidGraveyard Creature.YouOwn Oracle:Whenever a creature dies, scry 1. (Look at the top card of your library. You may put that card on the bottom of your library.)\n{4}{B}: Each opponent loses 2 life and you gain 2 life. Activate only if there are four or more creature cards in your graveyard. diff --git a/forge-gui/res/cardsfolder/s/shauku_endbringer.txt b/forge-gui/res/cardsfolder/s/shauku_endbringer.txt index 37193dd9e07..e32632a6528 100644 --- a/forge-gui/res/cardsfolder/s/shauku_endbringer.txt +++ b/forge-gui/res/cardsfolder/s/shauku_endbringer.txt @@ -3,12 +3,11 @@ ManaCost:5 B B Types:Legendary Creature Vampire PT:5/5 K:Flying -S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | CheckSVar$ X | SVarCompare$ GT1 | Description$ CARDNAME can't attack if another creature is on the battlefield. +S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. | IsPresent$ Creature | PresentCompare$ GT1 | Description$ CARDNAME can't attack if another creature is on the battlefield. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigLoseLife | TriggerDescription$ At the beginning of your upkeep, you lose 3 life. A:AB$ ChangeZone | Cost$ T | ValidTgts$ Creature | Origin$ Battlefield | Destination$ Exile | TgtPrompt$ Select target creature | SubAbility$ DBCounter | SpellDescription$ Exile target creature and put a +1/+1 counter on CARDNAME. SVar:TrigLoseLife:DB$ LoseLife | Defined$ You | LifeAmount$ 3 SVar:DBCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | Defined$ Self -SVar:X:Count$Valid Creature #TODO: This creature seems almost AI playable, except the AI won't play around it and will cast other creatures, which may not even be a necessarily bad thing. Maybe RemRandomDeck would suffice here. AI:RemoveDeck:All Oracle:Flying\nShauku, Endbringer can't attack if there's another creature on the battlefield.\nAt the beginning of your upkeep, you lose 3 life.\n{T}: Exile target creature and put a +1/+1 counter on Shauku. diff --git a/forge-gui/res/cardsfolder/s/sigarda_champion_of_light.txt b/forge-gui/res/cardsfolder/s/sigarda_champion_of_light.txt index 263884a0b2c..16d9c11582b 100644 --- a/forge-gui/res/cardsfolder/s/sigarda_champion_of_light.txt +++ b/forge-gui/res/cardsfolder/s/sigarda_champion_of_light.txt @@ -5,7 +5,7 @@ PT:4/4 K:Flying K:Trample S:Mode$ Continuous | Affected$ Creature.Human+YouCtrl | AddPower$ 1 | AddToughness$ 1 | Description$ Humans you control get +1/+1. -T:Mode$ Attacks | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigDig | TriggerDescription$ Coven — Whenever Sigarda attacks, if you control three or more creatures with different powers, look at the top five cards of your library. You may reveal a Human creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. +T:Mode$ Attacks | ValidCard$ Card.Self | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigDig | TriggerDescription$ Coven — Whenever NICKNAME attacks, if you control three or more creatures with different powers, look at the top five cards of your library. You may reveal a Human creature card from among them and put it into your hand. Put the rest on the bottom of your library in a random order. SVar:TrigDig:DB$ Dig | DigNum$ 5 | ChangeNum$ 1 | Optional$ True | ChangeValid$ Creature.Human SVar:X:Count$DifferentPower_Creature.YouCtrl DeckNeeds:Type$Human diff --git a/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt b/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt index 11b683a753c..26d66335f20 100644 --- a/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt +++ b/forge-gui/res/cardsfolder/s/skarrgan_firebird.txt @@ -5,5 +5,5 @@ PT:3/3 K:Bloodthirst:3 K:Flying A:AB$ ChangeZone | Cost$ R R R | Origin$ Graveyard | Destination$ Hand | ActivationZone$ Graveyard | CheckSVar$ OppDamaged | SVarCompare$ GE1 | SpellDescription$ Return CARDNAME from your graveyard to your hand. Activate only if an opponent was dealt damage this turn. -SVar:OppDamaged:PlayerCountPropertyYou$DamageToOppsThisTurn +SVar:OppDamaged:PlayerCountOpponents$HasPropertywasDealtDamageThisTurn Oracle:Bloodthirst 3 (If an opponent was dealt damage this turn, this creature enters the battlefield with three +1/+1 counters on it.)\nFlying\n{R}{R}{R}: Return Skarrgan Firebird from your graveyard to your hand. Activate only if an opponent was dealt damage this turn. diff --git a/forge-gui/res/cardsfolder/s/spectral_guardian.txt b/forge-gui/res/cardsfolder/s/spectral_guardian.txt index 7c2b5024017..0b38e77b986 100644 --- a/forge-gui/res/cardsfolder/s/spectral_guardian.txt +++ b/forge-gui/res/cardsfolder/s/spectral_guardian.txt @@ -2,6 +2,5 @@ Name:Spectral Guardian ManaCost:2 W W Types:Creature Spirit PT:2/3 -S:Mode$ Continuous | Affected$ Artifact.nonCreature | AddKeyword$ Shroud | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is untapped, noncreature artifacts have shroud. (They can't be the targets of spells or abilities.) -SVar:X:Count$Valid Card.Self+untapped +S:Mode$ Continuous | Affected$ Artifact.nonCreature | AddKeyword$ Shroud | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, noncreature artifacts have shroud. (They can't be the targets of spells or abilities.) Oracle:As long as Spectral Guardian is untapped, noncreature artifacts have shroud. (They can't be the targets of spells or abilities.) diff --git a/forge-gui/res/cardsfolder/s/spelleater_wolverine.txt b/forge-gui/res/cardsfolder/s/spelleater_wolverine.txt index dc5f922b4f4..3e0c40130d7 100644 --- a/forge-gui/res/cardsfolder/s/spelleater_wolverine.txt +++ b/forge-gui/res/cardsfolder/s/spelleater_wolverine.txt @@ -2,7 +2,6 @@ Name:Spelleater Wolverine ManaCost:2 R Types:Creature Wolverine PT:3/2 -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | CheckSVar$ X | SVarCompare$ GE3 | Description$ CARDNAME has double strike as long as there are three or more instant and/or sorcery cards in your graveyard. -SVar:X:Count$ValidGraveyard Instant.YouOwn,Sorcery.YouOwn +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Double Strike | IsPresent$ Instant.YouOwn,Sorcery.YouOwn | PresentZone$ Graveyard | PresentCompare$ GE3 | Description$ CARDNAME has double strike as long as there are three or more instant and/or sorcery cards in your graveyard. DeckHints:Type$Instant|Sorcery Oracle:Spelleater Wolverine has double strike as long as there are three or more instant and/or sorcery cards in your graveyard. diff --git a/forge-gui/res/cardsfolder/s/static_orb.txt b/forge-gui/res/cardsfolder/s/static_orb.txt index f4172482ae2..0a0d850c79b 100644 --- a/forge-gui/res/cardsfolder/s/static_orb.txt +++ b/forge-gui/res/cardsfolder/s/static_orb.txt @@ -1,8 +1,7 @@ Name:Static Orb ManaCost:3 Types:Artifact -S:Mode$ Continuous | Affected$ Player | AddKeyword$ UntapAdjust:Permanent:2 | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is untapped, players can't untap more than two permanents during their untap steps. -SVar:X:Count$Valid Card.Self+untapped +S:Mode$ Continuous | Affected$ Player | AddKeyword$ UntapAdjust:Permanent:2 | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, players can't untap more than two permanents during their untap steps. AI:RemoveDeck:All AI:RemoveDeck:Random SVar:NonStackingEffect:True diff --git a/forge-gui/res/cardsfolder/s/storage_matrix.txt b/forge-gui/res/cardsfolder/s/storage_matrix.txt index d1c1ab46475..e8ef1063d8a 100644 --- a/forge-gui/res/cardsfolder/s/storage_matrix.txt +++ b/forge-gui/res/cardsfolder/s/storage_matrix.txt @@ -1,8 +1,7 @@ Name:Storage Matrix ManaCost:3 Types:Artifact -S:Mode$ Continuous | Affected$ Player | AddKeyword$ OnlyUntapChosen:Artifact,Creature,Land | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is untapped, each player chooses artifact, creature, or land during their untap step. That player can untap only permanents of the chosen type this step. -SVar:X:Count$Valid Card.Self+untapped +S:Mode$ Continuous | Affected$ Player | AddKeyword$ OnlyUntapChosen:Artifact,Creature,Land | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, each player chooses artifact, creature, or land during their untap step. That player can untap only permanents of the chosen type this step. AI:RemoveDeck:All AI:RemoveDeck:Random Oracle:As long as Storage Matrix is untapped, each player chooses artifact, creature, or land during their untap step. That player can untap only permanents of the chosen type this step. diff --git a/forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt b/forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt index c9176a61e50..1b5d87b6a3f 100644 --- a/forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt +++ b/forge-gui/res/cardsfolder/t/tajic_blade_of_the_legion.txt @@ -3,7 +3,6 @@ ManaCost:2 R W Types:Legendary Creature Human Soldier PT:2/2 K:Indestructible -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +5/+5 until end of turn. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +5/+5 until end of turn. SVar:TrigBattalionPump:DB$ Pump | NumAtt$ +5 | NumDef$ +5 -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Indestructible\nBattalion — Whenever Tajic, Blade of the Legion and at least two other creatures attack, Tajic gets +5/+5 until end of turn. diff --git a/forge-gui/res/cardsfolder/t/tenacious_hunter.txt b/forge-gui/res/cardsfolder/t/tenacious_hunter.txt index 6ff503035fd..f9af9a440dc 100644 --- a/forge-gui/res/cardsfolder/t/tenacious_hunter.txt +++ b/forge-gui/res/cardsfolder/t/tenacious_hunter.txt @@ -2,6 +2,5 @@ Name:Tenacious Hunter ManaCost:2 G G Types:Creature Crocodile PT:4/4 -S:Mode$ Continuous | Affected$ Card.Self | CheckSVar$ X | SVarCompare$ GE1 | AddKeyword$ Vigilance & Deathtouch | Description$ As long as a creature has a -1/-1 counter on it, CARDNAME has vigilance and deathtouch. -SVar:X:Count$Valid Creature.counters_GE1_M1M1 +S:Mode$ Continuous | Affected$ Card.Self | IsPresent$ Creature.counters_GE1_M1M1 | AddKeyword$ Vigilance & Deathtouch | Description$ As long as a creature has a -1/-1 counter on it, CARDNAME has vigilance and deathtouch. Oracle:As long as a creature has a -1/-1 counter on it, Tenacious Hunter has vigilance and deathtouch. diff --git a/forge-gui/res/cardsfolder/t/thassas_oracle.txt b/forge-gui/res/cardsfolder/t/thassas_oracle.txt index 9d8a134ea07..ea4339dc071 100644 --- a/forge-gui/res/cardsfolder/t/thassas_oracle.txt +++ b/forge-gui/res/cardsfolder/t/thassas_oracle.txt @@ -2,9 +2,9 @@ Name:Thassa's Oracle ManaCost:U U Types:Creature Merfolk Wizard PT:1/3 -SVar:X:Count$Devotion.Blue -SVar:Y:Count$InYourLibrary T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Any | Destination$ Battlefield | Execute$ TrigDig | TriggerDescription$ When CARDNAME enters the battlefield, look at the top X cards of your library, where X is your devotion to blue. Put one of them on top of your library and the rest on the bottom of your library in a random order. If X is greater than or equal to the number of cards in your library, you win the game. SVar:TrigDig:DB$ Dig | DigNum$ X | ChangeNum$ 1 | DestinationZone$ Library | LibraryPosition$ 0 | RestRandomOrder$ True | SubAbility$ DBWin SVar:DBWin:DB$ WinsGame | Defined$ You | ConditionCheckSVar$ Y | ConditionSVarCompare$ LEX +SVar:X:Count$Devotion.Blue +SVar:Y:Count$InYourLibrary Oracle:When Thassa's Oracle enters the battlefield, look at the top X cards of your library, where X is your devotion to blue. Put up to one of them on top of your library and the rest on the bottom of your library in a random order. If X is greater than or equal to the number of cards in your library, you win the game. (Each {U} in the mana costs of permanents you control counts toward your devotion to blue.) diff --git a/forge-gui/res/cardsfolder/t/thunderstaff.txt b/forge-gui/res/cardsfolder/t/thunderstaff.txt index 832b29ae8cc..0e1cc864264 100644 --- a/forge-gui/res/cardsfolder/t/thunderstaff.txt +++ b/forge-gui/res/cardsfolder/t/thunderstaff.txt @@ -1,8 +1,7 @@ Name:Thunderstaff ManaCost:3 Types:Artifact -R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature | ValidTarget$ You | IsCombat$ True | ReplaceWith$ DBReplace | PreventionEffect$ True | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is untapped, if a creature would deal combat damage to you, prevent 1 of that damage. +R:Event$ DamageDone | ActiveZones$ Battlefield | ValidSource$ Creature | ValidTarget$ You | IsCombat$ True | ReplaceWith$ DBReplace | PreventionEffect$ True | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, if a creature would deal combat damage to you, prevent 1 of that damage. SVar:DBReplace:DB$ ReplaceDamage | Amount$ 1 A:AB$ PumpAll | Cost$ 2 T | ValidCards$ Creature.attacking | NumAtt$ +1 | SpellDescription$ Attacking creatures get +1/+0 until end of turn. -SVar:X:Count$Valid Card.Self+untapped Oracle:As long as Thunderstaff is untapped, if a creature would deal combat damage to you, prevent 1 of that damage.\n{2}, {T}: Attacking creatures get +1/+0 until end of turn. diff --git a/forge-gui/res/cardsfolder/t/tide_skimmer.txt b/forge-gui/res/cardsfolder/t/tide_skimmer.txt index 4e82779db4d..7615ce682dd 100644 --- a/forge-gui/res/cardsfolder/t/tide_skimmer.txt +++ b/forge-gui/res/cardsfolder/t/tide_skimmer.txt @@ -3,7 +3,6 @@ ManaCost:3 U Types:Creature Drake PT:2/3 K:Flying -T:Mode$ AttackersDeclared | Execute$ TrigDraw | CheckSVar$ X | SVarCompare$ GE2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more creatures with flying, draw a card. +T:Mode$ AttackersDeclared | Execute$ TrigDraw | IsPresent$ Creature.attacking+withFlying+YouCtrl | PresentCompare$ GE2 | NoResolvingCheck$ True | TriggerZones$ Battlefield | AttackingPlayer$ You | TriggerDescription$ Whenever you attack with two or more creatures with flying, draw a card. SVar:TrigDraw:DB$ Draw | NumCards$ 1 -SVar:X:Count$Valid Creature.attacking+withFlying+YouCtrl Oracle:Flying\nWhenever you attack with two or more creatures with flying, draw a card. diff --git a/forge-gui/res/cardsfolder/t/toxic_stench.txt b/forge-gui/res/cardsfolder/t/toxic_stench.txt index ece8719f4a5..0767528aa1a 100644 --- a/forge-gui/res/cardsfolder/t/toxic_stench.txt +++ b/forge-gui/res/cardsfolder/t/toxic_stench.txt @@ -2,6 +2,6 @@ Name:Toxic Stench ManaCost:1 B Types:Instant A:SP$ Pump | Cost$ 1 B | ValidTgts$ Creature.nonBlack | TgtPrompt$ Select target nonblack creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ LT7 | SubAbility$ DBDestroy | SpellDescription$ Target nonblack creature gets -1/-1 until end of turn. -SVar:DBDestroy:DB$ Destroy | Defined$ Targeted | NoRegen$ True | ConditionCheckSVar$ X | ConditionSVarCompare$ GE7 | SpellDescription$ Threshold — If seven or more cards are in your graveyard, instead destroy that creature. It can't be regenerated. +SVar:DBDestroy:DB$ Destroy | Defined$ Targeted | NoRegen$ True | Condition$ Threshold | SpellDescription$ Threshold — If seven or more cards are in your graveyard, instead destroy that creature. It can't be regenerated. SVar:X:Count$InYourYard Oracle:Target nonblack creature gets -1/-1 until end of turn.\nThreshold — If seven or more cards are in your graveyard, instead destroy that creature. It can't be regenerated. diff --git a/forge-gui/res/cardsfolder/t/track_down.txt b/forge-gui/res/cardsfolder/t/track_down.txt index 2d1e4e1a723..41d86a18145 100644 --- a/forge-gui/res/cardsfolder/t/track_down.txt +++ b/forge-gui/res/cardsfolder/t/track_down.txt @@ -3,6 +3,5 @@ ManaCost:1 G Types:Sorcery A:SP$ Scry | Cost$ 1 G | ScryNum$ 3 | SubAbility$ DBReveal | SpellDescription$ Scry 3, then reveal the top card of your library. If it's a creature or land card, draw a card. SVar:DBReveal:DB$ Dig | DigNum$ 1 | Reveal$ True | RememberRevealed$ True | DestinationZone$ Library | LibraryPosition$ 0 | SubAbility$ DBDraw -SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ1 -SVar:X:Remembered$Valid Creature,Land +SVar:DBDraw:DB$ Draw | NumCards$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Creature,Land Oracle:Scry 3, then reveal the top card of your library. If it's a creature or land card, draw a card. (To scry 3, look at the top three cards of your library, then put any number of them on the bottom of your library and the rest on top in any order.) diff --git a/forge-gui/res/cardsfolder/t/training_drone.txt b/forge-gui/res/cardsfolder/t/training_drone.txt index f83dfaa3f8c..b369730b546 100644 --- a/forge-gui/res/cardsfolder/t/training_drone.txt +++ b/forge-gui/res/cardsfolder/t/training_drone.txt @@ -2,8 +2,7 @@ Name:Training Drone ManaCost:3 Types:Artifact Creature Drone PT:4/4 -S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack. & CARDNAME can't block. | CheckSVar$ X | SVarCompare$ EQ1 | Description$ CARDNAME can't attack or block unless it's equipped. -SVar:X:Count$Valid Card.Self+unequipped +S:Mode$ Continuous | Affected$ Card.Self+unequipped | AddHiddenKeyword$ CARDNAME can't attack. & CARDNAME can't block. | Description$ CARDNAME can't attack or block unless it's equipped. SVar:BuffedBy:Artifact.Equipment SVar:EquipMe:Once AI:RemoveDeck:Random diff --git a/forge-gui/res/cardsfolder/t/trinisphere.txt b/forge-gui/res/cardsfolder/t/trinisphere.txt index 3ea3607a1be..4c53de41ae3 100644 --- a/forge-gui/res/cardsfolder/t/trinisphere.txt +++ b/forge-gui/res/cardsfolder/t/trinisphere.txt @@ -1,8 +1,7 @@ Name:Trinisphere ManaCost:3 Types:Artifact -S:Mode$ SetCost | ValidCard$ Card | Type$ Spell | Amount$ 3 | RaiseTo$ True | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is untapped, each spell that would cost less than three mana to cast costs three mana to cast. (Additional mana in the cost may be paid with any color of mana or colorless mana. For example, a spell that would cost {1}{B} to cast costs {2}{B} to cast instead.) -SVar:X:Count$Valid Card.Self+untapped +S:Mode$ SetCost | ValidCard$ Card | Type$ Spell | Amount$ 3 | RaiseTo$ True | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, each spell that would cost less than three mana to cast costs three mana to cast. (Additional mana in the cost may be paid with any color of mana or colorless mana. For example, a spell that would cost {1}{B} to cast costs {2}{B} to cast instead.) AI:RemoveDeck:Random SVar:NonStackingEffect:True Oracle:As long as Trinisphere is untapped, each spell that would cost less than three mana to cast costs three mana to cast. (Additional mana in the cost may be paid with any color of mana or colorless mana. For example, a spell that would cost {1}{B} to cast costs {2}{B} to cast instead.) diff --git a/forge-gui/res/cardsfolder/t/tromokratis.txt b/forge-gui/res/cardsfolder/t/tromokratis.txt index b1477172bef..81a5ed7b69c 100644 --- a/forge-gui/res/cardsfolder/t/tromokratis.txt +++ b/forge-gui/res/cardsfolder/t/tromokratis.txt @@ -2,7 +2,6 @@ Name:Tromokratis ManaCost:5 U U Types:Legendary Creature Kraken PT:8/8 -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | CheckSVar$ X | Description$ CARDNAME has hexproof unless it's attacking or blocking. -SVar:X:Count$Valid Card.Self+notattacking+notblocking +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Hexproof | IsPresent$ Card.Self+notattacking+notblocking | Description$ CARDNAME has hexproof unless it's attacking or blocking. K:CARDNAME can't be blocked unless all creatures defending player controls block it. Oracle:Tromokratis has hexproof unless it's attacking or blocking.\nTromokratis can't be blocked unless all creatures defending player controls block it. (If any creature that player controls doesn't block this creature, it can't be blocked.) diff --git a/forge-gui/res/cardsfolder/t/twinstrike.txt b/forge-gui/res/cardsfolder/t/twinstrike.txt index cda287c0535..d5bf929372c 100644 --- a/forge-gui/res/cardsfolder/t/twinstrike.txt +++ b/forge-gui/res/cardsfolder/t/twinstrike.txt @@ -2,6 +2,6 @@ Name:Twinstrike ManaCost:3 B R Types:Instant A:SP$ DealDamage | Cost$ 3 B R | TargetMin$ 2 | TargetMax$ 2 | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumDmg$ 2 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE1 | SubAbility$ DBDestroy | SpellDescription$ CARDNAME deals 2 damage to each of two target creatures. -SVar:DBDestroy:DB$ Destroy | Defined$ Targeted | ConditionCheckSVar$ X | ConditionSVarCompare$ EQ0 | SpellDescription$ Hellbent — Destroy those creatures instead if you have no cards in hand. +SVar:DBDestroy:DB$ Destroy | Defined$ Targeted | Condition$ Hellbent | SpellDescription$ Hellbent — Destroy those creatures instead if you have no cards in hand. SVar:X:Count$InYourHand Oracle:Twinstrike deals 2 damage to each of two target creatures.\nHellbent — Destroy those creatures instead if you have no cards in hand. diff --git a/forge-gui/res/cardsfolder/v/vengeful_firebrand.txt b/forge-gui/res/cardsfolder/v/vengeful_firebrand.txt index d72e9c8bd91..2c37cfe7979 100644 --- a/forge-gui/res/cardsfolder/v/vengeful_firebrand.txt +++ b/forge-gui/res/cardsfolder/v/vengeful_firebrand.txt @@ -3,6 +3,5 @@ ManaCost:3 R Types:Creature Elemental Warrior PT:5/2 A:AB$ Pump | Cost$ R | NumAtt$ +1 | SpellDescription$ CARDNAME gets +1/+0 until end of turn. -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Haste | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME has haste as long as a Warrior card is in your graveyard. -SVar:X:Count$TypeInYourYard.Warrior +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Haste | IsPresent$ Warrior.YouOwn | PresentZone$ Graveyard | Description$ CARDNAME has haste as long as a Warrior card is in your graveyard. Oracle:Vengeful Firebrand has haste as long as a Warrior card is in your graveyard.\n{R}: Vengeful Firebrand gets +1/+0 until end of turn. diff --git a/forge-gui/res/cardsfolder/v/veteran_brawlers.txt b/forge-gui/res/cardsfolder/v/veteran_brawlers.txt index 44b95fde933..3160ce587d5 100644 --- a/forge-gui/res/cardsfolder/v/veteran_brawlers.txt +++ b/forge-gui/res/cardsfolder/v/veteran_brawlers.txt @@ -3,6 +3,5 @@ ManaCost:1 R Types:Creature Human Soldier PT:4/4 S:Mode$ CantAttack | ValidCard$ Card.Self | IfDefenderControls$ Land.untapped | Description$ CARDNAME can't attack if defending player controls an untapped land. -S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | CheckSVar$ Y | SVarCompare$ GE1 | Description$ CARDNAME can't block if you control an untapped land. -SVar:Y:Count$Valid Land.YouCtrl+untapped +S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't block. | IsPresent$ Land.YouCtrl+untapped | Description$ CARDNAME can't block if you control an untapped land. Oracle:Veteran Brawlers can't attack if defending player controls an untapped land.\nVeteran Brawlers can't block if you control an untapped land. diff --git a/forge-gui/res/cardsfolder/w/war_elemental.txt b/forge-gui/res/cardsfolder/w/war_elemental.txt index 46c003b9f9d..69450146fb2 100644 --- a/forge-gui/res/cardsfolder/w/war_elemental.txt +++ b/forge-gui/res/cardsfolder/w/war_elemental.txt @@ -4,7 +4,7 @@ Types:Creature Elemental PT:1/1 T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ TrigSac | TriggerDescription$ When CARDNAME enters the battlefield, sacrifice it unless an opponent was dealt damage this turn. SVar:TrigSac:DB$ Sacrifice | ConditionCheckSVar$ WarElementalX | ConditionSVarCompare$ EQ0 -SVar:WarElementalX:PlayerCountPropertyYou$DamageToOppsThisTurn +SVar:WarElementalX:PlayerCountOpponents$HasPropertywasDealtDamageThisTurn T:Mode$ DamageDoneOnce | ValidSource$ Card | ValidTarget$ Opponent | TriggerZones$ Battlefield | Execute$ TrigPutCounter | TriggerDescription$ Whenever an opponent is dealt damage, put that many +1/+1 counters on CARDNAME. SVar:TrigPutCounter:DB$ PutCounter | Defined$ Self | CounterType$ P1P1 | CounterNum$ WarElementalY SVar:WarElementalY:TriggerCount$DamageAmount diff --git a/forge-gui/res/cardsfolder/w/warden_of_the_beyond.txt b/forge-gui/res/cardsfolder/w/warden_of_the_beyond.txt index 3ff72df8387..703dc137242 100644 --- a/forge-gui/res/cardsfolder/w/warden_of_the_beyond.txt +++ b/forge-gui/res/cardsfolder/w/warden_of_the_beyond.txt @@ -3,6 +3,5 @@ ManaCost:2 W Types:Creature Human Wizard PT:2/2 K:Vigilance -S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME gets +2/+2 as long as an opponent owns a card in exile. -SVar:X:Count$ValidExile Card.OppCtrl +S:Mode$ Continuous | Affected$ Card.Self | AddPower$ 2 | AddToughness$ 2 | IsPresent$ Card.OppOwn | PresentZone$ Exile | Description$ CARDNAME gets +2/+2 as long as an opponent owns a card in exile. Oracle:Vigilance (Attacking doesn't cause this creature to tap.)\nWarden of the Beyond gets +2/+2 as long as an opponent owns a card in exile. diff --git a/forge-gui/res/cardsfolder/w/wardscale_dragon.txt b/forge-gui/res/cardsfolder/w/wardscale_dragon.txt index 3c4a6e53e27..940f2d9a6cb 100644 --- a/forge-gui/res/cardsfolder/w/wardscale_dragon.txt +++ b/forge-gui/res/cardsfolder/w/wardscale_dragon.txt @@ -3,6 +3,5 @@ ManaCost:4 W W Types:Creature Dragon PT:4/4 K:Flying -S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player.attackedBySourceThisCombat | CheckSVar$ X | Description$ As long as CARDNAME is attacking, defending player can't cast spells. -SVar:X:Count$Valid Card.Self+attacking +S:Mode$ CantBeCast | ValidCard$ Card | Caster$ Player.attackedBySourceThisCombat | IsPresent$ Card.Self+attacking | Description$ As long as CARDNAME is attacking, defending player can't cast spells. Oracle:Flying\nAs long as Wardscale Dragon is attacking, defending player can't cast spells. diff --git a/forge-gui/res/cardsfolder/w/warmind_infantry.txt b/forge-gui/res/cardsfolder/w/warmind_infantry.txt index f34cfef63cd..5cdad25582d 100644 --- a/forge-gui/res/cardsfolder/w/warmind_infantry.txt +++ b/forge-gui/res/cardsfolder/w/warmind_infantry.txt @@ -2,7 +2,6 @@ Name:Warmind Infantry ManaCost:2 R Types:Creature Elemental Soldier PT:2/3 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +2/+0 until end of turn. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gets +2/+0 until end of turn. SVar:TrigBattalionPump:DB$ Pump | Defined$ Self | NumAtt$ +2 -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Warmind Infantry and at least two other creatures attack, Warmind Infantry gets +2/+0 until end of turn. diff --git a/forge-gui/res/cardsfolder/w/windwright_mage.txt b/forge-gui/res/cardsfolder/w/windwright_mage.txt index 530eb27dd46..46323247833 100644 --- a/forge-gui/res/cardsfolder/w/windwright_mage.txt +++ b/forge-gui/res/cardsfolder/w/windwright_mage.txt @@ -3,6 +3,5 @@ ManaCost:W U B Types:Artifact Creature Human Wizard PT:2/2 K:Lifelink -S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME has flying as long as an artifact card is in your graveyard. -SVar:X:Count$TypeInYourYard.Artifact +S:Mode$ Continuous | Affected$ Card.Self | AddKeyword$ Flying | IsPresent$ Artifact.YouOwn | PresentZone$ Graveyard | Description$ CARDNAME has flying as long as an artifact card is in your graveyard. Oracle:Lifelink (Damage dealt by this creature also causes you to gain that much life.)\nWindwright Mage has flying as long as an artifact card is in your graveyard. diff --git a/forge-gui/res/cardsfolder/w/winter_orb.txt b/forge-gui/res/cardsfolder/w/winter_orb.txt index 52803427380..3ff4599c567 100644 --- a/forge-gui/res/cardsfolder/w/winter_orb.txt +++ b/forge-gui/res/cardsfolder/w/winter_orb.txt @@ -1,8 +1,7 @@ Name:Winter Orb ManaCost:2 Types:Artifact -S:Mode$ Continuous | Affected$ Player | AddKeyword$ UntapAdjust:Land:1 | CheckSVar$ X | SVarCompare$ EQ1 | Description$ As long as CARDNAME is untapped, players can't untap more than one land during their untap steps. -SVar:X:Count$Valid Card.Self+untapped +S:Mode$ Continuous | Affected$ Player | AddKeyword$ UntapAdjust:Land:1 | IsPresent$ Card.Self+untapped | Description$ As long as CARDNAME is untapped, players can't untap more than one land during their untap steps. SVar:NonStackingEffect:True DeckHints:Type$Artifact AI:RemoveDeck:Random diff --git a/forge-gui/res/cardsfolder/w/wirecat.txt b/forge-gui/res/cardsfolder/w/wirecat.txt index 51b7e112ba8..9c67a389d40 100644 --- a/forge-gui/res/cardsfolder/w/wirecat.txt +++ b/forge-gui/res/cardsfolder/w/wirecat.txt @@ -2,6 +2,5 @@ Name:Wirecat ManaCost:4 Types:Artifact Creature Cat PT:4/3 -S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | CheckSVar$ X | SVarCompare$ GE1 | Description$ CARDNAME can't attack or block if an enchantment is on the battlefield. -SVar:X:Count$Valid Enchantment +S:Mode$ Continuous | Affected$ Card.Self | AddHiddenKeyword$ CARDNAME can't attack or block. | IsPresent$ Enchantment | Description$ CARDNAME can't attack or block if an enchantment is on the battlefield. Oracle:Wirecat can't attack or block if an enchantment is on the battlefield. diff --git a/forge-gui/res/cardsfolder/w/wojek_halberdiers.txt b/forge-gui/res/cardsfolder/w/wojek_halberdiers.txt index 54b48a0dfd4..85fdce8b44c 100644 --- a/forge-gui/res/cardsfolder/w/wojek_halberdiers.txt +++ b/forge-gui/res/cardsfolder/w/wojek_halberdiers.txt @@ -2,7 +2,6 @@ Name:Wojek Halberdiers ManaCost:R W Types:Creature Human Soldier PT:3/2 -T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | CheckSVar$ BattalionTest | NoResolvingCheck$ True | SVarCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gains first strike until end of turn. +T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | IsPresent$ Creature.attacking+Other | NoResolvingCheck$ True | PresentCompare$ GE2 | Execute$ TrigBattalionPump | TriggerDescription$ Battalion — Whenever CARDNAME and at least two other creatures attack, CARDNAME gains first strike until end of turn. SVar:TrigBattalionPump:DB$ Pump | KW$ First Strike | Defined$ Self -SVar:BattalionTest:Count$Valid Creature.attacking+Other Oracle:Battalion — Whenever Wojek Halberdiers and at least two other creatures attack, Wojek Halberdiers gains first strike until end of turn.