diff --git a/forge-gui/res/cardsfolder/upcoming/akki_ronin.txt b/forge-gui/res/cardsfolder/upcoming/akki_ronin.txt index c32a72c1e0e..520d9eaac7b 100644 --- a/forge-gui/res/cardsfolder/upcoming/akki_ronin.txt +++ b/forge-gui/res/cardsfolder/upcoming/akki_ronin.txt @@ -4,5 +4,6 @@ Types:Creature Goblin Samurai PT:1/3 T:Mode$ Attacks | ValidCard$ Samurai.YouCtrl,Warrior.YouCtrl | Alone$ True | Execute$ TrigDraw | TriggerZones$ Battlefield | TriggerDescription$ Whenever a Samurai or Warrior you control attacks alone, you may discard a card. If you do, draw a card. SVar:TrigDraw:AB$ Draw | Cost$ Discard<1/Card> | NumCards$ 1 +DeckHas:Ability$Discard DeckHints:Type$Samurai|Warrior Oracle:Whenever a Samurai or Warrior you control attacks alone, you may discard a card. If you do, draw a card. diff --git a/forge-gui/res/cardsfolder/upcoming/ascendant_acolyte.txt b/forge-gui/res/cardsfolder/upcoming/ascendant_acolyte.txt index 3df36439ae5..d57315c2e67 100644 --- a/forge-gui/res/cardsfolder/upcoming/ascendant_acolyte.txt +++ b/forge-gui/res/cardsfolder/upcoming/ascendant_acolyte.txt @@ -6,5 +6,6 @@ K:etbCounter:P1P1:X:no Condition:CARDNAME enters the battlefield with a +1/+1 co T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigDouble | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, double the number of +1/+1 counters on CARDNAME. SVar:TrigDouble:DB$ MultiplyCounter | Defined$ Self | CounterType$ P1P1 SVar:X:Count$TotalCounters_P1P1_Creature.YouCtrl+Other +SVar:NeedsToPlay:Creature.YouCtrl+counters_GE1_P1P1 DeckHas:Ability$Counters Oracle:Ascendant Acolyte enters the battlefield with a +1/+1 counter on it for each +1/+1 counter among other creatures you control.\nAt the beginning of your upkeep, double the number of +1/+1 counters on Ascendant Acolyte. diff --git a/forge-gui/res/cardsfolder/upcoming/crackling_emergence.txt b/forge-gui/res/cardsfolder/upcoming/crackling_emergence.txt index 412ef129707..b26ffd77a55 100644 --- a/forge-gui/res/cardsfolder/upcoming/crackling_emergence.txt +++ b/forge-gui/res/cardsfolder/upcoming/crackling_emergence.txt @@ -7,4 +7,5 @@ S:Mode$ Continuous | Affected$ Land.EnchantedBy | AddType$ Creature & Spirit | S R:Event$ Destroy | ValidCard$ Card.EnchantedBy | ReplaceWith$ CracklingEgress | Description$ If enchanted land would be destroyed, instead sacrifice CARDNAME and that land gains indestructible until end of turn. SVar:CracklingEgress:DB$ Sacrifice | Defined$ Card.Self | SubAbility$ DBPump SVar:DBPump:DB$ Pump | Defined$ Enchanted | KW$ Indestructible +DeckHas:Ability$Sacrifice & Type$Spirit Oracle:Enchant land you control\nEnchanted land is a 3/3 red Spirit creature with haste. It's still a land.\nIf enchanted land would be destroyed, instead sacrifice Crackling Emergence and that land gains indestructible until end of turn. diff --git a/forge-gui/res/cardsfolder/upcoming/dragonspark_reactor.txt b/forge-gui/res/cardsfolder/upcoming/dragonspark_reactor.txt index 4e784152425..64711f43883 100644 --- a/forge-gui/res/cardsfolder/upcoming/dragonspark_reactor.txt +++ b/forge-gui/res/cardsfolder/upcoming/dragonspark_reactor.txt @@ -6,5 +6,7 @@ SVar:TrigCounter:DB$ PutCounter | CounterType$ CHARGE | CounterNum$ 1 A:AB$ DealDamage | Cost$ 4 Sac<1/CARDNAME> | ValidTgts$ Player | TgtPrompt$ Select target player | NumDmg$ X | SubAbility$ DBDamage | SpellDescription$ It deals damage equal to the number of charge counters on it to target player and that much damage to up to one target creature. SVar:DBDamage:DB$ DealDamage | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | NumDmg$ X SVar:X:Count$CardCounters.CHARGE +SVar:BuffedBy:Artifact +DeckHas:Ability$Counters DeckNeeds:Type$Artifact Oracle:Whenever Dragonspark Reactor or another artifact enters the battlefield under your control, put a charge counter on Dragonspark Reactor.\n{4}, Sacrifice Dragonspark Reactor: It deals damage equal to the number of charge counters on it to target player and that much damage to up to one target creature. diff --git a/forge-gui/res/cardsfolder/upcoming/experimental_synthesizer.txt b/forge-gui/res/cardsfolder/upcoming/experimental_synthesizer.txt index d590581e244..d458b391e7a 100644 --- a/forge-gui/res/cardsfolder/upcoming/experimental_synthesizer.txt +++ b/forge-gui/res/cardsfolder/upcoming/experimental_synthesizer.txt @@ -8,6 +8,6 @@ SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ Pl SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the remembered card. SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True A:AB$ Token | Cost$ 2 R Sac<1/CARDNAME> | TokenScript$ w_2_2_samurai_vigilance | SorcerySpeed$ True | SpellDescription$ Create a 2/2 white Samurai creature token with vigilance. Activate only as a sorcery. -DeckHas:Ability$Token +DeckHas:Ability$Token & Type$Samurai & Keyword$Vigilance SVar:SacMe:4 Oracle:When Experimental Synthesizer enters or leaves the battlefield, exile the top card of your library. Until end of turn, you may play that card.\n{2}{R}, Sacrifice Experimental Synthesizer: Create a 2/2 white Samurai creature token with vigilance. Activate only as a sorcery. diff --git a/forge-gui/res/cardsfolder/upcoming/explosive_entry.txt b/forge-gui/res/cardsfolder/upcoming/explosive_entry.txt index 05607f15a0a..52050f13a16 100644 --- a/forge-gui/res/cardsfolder/upcoming/explosive_entry.txt +++ b/forge-gui/res/cardsfolder/upcoming/explosive_entry.txt @@ -3,5 +3,5 @@ ManaCost:1 R Types:Sorcery A:SP$ Destroy | Cost$ 1 R | ValidTgts$ Artifact | TgtPrompt$ Select up to one target artifact | TargetMin$ 0 | TargetMax$ 1 | SubAbility$ DBCounter | SpellDescription$ Destroy up to one target artifact. Put a +1/+1 counter on up to one target creature. SVar:DBCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select up to one target creature | TargetMin$ 0 | TargetMax$ 1 | CounterType$ P1P1 | CounterNum$ 1 -DeckHas:Ability$Counter +DeckHas:Ability$Counters Oracle:Destroy up to one target artifact. Put a +1/+1 counter on up to one target creature. diff --git a/forge-gui/res/cardsfolder/upcoming/gift_of_wrath.txt b/forge-gui/res/cardsfolder/upcoming/gift_of_wrath.txt index 691f5462955..bad16907278 100644 --- a/forge-gui/res/cardsfolder/upcoming/gift_of_wrath.txt +++ b/forge-gui/res/cardsfolder/upcoming/gift_of_wrath.txt @@ -6,5 +6,5 @@ A:SP$ Attach | Cost$ 3 R | ValidTgts$ Artifact,Creature | TgtPrompt$ Select targ S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Menace | Description$ As long as enchanted permanent is a creature, it gets +2/+2 and has menace. (It can't be blocked except by two or more creatures.) T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Execute$ TrigToken | TriggerDescription$ When CARDNAME leaves the battlefield, create a 2/2 red Spirit creature token with menace. SVar:TrigToken:DB$ Token | TokenScript$ r_2_2_spirit_menace -DeckHas:Ability$Token +DeckHas:Ability$Token & Type$Spirit & Keyword$Menace Oracle:Enchant artifact or creature\nAs long as enchanted permanent is a creature, it gets +2/+2 and has menace. (It can't be blocked except by two or more creatures.)\nWhen Gift of Wrath leaves the battlefield, create a 2/2 red Spirit creature token with menace. diff --git a/forge-gui/res/cardsfolder/upcoming/kami_of_industry.txt b/forge-gui/res/cardsfolder/upcoming/kami_of_industry.txt index cd32dee8450..b74be0f00a5 100644 --- a/forge-gui/res/cardsfolder/upcoming/kami_of_industry.txt +++ b/forge-gui/res/cardsfolder/upcoming/kami_of_industry.txt @@ -3,8 +3,7 @@ ManaCost:4 R Types:Creature Spirit PT:3/6 T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigReturn | TriggerDescription$ When CARDNAME enters the battlefield, return target artifact card with mana value 3 or less from your graveyard to the battlefield. It gains haste. Sacrifice it at the beginning of the next end step. -SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Artifact.YouCtrl+cmcLE3 | TgtPrompt$ Select target artifact card with mana value 3 or less in your graveyard | Origin$ Graveyard | Destination$ Battlefield | RememberChanged$ True | SubAbility$ DBAnimate -SVar:DBAnimate:DB$ Animate | Keywords$ Haste | Defined$ Remembered | Duration$ Permanent | AtEOT$ Sacrifice | SubAbility$ DBCleanup -SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True +SVar:TrigReturn:DB$ ChangeZone | ValidTgts$ Artifact.YouCtrl+cmcLE3 | TgtPrompt$ Select target artifact card with mana value 3 or less in your graveyard | Origin$ Graveyard | Destination$ Battlefield | SubAbility$ DBAnimate +SVar:DBAnimate:DB$ Animate | Keywords$ Haste | Defined$ Targeted | Duration$ Permanent | AtEOT$ Sacrifice DeckHints:Type$Artifact Oracle:When Kami of Industry enters the battlefield, return target artifact card with mana value 3 or less from your graveyard to the battlefield. It gains haste. Sacrifice it at the beginning of the next end step. diff --git a/forge-gui/res/cardsfolder/upcoming/thundering_raiju.txt b/forge-gui/res/cardsfolder/upcoming/thundering_raiju.txt index d31b729b1cb..1ebe11f3794 100644 --- a/forge-gui/res/cardsfolder/upcoming/thundering_raiju.txt +++ b/forge-gui/res/cardsfolder/upcoming/thundering_raiju.txt @@ -7,5 +7,6 @@ T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigCounter | TriggerDescripti SVar:TrigCounter:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 1 | SubAbility$ DBDamage SVar:DBDamage:DB$ DamageAll | ValidPlayers$ Opponent | NumDmg$ X SVar:X:Count$Valid Creature.Other+YouCtrl+modified +DeckHas:Ability$Counters DeckHints:Type$Equipment|Aura & Ability$Counters Oracle:Haste\nWhenever Thundering Raiju attacks, put a +1/+1 counter on target creature you control. Then Thundering Raiju deals X damage to each opponent, where X is the number of modified creatures you control other than Thundering Raiju. (Equipment, Auras you control, and counters are modifications.) diff --git a/forge-gui/res/cardsfolder/upcoming/universal_surveillance.txt b/forge-gui/res/cardsfolder/upcoming/universal_surveillance.txt index 450870c6e3a..3af519ef40b 100644 --- a/forge-gui/res/cardsfolder/upcoming/universal_surveillance.txt +++ b/forge-gui/res/cardsfolder/upcoming/universal_surveillance.txt @@ -4,4 +4,5 @@ Types:Sorcery K:Improvise A:SP$ Draw | Cost$ X U U U | NumCards$ X | SpellDescription$ Draw X cards. SVar:X:Count$xPaid +DeckHints:Type$Artifact Oracle:Improvise (Your artifacts can help cast this spell. Each artifact you tap after you're done activating mana abilities pays for {1}.)\nDraw X cards. diff --git a/forge-gui/res/cardsfolder/upcoming/virus_beetle.txt b/forge-gui/res/cardsfolder/upcoming/virus_beetle.txt index 5f507429f17..448d5b23220 100644 --- a/forge-gui/res/cardsfolder/upcoming/virus_beetle.txt +++ b/forge-gui/res/cardsfolder/upcoming/virus_beetle.txt @@ -4,4 +4,5 @@ Types:Artifact Creature Insect PT:1/1 T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigDiscard | TriggerDescription$ When CARDNAME enters the battlefield, each opponent discards a card. SVar:TrigDiscard:DB$ Discard | Defined$ Opponent | NumCards$ 1 | Mode$ TgtChoose +DeckHas:Ability$Discard Oracle:When Virus Beetle enters the battlefield, each opponent discards a card. diff --git a/forge-gui/res/cardsfolder/upcoming/yoshimaru_ever_faithful.txt b/forge-gui/res/cardsfolder/upcoming/yoshimaru_ever_faithful.txt index b9d488b125a..5ffb70e7d08 100644 --- a/forge-gui/res/cardsfolder/upcoming/yoshimaru_ever_faithful.txt +++ b/forge-gui/res/cardsfolder/upcoming/yoshimaru_ever_faithful.txt @@ -5,5 +5,6 @@ PT:1/1 K:Partner T:Mode$ ChangesZone | ValidCard$ Card.Legendary+Other+YouCtrl | Destination$ Battlefield | TriggerZones$ Battlefield | Execute$ TrigCounter | TriggerDescription$ Whenever another legendary permanent enters the battlefield under your control, put a +1/+1 counter on CARDNAME. SVar:TrigCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 +DeckHas:Ability$Counters DeckNeeds:Type$Legendary Oracle:Whenever another legendary permanent enters the battlefield under your control, put a +1/+1 counter on Yoshimaru, Ever Faithful.\nPartner (You can have two commanders if both have partner.)