Merge pull request #3945 from theelk801/master

Implemented Frenetic Raptor, added Dinosaur errata

Mage.Sets/src/mage/cards/a/AlphaTyrranax.java

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.a;
 
 import java.util.UUID;
@@ -41,15 +40,16 @@ import mage.constants.SubType;
  */
 public class AlphaTyrranax extends CardImpl {
 
-    public AlphaTyrranax (UUID ownerId, CardSetInfo setInfo) {
+    public AlphaTyrranax(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
+        this.subtype.add(SubType.DINOSAUR);
         this.subtype.add(SubType.BEAST);
 
         this.power = new MageInt(6);
         this.toughness = new MageInt(5);
     }
 
-    public AlphaTyrranax (final AlphaTyrranax card) {
+    public AlphaTyrranax(final AlphaTyrranax card) {
         super(card);
     }
 

Mage.Sets/src/mage/cards/b/Bedlam.java

@@ -25,18 +25,19 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.b;
 
 import java.util.UUID;
 import mage.abilities.Ability;
 import mage.abilities.common.SimpleStaticAbility;
 import mage.abilities.effects.RestrictionEffect;
+import mage.abilities.effects.common.combat.CantBlockAllEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
 import mage.constants.Zone;
+import mage.filter.StaticFilters;
 import mage.game.Game;
 import mage.game.permanent.Permanent;
 
@@ -47,11 +48,10 @@ import mage.game.permanent.Permanent;
 public class Bedlam extends CardImpl {
 
     public Bedlam(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{2}{R}{R}");
-
 
         // Creatures can't block.
-        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new BedlamEffect()));
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(StaticFilters.FILTER_PERMANENT_CREATURES, Duration.WhileOnBattlefield)));
     }
 
     public Bedlam(final Bedlam card) {
@@ -63,33 +63,3 @@ public class Bedlam extends CardImpl {
         return new Bedlam(this);
     }
 }
-
-class BedlamEffect extends RestrictionEffect {
-
-    BedlamEffect() {
-        super(Duration.WhileOnBattlefield);
-        staticText = "Creatures can't block";
-    }
-
-    BedlamEffect(final BedlamEffect effect) {
-        super(effect);
-    }
-
-    @Override
-    public boolean applies(Permanent permanent, Ability source, Game game) {
-        if (permanent.isCreature()) {
-            return true;
-        }
-        return false;
-    }
-
-    @Override
-    public BedlamEffect copy() {
-        return new BedlamEffect(this);
-    }
-
-    @Override
-    public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) {
-        return false;
-    }
-}

Mage.Sets/src/mage/cards/d/DeathmistRaptor.java

@@ -41,6 +41,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.filter.common.FilterControlledPermanent;
 import mage.game.Game;
