Merge branch 'Williams-master-patch-33748' into 'master'

Add STX Charms

See merge request core-developers/forge!3917

forge-gui/res/cardsfolder/upcoming/lorehold_command.txt

@@ -0,0 +1,12 @@
+Name:Lorehold Command
+ManaCost:3 W R
+Types:Instant
+A:SP$ Charm | Cost$ 3 W R | Choices$ DBSpirit,DBIndestructible,DBHelix,DBSacrifice | CharmNum$ 2
+SVar:DBSpirit:DB$ Token | TokenAmount$ 1 | TokenScript$ rw_3_2_spirit | TokenOwner$ You | SpellDescription$ Create a 3/2 red and white Spirit token.
+SVar:DBIndestructible:DB$ PumpAll | ValidCards$ Creature.YouCtrl | NumAtt$ +1 | KW$ Indestructible & haste | SpellDescription$ Creatures you control get +1/+0 and gain indestructible and haste until end of turn.
+SVar:DBHelix:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 3 | SubAbility$ DBGainLife | SpellDescription$ CARDNAME deals 3 damage to any target. Target player gains 3 life.
+SVar:DBGainLife:DB$ GainLife | ValidTgts$ Player | TgtPrompt$ Select target player (to gain 3 life) | LifeAmount$ 3 | SpellDescription$ Target player gains 3 life.
+SVar:DBSacrifice:DB$ Sacrifice | Defined$ You | SacValid$ Permanent | SubAbility$ DBDraw |
+SVar:DBDraw:DB$ Draw | NumCards$ 2 | SpellDescription$ Sacrifice a permanent,draw two cards.
+DeckHas:Ability$Token & Ability$LifeGain
+Oracle:Choose two —\n• Create a 3/2 red and white Spirit creature token.\nCreatures you control get +1/+0 and gain indestructible and haste until end of turn.\nLorehold Command deals 3 damage to any target. Target player gains 3 life.\nSacrifice a permanent, then draw 2 cards.

forge-gui/res/cardsfolder/upcoming/prismari_command.txt

@@ -0,0 +1,11 @@
+Name:Prismari Command
+ManaCost:1 U R
+Types:Instant
+A:SP$ Charm | Cost$ 1 U R | Choices$ DBShock,DBLoot,DBTreasure,DBShatter | CharmNum$ 2
+SVar:DBShock:DB$ DealDamage | ValidTgts$ Creature,Player,Planeswalker | TgtPrompt$ Select any target | NumDmg$ 2 | SpellDescription$ CARDNAME deals 2 damage to any target.
+SVar:DBLoot:DB$ Draw | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Choose a player | SpellDescription$ Target player draws two cards, then discards two cards. | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ Targeted | NumCards$ 2 | Mode$ TgtChoose
+SVar:DBTreasure:DB$ Token | ValidTgts$ Player | TgtPrompt$ Select target player | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ Target player creates a Treasure token.
+SVar:DBShatter:DB$ Destroy | ValidTgts$ Artifact | TgtPrompt$ Select target artifact. | SpellDescription$ Destroy target artifact.
+DeckHas:Ability$Token
+Oracle:Choose two —\n• Prismari Command deals 2 damage to any target.\nTarget player draws two cards, then discards two cards.\nTarget player creates a Treasure token.\nDestroy target artifact.

forge-gui/res/cardsfolder/upcoming/quandrix_command.txt

@@ -0,0 +1,11 @@
+Name:Quandrix Command
+ManaCost:1 G U
+Types:Instant
+A:SP$ Charm | Cost$ 1 G U | Choices$ DBBounce,DBAnnul,DBCounters,DBBlessing | CharmNum$ 2
+SVar:DBBounce:DB$ ChangeZone | ValidTgts$ Creature,Planeswalker | TargetMin$ 0 | TargetMax$ 1 | Origin$ Battlefield | Destination$ Hand | TgtPrompt$ Choose target creature or planeswalker | SpellDescription$ Return target creature or planeswalker to its owner's hand.
+SVar:DBAnnul:DB$ Counter | TargetType$ Spell | TgtPrompt$ Select target artifact or enchantment spell | ValidTgts$ Artifact,Enchantment | SpellDescription$ Counter target artifact or enchantment spell.
+SVar:DBCounters:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature.
+SVar:DBBlessing:DB$ Pump | Cost$ 1 G | ValidTgts$ Player | TgtPrompt$ Select target Player | SubAbility$ DBChangeZone | IsCurse$ True | SpellDescription$ Target player shuffles up to three target cards from their graveyard into their library.
+SVar:DBChangeZone:DB$ ChangeZone | TargetMin$ 0 | TargetMax$ 3 | TargetsWithDefinedController$ ParentTarget | Origin$ Graveyard | Destination$ Library | Shuffle$ True | TgtPrompt$ Choose target card | ValidTgts$ Card
+DeckHas:Ability$Counters
+Oracle:Choose two —\n• Return target creature or planeswalker to its owner's hand.\n• Counter target artifact or enchantment spell.\n• Put two +1/+1 counters on target creature.\n• Target player shuffles up to three target cards from their graveyard into their library.

