From e5d8ec5006e3735c1e65dce71bd1815fab5387fe Mon Sep 17 00:00:00 2001 From: Northmoc <103371817+Northmoc@users.noreply.github.com> Date: Thu, 13 Oct 2022 17:00:22 -0400 Subject: [PATCH] Fixes (#1678) * iymrith_desert_doom.txt CheckSVar > ConditionCheckSVar * spire_of_industry.txt use IsPresent * helm_of_kaldra.txt tidy up - solve nonlegendary corner case * bronze_bombshell.txt improve * bazaar_trader.txt tidy up --- forge-gui/res/cardsfolder/b/bazaar_trader.txt | 6 ++---- forge-gui/res/cardsfolder/b/bronze_bombshell.txt | 4 ++-- forge-gui/res/cardsfolder/h/helm_of_kaldra.txt | 11 +++++++---- forge-gui/res/cardsfolder/i/iymrith_desert_doom.txt | 4 ++-- forge-gui/res/cardsfolder/s/spire_of_industry.txt | 3 +-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/forge-gui/res/cardsfolder/b/bazaar_trader.txt b/forge-gui/res/cardsfolder/b/bazaar_trader.txt index b1096bb7bde..aad3264bd0f 100644 --- a/forge-gui/res/cardsfolder/b/bazaar_trader.txt +++ b/forge-gui/res/cardsfolder/b/bazaar_trader.txt @@ -2,9 +2,7 @@ Name:Bazaar Trader ManaCost:1 R Types:Creature Goblin PT:1/1 -A:AB$ Pump | Cost$ T | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBPumpPermanent | RememberObjects$ Targeted | SpellDescription$ Target player gains control of target artifact, creature, or land you control. | StackDescription$ None -SVar:DBPumpPermanent:DB$ Pump | ValidTgts$ Artifact.YouCtrl,Creature.YouCtrl,Land.YouCtrl | TgtPrompt$ Select target artifact, creature, or land you control | SubAbility$ DBGainControl | StackDescription$ None -SVar:DBGainControl:DB$ GainControl | Defined$ Targeted | NewController$ Remembered | SubAbility$ DBForgetRemembered -SVar:DBForgetRemembered:DB$ Cleanup | ClearRemembered$ True +A:AB$ Pump | Cost$ T | ValidTgts$ Player | SubAbility$ DBGainControl | SpellDescription$ Target player gains control of target artifact, creature, or land you control. | StackDescription$ None +SVar:DBGainControl:DB$ GainControl | ValidTgts$ Artifact.YouCtrl,Creature.YouCtrl,Land.YouCtrl | TgtPrompt$ Select target artifact, creature, or land you control | NewController$ ParentTarget AI:RemoveDeck:All Oracle:{T}: Target player gains control of target artifact, creature, or land you control. diff --git a/forge-gui/res/cardsfolder/b/bronze_bombshell.txt b/forge-gui/res/cardsfolder/b/bronze_bombshell.txt index dbf1e195040..b686121f137 100644 --- a/forge-gui/res/cardsfolder/b/bronze_bombshell.txt +++ b/forge-gui/res/cardsfolder/b/bronze_bombshell.txt @@ -4,6 +4,6 @@ Types:Artifact Creature Construct PT:4/1 T:Mode$ Always | TriggerZones$ Battlefield | IsPresent$ Card.Self+OwnerDoesntControl | Execute$ TrigSac | TriggerDescription$ When a player other than CARDNAME's owner controls it, that player sacrifices it. If the player does, CARDNAME deals 7 damage to the player. SVar:TrigSac:DB$ SacrificeAll | Defined$ Self | RememberSacrificed$ True | SubAbility$ DBDmg -SVar:DBDmg:DB$ DealDamage | Defined$ You | NumDmg$ 7 | CheckSVar$ X | SVarCompare$ GE1 -SVar:X:Remembered$Amount +SVar:DBDmg:DB$ DealDamage | Defined$ RememberedController | NumDmg$ 7 | ConditionDefined$ Remembered | ConditionPresent$ Card | SubAbility$ DBCleanup +SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True Oracle:When a player other than Bronze Bombshell's owner controls it, that player sacrifices it. If the player does, Bronze Bombshell deals 7 damage to the player. diff --git a/forge-gui/res/cardsfolder/h/helm_of_kaldra.txt b/forge-gui/res/cardsfolder/h/helm_of_kaldra.txt index 42e5fc728aa..23aeaf7a8fd 100644 --- a/forge-gui/res/cardsfolder/h/helm_of_kaldra.txt +++ b/forge-gui/res/cardsfolder/h/helm_of_kaldra.txt @@ -3,11 +3,14 @@ ManaCost:3 Types:Legendary Artifact Equipment K:Equip:2 S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddKeyword$ First Strike & Trample & Haste | Description$ Equipped creature has first strike, trample, and haste. -A:AB$ Token | Cost$ 1 | TokenAmount$ 1 | TokenScript$ kaldra | TokenOwner$ You | SubAbility$ DBAttachEach | RememberTokens$ True | ConditionCheckSVar$ HelmX | ConditionSVarCompare$ EQ3 | AILogic$ Never | SpellDescription$ If you control Equipment named CARDNAME, Sword of Kaldra, and Shield of Kaldra, create Kaldra, a legendary 4/4 colorless Avatar creature token. Attach those Equipment to it. -SVar:DBAttachEach:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Equipment.YouCtrl+namedHelm of Kaldra,Equipment.YouCtrl+namedSword of Kaldra,Equipment.YouCtrl+namedShield of Kaldra | CheckSVar$ HelmY | SVarCompare$ EQ1 | RepeatSubAbility$ DBAttach | SubAbility$ DBCleanup +A:AB$ Token | Cost$ 1 | TokenScript$ kaldra | SubAbility$ DBAttachEach | RememberTokens$ True | ConditionCheckSVar$ AllThree | ConditionSVarCompare$ EQ3 | AILogic$ Never | StackDescription$ {p:You} creates Kaldra, a legendary 4/4 colorless Avatar creature token. | SpellDescription$ If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create Kaldra, a legendary 4/4 colorless Avatar creature token. Attach those Equipment to it. +SVar:DBAttachEach:DB$ RepeatEach | UseImprinted$ True | RepeatCards$ Equipment.YouCtrl+namedHelm of Kaldra,Equipment.YouCtrl+namedSword of Kaldra,Equipment.YouCtrl+namedShield of Kaldra | ConditionDefined$ Remembered | ConditionPresent$ Card | RepeatSubAbility$ DBAttach | SubAbility$ DBCleanup | StackDescription$ {p:You} attaches Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra to it. SVar:DBAttach:DB$ Attach | Object$ Imprinted | Defined$ Remembered SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True -SVar:HelmX:Count$Valid Equipment.YouCtrl+namedHelm of Kaldra,Equipment.YouCtrl+namedSword of Kaldra,Equipment.YouCtrl+namedShield of Kaldra -SVar:HelmY:Remembered$Amount +SVar:AllThree:SVar$Sum/Plus.Shield +SVar:Helm:Count$Valid Equipment.YouCtrl+namedHelm of Kaldra/LimitMax.1 +SVar:Sword:Count$Valid Equipment.YouCtrl+namedSword of Kaldra/LimitMax.1 +SVar:Shield:Count$Valid Equipment.YouCtrl+namedShield of Kaldra/LimitMax.1 +SVar:Sum:SVar$Helm/Plus.Sword DeckHints:Name$Sword of Kaldra|Shield of Kaldra Oracle:Equipped creature has first strike, trample, and haste.\n{1}: If you control Equipment named Helm of Kaldra, Sword of Kaldra, and Shield of Kaldra, create Kaldra, a legendary 4/4 colorless Avatar creature token. Attach those Equipment to it.\nEquip {2} diff --git a/forge-gui/res/cardsfolder/i/iymrith_desert_doom.txt b/forge-gui/res/cardsfolder/i/iymrith_desert_doom.txt index 53fd4868110..9cb2ee0c1fe 100644 --- a/forge-gui/res/cardsfolder/i/iymrith_desert_doom.txt +++ b/forge-gui/res/cardsfolder/i/iymrith_desert_doom.txt @@ -5,8 +5,8 @@ PT:5/5 K:Flying S:Mode$ Continuous | Affected$ Card.Self+untapped | AddKeyword$ Ward:4 | Description$ CARDNAME has ward {4} as long as it's untapped. T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever NICKNAME deals combat damage to a player, draw a card. Then if you have fewer than three cards in hand, draw cards equal to the difference. -SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBDrawMore -SVar:DBDrawMore:DB$ Draw | Defined$ You | CheckSVar$ X | SVarCompare$ LT3 | NumCards$ Difference +SVar:TrigDraw:DB$ Draw | SubAbility$ DBDrawMore +SVar:DBDrawMore:DB$ Draw | ConditionCheckSVar$ X | ConditionSVarCompare$ LT3 | NumCards$ Difference SVar:X:Count$InYourHand SVar:Difference:Number$3/Minus.X Oracle:Flying\nIymrith, Desert Doom has ward {4} as long as it's untapped.\nWhenever Iymrith deals combat damage to a player, draw a card. Then if you have fewer than three cards in hand, draw cards equal to the difference. diff --git a/forge-gui/res/cardsfolder/s/spire_of_industry.txt b/forge-gui/res/cardsfolder/s/spire_of_industry.txt index 99e2741a43b..6abfac2f192 100644 --- a/forge-gui/res/cardsfolder/s/spire_of_industry.txt +++ b/forge-gui/res/cardsfolder/s/spire_of_industry.txt @@ -2,6 +2,5 @@ Name:Spire of Industry ManaCost:no cost Types:Land A:AB$ Mana | Cost$ T | Produced$ C | SpellDescription$ Add {C}. -A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | CheckSVar$ X | SpellDescription$ Add one mana of any color. Activate only if you control an artifact. -SVar:X:Count$Valid Artifact.YouCtrl +A:AB$ Mana | Cost$ T PayLife<1> | Produced$ Any | Amount$ 1 | IsPresent$ Artifact.YouCtrl | SpellDescription$ Add one mana of any color. Activate only if you control an artifact. Oracle:{T}: Add {C}.\n{T}, Pay 1 life: Add one mana of any color. Activate only if you control an artifact.