Merge branch 'neo_3' into 'master'

NEO – 3 Feb

See merge request core-developers/forge!6143

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

@@ -0,0 +1,8 @@
+Name:Armguard Familiar
+ManaCost:1 U
+Types:Artifact Creature Equipment Beast
+PT:2/1
+K:Ward:2
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 2 | AddToughness$ 1 | AddKeyword$ Ward:2 | Description$ Equipped creature gets +2/+1 and has ward {2}.
+K:Reconfigure:4
+Oracle:Ward {2} (Whenever this creature becomes the target of a spell or ability an opponent controls, counter it unless that player pays {2}.)\nEquipped creature gets +2/+1 and has ward {2}.\nReconfigure {4} ({4}: Attach to target creature you control; or unattach from a creature. Reconfigure only as a sorcery. While attached, this isn’t a creature.)

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

@@ -0,0 +1,12 @@
+Name:Awakened Awareness
+ManaCost:X U U
+Types:Enchantment Aura
+K:Enchant artifact or creature
+A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Permanent.EnchantedBy+greatestPower | Execute$ TrigPutCounters | TriggerDescription$ When CARDNAME enters the battlefield, put X +1/+1 counters on enchanted permanent.
+SVar:TrigPutCounters:DB$ PutCounter | Defined$ Enchanted | CounterType$ P1P1 | CounterNum$ X
+SVar:X:Count$xPaid
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | SetPower$ 1 | SetToughness$ 1 | Description$ As long as enchanted permanent is a creature, it has base power and toughness 1/1.
+DeckHints:Type$Artifact|Vehicle
+DeckHas:Ability$Counters
+Oracle:Enchant artifact or creature\nWhen Awakened Awareness enters the battlefield, put X +1/+1 counters on enchanted permanent.\nAs long as enchanted permanent is a creature, it has base power and toughness 1/1.

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

@@ -0,0 +1,8 @@
+Name:Bamboo Grove Archer
+ManaCost:1 G
+Types:Enchantment Creature Snake Archer
+PT:3/3
+K:Defender
+K:Reach
+A:AB$ Destroy | PrecostDesc$ Channel — | Cost$ 4 G Discard<1/CARDNAME> | ActivationZone$ Hand | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | SpellDescription$ Destroy target creature with flying.
+Oracle:Defender, reach\nChannel — {4}{G}, Discard Bamboo Grove Archer: Destroy target creature with flying.

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

@@ -0,0 +1,7 @@
+Name:Brilliant Restoration
+ManaCost:3 W W W W
+Types:Sorcery
+A:SP$ ChangeZoneAll | ChangeType$ Artifact.YouOwn,Enchantment.YouOwn | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return all artifact and enchantment cards from your graveyard to the battlefield.
+DeckNeeds:Type$Artifact|Enchantment
+DeckHas:Ability$Graveyard
+Oracle:Return all artifact and enchantment cards from your graveyard to the battlefield.

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

@@ -0,0 +1,10 @@
+Name:Circuit Mender
+ManaCost:3
+Types:Artifact Creature Insect
+PT:2/3
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigGainLife | TriggerDescription$ When CARDNAME enters the battlefield, you gain 2 life.
+SVar:TrigGainLife:DB$ GainLife | LifeAmount$ 2
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Origin$ Battlefield | Execute$ TrigDraw | TriggerDescription$ When CARDNAME leaves the battlefield, draw a card.
+SVar:TrigDraw:DB$ Draw | NumCards$ 1
+DeckHas:Ability$LifeGain
+Oracle:When Circuit Mender enters the battlefield, you gain 2 life.\nWhen Circuit Mender leaves the battlefield, draw a card.

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