forge-gui/res/cardsfolder/upcoming/silverquill_command.txt

@@ -0,0 +1,9 @@
+Name:Silverquill Command
+ManaCost:2 W B
+Types:Sorcery
+A:SP$ Charm | Cost$ 2 W B | Choices$ DBPump,DBReturn,DBDraw,SacCreature | CharmNum$ 2
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 3 | NumDef$ 3 | KW$ Flying | SpellDescription$ Target creature gets +3/+3 and gains flying until end of turn.
+SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Battlefield | ValidTgts$ Card.Creature+cmcLE2+YouOwn | TgtPrompt$ Select target creature card with converted mana cost 2 or less | SpellDescription$ Return target creature card with converted mana cost 2 or less from your graveyard to the battlefield.
+SVar:DBDraw:DB$ Draw | ValidTgts$ Player | NumCards$ 1 | SubAbility$ DBLoseLife | SpellDescription$ Target player draws a card and loses 1 life.
+SVar:SacCreature:DB$ Sacrifice | ValidTgts$ Opponent | SacValid$ Creature | SpellDescription$ Target opponent sacrifices a creature.
+Oracle:Choose two —\n•  Target creature gets +3/+3 and gains flying until end of turn.\n• Return target creature card with mana value 2 or less from your graveyard to the battlefield.\n• Target player draws a card and loses 1 life.\n• Target opponent sacrifices a creature.

forge-gui/res/cardsfolder/upcoming/witherbloom_command.txt

@@ -0,0 +1,13 @@
+Name:Witherbloom Command
+ManaCost:B G
+Types:Sorcery
+A:SP$ Charm | Cost$ B G | CharmNum$ 2 | Choices$ DBMill,DBDestroy,DBPump,DBLoseLife
+SVar:DBMill:DB$ Mill | NumCards$ 2 | ValidTgts$ Player | TgtPrompt$ Select target player | SubAbility$ DBReturn | SpellDescription$ Target player mills three cards, then you return a land card from your graveyard to your hand.
+SVar:DBReturn:DB$ ChangeZone | Origin$ Graveyard | Destination$ Hand | Hidden$ True | Mandatory$ True | ChangeType$ Land.YouOwn
+SVar:DBDestroy:DB$ Destroy | ValidTgts$ Permanent.nonCreature+nonLand+cmcLE2 | TgtPrompt$ Select target noncreature, nonland permanent with mana value 2 or less | SpellDescription$ Destroy target noncreature, nonland permanent with mana value 2 or less.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -3 | NumDef$ -1 | SpellDescription$ Target creature gets -3/-1 until end of turn.
+SVar:DBLoseLife:DB$ LoseLife | ValidTgts$ Player.Opponent | TgtPrompt$ Select target opponent | LifeAmount$ 2 | SubAbility$ DBGainLife | SpellDescription$ Target opponent loses 2 life and you gain 2 life.
+SVar:DBGainLife:DB$ GainLife | LifeAmount$ 2
+DeckHas:Ability$LifeGain & Ability$Mill
+Oracle:Choose two —\n• Target player mills three cards, then you return a land card from your graveyard to your hand.\n• Destroy target noncreature, nonland permanent with mana value 2 or less.\n• Target creature gets -3/-1 until end of turn.\n• Target opponent loses 2 life and you gain 2 life.
+

forge-gui/res/tokenscripts/rw_3_2_spirit.txt

@@ -0,0 +1,6 @@
+Name:Spirit
+Types:Creature Spirit
+Colors:red,white
+ManaCost:no cost
+PT:3/2
+Oracle: