From 4c423c6e7e60f3e8097968da2fb103e461d92c20 Mon Sep 17 00:00:00 2001
From: Jeff <Jeff@PCB256.delmarus.com>
Date: Sun, 30 Jun 2013 11:59:31 -0500
Subject: [PATCH] - Added Esper Stormblade, Grixis Grimblade, and Thopter
Foundry.
---
.../sets/alarareborn/EsperStormblade.java | 94 ++++++++++++++++
.../sets/alarareborn/GrixisGrimblade.java | 95 +++++++++++++++++
.../mage/sets/alarareborn/ThopterFoundry.java | 100 ++++++++++++++++++
.../common/ControlsPermanentCondition.java | 6 +-
4 files changed, 292 insertions(+), 3 deletions(-)
create mode 100644 Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java
create mode 100644 Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java
create mode 100644 Mage.Sets/src/mage/sets/alarareborn/ThopterFoundry.java
diff --git a/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java b/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java
new file mode 100644
index 0000000000..ed7dbe2909
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alarareborn/EsperStormblade.java
@@ -0,0 +1,94 @@
+/*
+ * 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.sets.alarareborn;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.ControlsPermanentCondition;
+import mage.abilities.decorator.ConditionalContinousEffect;
+import mage.abilities.effects.common.continious.BoostSourceEffect;
+import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.mageobject.MulticoloredPredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class EsperStormblade extends CardImpl<EsperStormblade> {
+
+ private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent");
+
+ static {
+ filter.add(new MulticoloredPredicate());
+ filter.add(new AnotherPredicate());
+ }
+
+ public EsperStormblade(UUID ownerId) {
+ super(ownerId, 132, "Esper Stormblade", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{W/B}{U}");
+ this.expansionSetCode = "ARB";
+ this.subtype.add("Vedalken");
+ this.subtype.add("Wizard");
+
+ this.color.setBlue(true);
+ this.color.setBlack(true);
+ this.color.setWhite(true);
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(1);
+
+ // As long as you control another multicolored permanent, Esper Stormblade gets +1/+1 and has flying.
+ Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+ new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
+ new ControlsPermanentCondition(filter),
+ "As long as you control another multicolored permanent, Esper Stormblade gets +1/+1 and has flying"));
+ Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+ new GainAbilitySourceEffect(FlyingAbility.getInstance()),
+ new ControlsPermanentCondition(filter),
+ null));
+ this.addAbility(ability);
+ this.addAbility(ability2);
+ }
+
+ public EsperStormblade(final EsperStormblade card) {
+ super(card);
+ }
+
+ @Override
+ public EsperStormblade copy() {
+ return new EsperStormblade(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java b/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java
new file mode 100644
index 0000000000..1f97073691
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alarareborn/GrixisGrimblade.java
@@ -0,0 +1,95 @@
+/*
+ * 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.sets.alarareborn;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleStaticAbility;
+import mage.abilities.condition.common.ControlsPermanentCondition;
+import mage.abilities.decorator.ConditionalContinousEffect;
+import mage.abilities.effects.common.continious.BoostSourceEffect;
+import mage.abilities.effects.common.continious.GainAbilitySourceEffect;
+import mage.abilities.keyword.DeathtouchAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledCreaturePermanent;
+import mage.filter.predicate.mageobject.MulticoloredPredicate;
+import mage.filter.predicate.permanent.AnotherPredicate;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class GrixisGrimblade extends CardImpl<GrixisGrimblade> {
+
+ private static final FilterControlledCreaturePermanent filter = new FilterControlledCreaturePermanent("another multicolor permanent");
+
+ static {
+ filter.add(new MulticoloredPredicate());
+ filter.add(new AnotherPredicate());
+ }
+
+ public GrixisGrimblade(UUID ownerId) {
+ super(ownerId, 134, "Grixis Grimblade", Rarity.COMMON, new CardType[]{CardType.CREATURE}, "{U/R}{B}");
+ this.expansionSetCode = "ARB";
+ this.subtype.add("Zombie");
+ this.subtype.add("Warrior");
+
+ this.color.setRed(true);
+ this.color.setBlue(true);
+ this.color.setBlack(true);
+ this.power = new MageInt(2);
+ this.toughness = new MageInt(1);
+
+ // As long as you control another multicolored permanent, Grixis Grimblade gets +1/+1 and has deathtouch.
+ Ability ability = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+ new BoostSourceEffect(1,1, Duration.WhileOnBattlefield),
+ new ControlsPermanentCondition(filter),
+ "As long as you control another multicolored permanent, Grixis Grimblade gets +1/+1 and has deathtouch"));
+ Ability ability2 = new SimpleStaticAbility(Zone.BATTLEFIELD, new ConditionalContinousEffect(
+ new GainAbilitySourceEffect(DeathtouchAbility.getInstance()),
+ new ControlsPermanentCondition(filter),
+ null));
+ this.addAbility(ability);
+ this.addAbility(ability2);
+
+ }
+
+ public GrixisGrimblade(final GrixisGrimblade card) {
+ super(card);
+ }
+
+ @Override
+ public GrixisGrimblade copy() {
+ return new GrixisGrimblade(this);
+ }
+}
diff --git a/Mage.Sets/src/mage/sets/alarareborn/ThopterFoundry.java b/Mage.Sets/src/mage/sets/alarareborn/ThopterFoundry.java
new file mode 100644
index 0000000000..4ef7a15523
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/alarareborn/ThopterFoundry.java
@@ -0,0 +1,100 @@
+/*
+ * 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.sets.alarareborn;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.common.SacrificeTargetCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.effects.common.CreateTokenEffect;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.keyword.FlyingAbility;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.filter.common.FilterControlledPermanent;
+import mage.filter.predicate.Predicates;
+import mage.filter.predicate.mageobject.CardTypePredicate;
+import mage.filter.predicate.permanent.TokenPredicate;
+import mage.game.permanent.token.Token;
+import mage.target.common.TargetControlledPermanent;
+
+/**
+ *
+ * @author jeffwadsworth
+ */
+public class ThopterFoundry extends CardImpl<ThopterFoundry> {
+
+ private static final FilterControlledPermanent filter = new FilterControlledPermanent("a nontoken artifact");
+
+ static {
+ filter.add(new CardTypePredicate(CardType.ARTIFACT));
+ filter.add(Predicates.not(new TokenPredicate()));
+ }
+
+ public ThopterFoundry(UUID ownerId) {
+ super(ownerId, 133, "Thopter Foundry", Rarity.UNCOMMON, new CardType[]{CardType.ARTIFACT}, "{W/B}{U}");
+ this.expansionSetCode = "ARB";
+
+ this.color.setBlue(true);
+ this.color.setBlack(true);
+ this.color.setWhite(true);
+
+ // {1}, Sacrifice a nontoken artifact: Put a 1/1 blue Thopter artifact creature token with flying onto the battlefield. You gain 1 life.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ThopterToken()), new GenericManaCost(1));
+ ability.addEffect(new GainLifeEffect(1));
+ ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(filter)));
+ this.addAbility(ability);
+ }
+
+ public ThopterFoundry(final ThopterFoundry card) {
+ super(card);
+ }
+
+ @Override
+ public ThopterFoundry copy() {
+ return new ThopterFoundry(this);
+ }
+}
+
+class ThopterToken extends Token {
+
+ ThopterToken() {
+ super("Thopter", "a 1/1 blue Thopter artifact creature token with flying");
+ cardType.add(CardType.CREATURE);
+ cardType.add(CardType.ARTIFACT);
+ color.setBlue(true);
+ subtype.add("Thopter");
+ power = new MageInt(1);
+ toughness = new MageInt(1);
+ this.addAbility(FlyingAbility.getInstance());
+ }
+}
\ No newline at end of file
diff --git a/Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java b/Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java
index c25bf3f00c..74d76ce667 100644
--- a/Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java
+++ b/Mage/src/mage/abilities/condition/common/ControlsPermanentCondition.java
@@ -97,13 +97,13 @@ public class ControlsPermanentCondition implements Condition {
switch ( this.type ) {
case FEWER_THAN:
- conditionApplies = game.getBattlefield().countAll(filter, source.getControllerId(), game) < this.count;
+ conditionApplies = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) < this.count;
break;
case MORE_THAN:
- conditionApplies = game.getBattlefield().countAll(filter, source.getControllerId(), game) > this.count;
+ conditionApplies = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) > this.count;
break;
case EQUAL_TO:
- conditionApplies = game.getBattlefield().countAll(filter, source.getControllerId(), game) == this.count;
+ conditionApplies = game.getBattlefield().count(filter, source.getSourceId(), source.getControllerId(), game) == this.count;
break;
}