Added AFR RollDice cards and Temple of the Dragon Queen

forge-game/src/main/java/forge/game/ability/effects/RevealEffect.java

@@ -25,6 +25,7 @@ public class RevealEffect extends SpellAbilityEffect {
         final Card host = sa.getHostCard();
         final Game game = host.getGame();
         final boolean anyNumber = sa.hasParam("AnyNumber");
+        final boolean optional = sa.hasParam("Optional");
         int cnt = sa.hasParam("NumCards") ? AbilityUtils.calculateAmount(host, sa.getParam("NumCards"), sa) : 1;
 
         for (final Player p : getTargetPlayers(sa)) {
@@ -66,6 +67,8 @@ public class RevealEffect extends SpellAbilityEffect {
                     if (anyNumber) {
                         cnt = valid.size();
                         min = 0;
+                    } else if (optional) {
+                        min = 0;
                     }
 
                     revealed.addAll(p.getController().chooseCardsToRevealFromHand(min, cnt, valid));

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

@@ -0,0 +1,7 @@
+Name:Brazen Dwarf
+ManaCost:1 R
+Types:Creature Dwarf Shaman
+PT:1/3
+T:Mode$ RolledDieOnce | TriggerZones$ Battlefield | ValidPlayer$ You | Execute$ TrigDamage | TriggerDescription$ Whenever you roll one or more dice, CARDNAME deals 1 damage to each opponent.
+SVar:TrigDamage:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 1
+Oracle:Whenever you roll one or more dice, Brazen Dwarf deals 1 damage to each opponent.

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

@@ -0,0 +1,13 @@
+Name:Chaos Channeler
+ManaCost:2 R R
+Types:Creature Human Shaman
+PT:4/3
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigRollDice | TriggerDescription$ Wild Magic Surge — Whenever CARDNAME attacks, ABILITY
+SVar:TrigRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:Exile1,10-19:Exile2,20:Exile3 | SpellDescription$ roll a d20.
+SVar:Exile1:DB$ Dig | Defined$ You | DigNum$ 1 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ 1-9 VERT Exile the top card of your library. You may play it this turn.
+SVar:Exile2:DB$ Dig | Defined$ You | DigNum$ 2 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ 10-19 VERT Exile the top two cards of your library. You may play them this turn.
+SVar:Exile3:DB$ Dig | Defined$ You | DigNum$ 3 | ChangeNum$ All | DestinationZone$ Exile | RememberChanged$ True | SubAbility$ DBEffect | SpellDescription$ 20 VERT Exile the top three cards of your library. You may play them this turn.
+SVar:DBEffect:DB$ Effect | StaticAbilities$ STPlay | RememberObjects$ Remembered | ForgetOnMoved$ Exile | SubAbility$ DBCleanup
+SVar:STPlay:Mode$ Continuous | EffectZone$ Command | AffectedZone$ Exile | Affected$ Card.IsRemembered | MayPlay$ True | Description$ You may play the card(s) this turn.
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+Oracle:Wild Magic Surge — Whenever Chaos Channeler attacks, roll a d20.\n1-9 | Exile the top card of your library. You may play it this turn.\n10-19 | Exile the top two cards of your library. You may play them this turn.\n20 | Exile the top three cards of your library. You may play them this turn.

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

@@ -0,0 +1,11 @@
+Name:Earth-Cult Elemental
+ManaCost:4 R R
+Types:Creature Elemental
+PT:6/6
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigRollDice | TriggerDescription$ Siege Monster — When CARDNAME enters the battlefield, ABILITY
+SVar:TrigRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:Sac1,10-19:SacOpp,20:SacOpp2 | SpellDescription$ roll a d20.
+SVar:Sac1:DB$ Sacrifice | SacValid$ Permanent | Defined$ Player | SpellDescription$ 1-9 VERT Each player sacrifices a permanent.
+SVar:SacOpp:DB$ Sacrifice | SacValid$ Permanent | Defined$ Player.Opponent | SpellDescription$ 10-19 VERT Each opponent sacrifices a permanent.
+SVar:SacOpp2:DB$ Sacrifice | SacValid$ Permanent | Amount$ 2 | Defined$ Player.Opponent | SpellDescription$ 20 VERT Each opponent sacrifices two permanents.
+DeckHas:Ability$Sacrifice
+Oracle:Siege Monster — When Earth-Cult Elemental enters the battlefield, roll a d20.\n1-9 | Each player sacrifices a permanent.\n10-19 | Each opponent sacrifices a permanent.\n20 | Each opponent sacrifices two permanents.

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

@@ -0,0 +1,8 @@
+Name:Farideh's Fireball
+ManaCost:3 R R
+Types:Instant
+A:SP$ DealDamage | ValidTgts$ Creature,Planeswalker | NumDmg$ 5 | SubAbility$ DBRollDice | SpellDescription$ CARDNAME deals 5 damage to target creature or planeswalker. Roll a d20.
+SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:DamageAll,10-20:DamageOpp
+SVar:DamageAll:DB$ DealDamage | Defined$ Player | NumDmg$ 2 | SpellDescription$ 1-9 VERT CARDNAME deals 2 damage to each player.
+SVar:DamageOpp:DB$ DealDamage | Defined$ Player.Opponent | NumDmg$ 2 | SpellDescription$ 10-20 VERT CARDNAME deals 2 damage to each opponent.
+Oracle:Farideh's Fireball deals 5 damage to target creature or planeswalker. Roll a d20.\n1-9 | Farideh's Fireball deals 2 damage to each player.\n10-20 | Farideh's Fireball deals 2 damage to each opponent.

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

@@ -0,0 +1,13 @@
+Name:Herald of Hadar
+ManaCost:4 B
+Types:Creature Human Warlock
+PT:4/4
+A:AB$ RollDice | Cost$ 5 B | Sides$ 20 | ResultSubAbilities$ 1-9:LoseTwo,10-19:LoseGain,20:LoseTrea | PrecostDesc$ Circle of Death — | SpellDescription$ Roll a d20.
+SVar:LoseTwo:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SpellDescription$ 1-9 VERT Each opponent loses 2 life.
+SVar:LoseGain:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGain2 | SpellDescription$ 10-19 VERT Each opponent loses 2 life and you gain 2 life.
+SVar:DBGain2:DB$ GainLife | Defined$ You | LifeAmount$ 2
+SVar:LoseTrea:DB$ LoseLife | Defined$ Player.Opponent | LifeAmount$ 2 | SubAbility$ DBGainTrea | SpellDescription$ 20 VERT Each opponent loses 2 life and you gain 2 life. Create two Treasure tokens. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:DBGainTrea:DB$ GainLife | Defined$ You | LifeAmount$ 2 | SubAbility$ DBTreasure
+SVar:DBTreasure:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+DeckHas:Ability$LifeGain & Ability$Token
+Oracle:Circle of Death — {5}{B}: Roll a d20.\n1-9 | Each opponent loses 2 life.\n10-19 | Each opponent loses 2 life and you gain 2 life.\n20 | Each opponent loses 2 life and you gain 2 life. Create two Treasure tokens. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")

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

@@ -0,0 +1,11 @@
+Name:Hoarding Ogre
+ManaCost:3 R
+Types:Creature Ogre
+PT:3/3
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigRollDice | TriggerDescription$ Whenever CARDNAME attacks, ABILITY
+SVar:TrigRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:Token1,10-19:Token2,20:Token3 | SpellDescription$ roll a d20.
+SVar:Token1:DB$ Token | TokenAmount$ 1 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ 1-9 VERT Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")
+SVar:Token2:DB$ Token | TokenAmount$ 2 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ 10-19 VERT Create two Treasure tokens.
+SVar:Token3:DB$ Token | TokenAmount$ 3 | TokenScript$ c_a_treasure_sac | TokenOwner$ You | SpellDescription$ 20 VERT Create three Treasure tokens.
+DeckHas:Ability$Token
+Oracle:Whenever Hoarding Ogre attacks, roll a d20.\n1-9 | Create a Treasure token. (It's an artifact with "{T}, Sacrifice this artifact: Add one mana of any color.")\n10-19 | Create two Treasure tokens.\n20 | Create three Treasure tokens.

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

@@ -0,0 +1,10 @@
+Name:Lightfoot Rogue
+ManaCost:1 B
+Types:Creature Halfling Rogue
+PT:2/1
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigRollDice | TriggerDescription$ Sneak Attack — Whenever CARDNAME attacks, ABILITY
+SVar:TrigRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:Pump1,10-19:Pump2,20:Pump3 | SpellDescription$ roll a d20.
+SVar:Pump1:DB$ Pump | Defined$ Self | KW$ Deathtouch | SpellDescription$ 1-9 VERT CARDNAME gains deathtouch until end of turn.
+SVar:Pump2:DB$ Pump | Defined$ Self | KW$ Deathtouch | NumAtt$ 1 | SpellDescription$ 10-19 VERT It gets +1/+0 and gains deathtouch until end of turn.
+SVar:Pump3:DB$ Pump | Defined$ Self | KW$ First Strike & Deathtouch | NumAtt$ 3 | SpellDescription$ 20 VERT It gets +3/+0 and gains first strike and deathtouch until end of turn.
+Oracle:Sneak Attack — Whenever Lightfoot Rogue attacks, roll a d20.\n1-9 | Lightfoot Rogue gains deathtouch until end of turn.\n10-19 | It gets +1/+0 and gains deathtouch until end of turn.\n20 | It gets +3/+0 and gains first strike and deathtouch until end of turn.

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

@@ -0,0 +1,9 @@
+Name:Loathsome Troll
+ManaCost:3 G G
+Types:Creature Troll
+PT:6/2
+A:AB$ RollDice | Cost$ 3 G | ActivationZone$ Graveyard | Sides$ 20 | ResultSubAbilities$ 1-9:ToLib,10-19:ToHand,20:ToField | SpellDescription$ Roll a d20. Activate only if CARDNAME is in your graveyard.
+SVar:ToLib:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Library | SpellDescription$ 1-9 VERT Put CARDNAME on top of your library.
+SVar:ToHand:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Hand | SpellDescription$ 10-19 VERT Return CARDNAME to your hand.
+SVar:ToField:DB$ ChangeZone | Defined$ Self | Origin$ Graveyard | Destination$ Battlefield | Tapped$ True | SpellDescription$ 20 VERT Return CARDNAME to the battlefield tapped.
+Oracle:{3}{G}: Roll a d20. Activate only if Loathsome Troll is in your graveyard.\n1-9 | Put Loathsome Troll on top of your library.\n10-19 | Return Loathsome Troll to your hand.\n20 | Return Loathsome Troll to the battlefield tapped.

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

@@ -0,0 +1,10 @@
+Name:Spiked Pit Trap
+ManaCost:1
+Types:Artifact
+K:Flash
+A:AB$ Pump | Cost$ 5 T Sac<1/CARDNAME> | ValidTgts$ Creature | AITgts$ Creature.OppCtrl+toughnessLE5 | IsCurse$ True | SubAbility$ DBRollDice | StackDescription$ SpellDescription | SpellDescription$ Choose target creature, then roll a d20.
+SVar:DBRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:DBDamage,10-20:DBDamageAndTreasure
+SVar:DBDamage:DB$ DealDamage | Defined$ Targeted | NumDmg$ 5 | SpellDescription$ 1-9 VERT CARDNAME deals 5 damage to that creature.
+SVar:DBDamageAndTreasure:DB$ DealDamage | Defined$ Targeted | NumDmg$ 5 | SubAbility$ DBTreasure | SpellDescription$ 10-20 VERT CARDNAME deals 5 damage to that creature. Create a Treasure token.
+SVar:DBTreasure:DB$ Token | TokenScript$ c_a_treasure_sac | TokenOwner$ You
+Oracle:Flash\n{5}, {T}, Sacrifice Spiked Pit Trap: Choose target creature, then roll a d20.\n1-9 | Spiked Pit Trap deals 5 damage to that creature.\n10-20 | Spiked Pit Trap deals 5 damage to that creature. Create a Treasure token.

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

@@ -0,0 +1,11 @@
+Name:Swarming Goblins
+ManaCost:4 R
+Types:Creature Goblin
+PT:4/3
+T:Mode$ ChangesZone | ValidCard$ Card.Self | Destination$ Battlefield | Execute$ TrigRollDice | TriggerDescription$ When CARDNAME enters the battlefield, ABILITY
+SVar:TrigRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:Token1,10-19:Token2,20:Token3 | SpellDescription$ roll a d20.
+SVar:Token1:DB$ Token | TokenAmount$ 1 | TokenScript$ r_1_1_goblin | TokenOwner$ You | SpellDescription$ 1-9 VERT Create a 1/1 red Goblin creature token.
+SVar:Token2:DB$ Token | TokenAmount$ 2 | TokenScript$ r_1_1_goblin | TokenOwner$ You | SpellDescription$ 10-19 VERT Create two of those tokens.
+SVar:Token3:DB$ Token | TokenAmount$ 3 | TokenScript$ r_1_1_goblin | TokenOwner$ You | SpellDescription$ 20 VERT Create three of those tokens.
+DeckHas:Ability$Token
+Oracle:When Swarming Goblins enters the battlefield, roll a d20.\n1-9 | Create a 1/1 red Goblin creature token.\n10-19 | Create two of those tokens.\n20 | Create three of those tokens.

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

@@ -0,0 +1,12 @@
+Name:Sylvan Shepherd
+ManaCost:2 G
+Types:Creature Human Druid
+PT:2/3
+K:Vigilance
+T:Mode$ Attacks | ValidCard$ Card.Self | TriggerZones$ Battlefield | Execute$ TrigRollDice | TriggerDescription$ Whenever CARDNAME attacks, ABILITY
+SVar:TrigRollDice:DB$ RollDice | Sides$ 20 | ResultSubAbilities$ 1-9:Gain1,10-19:Gain2,20:Gain5 | SpellDescription$ roll a d20.
+SVar:Gain1:DB$ GainLife | Defined$ You | LifeAmount$ 1 | SpellDescription$ 1-9 VERT You gain 1 life.
+SVar:Gain2:DB$ GainLife | Defined$ You | LifeAmount$ 2 | SpellDescription$ 10-19 VERT You gain 2 life.
+SVar:Gain5:DB$ GainLife | Defined$ You | LifeAmount$ 5 | SpellDescription$ 20 VERT You gain 5 life.
+DeckHas:Ability$LifeGain
+Oracle:Vigilance\nWhenever Sylvan Shepherd attacks, roll a d20.\n1-9 | You gain 1 life.\n10-19 | You gain 2 life.\n20 | You gain 5 life.

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

@@ -0,0 +1,13 @@
+Name:Temple of the Dragon Queen
+ManaCost:no cost
+Types:Land
+K:ETBReplacement:Other:DBReveal
+SVar:DBReveal:DB$ Reveal | RevealValid$ Dragon | Optional$ True | RememberRevealed$ True | SubAbility$ DBTap | SpellDescription$ As CARDNAME enters the battlefield, you may reveal a Dragon card from your hand. CARDNAME enters the battlefield tapped unless you revealed a Dragon card this way or you control a Dragon.
+SVar:DBTap:DB$ Tap | ETB$ True | Defined$ Self | StackDescription$ enters the battlefield tapped. | ConditionCheckSVar$ DragonPresence | ConditionSVarCompare$ EQ0 | SubAbility$ DBCleanup
+SVar:DBCleanup:DB$ Cleanup | ClearRemembered$ True
+SVar:DragonPresence:Count$RememberedSize/Plus.DragonControlled
+SVar:DragonControlled:Count$Valid Dragon.inZoneBattlefield+YouCtrl
+K:ETBReplacement:Other:ChooseColor
+SVar:ChooseColor:DB$ ChooseColor | Defined$ You | AILogic$ MostProminentInComputerDeck | SpellDescription$ As CARDNAME enters the battlefield, choose a color.
+A:AB$ Mana | Cost$ T | Produced$ Chosen | SpellDescription$ Add one mana of the chosen color.
+Oracle:As Temple of the Dragon Queen enters the battlefield, you may reveal a Dragon card from your hand. Temple of the Dragon Queen enters the battlefield tapped unless you revealed a Dragon card this way or you control a Dragon.\nAs Temple of the Dragon Queen enters the battlefield, choose a color.\n{T}: Add one mana of the chosen color.