@@ -0,0 +1,8 @@
+Name:Enormous Energy Blade
+ManaCost:2 B
+Types:Artifact Equipment
+S:Mode$ Continuous | Affected$ Creature.EquippedBy | AddPower$ 4 | Description$ Equipped creature gets +4/+0.
+T:Mode$ Attached | ValidSource$ Card.Self | ValidTarget$ Creature | TriggerZones$ Battlefield | Execute$ TrigTap | TriggerDescription$ Whenever CARDNAME becomes attached to a creature, tap that creature.
+SVar:TrigTap:DB$ Tap | Defined$ TriggeredTarget
+K:Equip:2
+Oracle:Equipped creature gets +4/+0.\nWhenever Enormous Energy Blade becomes attached to a creature, tap that creature.\nEquip {2} ({2}: Attach to target creature you control. Equip only as a sorcery.)

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

@@ -0,0 +1,9 @@
+Name:Generous Visitor
+ManaCost:G
+Types:Creature Spirit
+PT:1/1
+T:Mode$ SpellCast | ValidCard$ Enchantment | ValidActivatingPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever you cast an enchantment spell, put a +1/+1 counter on target creature.
+SVar:TrigPutCounter:DB$ PutCounter | ValidTgts$ Creature | TgtPrompt$ Select target creature | CounterType$ P1P1 | CounterNum$ 1
+DeckNeeds:Type$Enchantment
+DeckHas:Ability$Counters
+Oracle:Whenever you cast an enchantment spell, put a +1/+1 counter on target creature.

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

@@ -0,0 +1,11 @@
+Name:Go-Shintai of Ancient Wars
+ManaCost:2 R
+Types:Legendary Enchantment Creature Shrine
+PT:2/2
+K:First strike
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigImmediateTrig | TriggerDescription$ At the beginning of your end step, you may pay {1}. When you do, CARDNAME deals X damage to target player or planeswalker, where X is the number of Shrines you control.
+SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ 1 | Execute$ TrigDealDamage | SpellDescription$ CARDNAME deals X damage to target player or planeswalker, where X is the number of Shrines you control.
+SVar:TrigDealDamage:DB$ DealDamage | ValidTgts$ Player,Planeswalker | TgtPrompt$ Select target player or planeswalker | NumDmg$ X
+SVar:X:Count$TypeYouCtrl.Shrine
+DeckHints:Type$Shrine
+Oracle:First strike\nAt the beginning of your end step, you may pay {1}. When you do, Go-Shintai of Ancient Wars deals X damage to target player or planeswalker, where X is the number of Shrines you control.

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

@@ -0,0 +1,12 @@
+Name:Go-Shintai of Lost Wisdom
+ManaCost:1 U
+Types:Legendary Enchantment Creature Shrine
+PT:0/4
+K:Flying
+T:Mode$ Phase | Phase$ End of Turn | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigImmediateTrig | TriggerDescription$ At the beginning of your end step, you may pay {1}. When you do, target player mills X cards, where X is the number of Shrines you control. (To mill a card, a player puts the top card of their library into their graveyard.)
+SVar:TrigImmediateTrig:AB$ ImmediateTrigger | Cost$ 1 | Execute$ TrigMill | SpellDescription$ Target player mills X cards, where X is the number of Shrines you control.
+SVar:TrigMill:DB$ Mill | ValidTgts$ Player | NumCards$ X | TgtPrompt$ Select target player | SpellDescription$ Fart knocker!
+SVar:X:Count$TypeYouCtrl.Shrine
+DeckHas:Ability$Mill
+DeckHints:Type$Shrine
+Oracle:Flying\nAt the beginning of your end step, you may pay {1}. When you do, target player mills X cards, where X is the number of Shrines you control. (To mill a card, a player puts the top card of their library into their graveyard.)

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

@@ -0,0 +1,8 @@
+Name:Guardians of Oboro
+ManaCost:2 U
+Types:Creature Moonfolk Samurai
+PT:3/4
+K:Defender
+S:Mode$ Continuous | Affected$ Creature.YouCtrl+modified | AddHiddenKeyword$ CARDNAME can attack as though it didn't have defender. | Description$ Modified creatures you control can attack as though they didn't have defender.
+DeckHints:Type$Aura|Equipment & Ability$Counters & Keyword$Defender
+Oracle:Defender\nModified creatures you control can attack as though they didn't have defender. (Equipment, Auras you control, and counters are modifications.)

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

