Merge https://github.com/magefree/mage into hou

Mage.Sets/src/mage/cards/c/CrestedSunmare.java

@@ -0,0 +1,102 @@
+/*
+ *  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.c;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.BeginningOfEndStepTriggeredAbility;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.YouGainedLifeCondition;
+import mage.abilities.decorator.ConditionalTriggeredAbility;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.continuous.GainAbilityAllEffect;
+import mage.abilities.keyword.IndestructibleAbility;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.ComparisonType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.game.permanent.token.Token;
+import mage.watchers.common.PlayerGainedLifeWatcher;
+
+/**
+ *
+ * @author emerald000
+ */
+public class CrestedSunmare extends CardImpl {
+
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("Horses you control");
+    static {
+        filter.add(new SubtypePredicate(SubType.HORSE));
+    }
+
+    public CrestedSunmare(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{W}{W}");
+
+        this.subtype.add("Horse");
+        this.power = new MageInt(5);
+        this.toughness = new MageInt(5);
+
+        // Other Horses you control have indestructible.
+        this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new GainAbilityAllEffect(IndestructibleAbility.getInstance(), Duration.WhileOnBattlefield, filter, true)));
+
+        // At the beginning of each end step, if you gained life this turn, create a 5/5 white Horse creature token.
+        this.addAbility(
+                new ConditionalTriggeredAbility(
+                    new BeginningOfEndStepTriggeredAbility(new CreateTokenEffect(new CrestedSunmareToken()), TargetController.ANY, false),
+                    new YouGainedLifeCondition(ComparisonType.MORE_THAN, 0),
+                    "At the beginning of each end step, if you gained life this turn, create a 5/5 white Horse creature token."),
+                new PlayerGainedLifeWatcher());
+    }
+
+    public CrestedSunmare(final CrestedSunmare card) {
+        super(card);
+    }
+
+    @Override
+    public CrestedSunmare copy() {
+        return new CrestedSunmare(this);
+    }
+}
+
+class CrestedSunmareToken extends Token {
+
+    CrestedSunmareToken() {
+        super("Horse", "5/5 white Horse creature token");
+        power = new MageInt(5);
+        toughness = new MageInt(5);
+        color.setWhite(true);
+        subtype.add("Horse");
+        cardType.add(CardType.CREATURE);
+    }
+}

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

@@ -25,37 +25,49 @@
  *  authors and should not be interpreted as representing official policies, either expressed
  *  or implied, of BetaSteward_at_googlemail.com.
  */
-package mage.cards.c;
+package mage.cards.g;
 
 import java.util.UUID;
-
+import mage.MageInt;
+import mage.ObjectColor;
+import mage.abilities.common.SpellCastControllerTriggeredAbility;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
-import mage.cards.SplitCard;
 import mage.constants.CardType;
-import mage.constants.SpellAbilityType;
+import mage.filter.FilterSpell;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.ColorPredicate;
 
 /**
  *
- * @author LevelX2
+ * @author emerald000
  */
-public class ConsignOblivion extends SplitCard {
+public class GodPharaohsFaithful extends CardImpl {
-
-    public ConsignOblivion(UUID ownerId, CardSetInfo setInfo) {
-        super(ownerId, setInfo, new CardType[]{}, new CardType[]{}, "", "", SpellAbilityType.SPLIT_AFTERMATH);
-  
-
-    getLeftHalfCard().getSpellAbility().addEffect(new Effect...);
-
-    getRightHalfCard().getSpellAbility().addEffect(new Effect...);
 
+    private static final FilterSpell filter = new FilterSpell("a blue, black or red spell");
+    static {
+        filter.add(Predicates.or(new ColorPredicate(ObjectColor.BLUE), new ColorPredicate(ObjectColor.BLACK), new ColorPredicate(ObjectColor.RED)));
     }
 
-    public ConsignOblivion(final ConsignOblivion card) {
+    public GodPharaohsFaithful(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{W}");
+
+        this.subtype.add("Human");
+        this.subtype.add("Wizard");
+        this.power = new MageInt(0);
+        this.toughness = new MageInt(4);
+
+        // Whenever you cast a blue, black or red spell, you gain 1 life.
+        this.addAbility(new SpellCastControllerTriggeredAbility(new GainLifeEffect(1), filter, false));
+    }
+
+    public GodPharaohsFaithful(final GodPharaohsFaithful card) {
         super(card);
     }
 
     @Override
-    public ConsignOblivion copy() {
+    public GodPharaohsFaithful copy() {
-        return new ConsignOblivion(this);
+        return new GodPharaohsFaithful(this);
     }
 }

Mage.Sets/src/mage/cards/m/MummyParamount.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.m;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.common.EntersBattlefieldAllTriggeredAbility;
+import mage.abilities.effects.common.continuous.BoostSourceEffect;
+import mage.cards.CardImpl;
+import mage.cards.CardSetInfo;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.SubType;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.mageobject.SubtypePredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
+
+/**
+ *
+ * @author emerald000
+ */
+public class MummyParamount extends CardImpl {
+
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie");
+    static {
+        filter.add(new SubtypePredicate(SubType.ZOMBIE));
+        filter.add(new AnotherPredicate());
+    }
+
+    public MummyParamount(UUID ownerId, CardSetInfo setInfo) {
+        super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{1}{W}");
+
+        this.subtype.add("Zombie");
+        this.power = new MageInt(2);
+        this.toughness = new MageInt(2);
+
+        // Whenever another Zombie enters the battlefield under your control, Mummy Paramount gets +1/+1 until end of turn.
+        this.addAbility(new EntersBattlefieldAllTriggeredAbility(new BoostSourceEffect(1, 1, Duration.EndOfTurn), filter));
+    }
+
+    public MummyParamount(final MummyParamount card) {
+        super(card);
+    }
+
+    @Override
+    public MummyParamount copy() {
+        return new MummyParamount(this);
+    }
+}

Mage.Sets/src/mage/cards/w/WaywardServant.java

@@ -38,7 +38,7 @@ import mage.cards.CardImpl;
 import mage.cards.CardSetInfo;
 import mage.constants.CardType;
 import mage.constants.SubType;
-import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.common.FilterControlledPermanent;
 import mage.filter.predicate.mageobject.SubtypePredicate;
 import mage.filter.predicate.permanent.AnotherPredicate;
 
@@ -48,7 +48,7 @@ import mage.filter.predicate.permanent.AnotherPredicate;
  */
 public class WaywardServant extends CardImpl {
 
-    private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another Zombie");
+    private static final FilterControlledPermanent filter = new FilterControlledPermanent("another Zombie");
 
     static {
         filter.add(new SubtypePredicate(SubType.ZOMBIE));