@@ -53,9 +54,9 @@ import mage.players.Player;
 public class DeathmistRaptor extends CardImpl {
 
     public DeathmistRaptor(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{G}{G}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.BEAST);
         this.power = new MageInt(3);
         this.toughness = new MageInt(3);
 

Mage.Sets/src/mage/cards/d/Dromosaur.java

@@ -35,6 +35,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.SubType;
 
 /**
  *
@@ -43,8 +44,8 @@ import mage.constants.Duration;
 public class Dromosaur extends CardImpl {
 
     public Dromosaur(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(3);
@@ -61,4 +62,4 @@ public class Dromosaur extends CardImpl {
     public Dromosaur copy() {
         return new Dromosaur(this);
     }
-}
+}

Mage.Sets/src/mage/cards/f/FreneticRaptor.java

@@ -0,0 +1,70 @@
+/*
+ *  Copyright 2010 BetaSteward_at_googlemail.com. All rights reserved.
+ *
+ *  Redistribution and use in source and binary forms, with or without modification, are
+ *  permitted provided that the following conditions are met:
+ *
+ *     1. Redistributions of source code must retain the above copyright notice, this list of
+ *        conditions and the following disclaimer.
+ *
+ *     2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *        of conditions and the following disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY BetaSteward_at_googlemail.com ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ *  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ *  FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL BetaSteward_at_googlemail.com OR
+ *  CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ *  CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ *  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ *  ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ *  NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ *  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ *  The views and conclusions contained in the software and documentation are those of the
+ *  authors and should not be interpreted as representing official policies, either expressed
+ *  or implied, of BetaSteward_at_googlemail.com.
+ */
+package mage.cards.f;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.effects.common.combat.CantBlockAllEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+
+/**
+ *
+ * @author TheElk801
+ */
+public class FreneticRaptor extends CardImpl {
+
+    private static final FilterCreaturePermanent filter = new FilterCreaturePermanent(SubType.BEAST, "Beasts");
+
+    public FreneticRaptor(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{R}");
+
+        this.subtype.add("Dinosaur");
+        this.subtype.add("Beast");
+        this.power = new MageInt(6);
+        this.toughness = new MageInt(6);
+
+        // Beasts can't block.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockAllEffect(filter, Duration.WhileOnBattlefield)));
+    }
+
+    public FreneticRaptor(final FreneticRaptor card) {
+        super(card);
+    }
+
+    @Override
+    public FreneticRaptor copy() {
+        return new FreneticRaptor(this);
+    }
+}

Mage.Sets/src/mage/cards/f/Fungusaur.java

@@ -34,6 +34,7 @@ import mage.abilities.effects.common.counter.AddCountersSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.counters.CounterType;
 
@@ -44,9 +45,9 @@ import mage.counters.CounterType;
 public class Fungusaur extends CardImpl {
 
     public Fungusaur(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{G}");
-        this.subtype.add("Fungus");
+        this.subtype.add(SubType.FUNGUS);
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/i/Imperiosaur.java

@@ -33,6 +33,7 @@ import mage.abilities.StaticAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.SuperType;
 import mage.constants.Zone;
 import mage.filter.common.FilterLandPermanent;
@@ -45,13 +46,14 @@ import mage.filter.predicate.mageobject.SupertypePredicate;
 public class Imperiosaur extends CardImpl {
 
     private static final FilterLandPermanent filter = new FilterLandPermanent();
+
     static {
         filter.add(new SupertypePredicate(SuperType.BASIC));
     }
 
     public Imperiosaur(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
 
         this.power = new MageInt(5);
         this.toughness = new MageInt(5);

Mage.Sets/src/mage/cards/m/Magmasaur.java

@@ -40,6 +40,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Outcome;
+import mage.constants.SubType;
 import mage.constants.TargetController;
 import mage.constants.Zone;
 import mage.counters.CounterType;
@@ -57,9 +58,9 @@ import mage.players.Player;
 public class Magmasaur extends CardImpl {
 
     public Magmasaur(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}{R}");
-        this.subtype.add("Elemental");
+        this.subtype.add(SubType.ELEMENTAL);
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
         this.power = new MageInt(0);
         this.toughness = new MageInt(0);
 

Mage.Sets/src/mage/cards/p/Pangosaur.java

@@ -34,6 +34,7 @@ import mage.abilities.effects.common.ReturnToHandSourceEffect;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 import mage.constants.Zone;
 import mage.game.Game;
 import mage.game.events.GameEvent;
@@ -46,8 +47,8 @@ import mage.game.events.GameEvent.EventType;
 public class Pangosaur extends CardImpl {
 
     public Pangosaur(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}{G}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
         this.power = new MageInt(6);
         this.toughness = new MageInt(6);
 
@@ -66,6 +67,7 @@ public class Pangosaur extends CardImpl {
 }
 
 class PangosaurTriggeredAbility extends TriggeredAbilityImpl {
+
     PangosaurTriggeredAbility() {
         super(Zone.BATTLEFIELD, new ReturnToHandSourceEffect());
     }
@@ -83,7 +85,7 @@ class PangosaurTriggeredAbility extends TriggeredAbilityImpl {
     public boolean checkTrigger(GameEvent event, Game game) {
         return true;
     }
-    
+
     @Override
     public PangosaurTriggeredAbility copy() {
         return new PangosaurTriggeredAbility(this);

Mage.Sets/src/mage/cards/p/PutridRaptor.java

@@ -51,10 +51,10 @@ public class PutridRaptor extends CardImpl {
     }
 
     public PutridRaptor(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{B}{B}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{B}{B}");
-        this.subtype.add("Zombie");
+        this.subtype.add(SubType.ZOMBIE);
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.BEAST);
         this.power = new MageInt(4);
         this.toughness = new MageInt(4);
 

Mage.Sets/src/mage/cards/p/PygmyAllosaurus.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.SwampwalkAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 /**
  *
@@ -41,8 +42,8 @@ import mage.constants.CardType;
 public class PygmyAllosaurus extends CardImpl {
 
     public PygmyAllosaurus(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{G}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(2);

Mage.Sets/src/mage/cards/r/RidgetopRaptor.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.DoubleStrikeAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 /**
  *
@@ -41,9 +42,9 @@ import mage.constants.CardType;
 public class RidgetopRaptor extends CardImpl {
 
     public RidgetopRaptor(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{R}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.BEAST);
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);

Mage.Sets/src/mage/cards/r/RipscalePredator.java

@@ -33,6 +33,7 @@ import mage.abilities.keyword.MenaceAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 /**
  *
@@ -41,8 +42,8 @@ import mage.constants.CardType;
 public class RipscalePredator extends CardImpl {
 
     public RipscalePredator(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{R}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{R}{R}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
 
         this.power = new MageInt(6);
         this.toughness = new MageInt(5);

Mage.Sets/src/mage/cards/s/ShivanRaptor.java

@@ -25,7 +25,6 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-
 package mage.cards.s;
 
 import java.util.UUID;
@@ -36,6 +35,7 @@ import mage.abilities.keyword.HasteAbility;
 import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
+import mage.constants.SubType;
 
 /**
  *
@@ -44,15 +44,15 @@ import mage.constants.CardType;
 public class ShivanRaptor extends CardImpl {
 
     public ShivanRaptor(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{2}{R}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{2}{R}");
-        this.subtype.add("Lizard");
+        this.subtype.add(SubType.DINOSAUR);
 
         this.power = new MageInt(3);
         this.toughness = new MageInt(1);
 
-    this.addAbility(FirstStrikeAbility.getInstance());
+        this.addAbility(FirstStrikeAbility.getInstance());
-    this.addAbility(HasteAbility.getInstance());
+        this.addAbility(HasteAbility.getInstance());
-    this.addAbility(new EchoAbility("{2}{R}"));
+        this.addAbility(new EchoAbility("{2}{R}"));
     }
 
     public ShivanRaptor(final ShivanRaptor card) {
@@ -64,4 +64,4 @@ public class ShivanRaptor extends CardImpl {
         return new ShivanRaptor(this);
     }
 
-}
+}

Mage.Sets/src/mage/cards/t/Tyrranax.java

@@ -36,6 +36,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.Duration;
+import mage.constants.SubType;
 import mage.constants.Zone;
 
 /**
@@ -45,8 +46,9 @@ import mage.constants.Zone;
 public class Tyrranax extends CardImpl {
 
     public Tyrranax(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{4}{G}{G}");
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{4}{G}{G}");
-        this.subtype.add("Beast");
+        this.subtype.add(SubType.DINOSAUR);
+        this.subtype.add(SubType.BEAST);
 
         this.power = new MageInt(5);
         this.toughness = new MageInt(4);

Mage.Sets/src/mage/sets/Legions.java

@@ -97,6 +97,7 @@ public class Legions extends ExpansionSet {
         cards.add(new SetCardInfo("Essence Sliver", 13, Rarity.RARE, mage.cards.e.EssenceSliver.class));
         cards.add(new SetCardInfo("Feral Throwback", 126, Rarity.RARE, mage.cards.f.FeralThrowback.class));
         cards.add(new SetCardInfo("Flamewave Invoker", 92, Rarity.COMMON, mage.cards.f.FlamewaveInvoker.class));
+        cards.add(new SetCardInfo("Frenetic Raptor", 93, Rarity.UNCOMMON, mage.cards.f.FreneticRaptor.class));
         cards.add(new SetCardInfo("Fugitive Wizard", 38, Rarity.COMMON, mage.cards.f.FugitiveWizard.class));
         cards.add(new SetCardInfo("Gempalm Avenger", 14, Rarity.COMMON, mage.cards.g.GempalmAvenger.class));
         cards.add(new SetCardInfo("Gempalm Incinerator", 94, Rarity.UNCOMMON, mage.cards.g.GempalmIncinerator.class));

Utils/mtg-cards-data.txt

@@ -11196,7 +11196,7 @@ Daru Sanctifier|Legions|9|C|{3}{W}|Creature - Human Cleric|1|4|Morph {1}{W} <i>Y
 Clickslither|Legions|90|R|{1}{R}{R}{R}|Creature - Insect|3|3|Haste$Sacrifice a Goblin: Clickslither gets +2/+2 and gains trample until end of turn.|
 Crested Craghorn|Legions|91|C|{4}{R}|Creature - Goat Beast|4|1|Haste$Provoke <i>(When this attacks, you may have target creature defending player controls untap and block it if able.)</i>|
 Flamewave Invoker|Legions|92|C|{2}{R}|Creature - Goblin Mutant|2|2|{7}{R}: Flamewave Invoker deals 5 damage to target player.|
-Frenetic Raptor|Legions|93|U|{5}{R}|Creature - Lizard Beast|6|6|Beasts can't block.|
+Frenetic Raptor|Legions|93|U|{5}{R}|Creature - Dinosaur Beast|6|6|Beasts can't block.|
 Gempalm Incinerator|Legions|94|U|{2}{R}|Creature - Goblin|2|1|Cycling {1}{R} <i>({1}{R}, Discard this card: Draw a card.)</i>$When you cycle Gempalm Incinerator, you may have it deal X damage to target creature, where X is the number of Goblins on the battlefield.|
 Goblin Assassin|Legions|95|U|{3}{R}{R}|Creature - Goblin Assassin|2|2|Whenever Goblin Assassin or another Goblin enters the battlefield, each player flips a coin. Each player whose coin comes up tails sacrifices a creature.|
 Goblin Clearcutter|Legions|96|U|{3}{R}|Creature - Goblin|3|3|{tap}, Sacrifice a Forest: Add three mana in any combination of {R} and/or {G} to your mana pool.|