@@ -0,0 +1,11 @@
+Name:Heiko Yamazaki, the General
+ManaCost:3 R
+Types:Legendary Creature Human Samurai
+PT:3/3
+K:Trample
+T:Mode$ Attacks | ValidCard$ Samurai.YouCtrl,Warrior.YouCtrl | Alone$ True | TriggerZones$ Battlefield | Execute$ TrigEffect | TriggerDescription$ Whenever a Samurai or Warrior you control attacks alone, you may cast target artifact card from your graveyard this turn.
+SVar:TrigEffect:DB$ Effect | ValidTgts$ Artifact.YouOwn | TgtZone$ Graveyard | TgtPrompt$ Select target artifact card | RememberObjects$ Targeted | StaticAbilities$ Play | ExileOnMoved$ Graveyard
+SVar:Play:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Graveyard | Description$ You may play this card from your graveyard this turn.
+DeckHints:Type$Samurai|Warrior|Artifact
+DeckHas:Ability$Graveyard
+Oracle:Trample\nWhenever a Samurai or Warrior you control attacks alone, you may cast target artifact card from your graveyard this turn.

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

@@ -0,0 +1,10 @@
+Name:Historian's Wisdom
+ManaCost:2 G
+Types:Enchantment Aura
+K:Enchant artifact or creature
+A:SP$ Attach | ValidTgts$ Artifact,Creature | TgtPrompt$ Select target artifact or creature
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Permanent.EnchantedBy+greatestPower | Execute$ TrigDraw | TriggerDescription$ When CARDNAME enters the battlefield, if enchanted permanent is a creature with the greatest power among creatures on the battlefield, draw a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 1 | Description$ As long as enchanted permanent is a creature, it gets +2/+1.
+DeckHints:Type$Artifact|Vehicle
+Oracle:Enchant artifact or creature\nWhen Historian's Wisdom enters the battlefield, if enchanted permanent is a creature with the greatest power among creatures on the battlefield, draw a card.\nAs long as enchanted permanent is a creature, it gets +2/+1.

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

@@ -0,0 +1,7 @@
+Name:Inkrise Infiltrator
+ManaCost:1 B
+Types:Creature Human Ninja
+PT:1/2
+K:Flying
+A:AB$ Pump | Cost$ 3 B | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | SpellDescription$ CARDNAME gets +2/+2 until end of turn.
+Oracle:Flying\n{3}{B}: Inkrise Infiltrator gets +2/+2 until end of turn.

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

