From 03bbb90def56a564e632fdc243c2f98f522aa94b Mon Sep 17 00:00:00 2001 From: tool4EvEr Date: Thu, 2 Feb 2023 22:53:50 +0100 Subject: [PATCH] Fix scripts --- forge-gui/res/cardsfolder/b/bag_of_devouring.txt | 10 +++------- forge-gui/res/cardsfolder/j/jihad.txt | 4 ++-- forge-gui/res/cardsfolder/l/lich.txt | 4 ++-- .../t/teachings_of_the_kirin_kirin_touched_orochi.txt | 8 ++++---- .../res/cardsfolder/upcoming/venser_corpse_puppet.txt | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/forge-gui/res/cardsfolder/b/bag_of_devouring.txt b/forge-gui/res/cardsfolder/b/bag_of_devouring.txt index 8bbc1fa209c..2f492a5a92d 100644 --- a/forge-gui/res/cardsfolder/b/bag_of_devouring.txt +++ b/forge-gui/res/cardsfolder/b/bag_of_devouring.txt @@ -1,16 +1,12 @@ Name:Bag of Devouring ManaCost:B Types:Artifact -T:Mode$ Sacrificed | ValidCard$ Artifact.nontoken+Other,Creature.nontoken+Other | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever you sacrifice another nontoken artifact or creature, exile it. -SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True +T:Mode$ Sacrificed | ValidCard$ Artifact.nonToken+Other,Creature.nonToken+Other | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever you sacrifice another nontoken artifact or creature, exile it. +SVar:TrigExile:DB$ ChangeZone | Defined$ TriggeredCard | Origin$ Graveyard | Destination$ Exile A:AB$ Draw | Cost$ 2 T Sac<1/Artifact.Other;Creature.Other/another artifact or creature> | NumCards$ 1 | SpellDescription$ Draw a card. A:AB$ RollDice | Cost$ 3 T Sac<1/CARDNAME> | Sides$ 10 | ResultSVar$ X | SubAbility$ DBChoose | SpellDescription$ Roll a d10. Return up to X cards from among cards exiled with CARDNAME to their owners' hands, where X is the result. -SVar:DBChoose:DB$ ChooseCard | ChoiceZone$ Exile | Choices$ Card.IsRemembered+ExiledWithSource | Amount$ X | MinAmount$ 0 | SubAbility$ DBReturn | StackDescription$ None +SVar:DBChoose:DB$ ChooseCard | ChoiceZone$ Exile | Choices$ Card.ExiledWithSource | Amount$ X | MinAmount$ 0 | SubAbility$ DBReturn | StackDescription$ None SVar:DBReturn:DB$ ChangeZone | Defined$ ChosenCard | Origin$ Exile | Destination$ Hand | StackDescription$ Return up to X cards from among cards exiled with CARDNAME to their owners' hands, where X is the result. -T:Mode$ ChangesZone | Origin$ Exile | Destination$ Any | Static$ True | ValidCard$ Card.IsRemembered+ExiledWithSource | Execute$ DBForget -SVar:DBForget:DB$ Pump | ForgetObjects$ TriggeredCard -T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Any | Static$ True | ValidCard$ Card.Self | Execute$ DBCleanup -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:NonStackingEffect:True DeckHas:Ability$Sacrifice Oracle:Whenever you sacrifice another nontoken artifact or creature, exile it.\n{2}, {T}, Sacrifice another artifact or creature: Draw a card.\n{3}, {T}, Sacrifice Bag of Devouring: Roll a d10. Return up to X cards from among cards exiled with Bag of Devouring to their owners' hands, where X is the result. diff --git a/forge-gui/res/cardsfolder/j/jihad.txt b/forge-gui/res/cardsfolder/j/jihad.txt index 46dc09dbafa..df80b6c24c6 100644 --- a/forge-gui/res/cardsfolder/j/jihad.txt +++ b/forge-gui/res/cardsfolder/j/jihad.txt @@ -5,8 +5,8 @@ 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. -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. +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: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/l/lich.txt b/forge-gui/res/cardsfolder/l/lich.txt index 516bb828ef0..2b48719b9d4 100644 --- a/forge-gui/res/cardsfolder/l/lich.txt +++ b/forge-gui/res/cardsfolder/l/lich.txt @@ -10,9 +10,9 @@ SVar:Draw:DB$ Draw | Defined$ You | NumCards$ X SVar:X:ReplaceCount$LifeGained T:Mode$ DamageDoneOnce | ValidTarget$ You | TriggerZones$ Battlefield | Execute$ TrigLoseOrSac | TriggerDescription$ Whenever you're dealt damage, sacrifice that many nontoken permanents. If you can't, you lose the game. SVar:TrigLoseOrSac:DB$ LosesGame | Defined$ You | ConditionCheckSVar$ PermanentsToSac | ConditionSVarCompare$ GTY | SubAbility$ DBSacrificePerm -SVar:DBSacrificePerm:DB$ Sacrifice | Amount$ PermanentsToSac | SacValid$ Permanent.nontoken | ConditionCheckSVar$ PermanentsToSac | ConditionSVarCompare$ LEY +SVar:DBSacrificePerm:DB$ Sacrifice | Amount$ PermanentsToSac | SacValid$ Permanent.nonToken | ConditionCheckSVar$ PermanentsToSac | ConditionSVarCompare$ LEY SVar:PermanentsToSac:TriggerCount$DamageAmount -SVar:Y:Count$Valid Permanent.nontoken+YouCtrl +SVar:Y:Count$Valid Permanent.nonToken+YouCtrl T:Mode$ ChangesZone | Origin$ Battlefield | Destination$ Graveyard | ValidCard$ Card.Self | Execute$ TrigLose | TriggerDescription$ When CARDNAME is put into a graveyard from the battlefield, you lose the game. SVar:TrigLose:DB$ LosesGame | Defined$ You AI:RemoveDeck:Random diff --git a/forge-gui/res/cardsfolder/t/teachings_of_the_kirin_kirin_touched_orochi.txt b/forge-gui/res/cardsfolder/t/teachings_of_the_kirin_kirin_touched_orochi.txt index d1602412040..02bee9bcea4 100644 --- a/forge-gui/res/cardsfolder/t/teachings_of_the_kirin_kirin_touched_orochi.txt +++ b/forge-gui/res/cardsfolder/t/teachings_of_the_kirin_kirin_touched_orochi.txt @@ -22,11 +22,11 @@ PT:1/1 T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCharm | TriggerDescription$ Whenever CARDNAME attacks, ABILITY SVar:TrigCharm:DB$ Charm | Choices$ DBExileC,DBExileNonC SVar:DBExileC:DB$ ChangeZone | ValidTgts$ Creature | TgtPrompt$ Select target creature card | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ DBImmediateTrig1 | SpellDescription$ Exile target creature card from a graveyard. When you do, create a 1/1 colorless Spirit creature token. -SVar:DBImmediateTrig1:DB$ ImmediateTrigger | Execute$ TrigToken | TriggerDescription$ When you do, create a 1/1 colorless Spirit creature token. -SVar:TrigToken:DB$ Token | TokenScript$ c_1_1_spirit | SubAbility$ DBCleanup +SVar:DBImmediateTrig1:DB$ ImmediateTrigger | Execute$ TrigToken | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, create a 1/1 colorless Spirit creature token. +SVar:TrigToken:DB$ Token | TokenScript$ c_1_1_spirit SVar:DBExileNonC:DB$ ChangeZone | ValidTgts$ Card.nonCreature | TgtPrompt$ Select target noncreature card | Origin$ Graveyard | Destination$ Exile | RememberChanged$ True | SubAbility$ DBImmediateTrig2 | SpellDescription$ Exile target noncreature card from a graveyard. When you do, put a +1/+1 counter on target creature you control. -SVar:DBImmediateTrig2:DB$ ImmediateTrigger | Execute$ TrigPutCounter | ConditionDefined$ Remembered | ConditionPresent$ Card | TriggerDescription$ When you do, put a +1/+1 counter on target creature you control. -SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBCleanup +SVar:DBImmediateTrig2:DB$ ImmediateTrigger | Execute$ TrigPutCounter | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup | TriggerDescription$ When you do, put a +1/+1 counter on target creature you control. +SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1 SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True SVar:HasAttackEffect:TRUE Oracle:Whenever Kirin-Touched Orochi attacks, choose one —\n• Exile target creature card from a graveyard. When you do, create a 1/1 colorless Spirit creature token.\n• Exile target noncreature card from a graveyard. When you do, put a +1/+1 counter on target creature you control. diff --git a/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt b/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt index f7e2c9a0a21..6233e685152 100644 --- a/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt +++ b/forge-gui/res/cardsfolder/upcoming/venser_corpse_puppet.txt @@ -4,7 +4,7 @@ Types:Legendary Creature Phyrexian Zombie Wizard PT:1/3 K:Lifelink K:Toxic:1 -T:Mode$ Proliferate | ValidPlayer$ You | Execute$ TrigChoose | TriggerDescription$ Whenever you proliferate, ABILITY +T:Mode$ Proliferate | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigChoose | TriggerDescription$ Whenever you proliferate, ABILITY SVar:TrigChoose:DB$ Charm | Choices$ DBToken,DBPump SVar:DBToken:DB$ Token | TokenAmount$ 1 | TokenScript$ the_hollow_sentinel | TokenOwner$ You | ConditionPresent$ Creature.YouCtrl+namedThe Hollow Sentinel | ConditionCompare$ EQ0 | SpellDescription$ If you don't control a creature named The Hollow Sentinel, create The Hollow Sentinel, a legendary 3/3 colorless Phyrexian Golem artifact creature token. SVar:DBPump:DB$ Pump | ValidTgts$ Creature.Artifact+YouCtrl | TgtPrompt$ Select target artifact creature you control | KW$ Flying & Lifelink | SpellDescription$ Target artifact creature you control gains flying and lifelink until end of turn.