diff --git a/Mage.Sets/src/mage/sets/invasion/Prohibit.java b/Mage.Sets/src/mage/sets/invasion/Prohibit.java index 4e01d7a6d3..d32d45462d 100644 --- a/Mage.Sets/src/mage/sets/invasion/Prohibit.java +++ b/Mage.Sets/src/mage/sets/invasion/Prohibit.java @@ -49,7 +49,7 @@ import mage.target.TargetSpell; public class Prohibit extends CardImpl { private static final FilterSpell filter2 = new FilterSpell("spell if its converted mana cost is 2 or less"); - private static final FilterSpell filter4 = new FilterSpell("spell if its converted mana cost is 5 or less"); + private static final FilterSpell filter4 = new FilterSpell("spell if its converted mana cost is 4 or less"); static { filter2.add(new ConvertedManaCostPredicate(Filter.ComparisonType.LessThan, 3)); @@ -67,15 +67,15 @@ public class Prohibit extends CardImpl { // Counter target spell if its converted mana cost is 2 or less. If Prohibit was kicked, counter that spell if its converted mana cost is 4 or less instead. this.getSpellAbility().addEffect(new CounterTargetEffect()); - this.getSpellAbility().addTarget(new TargetSpell(filter2)); + this.getSpellAbility().addTarget(new TargetSpell(filter4)); } @Override public void adjustTargets(Ability ability, Game game) { if (ability instanceof SpellAbility) { - if (KickedCondition.getInstance().apply(game, ability)) { + if (!KickedCondition.getInstance().apply(game, ability)) { ability.getTargets().clear(); - ability.getTargets().add(new TargetSpell(filter4)); + ability.getTargets().add(new TargetSpell(filter2)); } } } diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java b/Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java index f535f26957..ea0ee9b4e0 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/AeonChronicler.java @@ -33,7 +33,6 @@ import mage.abilities.TriggeredAbilityImpl; import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.dynamicvalue.common.CardsInControllerHandCount; -import mage.abilities.effects.common.CreateDelayedTriggeredAbilityEffect; import mage.abilities.effects.common.DrawCardSourceControllerEffect; import mage.abilities.effects.common.continious.SetPowerToughnessSourceEffect; import mage.abilities.keyword.SuspendAbility; @@ -42,6 +41,7 @@ import mage.constants.CardType; import mage.constants.Duration; import mage.constants.Rarity; import mage.constants.Zone; +import mage.counters.CounterType; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; @@ -65,7 +65,7 @@ public class AeonChronicler extends CardImpl { this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new CardsInControllerHandCount(), Duration.EndOfGame))); // Suspend X-{X}{3}{U}. X can't be 0. - this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{X}{3}"), this, true)); + this.addAbility(new SuspendAbility(Integer.MAX_VALUE, new ManaCostsImpl("{3}{U}"), this, true)); // Whenever a time counter is removed from Aeon Chronicler while it's exiled, draw a card. this.addAbility(new AeonChroniclerTriggeredAbility()); @@ -83,27 +83,27 @@ public class AeonChronicler extends CardImpl { class AeonChroniclerTriggeredAbility extends TriggeredAbilityImpl { - public AeonChroniclerTriggeredAbility() { - super(Zone.EXILED, new DrawCardSourceControllerEffect(1), false); - } - - public AeonChroniclerTriggeredAbility(final AeonChroniclerTriggeredAbility ability) { - super(ability); - } - - @Override - public AeonChroniclerTriggeredAbility copy() { - return new AeonChroniclerTriggeredAbility(this); - } - - @Override - public boolean checkTrigger(GameEvent event, Game game) { - return EventType.COUNTER_REMOVED.equals(event.getType()) && event.getData().equals("time") && event.getTargetId().equals(this.getSourceId()); - } - - @Override - public String getRule() { - return "Whenever a time counter is removed from {this} while it's exiled, " + super.getRule(); - } - + public AeonChroniclerTriggeredAbility() { + super(Zone.EXILED, new DrawCardSourceControllerEffect(1), false); } + + public AeonChroniclerTriggeredAbility(final AeonChroniclerTriggeredAbility ability) { + super(ability); + } + + @Override + public AeonChroniclerTriggeredAbility copy() { + return new AeonChroniclerTriggeredAbility(this); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + return EventType.COUNTER_REMOVED.equals(event.getType()) && event.getData().equals(CounterType.TIME.getName()) && event.getTargetId().equals(this.getSourceId()); + } + + @Override + public String getRule() { + return "Whenever a time counter is removed from {this} while it's exiled, " + super.getRule(); + } + +} diff --git a/Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java b/Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java index 3753263888..834f4e39a5 100644 --- a/Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java +++ b/Mage.Sets/src/mage/sets/jacevsvraska/BodyDouble.java @@ -98,7 +98,7 @@ class BodyDoubleCopyEffect extends OneShotEffect { Player player = game.getPlayer(source.getControllerId()); Permanent sourcePermanent = game.getPermanent(source.getSourceId()); if (player != null && sourcePermanent != null) { - Target target = new TargetCardInGraveyard(new FilterCreatureCard()); + Target target = new TargetCardInGraveyard(new FilterCreatureCard("creature card in a graveyard")); target.setNotTarget(true); if (target.canChoose(source.getControllerId(), game)) { player.choose(outcome, target, source.getSourceId(), game); diff --git a/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java b/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java index 51eab83954..debf69c55d 100644 --- a/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java +++ b/Mage/src/mage/abilities/dynamicvalue/common/CardsInAllGraveyardsCount.java @@ -1,18 +1,40 @@ /* - * To change this template, choose Tools | Templates - * and open the template in the editor. + * 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.dynamicvalue.common; +import java.util.UUID; import mage.abilities.Ability; import mage.abilities.dynamicvalue.DynamicValue; import mage.abilities.effects.Effect; import mage.filter.FilterCard; import mage.game.Game; import mage.players.Player; -import mage.players.PlayerList; - -import java.util.UUID; /** * @@ -37,11 +59,13 @@ public class CardsInAllGraveyardsCount implements DynamicValue { @Override public int calculate(Game game, Ability sourceAbility, Effect effect) { int amount = 0; - PlayerList playerList = game.getPlayerList(); - for (UUID playerUUID : playerList) { - Player player = game.getPlayer(playerUUID); - if (player != null) { - amount += player.getGraveyard().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); + Player controller = game.getPlayer(sourceAbility.getControllerId()); + if (controller != null) { + for (UUID playerUUID : controller.getInRange()) { + Player player = game.getPlayer(playerUUID); + if (player != null) { + amount += player.getGraveyard().count(filter, sourceAbility.getSourceId(), sourceAbility.getControllerId(), game); + } } } return amount; diff --git a/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java b/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java index e473971203..c001d57ae2 100644 --- a/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java +++ b/Mage/src/mage/abilities/effects/common/DestroyTargetEffect.java @@ -107,7 +107,7 @@ public class DestroyTargetEffect extends OneShotEffect { sb.append("destroy that creature"); //TODO add possibility to specify text with targetPointer usage } else if (mode.getTargets().get(0).getNumberOfTargets() == 1) { String targetName = mode.getTargets().get(0).getTargetName(); - sb.append("Destroy "); + sb.append("destroy "); if (!targetName.startsWith("another")) { sb.append("target "); } diff --git a/Mage/src/mage/abilities/keyword/SuspendAbility.java b/Mage/src/mage/abilities/keyword/SuspendAbility.java index 58adf42107..ebb2fae4a8 100644 --- a/Mage/src/mage/abilities/keyword/SuspendAbility.java +++ b/Mage/src/mage/abilities/keyword/SuspendAbility.java @@ -165,12 +165,12 @@ public class SuspendAbility extends ActivatedAbilityImpl { } StringBuilder sb = new StringBuilder("Suspend "); if (cost != null) { - sb.append(suspend).append(" - ").append(cost.getText()); + sb.append(suspend == Integer.MAX_VALUE ? "X":suspend).append(" - ").append(cost.getText()); if (!shortRule) { sb.append(" (Rather than cast this card from your hand, pay ") .append(cost.getText()) .append(" and exile it with ") - .append((suspend == 1 ? "a time counter": suspend == Integer.MAX_VALUE ? "X time counters": suspend + " time counters")) + .append((suspend == 1 ? "a time counter": (suspend == Integer.MAX_VALUE ? "X time counters": suspend + " time counters"))) .append(" on it.") .append(" At the beginning of your upkeep, remove a time counter. When the last is removed, cast it without paying its mana cost.") .append(card.getCardType().contains(CardType.CREATURE)? " If you play it this way and it's a creature, it gains haste until you lose control of it.":"") @@ -223,7 +223,7 @@ class SuspendExileEffect extends OneShotEffect { public SuspendExileEffect(int suspend) { super(Outcome.PutCardInPlay); - this.staticText = new StringBuilder("Suspend ").append(suspend).toString(); + this.staticText = new StringBuilder("Suspend ").append(suspend == Integer.MAX_VALUE ? "X":suspend).toString(); this.suspend = suspend; } diff --git a/Mage/src/mage/target/common/TargetCardInExile.java b/Mage/src/mage/target/common/TargetCardInExile.java index f5c863988c..1e225d6db2 100644 --- a/Mage/src/mage/target/common/TargetCardInExile.java +++ b/Mage/src/mage/target/common/TargetCardInExile.java @@ -71,7 +71,7 @@ public class TargetCardInExile extends TargetCard { @Override public Set possibleTargets(UUID sourceId, UUID sourceControllerId, Game game) { - Set possibleTargets = new HashSet(); + Set possibleTargets = new HashSet<>(); if (allExileZones) { for (Card card : game.getExile().getAllCards(game)) { if (filter.match(card, sourceControllerId, game)) {