Merge pull request #56 from magefree/master

merge

Mage.Sets/src/mage/cards/g/GoringCeratops.java

@@ -0,0 +1,74 @@
+/*
+ *  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.g;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.AttacksTriggeredAbility;
+import mage.abilities.effects.Effect;
+import mage.abilities.effects.common.continuous.GainAbilityControlledEffect;
+import mage.abilities.keyword.DoubleStrikeAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.filter.StaticFilters;
+
+/**
+ *
+ * @author caldover
+ */
+public class GoringCeratops extends CardImpl {
+
+    public GoringCeratops(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{5}{W}{W}");
+
+        this.subtype.add("Dinosaur");
+        this.power = new MageInt(3);
+        this.toughness = new MageInt(3);
+
+        // Double Strike
+        this.addAbility(DoubleStrikeAbility.getInstance());
+
+        // Whenever Goring Ceratops attacks, other creatures you control gain double strike until end of turn.
+        Effect effect = new GainAbilityControlledEffect(DoubleStrikeAbility.getInstance(), Duration.EndOfTurn, StaticFilters.FILTER_PERMANENT_CREATURE, true);
+        effect.setText("other creatures you control gain double strike");
+        Ability ability = new AttacksTriggeredAbility(effect, false);
+        this.addAbility(ability);
+    }
+
+    public GoringCeratops(final GoringCeratops card) {
+        super(card);
+    }
+
+    @Override
+    public GoringCeratops copy() {
+        return new GoringCeratops(this);
+    }
+}

Mage.Sets/src/mage/cards/g/GrenzoHavocRaiser.java

@@ -54,7 +54,7 @@ import mage.filter.common.FilterCreaturePermanent;
 import mage.filter.predicate.permanent.ControllerIdPredicate;
 import mage.game.ExileZone;
 import mage.game.Game;
-import mage.game.events.DamageEvent;
+import mage.game.events.DamagedEvent;
 import mage.game.events.GameEvent;
 import mage.game.permanent.Permanent;
 import mage.players.ManaPoolItem;
@@ -125,7 +125,7 @@ class GrenzoHavocRaiserTriggeredAbility extends TriggeredAbilityImpl {
         Player damagedPlayer = game.getPlayer(event.getPlayerId());
         Permanent permanent = game.getPermanentOrLKIBattlefield(event.getSourceId());
         if (damagedPlayer != null && permanent != null
-                && ((DamageEvent) event).isCombatDamage()
+                && ((DamagedEvent) event).isCombatDamage()
                 && getControllerId().equals(permanent.getControllerId())) {
             FilterCreaturePermanent filter = new FilterCreaturePermanent("creature " + damagedPlayer.getLogName() + " controls");
             filter.add(new ControllerIdPredicate(damagedPlayer.getId()));

Mage.Sets/src/mage/cards/v/VisionCharm.java

@@ -102,6 +102,8 @@ class VisionCharmEffect extends ContinuousEffectImpl {
 
     public VisionCharmEffect(final VisionCharmEffect effect) {
         super(effect);
+        targetLandType = effect.targetLandType;
+        targetBasicLandType = effect.targetBasicLandType;
     }
 
     @Override
@@ -120,8 +122,13 @@ class VisionCharmEffect extends ContinuousEffectImpl {
             choice = new ChoiceBasicLandType();
             controller.choose(outcome, choice, game);
             targetBasicLandType = choice.getChoice();
+            if (targetLandType == null || targetBasicLandType == null) {
+                this.discard();
+                return;
+            }
         } else {
             this.discard();
+            return;
         }
         FilterPermanent filter = new FilterLandPermanent();
         filter.add(new SubtypePredicate(SubType.byDescription(targetLandType)));

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

@@ -58,6 +58,7 @@ public class Ixalan extends ExpansionSet {
         cards.add(new SetCardInfo("Entrancing Melody", 55, Rarity.RARE, mage.cards.e.EntrancingMelody.class));
         cards.add(new SetCardInfo("Gishath, Sun's Avatar", 222, Rarity.MYTHIC, mage.cards.g.GishathSunsAvatar.class));
         cards.add(new SetCardInfo("Glacial Fortress", 255, Rarity.RARE, mage.cards.g.GlacialFortress.class));
+        cards.add(new SetCardInfo("Goring Certatops", 13, Rarity.RARE, mage.cards.g.GoringCeratops.class));
         cards.add(new SetCardInfo("Headwater Sentries", 58, Rarity.COMMON, mage.cards.h.HeadwaterSentries.class));
         cards.add(new SetCardInfo("Herald of Secret Streams", 59, Rarity.RARE, mage.cards.h.HeraldOfSecretStreams.class));
         cards.add(new SetCardInfo("Huatli's Snubhorn", 286, Rarity.COMMON, mage.cards.h.HuatlisSnubhorn.class));