From de10554ec45ae7d23823b0b729a40a13d89b2889 Mon Sep 17 00:00:00 2001
From: LevelX2 <ludwig.hirth@online.de>
Date: Sat, 17 Jan 2015 13:08:39 +0100
Subject: [PATCH] [FRF] Added Brutal Hordechief and Crucible of the Spirit
Dragon. FRF Complete!!!
---
.../sets/fatereforged/BrutalHordechief.java | 170 ++++++++++++++++++
.../CrucibleOfTheSpiritDragon.java | 123 +++++++++++++
.../sets/magic2013/OdricMasterTactician.java | 18 +-
.../abilities/keywords/DeathtouchTest.java | 2 +-
.../AddConditionalManaOfAnyColorEffect.java | 41 ++++-
.../common/AddManaInAnyCombinationEffect.java | 2 +-
.../common/combat/AttacksIfAbleAllEffect.java | 15 +-
.../common/combat/BlocksIfAbleAllEffect.java | 83 +++++++++
.../mana/ConditionalAnyColorManaAbility.java | 33 ++--
9 files changed, 451 insertions(+), 36 deletions(-)
create mode 100644 Mage.Sets/src/mage/sets/fatereforged/BrutalHordechief.java
create mode 100644 Mage.Sets/src/mage/sets/fatereforged/CrucibleOfTheSpiritDragon.java
create mode 100644 Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java
diff --git a/Mage.Sets/src/mage/sets/fatereforged/BrutalHordechief.java b/Mage.Sets/src/mage/sets/fatereforged/BrutalHordechief.java
new file mode 100644
index 0000000000..c2edd96856
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fatereforged/BrutalHordechief.java
@@ -0,0 +1,170 @@
+/*
+ * 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.fatereforged;
+
+import java.util.UUID;
+import mage.MageInt;
+import mage.abilities.Ability;
+import mage.abilities.TriggeredAbilityImpl;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.costs.mana.ManaCostsImpl;
+import mage.abilities.effects.ReplacementEffectImpl;
+import mage.abilities.effects.common.DamageTargetEffect;
+import mage.abilities.effects.common.GainLifeEffect;
+import mage.abilities.effects.common.combat.BlocksIfAbleAllEffect;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Duration;
+import mage.constants.Outcome;
+import mage.constants.Rarity;
+import mage.constants.TargetController;
+import mage.constants.Zone;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.filter.predicate.permanent.ControllerPredicate;
+import mage.game.Game;
+import mage.game.events.GameEvent;
+import mage.game.permanent.Permanent;
+import mage.players.Player;
+import mage.target.targetpointer.FixedTarget;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class BrutalHordechief extends CardImpl {
+
+ private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("Creature your opponents control");
+
+ static {
+ filter.add(new ControllerPredicate(TargetController.OPPONENT));
+ }
+
+ public BrutalHordechief(UUID ownerId) {
+ super(ownerId, 64, "Brutal Hordechief", Rarity.MYTHIC, new CardType[]{CardType.CREATURE}, "{3}{B}");
+ this.expansionSetCode = "FRF";
+ this.subtype.add("Orc");
+ this.subtype.add("Warrior");
+ this.power = new MageInt(3);
+ this.toughness = new MageInt(3);
+
+ // Whenever a creature you control attacks, defending player loses 1 life and you gain 1 life.
+ this.addAbility(new BrutalHordechiefTriggeredAbility());
+
+ // {3}{R/W}{R/W}: Creatures your opponents control block this turn if able, and you choose how those creatures block.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BlocksIfAbleAllEffect(filter), new ManaCostsImpl("{3}{R/W}{R/W}"));
+ ability.addEffect(new BrutalHordechiefReplacementEffect());
+ this.addAbility(ability);
+ }
+
+ public BrutalHordechief(final BrutalHordechief card) {
+ super(card);
+ }
+
+ @Override
+ public BrutalHordechief copy() {
+ return new BrutalHordechief(this);
+ }
+}
+
+class BrutalHordechiefTriggeredAbility extends TriggeredAbilityImpl {
+
+ public BrutalHordechiefTriggeredAbility() {
+ super(Zone.BATTLEFIELD, new DamageTargetEffect(1));
+ this.addEffect(new GainLifeEffect(1));
+ }
+
+ public BrutalHordechiefTriggeredAbility(final BrutalHordechiefTriggeredAbility ability) {
+ super(ability);
+ }
+
+ @Override
+ public BrutalHordechiefTriggeredAbility copy() {
+ return new BrutalHordechiefTriggeredAbility(this);
+ }
+
+ @Override
+ public boolean checkTrigger(GameEvent event, Game game) {
+ if (event.getType() == GameEvent.EventType.ATTACKER_DECLARED) {
+ Permanent source = game.getPermanent(event.getSourceId());
+ if (source != null && source.getControllerId().equals(controllerId)) {
+ UUID defendingPlayerId = game.getCombat().getDefendingPlayerId(event.getSourceId(), game);
+ this.getEffects().get(0).setTargetPointer(new FixedTarget(defendingPlayerId));
+ return true;
+ }
+ }
+ return false;
+ }
+
+ @Override
+ public String getRule() {
+ return "Whenever a creature you control attacks, defending player loses 1 life and you gain 1 life.";
+ }
+}
+
+class BrutalHordechiefReplacementEffect extends ReplacementEffectImpl {
+
+ public BrutalHordechiefReplacementEffect() {
+ super(Duration.EndOfCombat, Outcome.Benefit);
+ staticText = ", and you choose how those creatures block";
+ }
+
+ public BrutalHordechiefReplacementEffect(final BrutalHordechiefReplacementEffect effect) {
+ super(effect);
+ }
+
+ @Override
+ public BrutalHordechiefReplacementEffect copy() {
+ return new BrutalHordechiefReplacementEffect(this);
+ }
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ return false;
+ }
+
+ @Override
+ public boolean replaceEvent(GameEvent event, Ability source, Game game) {
+ Player blockController = game.getPlayer(source.getControllerId());
+ if (blockController != null) {
+ game.getCombat().selectBlockers(blockController, game);
+ return true;
+ }
+ return false;
+ }
+
+ @Override
+ public boolean checksEventType(GameEvent event, Game game) {
+ return event.getType() == GameEvent.EventType.DECLARING_BLOCKERS;
+ }
+
+ @Override
+ public boolean applies(GameEvent event, Ability source, Game game) {
+ Player player = game.getPlayer(event.getPlayerId());
+ return player != null && game.isOpponent(player, source.getControllerId());
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/fatereforged/CrucibleOfTheSpiritDragon.java b/Mage.Sets/src/mage/sets/fatereforged/CrucibleOfTheSpiritDragon.java
new file mode 100644
index 0000000000..6a065ebd93
--- /dev/null
+++ b/Mage.Sets/src/mage/sets/fatereforged/CrucibleOfTheSpiritDragon.java
@@ -0,0 +1,123 @@
+/*
+ * 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.fatereforged;
+
+import java.util.UUID;
+import mage.ConditionalMana;
+import mage.MageObject;
+import mage.Mana;
+import mage.abilities.Ability;
+import mage.abilities.common.SimpleActivatedAbility;
+import mage.abilities.condition.Condition;
+import mage.abilities.costs.common.RemoveVariableCountersSourceCost;
+import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.costs.mana.GenericManaCost;
+import mage.abilities.dynamicvalue.common.RemovedCountersForCostValue;
+import mage.abilities.effects.common.counter.AddCountersSourceEffect;
+import mage.abilities.mana.ColorlessManaAbility;
+import mage.abilities.mana.ConditionalAnyColorManaAbility;
+import mage.abilities.mana.builder.ConditionalManaBuilder;
+import mage.cards.CardImpl;
+import mage.constants.CardType;
+import mage.constants.Rarity;
+import mage.constants.Zone;
+import mage.counters.CounterType;
+import mage.game.Game;
+
+/**
+ *
+ * @author LevelX2
+ */
+public class CrucibleOfTheSpiritDragon extends CardImpl {
+
+ public CrucibleOfTheSpiritDragon(UUID ownerId) {
+ super(ownerId, 167, "Crucible of the Spirit Dragon", Rarity.RARE, new CardType[]{CardType.LAND}, "");
+ this.expansionSetCode = "FRF";
+
+ // {T}: Add {1} to your mana pool.
+ this.addAbility(new ColorlessManaAbility());
+
+ // {1}, {T}: Put a storage counter on Crucible of the Spirit Dragon.
+ Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.STORAGE.createInstance()),new GenericManaCost(1));
+ ability.addCost(new TapSourceCost());
+ this.addAbility(ability);
+
+ // {T}, Remove X storage counters from Crucible of the Spirit Dragon: Add X mana in any combination of colors to your mana pool. Spend this mana only to cast Dragon spells or activate abilities of Dragons.
+ ability = new ConditionalAnyColorManaAbility(
+ new TapSourceCost(),
+ new RemovedCountersForCostValue(),
+ new CrucibleOfTheSpiritDragonManaBuilder(),
+ false
+ );
+ ability.addCost(new RemoveVariableCountersSourceCost(CounterType.STORAGE.createInstance()));
+ this.addAbility(ability);
+ }
+
+ public CrucibleOfTheSpiritDragon(final CrucibleOfTheSpiritDragon card) {
+ super(card);
+ }
+
+ @Override
+ public CrucibleOfTheSpiritDragon copy() {
+ return new CrucibleOfTheSpiritDragon(this);
+ }
+}
+
+class CrucibleOfTheSpiritDragonManaBuilder extends ConditionalManaBuilder {
+
+ @Override
+ public ConditionalMana build(Object... options) {
+ return new CrucibleOfTheSpiritDragonConditionalMana(this.mana);
+ }
+
+ @Override
+ public String getRule() {
+ return "Spend this mana only to cast Dragon spells or activate abilities of Dragons";
+ }
+}
+
+class CrucibleOfTheSpiritDragonConditionalMana extends ConditionalMana {
+
+ public CrucibleOfTheSpiritDragonConditionalMana(Mana mana) {
+ super(mana);
+ this.staticText = "Spend this mana only to cast Dragon spells or activate abilities of Dragons";
+ addCondition(new CrucibleOfTheSpiritDragonManaCondition());
+ }
+}
+
+class CrucibleOfTheSpiritDragonManaCondition implements Condition {
+
+ @Override
+ public boolean apply(Game game, Ability source) {
+ MageObject object = game.getObject(source.getSourceId());
+ if (object != null && object.hasSubtype("Dragon")) {
+ return true;
+ }
+ return false;
+ }
+}
\ No newline at end of file
diff --git a/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java b/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java
index c4e614d305..b73b61801a 100644
--- a/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java
+++ b/Mage.Sets/src/mage/sets/magic2013/OdricMasterTactician.java
@@ -115,7 +115,7 @@ class OdricMasterTacticianTriggeredAbility extends TriggeredAbilityImpl {
@Override
public String getRule() {
- return "Whenever Odric, Master Tactician and at least three other creatures attack, you choose which creatures block this combat and how those creatures block.";
+ return "Whenever {this} and at least three other creatures attack, you choose which creatures block this combat and how those creatures block.";
}
}
@@ -150,17 +150,19 @@ class OdricMasterTacticianEffect extends ReplacementEffectImpl {
return false;
}
+ @Override
+ public boolean checksEventType(GameEvent event, Game game) {
+ return event.getType() == GameEvent.EventType.DECLARING_BLOCKERS;
+ }
+
@Override
public boolean applies(GameEvent event, Ability source, Game game) {
- if (event.getType() == GameEvent.EventType.DECLARING_BLOCKERS) {
- Object object = getValue("apply_" + source.getSourceId());
- if (object != null && object instanceof Boolean) {
- if ((Boolean)object) {
- return true; // replace event
- }
+ Object object = getValue("apply_" + source.getSourceId());
+ if (object != null && object instanceof Boolean) {
+ if ((Boolean)object) {
+ return true; // replace event
}
}
-
return false;
}
}
diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeathtouchTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeathtouchTest.java
index ed7cbf314f..57593d88f0 100644
--- a/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeathtouchTest.java
+++ b/Mage.Tests/src/test/java/org/mage/test/cards/abilities/keywords/DeathtouchTest.java
@@ -90,7 +90,7 @@ public class DeathtouchTest extends CardTestPlayerBase {
activateAbility(1, PhaseStep.PRECOMBAT_MAIN, playerA, "Equip {2}", "Marath, Will of the Wild");
- activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{X},Remove X +1/+1 counters from Marath: Choose one - <br>&bull Put X +1/+1 counters on target creature.<br>&bull {source} deals X damage to target creature or player.<br>&bull Put an X/X green Elemental creature token onto the battlefield.<br>", "Archangel of Thune");
+ activateAbility(1, PhaseStep.POSTCOMBAT_MAIN, playerA, "{X},Remove X +1/+1 counters from Marath: Choose one — <br>&bull Put X +1/+1 counters on target creature.<br>&bull {source} deals X damage to target creature or player.<br>&bull Put an X/X green Elemental creature token onto the battlefield.<br>", "Archangel of Thune");
setChoice(playerA, "X=3");
setModeChoice(playerA, "2"); // Marath deals X damage to target creature or player
diff --git a/Mage/src/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java b/Mage/src/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java
index 81659d90b4..946bbf9613 100644
--- a/Mage/src/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java
+++ b/Mage/src/mage/abilities/effects/common/AddConditionalManaOfAnyColorEffect.java
@@ -29,6 +29,8 @@ package mage.abilities.effects.common;
import mage.Mana;
import mage.abilities.Ability;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.mana.builder.ConditionalManaBuilder;
import mage.choices.ChoiceColor;
import mage.game.Game;
@@ -39,20 +41,34 @@ import mage.players.Player;
*/
public class AddConditionalManaOfAnyColorEffect extends ManaEffect {
- private final int amount;
+ private final DynamicValue amount;
private final ConditionalManaBuilder manaBuilder;
+ private final boolean oneChoice;
public AddConditionalManaOfAnyColorEffect(int amount, ConditionalManaBuilder manaBuilder) {
+ this(new StaticValue(amount), manaBuilder);
+ }
+
+ public AddConditionalManaOfAnyColorEffect(DynamicValue amount, ConditionalManaBuilder manaBuilder) {
+ this(amount, manaBuilder, true);
+ }
+
+ public AddConditionalManaOfAnyColorEffect(DynamicValue amount, ConditionalManaBuilder manaBuilder, boolean oneChoice) {
super();
this.amount = amount;
this.manaBuilder = manaBuilder;
- staticText = "Add " + amount + " mana of any one color to your mana pool. " + manaBuilder.getRule();
+ this.oneChoice = oneChoice;
+ //
+ staticText = "Add " + amount + " mana of " +
+ (oneChoice ? "any one color":"in any combination of colors") +
+ " to your mana pool. " + manaBuilder.getRule();
}
public AddConditionalManaOfAnyColorEffect(final AddConditionalManaOfAnyColorEffect effect) {
super(effect);
this.amount = effect.amount;
this.manaBuilder = effect.manaBuilder;
+ this.oneChoice = effect.oneChoice;
}
@Override
@@ -62,15 +78,20 @@ public class AddConditionalManaOfAnyColorEffect extends ManaEffect {
@Override
public boolean apply(Game game, Ability source) {
- Player player = game.getPlayer(source.getControllerId());
- if (player == null) {
+ Player controller = game.getPlayer(source.getControllerId());
+ if (controller == null) {
return false;
}
+ int value = amount.calculate(game, source, this);
boolean result = false;
- for (int i = 0; i < amount; i++) {
- ChoiceColor choice = (ChoiceColor) source.getChoices().get(i);
-
+ ChoiceColor choice = new ChoiceColor();
+ for (int i = 0; i < value; i++) {
+ if (!choice.isChosen()) {
+ if (!controller.choose(outcome, choice, game)) {
+ return false;
+ }
+ }
Mana mana = null;
if (choice.getColor().isBlack()) {
mana = manaBuilder.setMana(Mana.BlackMana(1), source, game).build();
@@ -85,10 +106,12 @@ public class AddConditionalManaOfAnyColorEffect extends ManaEffect {
}
if (mana != null) {
- player.getManaPool().addMana(mana, game, source);
+ controller.getManaPool().addMana(mana, game, source);
result = true;
}
-
+ if (!oneChoice) {
+ choice.clearChoice();
+ }
}
diff --git a/Mage/src/mage/abilities/effects/common/AddManaInAnyCombinationEffect.java b/Mage/src/mage/abilities/effects/common/AddManaInAnyCombinationEffect.java
index 2bd0f6317a..2e6ce2a8e4 100644
--- a/Mage/src/mage/abilities/effects/common/AddManaInAnyCombinationEffect.java
+++ b/Mage/src/mage/abilities/effects/common/AddManaInAnyCombinationEffect.java
@@ -90,7 +90,7 @@ public class AddManaInAnyCombinationEffect extends ManaEffect {
sb.append(CardUtil.numberToText(amount.toString()));
sb.append(" mana in any combination of ");
if (manaSymbols.size() == 5) {
- sb.append("of colors");
+ sb.append("colors");
} else {
int i = 0;
for (ColoredManaSymbol coloredManaSymbol: manaSymbols) {
diff --git a/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java b/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java
index 28fc7f2b62..e2124a37bb 100644
--- a/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java
+++ b/Mage/src/mage/abilities/effects/common/combat/AttacksIfAbleAllEffect.java
@@ -22,8 +22,15 @@ public class AttacksIfAbleAllEffect extends RequirementEffect {
private final FilterCreaturePermanent filter;
public AttacksIfAbleAllEffect(FilterCreaturePermanent filter) {
- super(Duration.WhileOnBattlefield);
- staticText = new StringBuilder(filter.getMessage()).append(" attack each turn if able").toString();
+ this(filter, Duration.WhileOnBattlefield);
+ }
+
+ public AttacksIfAbleAllEffect(FilterCreaturePermanent filter, Duration duration) {
+ super(duration);
+ staticText = new StringBuilder(filter.getMessage())
+ .append(" attack ")
+ .append(duration.equals(Duration.EndOfTurn) ? "this":"each")
+ .append(" turn if able").toString();
this.filter = filter;
}
@@ -44,12 +51,12 @@ public class AttacksIfAbleAllEffect extends RequirementEffect {
@Override
public boolean mustAttack(Game game) {
- return true;
+ return false;
}
@Override
public boolean mustBlock(Game game) {
- return false;
+ return true;
}
}
diff --git a/Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java b/Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java
new file mode 100644
index 0000000000..5db653745c
--- /dev/null
+++ b/Mage/src/mage/abilities/effects/common/combat/BlocksIfAbleAllEffect.java
@@ -0,0 +1,83 @@
+/*
+ * 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.abilities.effects.common.combat;
+
+import mage.abilities.Ability;
+import mage.abilities.effects.RequirementEffect;
+import mage.constants.Duration;
+import mage.filter.common.FilterCreaturePermanent;
+import mage.game.Game;
+import mage.game.permanent.Permanent;
+
+/**
+ *
+ * @author LevelX2
+ */
+
+public class BlocksIfAbleAllEffect extends RequirementEffect {
+
+ private final FilterCreaturePermanent filter;
+
+ public BlocksIfAbleAllEffect(FilterCreaturePermanent filter) {
+ this(filter,Duration.WhileOnBattlefield);
+ }
+
+ public BlocksIfAbleAllEffect(FilterCreaturePermanent filter, Duration duration) {
+ super(Duration.WhileOnBattlefield);
+ staticText = new StringBuilder(filter.getMessage())
+ .append(" block ")
+ .append(duration.equals(Duration.EndOfTurn) ? "this":"each")
+ .append(" turn if able").toString();
+ this.filter = filter;
+ }
+ public BlocksIfAbleAllEffect(final BlocksIfAbleAllEffect effect) {
+ super(effect);
+ this.filter = effect.filter;
+ }
+
+ @Override
+ public BlocksIfAbleAllEffect copy() {
+ return new BlocksIfAbleAllEffect(this);
+ }
+
+ @Override
+ public boolean applies(Permanent permanent, Ability source, Game game) {
+ return filter.match(permanent, source.getSourceId(), source.getControllerId(), game);
+ }
+
+ @Override
+ public boolean mustAttack(Game game) {
+ return true;
+ }
+
+ @Override
+ public boolean mustBlock(Game game) {
+ return false;
+ }
+
+}
diff --git a/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java b/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java
index a5892859e2..5aa3331e23 100644
--- a/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java
+++ b/Mage/src/mage/abilities/mana/ConditionalAnyColorManaAbility.java
@@ -27,13 +27,16 @@
*/
package mage.abilities.mana;
+import java.util.List;
import mage.Mana;
import mage.abilities.costs.Cost;
import mage.abilities.costs.common.TapSourceCost;
+import mage.abilities.dynamicvalue.DynamicValue;
+import mage.abilities.dynamicvalue.common.StaticValue;
import mage.abilities.effects.common.AddConditionalManaOfAnyColorEffect;
import mage.abilities.mana.builder.ConditionalManaBuilder;
-import mage.choices.ChoiceColor;
import mage.constants.Zone;
+import mage.game.Game;
/**
* For cards like:
@@ -43,6 +46,8 @@ import mage.constants.Zone;
*/
public class ConditionalAnyColorManaAbility extends ManaAbility {
+ private DynamicValue amount;
+
public ConditionalAnyColorManaAbility(int amount, ConditionalManaBuilder manaBuilder) {
this(new TapSourceCost(), amount, manaBuilder);
}
@@ -52,22 +57,24 @@ public class ConditionalAnyColorManaAbility extends ManaAbility {
}
public ConditionalAnyColorManaAbility(Cost cost, int amount, ConditionalManaBuilder manaBuilder, boolean oneChoice) {
- super(Zone.BATTLEFIELD, new AddConditionalManaOfAnyColorEffect(oneChoice ? 1 :amount, manaBuilder), cost);
- int choices = amount;
- if (oneChoice) {
- for (int i = 1; i < amount; i++) {
- this.addEffect(new AddConditionalManaOfAnyColorEffect(1 , manaBuilder));
- }
- choices = 1;
- }
- for (int i = 0; i < choices; i++) {
- this.addChoice(new ChoiceColor());
- }
- this.netMana.add(new Mana(0,0,0,0,0,0,amount));
+ this(cost, new StaticValue(amount), manaBuilder, oneChoice);
+ }
+
+ public ConditionalAnyColorManaAbility(Cost cost, DynamicValue amount, ConditionalManaBuilder manaBuilder, boolean oneChoice) {
+ super(Zone.BATTLEFIELD, new AddConditionalManaOfAnyColorEffect(amount, manaBuilder, oneChoice), cost);
+ this.amount = amount;
}
public ConditionalAnyColorManaAbility(final ConditionalAnyColorManaAbility ability) {
super(ability);
+ this.amount = ability.amount;
+ }
+
+ @Override
+ public List<Mana> getNetMana(Game game) {
+ this.netMana.clear();
+ this.netMana.add(new Mana(0,0,0,0,0,0, amount.calculate(game, this, null)));
+ return super.getNetMana(game);
}
@Override