@@ -0,0 +1,12 @@
+Name:Lion Sash
+ManaCost:1 W
+Types:Artifact Creature Equipment Cat
+PT:1/1
+A:AB$ ChangeZone | Cost$ W | Origin$ Graveyard | Destination$ Exile | ValidTgts$ Card | TgtPrompt$ Select target card | RememberChanged$ True | SubAbility$ DBPutCounter | SpellDescription$ Exile target card from a graveyard.
+SVar:DBPutCounter:DB$ PutCounter | CounterType$ P1P1 | CounterNum$ 1 | ConditionDefined$ Remembered | ConditionPresent$ Permanent | ConditionDescription$ If it was a permanent card, | SpellDescription$ If it was a permanent card, put a +1/+1 counter on CARDNAME. | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+S:Mode$ Continuous | Affected$ Card.EquippedBy | AddPower$ X | AddToughness$ X | Description$ Equipped creature gets +1/+1 for each +1/+1 counter on CARDNAME.
+SVar:X:Count$CardCounters.P1P1
+K:Reconfigure:2
+DeckHas:Ability$Counters
+Oracle:{W}: Exile target card from a graveyard. If it was a permanent card, put a +1/+1 counter on Lion Sash.\nEquipped creature gets +1/+1 for each +1/+1 counter on Lion Sash.\nReconfigure {2} ({2}: Attach to target creature you control; or unattach from a creature. Reconfigure only as a sorcery. While attached, this isn't a creature.)

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

@@ -0,0 +1,10 @@
+Name:Moon-Circuit Hacker
+ManaCost:1 U
+Types:Enchantment Creature Human Ninja
+PT:2/1
+K:Ninjutsu:U
+T:Mode$ DamageDone | ValidSource$ Card.Self | ValidTarget$ Player | CombatDamage$ True | Execute$ TrigDraw | TriggerDescription$ Whenever CARDNAME deals combat damage to a player, you may draw a card. If you do, discard a card.
+SVar:TrigDraw:DB$ Draw | Defined$ You | NumCards$ 1 | SubAbility$ DBDiscard
+SVar:DBDiscard:DB$ Discard | Defined$ You | Mode$ TgtChoose | NumCards$ 1 | ConditionDefined$ Self | ConditionPresent$ Card.ThisTurnEntered | ConditionCompare$ EQ0
+DeckHas:Ability$Discard
+Oracle:Ninjutsu {U} ({U}, Return an unblocked attacker you control to hand: Put this card onto the battlefield from your hand tapped and attacking.)\nWhenever Moon-Circuit Hacker deals combat damage to a player, you may draw a card. If you do, discard a card unless Moon-Circuit Hacker entered the battlefield this turn.

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

@@ -0,0 +1,11 @@
+Name:Naomi, Pillar of Order
+ManaCost:3 W B
+Types:Legendary Creature Human Advisor
+PT:4/4
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Artifact.YouCtrl | IsPresent2$ Enchantment.YouCtrl | Execute$ TrigToken | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.
+T:Mode$ Attacks | ValidCard$ Card.Self | Execute$ TrigToken | IsPresent$ Artifact.YouCtrl | IsPresent2$ Enchantment.YouCtrl | Secondary$ True | TriggerDescription$ Whenever CARDNAME enters the battlefield or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.
+SVar:TrigToken:DB$ Token | TokenScript$ w_2_2_samurai_vigilance
+DeckHints:Type$Artifact|Enchantment
+DeckHas:Ability$Token & Type$Samurai
+SVar:HasAttackEffect:TRUE
+Oracle:Whenever Naomi, Pillar of Order enters the battlefield or attacks, if you control an artifact and an enchantment, create a 2/2 white Samurai creature token with vigilance.

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

@@ -0,0 +1,17 @@
+Name:Storyweave
+ManaCost:2 G
+Types:Instant
+A:SP$ Charm | Choices$ P1P1,Lore
+SVar:P1P1:DB$ PutCounter | ValidTgts$ Creature.YouCtrl | TgtPrompt$ Select target creature you control | CounterType$ P1P1 | CounterNum$ 2 | SpellDescription$ Put two +1/+1 counters on target creature you control.
+SVar:Lore:DB$ PutCounter | ValidTgts$ Saga.YouCtrl | TgtPrompt$ Select target Saga you control | CounterType$ LORE | CounterNum$ 2 | SubAbility$ DBEffect | SpellDescription$ Put two lore counters on target Saga you control. The next time one or more enchantment creatures enter the battlefield under your control this turn, each enters with two additional +1/+1 counters on it.
+SVar:DBEffect:DB$ Effect | ReplacementEffects$ ReplaceETB | Triggers$ TrigRemove
+SVar:ReplaceETB:Event$ Moved | Destination$ Battlefield | ValidCard$ Creature.Enchantment | ReplaceWith$ DBPutP1P1
+SVar:DBPutP1P1:DB$ PutCounter | Defined$ ReplacedCard | CounterType$ P1P1 | ETB$ True | CounterNum$ 2 | SubAbility$ MoveToBattlefield
+SVar:MoveToBattlefield:DB$ InternalEtbReplacement | SubAbility$ DBImprint
+SVar:DBImprint:DB$ Pump | ImprintCards$ ReplacedCard
+SVar:TrigRemove:Mode$ ChangesZoneAll | CheckSVar$ Z | Execute$ ExileSelf | Static$ True
+SVar:ExileSelf:DB$ ChangeZone | Origin$ Command | Destination$ Exile | Defined$ Self
+SVar:Z:Imprinted$Amount
+DeckHas:Ability$Counters
+DeckHints:Type$Saga
+Oracle:Choose one —\n• Put two +1/+1 counters on target creature you control.\n• Put two lore counters on target Saga you control. The next time one or more enchantment creatures enter the battlefield under your control this turn, each enters with two additional +1/+1 counters on it.

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

@@ -4,7 +4,7 @@ Types:Legendary Creature Human Ninja
 PT:3/3
 T:Mode$ SpellCast | ValidCard$ Enchantment | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigToken | IsPresent$ Creature.YouCtrl+namedKeimi | PresentCompare$ EQ0 | TriggerDescription$ Whenever you cast an enchantment spell, if you don't control a creature named Keimi, create Keimi, a legendary 3/3 black and green Frog creature token with "Whenever you cast an enchantment spell, each opponent loses 1 life and you gain 1 life."
 SVar:TrigToken:DB$ Token | TokenScript$ keimi
-A:AB$ Effect | Cost$ 1 GU | ValidTgts$ Frog.YouCtrl | TgtPrompt$ Select target Frog you control | RememberObjects$ Targeted | StaticAbilities$ STCantBlockBy,STCantBlockByFrog | SubAbility$ DBEffect | StackDescription$ CARDNAME and {c:Targeted} can't be blocked this turn except by creatures with flying or reach. | SpellDescription$ CARDNAME and target Frog you control can't be blocked this turn except by creatures with flying or reach.
+A:AB$ Effect | Cost$ 1 GU | ValidTgts$ Frog.YouCtrl | TgtPrompt$ Select target Frog you control | RememberObjects$ Targeted | StaticAbilities$ STCantBlockBy,STCantBlockByFrog | StackDescription$ CARDNAME and {c:Targeted} can't be blocked this turn except by creatures with flying or reach. | SpellDescription$ CARDNAME and target Frog you control can't be blocked this turn except by creatures with flying or reach.
 SVar:STCantBlockBy:Mode$ CantBlockBy | ValidAttacker$ Creature.EffectSource | ValidBlocker$ Creature.withoutFlying+withoutReach | Description$ EFFECTSOURCE and target Frog you control can't be blocked this turn except by creatures with flying or reach.
 SVar:STCantBlockByFrog:Mode$ CantBlockBy | ValidAttacker$ Creature.IsRemembered | ValidBlocker$ Creature.withoutFlying+withoutReach | Secondary$ True
 DeckNeeds:Type$Enchantment

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

@@ -0,0 +1,9 @@
+Name:Tempered in Solitude
+ManaCost:1 R
+Types:Enchantment
+T:Mode$ Attacks | ValidCard$ Creature.YouCtrl | Alone$ True | TriggerZones$ Battlefield | Execute$ TrigExile | TriggerDescription$ Whenever a creature you control attacks alone, exile the top card of your library. You may play that card this turn.
+SVar:TrigExile:DB$ Dig | DigNum$ 1 | ChangeNum$ All | Defined$ You | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect
+SVar:DBEffect:DB$ Effect | RememberObjects$ RememberedCard | StaticAbilities$ MayPlay | SubAbility$ DBCleanup | ExileOnMoved$ Exile
+SVar:MayPlay:Mode$ Continuous | MayPlay$ True | EffectZone$ Command | Affected$ Card.IsRemembered | AffectedZone$ Exile | Description$ You may play the exiled card this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Whenever a creature you control attacks alone, exile the top card of your library. You may play that card this turn.