Merge branch 'mh2_3' into 'master'

MH2 - 3 June

See merge request core-developers/forge!4816

forge-game/src/main/java/forge/game/card/CounterEnumType.java

@@ -33,6 +33,8 @@ public enum CounterEnumType {
 
     LOYALTY("LOYAL", 198, 198, 198),
 
+    ACORN("ACORN", 139,69,19),
+
     AEGIS("AEGIS", 207, 207, 207),
 
     AGE("AGE", 255, 137, 57),

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

@@ -0,0 +1,11 @@
+Name:Chitterspitter
+ManaCost:2 G
+Types:Artifact
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ At the beginning of your upkeep, you may sacrifice a token. If you do, put an acorn counter on CARDNAME.
+SVar:TrigPutCounter:AB$ PutCounter | Cost$ Sac<1/Permanent.token/token> | CounterType$ ACORN | CounterNum$ 1
+S:Mode$ Continuous | Affected$ Squirrel.YouCtrl | AddPower$ X | AddToughness$ X | Description$ Squirrels you control get +1/+1 for each acorn counter on CARDNAME.
+A:AB$ Token | Cost$ G T | TokenScript$ g_1_1_squirrel | SpellDescription$ Create a 1/1 green Squirrel creature token.
+SVar:X:Count$CardCounters.ACORN
+DeckHas:Ability$Sacrifice & Ability$Counters & Ability$Token
+DeckHints:Type$Squirrel
+Oracle:At the beginning of your upkeep, you may sacrifice a token. If you do, put an acorn counter on Chitterspitter.\nSquirrels you control get +1/+1 for each acorn counter on Chitterspitter.\n{G}, {T}: Create a 1/1 green Squirrel creature token.

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

@@ -0,0 +1,7 @@
+Name:Echoing Return
+ManaCost:B
+Types:Sorcery
+A:SP$ ChangeZone | Origin$ Graveyard | Destination$ Hand | AILogic$ SameName | ValidTgts$ Creature.YouOwn | TgtPrompt$ Select target creature | SubAbility$ DBReturn | SpellDescription$ Return target creature card and all other cards with the same name as that card from your graveyard to your hand. | StackDescription$ Return {c:Targeted} and all other cards with the same name as that card from your graveyard to your hand.
+SVar:DBReturn:DB$ ChangeZoneAll | Origin$ Graveyard | Destination$ Hand | Defined$ You | ChangeType$ TargetedCard.sameName
+DeckHas:Ability$Graveyard
+Oracle:Return target creature card and all other cards with the same name as that card from your graveyard to your hand.

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

@@ -0,0 +1,8 @@
+Name:Flourishing Strike
+ManaCost:1 G
+Types:Instant
+K:Entwine:2 G
+A:SP$ Charm | Choices$ DBDealDamage,DBPump
+SVar:DBDealDamage:DB$ DealDamage | ValidTgts$ Creature.withFlying | TgtPrompt$ Select target creature with flying | NumDmg$ 5 | SpellDescription$ CARDNAME deals 5 damage to target creature with flying.
+SVar:DBPump:DB$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ +3 | NumDef$ +3 | AILogic$ Pump | SpellDescription$ Target creature gets +3/+3 until end of turn.
+Oracle:Choose one — \n• Flourishing Strike deals 5 damage to target creature with flying.\n• Target creature gets +3/+3 until end of turn.\nEntwine {2}{G} (Choose both if you pay the entwine cost.)

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

@@ -0,0 +1,10 @@
+Name:Nykthos Paragon
+ManaCost:4 W W
+Types:Enchantment Creature Human Soldier
+PT:4/6
+T:Mode$ LifeGained | ValidPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPutCounterAll | ActivationLimit$ 1 | OptionalDecider$ You | TriggerDescription$ Whenever you gain life, you may put that many +1/+1 counters on each creature you control. This ability triggers only once each turn.
+SVar:TrigPutCounterAll:DB$ PutCounterAll | ValidCards$ Creature.YouCtrl | CounterType$ P1P1 | CounterNum$ X
+SVar:X:TriggerCount$LifeAmount
+DeckNeeds:Ability$LifeGain
+DeckHas:Ability$Counters
+Oracle:Whenever you gain life, you may put that many +1/+1 counters on each creature you control. This ability triggers only once each turn.

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

@@ -4,6 +4,6 @@ Types:Creature Dinosaur Illusion
 PT:6/6
 K:Trample
 T:Mode$ BecomesTarget | ValidTarget$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigSac | TriggerDescription$ When CARDNAME becomes the target of a spell or ability, sacrifice it.
-SVar:TrigSac:DB$Sacrifice | Defined$ Self
+SVar:TrigSac:DB$ Sacrifice | Defined$ Self
 SVar:Targeting:Dies
-Oracle:Flying\nWhen Phantasmal Dreadmaw becomes the target of a spell or ability, sacrifice it.
+Oracle:Trample\nWhen Phantasmal Dreadmaw becomes the target of a spell or ability, sacrifice it.

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

@@ -0,0 +1,9 @@
+Name:Resurgent Belief
+ManaCost:no cost
+Types:Sorcery
+Colors:white
+K:Suspend:2:1 W
+A:SP$ ChangeZoneAll | ChangeType$ Enchantment.YouOwn | Origin$ Graveyard | Destination$ Battlefield | SpellDescription$ Return all enchantment cards from your graveyard to the battlefield. (Auras with nothing to enchant remain in your graveyard.)
+DeckNeeds:Type$Enchantment
+AI:RemoveDeck:Random
+Oracle:Suspend 2 — {1}{W} (Rather than cast this card from your hand, pay {1}{W} and exile it with two time counters on it. At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.)\nReturn all enchantment cards from your graveyard to the battlefield. (Auras with nothing to enchant remain in your graveyard.)

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

@@ -0,0 +1,9 @@
+Name:Vile Entomber
+ManaCost:2 B B
+Types:Creature Zombie Warlock
+PT:2/2
+K:Deathtouch
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Creature.Self | Execute$ TrigChange | TriggerDescription$ When CARDNAME enters the battlefield, search your library for a card, put that card into your graveyard, then shuffle.
+SVar:TrigChange:DB$ ChangeZone | Origin$ Library | Destination$ Graveyard | ChangeNum$ 1 | Mandatory$ True | ChangeType$ Card
+DeckHas:Ability$Graveyard
+Oracle:Deathtouch\nWhen Vile Entomber enters the battlefield, search your library for a card, put that card into your graveyard, then shuffle.