From b63f27d15dcffbebd633bf035f232a84e2acbcf6 Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Mon, 31 Oct 2022 23:26:22 +0100 Subject: [PATCH] Clean up --- forge-gui/res/cardsfolder/b/booby_trap.txt | 3 +-- forge-gui/res/cardsfolder/h/hermetic_study.txt | 2 +- forge-gui/res/cardsfolder/j/jasconian_isle.txt | 2 +- forge-gui/res/cardsfolder/j/jeweled_torque.txt | 2 +- forge-gui/res/cardsfolder/j/joiner_adept.txt | 2 +- forge-gui/res/cardsfolder/v/vigil_for_the_lost.txt | 2 +- forge-gui/res/cardsfolder/v/viridian_longbow.txt | 2 +- forge-gui/res/cardsfolder/v/vorosh_the_hunter.txt | 2 +- forge-gui/res/cardsfolder/w/wolfhunters_quiver.txt | 4 ++-- forge-gui/res/cardsfolder/z/zombie_master.txt | 2 +- 10 files changed, 11 insertions(+), 12 deletions(-) diff --git a/forge-gui/res/cardsfolder/b/booby_trap.txt b/forge-gui/res/cardsfolder/b/booby_trap.txt index bde00c1b33a..e45975479c6 100644 --- a/forge-gui/res/cardsfolder/b/booby_trap.txt +++ b/forge-gui/res/cardsfolder/b/booby_trap.txt @@ -9,7 +9,6 @@ SVar:RevealedDraw:DB$ Draw | Defined$ Player.Chosen | NumCards$ 1 | SubAbility$ SVar:TrigReveal:DB$ Reveal | Defined$ Player.Chosen | RevealValid$ Card.IsRemembered | SubAbility$ DBCleanup SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True T:Mode$ Drawn | ValidCard$ Card.NamedCard+OwnedBy Player.Chosen | TriggerZones$ Battlefield | Execute$ TrapTriggered | TriggerDescription$ When the chosen player draws a card with the chosen name, sacrifice CARDNAME. If you do, CARDNAME deals 10 damage to that player. -SVar:TrapTriggered:DB$ SacrificeAll | Defined$ Self | RememberSacrificed$ True | SubAbility$ Explosion -SVar:Explosion:DB$ DealDamage | NumDmg$ 10 | Defined$ Player.Chosen | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup +SVar:TrapTriggered:AB$ DealDamage | Cost$ Mandatory Sac<1/CARDNAME> | NumDmg$ 10 | Defined$ Player.Chosen AI:RemoveDeck:Random Oracle:As Booby Trap enters the battlefield, choose an opponent and a card name other than a basic land card name.\nThe chosen player reveals each card they draw.\nWhen the chosen player draws a card with the chosen name, sacrifice Booby Trap. If you do, Booby Trap deals 10 damage to that player. diff --git a/forge-gui/res/cardsfolder/h/hermetic_study.txt b/forge-gui/res/cardsfolder/h/hermetic_study.txt index f8d3dc07818..f3331d30a03 100644 --- a/forge-gui/res/cardsfolder/h/hermetic_study.txt +++ b/forge-gui/res/cardsfolder/h/hermetic_study.txt @@ -4,6 +4,6 @@ Types:Enchantment Aura K:Enchant creature A:SP$ Attach | Cost$ 1 U | ValidTgts$ Creature | AILogic$ Pump S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddAbility$ Damage | Description$ Enchanted creature has "{T}: This creature deals 1 damage to any target." -SVar:Damage:AB$DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. +SVar:Damage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. SVar:NonStackingAttachEffect:True Oracle:Enchant creature\nEnchanted creature has "{T}: This creature deals 1 damage to any target." diff --git a/forge-gui/res/cardsfolder/j/jasconian_isle.txt b/forge-gui/res/cardsfolder/j/jasconian_isle.txt index 8c6b27b8399..f216d09c897 100644 --- a/forge-gui/res/cardsfolder/j/jasconian_isle.txt +++ b/forge-gui/res/cardsfolder/j/jasconian_isle.txt @@ -5,5 +5,5 @@ PT:3/4 K:CARDNAME enters the battlefield tapped. K:CARDNAME doesn't untap during your untap step. T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigUntap | TriggerDescription$ At the beginning of your upkeep, you may pay {U}{U}. If you do, untap CARDNAME. -SVar:TrigUntap:AB$Untap | Cost$ U U | Defined$ Self +SVar:TrigUntap:AB$ Untap | Cost$ U U | Defined$ Self Oracle:(Jasconian Isle isn't a spell, it's affected by summoning sickness, it's blue, and it has "{T}: Add {U}.")\nJasconian Isle enters the battlefield tapped.\nJasconian Isle doesn't untap during your untap step.\nAt the beginning of your upkeep, you may pay {U}{U}. If you do, untap Jasconian Isle. diff --git a/forge-gui/res/cardsfolder/j/jeweled_torque.txt b/forge-gui/res/cardsfolder/j/jeweled_torque.txt index 4886b7f7e93..13cae90ac97 100644 --- a/forge-gui/res/cardsfolder/j/jeweled_torque.txt +++ b/forge-gui/res/cardsfolder/j/jeweled_torque.txt @@ -4,5 +4,5 @@ Types:Artifact K:ETBReplacement:Other:ChooseColor SVar:ChooseColor:DB$ ChooseColor | Defined$ You | SpellDescription$ As CARDNAME enters the battlefield, choose a color. | AILogic$ MostProminentInGame T:Mode$ SpellCast | ValidCard$ Card.ChosenColor | TriggerZones$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ Whenever a player casts a spell of the chosen color, you may pay {2}. If you do, you gain 2 life. -SVar:TrigGainLife:AB$GainLife | Cost$ 2 | Defined$ You | LifeAmount$ 2 +SVar:TrigGainLife:AB$ GainLife | Cost$ 2 | Defined$ You | LifeAmount$ 2 Oracle:As Jeweled Torque enters the battlefield, choose a color.\nWhenever a player casts a spell of the chosen color, you may pay {2}. If you do, you gain 2 life. diff --git a/forge-gui/res/cardsfolder/j/joiner_adept.txt b/forge-gui/res/cardsfolder/j/joiner_adept.txt index 57bbbdb303e..b993fd95d94 100644 --- a/forge-gui/res/cardsfolder/j/joiner_adept.txt +++ b/forge-gui/res/cardsfolder/j/joiner_adept.txt @@ -3,5 +3,5 @@ ManaCost:1 G Types:Creature Elf Druid PT:2/1 S:Mode$ Continuous | Affected$ Land.YouCtrl | AddAbility$ AnyMana | Description$ Lands you control have "{T}: Add one mana of any color." -SVar:AnyMana:AB$Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color. +SVar:AnyMana:AB$ Mana | Cost$ T | Produced$ Any | Amount$ 1 | SpellDescription$ Add one mana of any color. Oracle:Lands you control have "{T}: Add one mana of any color." diff --git a/forge-gui/res/cardsfolder/v/vigil_for_the_lost.txt b/forge-gui/res/cardsfolder/v/vigil_for_the_lost.txt index f539ff8ba53..d3c6714be9d 100644 --- a/forge-gui/res/cardsfolder/v/vigil_for_the_lost.txt +++ b/forge-gui/res/cardsfolder/v/vigil_for_the_lost.txt @@ -2,6 +2,6 @@ Name:Vigil for the Lost ManaCost:3 W Types:Enchantment T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Creature.YouCtrl | Execute$ TrigGainLife | OptionalDecider$ You | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control dies, you may pay {X}. If you do, you gain X life. -SVar:TrigGainLife:AB$GainLife | Cost$ X | LifeAmount$ X +SVar:TrigGainLife:AB$ GainLife | Cost$ X | LifeAmount$ X SVar:X:Count$xPaid Oracle:Whenever a creature you control dies, you may pay {X}. If you do, you gain X life. diff --git a/forge-gui/res/cardsfolder/v/viridian_longbow.txt b/forge-gui/res/cardsfolder/v/viridian_longbow.txt index e0b9feff365..7bc4292c93a 100644 --- a/forge-gui/res/cardsfolder/v/viridian_longbow.txt +++ b/forge-gui/res/cardsfolder/v/viridian_longbow.txt @@ -3,6 +3,6 @@ ManaCost:1 Types:Artifact Equipment K:Equip:3 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ Damage | Description$ Equipped creature has "{T}: This creature deals 1 damage to any target." -SVar:Damage:AB$DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. +SVar:Damage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. SVar:NonStackingAttachEffect:True Oracle:Equipped creature has "{T}: This creature deals 1 damage to any target."\nEquip {3} ({3}: Attach to target creature you control. Equip only as a sorcery. This card enters the battlefield unattached and stays on the battlefield if the creature leaves.) diff --git a/forge-gui/res/cardsfolder/v/vorosh_the_hunter.txt b/forge-gui/res/cardsfolder/v/vorosh_the_hunter.txt index 42d07f2333d..34e6c1d1fee 100644 --- a/forge-gui/res/cardsfolder/v/vorosh_the_hunter.txt +++ b/forge-gui/res/cardsfolder/v/vorosh_the_hunter.txt @@ -4,5 +4,5 @@ Types:Legendary Creature Dragon PT:6/6 K:Flying T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | OptionalDecider$ You | Execute$ TrigPutCounter | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may pay {2}{G}. If you do, put six +1/+1 counters on Vorosh. -SVar:TrigPutCounter:AB$PutCounter | Cost$ 2 G | Defined$ Self | CounterType$ P1P1 | CounterNum$ 6 +SVar:TrigPutCounter:AB$ PutCounter | Cost$ 2 G | Defined$ Self | CounterType$ P1P1 | CounterNum$ 6 Oracle:Flying\nWhenever Vorosh, the Hunter deals combat damage to a player, you may pay {2}{G}. If you do, put six +1/+1 counters on Vorosh. diff --git a/forge-gui/res/cardsfolder/w/wolfhunters_quiver.txt b/forge-gui/res/cardsfolder/w/wolfhunters_quiver.txt index 2c13e90682f..b83dffb3831 100644 --- a/forge-gui/res/cardsfolder/w/wolfhunters_quiver.txt +++ b/forge-gui/res/cardsfolder/w/wolfhunters_quiver.txt @@ -3,7 +3,7 @@ ManaCost:1 Types:Artifact Equipment K:Equip:5 S:Mode$ Continuous | Affected$ Card.EquippedBy | AddAbility$ Damage & DamageWerewolf | Description$ Equipped creature has "{T}: This creature deals 1 damage to any target" and "{T}: This creature deals 3 damage to target Werewolf creature." -SVar:Damage:AB$DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. -SVar:DamageWerewolf:AB$DealDamage | Cost$ T | ValidTgts$ Creature.Werewolf | TgtPrompt$ Select target Werewolf creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target Werewolf creature. +SVar:Damage:AB$ DealDamage | Cost$ T | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 1 | SpellDescription$ CARDNAME deals 1 damage to any target. +SVar:DamageWerewolf:AB$ DealDamage | Cost$ T | ValidTgts$ Creature.Werewolf | TgtPrompt$ Select target Werewolf creature | NumDmg$ 3 | SpellDescription$ CARDNAME deals 3 damage to target Werewolf creature. SVar:NonStackingAttachEffect:True Oracle:Equipped creature has "{T}: This creature deals 1 damage to any target" and "{T}: This creature deals 3 damage to target Werewolf creature."\nEquip {5} diff --git a/forge-gui/res/cardsfolder/z/zombie_master.txt b/forge-gui/res/cardsfolder/z/zombie_master.txt index a4c29eb0513..df6801b20ee 100644 --- a/forge-gui/res/cardsfolder/z/zombie_master.txt +++ b/forge-gui/res/cardsfolder/z/zombie_master.txt @@ -4,7 +4,7 @@ Types:Creature Zombie PT:2/3 S:Mode$ Continuous | Affected$ Creature.Zombie+Other | AddKeyword$ Swampwalk | Description$ Other Zombie creatures have swampwalk. (They can't be blocked as long as defending player controls a Swamp.) S:Mode$ Continuous | Affected$ Card.Zombie+Other | AddAbility$ Regenerate | Description$ Other Zombies have "{B}: Regenerate this permanent." -SVar:Regenerate:AB$Regenerate | Cost$ B | SpellDescription$ Regenerate this permanent +SVar:Regenerate:AB$ Regenerate | Cost$ B | SpellDescription$ Regenerate this permanent SVar:PlayMain1:TRUE DeckHas:Keyword$Regenerate|Swampwalk DeckHints:Type$Zombie & Name$Urborg, Tomb of Yawgmoth