From f494ba91ee13668d28994a61bda85cd9237a5080 Mon Sep 17 00:00:00 2001 From: tool4ever Date: Fri, 16 Feb 2024 15:59:23 +0100 Subject: [PATCH] Fix scripts (#4699) --- forge-gui/res/cardsfolder/a/axgard_armory.txt | 3 +-- forge-gui/res/cardsfolder/c/cavalcade_of_calamity.txt | 2 +- forge-gui/res/cardsfolder/f/fathom_fleet_swordjack.txt | 2 +- forge-gui/res/cardsfolder/h/hellrider.txt | 2 +- forge-gui/res/cardsfolder/i/invert_invent.txt | 3 +-- forge-gui/res/cardsfolder/m/mage_slayer.txt | 2 +- forge-gui/res/cardsfolder/m/myr_battlesphere.txt | 2 +- forge-gui/res/cardsfolder/r/raid_bombardment.txt | 2 +- forge-gui/res/cardsfolder/r/rakdos_roustabout.txt | 2 +- forge-gui/res/cardsfolder/s/scorch_spitter.txt | 2 +- forge-gui/res/cardsfolder/t/thran_vigil.txt | 2 +- 11 files changed, 11 insertions(+), 13 deletions(-) diff --git a/forge-gui/res/cardsfolder/a/axgard_armory.txt b/forge-gui/res/cardsfolder/a/axgard_armory.txt index 04f8e6be21f..d6f79a7d65d 100644 --- a/forge-gui/res/cardsfolder/a/axgard_armory.txt +++ b/forge-gui/res/cardsfolder/a/axgard_armory.txt @@ -3,8 +3,7 @@ ManaCost:no cost Types:Land K:CARDNAME enters the battlefield tapped. A:AB$ Mana | Cost$ T | Produced$ W | SpellDescription$ Add {W}. -A:AB$ ChangeZone | Cost$ 1 R R W T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ Aura | SubAbility$ DBChange | StackDescription$ {p:You} searches their library for an Aura card and/or an Equipment card, reveals them, puts them into their hand, then shuffles their library. | SpellDescription$ Search your library for an Aura card and/or an Equipment card, reveal them, put them into your hand, then shuffle. -SVar:DBChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Equipment | Shuffle$ True | StackDescription$ None +A:AB$ ChangeZone | Cost$ 1 R R W T Sac<1/CARDNAME> | Origin$ Library | Destination$ Hand | ChangeType$ EACH Aura & Equipment | StackDescription$ {p:You} searches their library for an Aura card and/or an Equipment card, reveals them, puts them into their hand, then shuffles their library. | SpellDescription$ Search your library for an Aura card and/or an Equipment card, reveal them, put them into your hand, then shuffle. AI:RemoveDeck:Random DeckNeeds:Type$Aura|Equipment DeckHas:Ability$Sacrifice diff --git a/forge-gui/res/cardsfolder/c/cavalcade_of_calamity.txt b/forge-gui/res/cardsfolder/c/cavalcade_of_calamity.txt index 7b430df4c23..6b2522795e4 100644 --- a/forge-gui/res/cardsfolder/c/cavalcade_of_calamity.txt +++ b/forge-gui/res/cardsfolder/c/cavalcade_of_calamity.txt @@ -2,6 +2,6 @@ Name:Cavalcade of Calamity ManaCost:1 R Types:Enchantment T:Mode$ Attacks | ValidCard$ Creature.powerLE1+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature you control with power 1 or less attacks, CARDNAME deals 1 damage to the player or planeswalker that creature is attacking -SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & TriggeredDefender.Planeswalker | NumDmg$ 1 +SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & Valid Planeswalker.TriggeredDefender | NumDmg$ 1 SVar:PlayMain1:TRUE Oracle:Whenever a creature you control with power 1 or less attacks, Cavalcade of Calamity deals 1 damage to the player or planeswalker that creature is attacking. diff --git a/forge-gui/res/cardsfolder/f/fathom_fleet_swordjack.txt b/forge-gui/res/cardsfolder/f/fathom_fleet_swordjack.txt index a50e895579a..cedfa1b3ff7 100644 --- a/forge-gui/res/cardsfolder/f/fathom_fleet_swordjack.txt +++ b/forge-gui/res/cardsfolder/f/fathom_fleet_swordjack.txt @@ -4,7 +4,7 @@ Types:Creature Orc Pirate PT:4/3 K:Encore:5 R T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals damage to the player or planeswalker it's attacking equal to the number of artifacts you control. -SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & TriggeredDefender.Planeswalker | NumDmg$ X +SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & Valid Planeswalker.TriggeredDefender | NumDmg$ X SVar:X:Count$Valid Artifact.YouCtrl SVar:HasAttackEffect:TRUE DeckNeeds:Type$Artifact diff --git a/forge-gui/res/cardsfolder/h/hellrider.txt b/forge-gui/res/cardsfolder/h/hellrider.txt index 29f34f59ab5..d8cc836a495 100644 --- a/forge-gui/res/cardsfolder/h/hellrider.txt +++ b/forge-gui/res/cardsfolder/h/hellrider.txt @@ -4,6 +4,6 @@ Types:Creature Devil PT:3/3 K:Haste T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | Execute$ TrigDealDamage | TriggerZones$ Battlefield | TriggerDescription$ Whenever a creature you control attacks, CARDNAME deals 1 damage to the player or planeswalker it's attacking. -SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & TriggeredDefender.Planeswalker | NumDmg$ 1 +SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & Valid Planeswalker.TriggeredDefender | NumDmg$ 1 SVar:HasAttackEffect:TRUE Oracle:Haste\nWhenever a creature you control attacks, Hellrider deals 1 damage to the player or planeswalker it's attacking. diff --git a/forge-gui/res/cardsfolder/i/invert_invent.txt b/forge-gui/res/cardsfolder/i/invert_invent.txt index a726e53f127..db374c419b0 100644 --- a/forge-gui/res/cardsfolder/i/invert_invent.txt +++ b/forge-gui/res/cardsfolder/i/invert_invent.txt @@ -10,8 +10,7 @@ ALTERNATE Name:Invent ManaCost:4 U R Types:Instant -A:SP$ ChangeZone | Cost$ 4 U R | Origin$ Library | Destination$ Hand | ChangeType$ Instant | ChangeNum$ 1 | SubAbility$ DBChange | SpellDescription$ Search your library for and instant permanent and/or a sorcery card, reveal them, put them into your hand, then shuffle. -SVar:DBChange:DB$ ChangeZone | Origin$ Library | Destination$ Hand | ChangeType$ Sorcery | ChangeNum$ 1 | Shuffle$ True +A:SP$ ChangeZone | Cost$ 4 U R | Origin$ Library | Destination$ Hand | ChangeType$ EACH Instant & Sorcery | SpellDescription$ Search your library for an instant card and/or a sorcery card, reveal them, put them into your hand, then shuffle. AI:RemoveDeck:Random DeckHints:Type$Instant|Sorcery Oracle:Search your library for an instant card and/or a sorcery card, reveal them, put them into your hand, then shuffle. diff --git a/forge-gui/res/cardsfolder/m/mage_slayer.txt b/forge-gui/res/cardsfolder/m/mage_slayer.txt index 1272852b4a3..37fc0757ed5 100644 --- a/forge-gui/res/cardsfolder/m/mage_slayer.txt +++ b/forge-gui/res/cardsfolder/m/mage_slayer.txt @@ -3,7 +3,7 @@ ManaCost:1 R G Types:Artifact Equipment K:Equip:3 T:Mode$ Attacks | ValidCard$ Card.AttachedBy | Execute$ TrigDamage | TriggerDescription$ Whenever equipped creature attacks, it deals damage equal to its power to the player or planeswalker it's attacking. -SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & TriggeredDefender.Planeswalker | DamageSource$ TriggeredAttackerLKICopy | NumDmg$ X +SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & Valid Planeswalker.TriggeredDefender | DamageSource$ TriggeredAttackerLKICopy | NumDmg$ X SVar:X:TriggeredAttacker$CardPower S:Mode$ Continuous | Affected$ Creature.AttachedBy | AddSVar$ AE SVar:AE:SVar:HasAttackEffect:TRUE diff --git a/forge-gui/res/cardsfolder/m/myr_battlesphere.txt b/forge-gui/res/cardsfolder/m/myr_battlesphere.txt index 84328504080..8e9c346a630 100644 --- a/forge-gui/res/cardsfolder/m/myr_battlesphere.txt +++ b/forge-gui/res/cardsfolder/m/myr_battlesphere.txt @@ -6,7 +6,7 @@ T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.S SVar:TrigToken:DB$ Token | TokenAmount$ 4 | TokenScript$ c_1_1_a_myr | TokenOwner$ You T:Mode$ Attacks | ValidCard$ Card.Self | OptionalDecider$ You | Execute$ TrigPump | TriggerDescription$ Whenever CARDNAME attacks, you may tap X untapped Myr you control. If you do, CARDNAME gets +X/+0 until end of turn and deals X damage to the player or planeswalker it's attacking. SVar:TrigPump:AB$ Pump | Cost$ tapXType | Defined$ Self | NumAtt$ +X | NumDef$ +0 | SubAbility$ DBDealDamage -SVar:DBDealDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & TriggeredDefender.Planeswalker | NumDmg$ X +SVar:DBDealDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & Valid Planeswalker.TriggeredDefender | NumDmg$ X SVar:X:Count$xPaid DeckHas:Ability$Token Oracle:When Myr Battlesphere enters the battlefield, create four 1/1 colorless Myr artifact creature tokens.\nWhenever Myr Battlesphere attacks, you may tap X untapped Myr you control. If you do, Myr Battlesphere gets +X/+0 until end of turn and deals X damage to the player or planeswalker it's attacking. diff --git a/forge-gui/res/cardsfolder/r/raid_bombardment.txt b/forge-gui/res/cardsfolder/r/raid_bombardment.txt index c5c30eba811..d19dec9551b 100644 --- a/forge-gui/res/cardsfolder/r/raid_bombardment.txt +++ b/forge-gui/res/cardsfolder/r/raid_bombardment.txt @@ -2,6 +2,6 @@ Name:Raid Bombardment ManaCost:2 R Types:Enchantment T:Mode$ Attacks | ValidCard$ Creature.powerLE2+YouCtrl | TriggerZones$ Battlefield | Execute$ TrigDamage | TriggerDescription$ Whenever a creature you control with power 2 or less attacks, CARDNAME deals 1 damage to the player or planeswalker that creature is attacking -SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & TriggeredDefender.Planeswalker | NumDmg$ 1 +SVar:TrigDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & Valid Planeswalker.TriggeredDefender | NumDmg$ 1 SVar:PlayMain1:TRUE Oracle:Whenever a creature you control with power 2 or less attacks, Raid Bombardment deals 1 damage to the player or planeswalker that creature is attacking. diff --git a/forge-gui/res/cardsfolder/r/rakdos_roustabout.txt b/forge-gui/res/cardsfolder/r/rakdos_roustabout.txt index f4c678e71b8..1173df31e38 100644 --- a/forge-gui/res/cardsfolder/r/rakdos_roustabout.txt +++ b/forge-gui/res/cardsfolder/r/rakdos_roustabout.txt @@ -3,6 +3,6 @@ ManaCost:1 B R Types:Creature Ogre Warrior PT:3/2 T:Mode$ AttackerBlocked | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME becomes blocked, it deals 1 damage to the player or planeswalker it's attacking. -SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & TriggeredDefender.Planeswalker | NumDmg$ 1 +SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & Valid Planeswalker.TriggeredDefender | NumDmg$ 1 SVar:HasAttackEffect:Blocked Oracle:Whenever Rakdos Roustabout becomes blocked, it deals 1 damage to the player or planeswalker it's attacking. diff --git a/forge-gui/res/cardsfolder/s/scorch_spitter.txt b/forge-gui/res/cardsfolder/s/scorch_spitter.txt index 364685ae43a..dde8c331dd5 100644 --- a/forge-gui/res/cardsfolder/s/scorch_spitter.txt +++ b/forge-gui/res/cardsfolder/s/scorch_spitter.txt @@ -3,6 +3,6 @@ ManaCost:R Types:Creature Elemental Lizard PT:1/1 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigDealDamage | TriggerDescription$ Whenever CARDNAME attacks, it deals 1 damage to the player or planeswalker it's attacking. -SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & TriggeredDefender.Planeswalker | NumDmg$ 1 +SVar:TrigDealDamage:DB$ DealDamage | Defined$ TriggeredDefender.Player & Valid Planeswalker.TriggeredDefender | NumDmg$ 1 SVar:HasAttackEffect:TRUE Oracle:Whenever Scorch Spitter attacks, it deals 1 damage to the player or planeswalker it's attacking. diff --git a/forge-gui/res/cardsfolder/t/thran_vigil.txt b/forge-gui/res/cardsfolder/t/thran_vigil.txt index 7e292411f58..cbbab8f5524 100644 --- a/forge-gui/res/cardsfolder/t/thran_vigil.txt +++ b/forge-gui/res/cardsfolder/t/thran_vigil.txt @@ -1,7 +1,7 @@ Name:Thran Vigil ManaCost:1 B Types:Enchantment -T:Mode$ ChangesZoneAll | Origin$ Graveyard | Destination$ Any | ValidCards$ Creature.YouOwn,Artifact.YouOwn | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more artifact and/or creature cards leave your graveyard during your turn, put a +1/+1 counter on target creature you control. +T:Mode$ ChangesZoneAll | Origin$ Graveyard | Destination$ Any | ValidCards$ Creature.YouOwn,Artifact.YouOwn | PlayerTurn$ True | Execute$ TrigCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever one or more artifact and/or creature cards leave your graveyard during your turn, put a +1/+1 counter on target creature you control. SVar:TrigCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | ValidTgts$ Creature.YouCtrl DeckHas:Ability$Graveyard|Counters DeckHints:Ability$Graveyard