Merge remote-tracking branch 'remotes/core/master'

forge-core/src/main/java/forge/card/CardRulesPredicates.java

@@ -270,7 +270,6 @@ public final class CardRulesPredicates {
         return new PredicateSuperType(type, isEqual);
     }
 
-
     /**
      * Checks for color.
      *

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

@@ -166,7 +166,6 @@ public class ChangeZoneAllEffect extends SpellAbilityEffect {
             Map<AbilityKey, Object> moveParams = Maps.newEnumMap(AbilityKey.class);
 
             if (destination == ZoneType.Battlefield) {
-
                 if (sa.hasAdditionalAbility("AnimateSubAbility")) {
                     // need LKI before Animate does apply
                     moveParams.put(AbilityKey.CardLKI, CardUtil.getLKICopy(c));

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

@@ -1,6 +1,5 @@
 package forge.game.ability.effects;
 
-
 import java.util.List;
 
 import forge.game.ability.AbilityUtils;

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

@@ -89,7 +89,6 @@ public class TokenCreateTable extends ForwardingTable<Player, Card, Integer> {
             result += c.getValue();
         }
 
-        
         return result;
     }
 }

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

@@ -0,0 +1,7 @@
+Name:Avacyn's Memorial
+ManaCost:5 W W W
+Types:Legendary Artifact
+K:Indestructible
+S:Mode$ Continuous | Affected$ Permanent.Other+YouCtrl+Legendary | AddKeyword$ Indestructible | Description$ Other legendary permanents you control have indestructible.
+DeckNeeds:Type$Legendary
+Oracle:Indestructible\nOther legendary permanents you control have indestructible.

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

@@ -0,0 +1,8 @@
+Name:Candlelit Cavalry
+ManaCost:4 G
+Types:Creature Human Knight
+PT:5/5
+T:Mode$ Phase | Phase$ BeginCombat | ValidPlayer$ You | TriggerZones$ Battlefield | CheckSVar$ X | SVarCompare$ GE3 | Execute$ TrigPump | TriggerDescription$ Coven – At the beginning of combat on your turn, if you control three or more creatures with different powers, CARDNAME gains trample until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | KW$ Trample
+SVar:X:Count$DifferentPower_Creature.YouCtrl
+Oracle:Coven — At the beginning of combat on your turn, if you control three or more creatures with different powers, Candlelit Cavalry gains trample until end of turn.

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

@@ -0,0 +1,8 @@
+Name:Festival Crasher
+ManaCost:1 R
+Types:Creature Devil
+PT:1/3
+T:Mode$ SpellCast | ValidCard$ Instant,Sorcery | ValidActivatingPlayer$ You | TriggerZones$ Battlefield | Execute$ TrigPump | TriggerDescription$ Whenever you cast an instant or sorcery spell, CARDNAME gets +2/+0 until end of turn.
+SVar:TrigPump:DB$ Pump | Defined$ Self | NumAtt$ 2
+DeckHints:Type$Instant|Sorcery
+Oracle:Whenever you cast an instant or sorcery spell, Festival Crasher gets +2/+0 until end of turn.

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

@@ -0,0 +1,11 @@
+Name:Howl of the Hunt
+ManaCost:2 G
+Types:Enchantment Aura
+K:Flash
+K:Enchant creature
+A:SP$ Attach | ValidTgts$ Creature | AILogic$ Pump
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | IsPresent$ Creature.EnchantedBy+Wolf,Creature.EnchantedBy+Werewolf | PresentCompare$ EQ1 | Execute$ TrigUntap | TriggerDescription$ When CARDNAME enters the battlefield, if enchanted creature is a Wolf or Werewolf, untap that creature.
+SVar:TrigUntap:DB$ Untap | Defined$ Enchanted
+S:Mode$ Continuous | Affected$ Creature.EnchantedBy | AddPower$ 2 | AddToughness$ 2 | AddKeyword$ Vigilance | Description$ Enchanted creature gets +2/+2 and has vigilance.
+DeckHints:Type$Wolf|Werewolf
+Oracle:Flash\nEnchant creature\nWhen Howl of the Hunt enters the battlefield, if enchanted creature is a Wolf or Werewolf, untap that creature.\nEnchanted creature gets +2/+2 and has vigilance.

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

@@ -0,0 +1,7 @@
+Name:Might of the Old Ways
+ManaCost:1 G
+Types:Instant
+A:SP$ Pump | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ 2 | NumDef$ 2 | SubAbility$ DBDraw | SpellDescription$ Target creature gets +2/+2 until end of turn.
+SVar:DBDraw:DB$ Draw | Defined$ You | NumCards$ 1 | ConditionCheckSVar$ X | ConditionSVarCompare$ GE3 | StackDescription$ SpellDescription | SpellDescription$ Coven — Then if you control three or more creatures with different powers, draw a card.
+SVar:X:Count$DifferentPower_Creature.YouCtrl
+Oracle:Target creature gets +2/+2 until end of turn.\nCoven — Then if you control three or more creatures with different powers, draw a card.

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

@@ -0,0 +1,6 @@
+Name:Pestilent Wolf
+ManaCost:1 G
+Types:Creature Wolf
+PT:2/2
+A:AB$ Pump | Cost$ 2 G | Defined$ Self | KW$ Deathtouch | SpellDescription$ CARDNAME gains deathtouch until end of turn.
+Oracle:{2}{G}: Pestilent Wolf gains deathtouch until end of turn.

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

@@ -0,0 +1,6 @@
+Name:Snarling Wolf
+ManaCost:G
+Types:Creature Wolf
+PT:1/1
+A:AB$ Pump | Cost$ 1 G | Defined$ Self | NumAtt$ 2 | NumDef$ 2 | ActivationLimit$ 1 | SpellDescription$ CARDNAME gets +2/+2 until end of turn. Activate only once each turn.
+Oracle:{1}{G}: Snarling Wolf gets +2/+2 until end of turn. Activate only once each turn.

forge-gui/res/quest/commanderprecons/Built from Scratch (2018).dck

@@ -32,7 +32,7 @@ Name=Built from Scratch (2018)
 1 Great Furnace|CM2
 1 Hoard-Smelter Dragon|CM2
 1 Ichor Wellspring|CM2
-#1 Impact Resonance|CM2
+1 Impact Resonance|CM2
 1 Incite Rebellion|CM2
 1 Ingot Chewer|CM2
 1 Jalum Tome|CM2

forge-gui/res/quest/commanderprecons/Built from Scratch.dck

@@ -32,7 +32,7 @@ Name=Built from Scratch
 1 Great Furnace|C14
 1 Hoard-Smelter Dragon|C14
 1 Ichor Wellspring|C14
-#1 Impact Resonance|C14
+1 Impact Resonance|C14
 1 Incite Rebellion|C14
 1 Ingot Chewer|C14
 1 Jalum Tome|C14

forge-gui/res/quest/commanderprecons/Entropic Uprising.dck

@@ -83,6 +83,6 @@ Name=Entropic Uprising
 1 Curtains' Call|C16
 1 Parting Thoughts|C16
 1 Grave Upheaval|C16
-#1 Cruel Entertainment|C16
+1 Cruel Entertainment|C16
 1 Treacherous Terrain|C16
 1 Ash Barrens|C16

forge-gui/res/quest/commanderprecons/Feline Ferocity.dck

@@ -77,7 +77,7 @@ Name=Feline Ferocity
 1 Soul's Majesty|C17
 1 Spirit of the Hearth|C17
 1 Staff of Nin|C17
-#1 Stalking Leonin|C17
+1 Stalking Leonin|C17
 1 Stirring Wildwood|C17
 1 Sunspear Shikari|C17
 1 Swiftfoot Boots|C17