diff --git a/Mage.Sets/src/mage/cards/f/FacesOfThePast.java b/Mage.Sets/src/mage/cards/f/FacesOfThePast.java new file mode 100644 index 00000000000..bb77709a656 --- /dev/null +++ b/Mage.Sets/src/mage/cards/f/FacesOfThePast.java @@ -0,0 +1,107 @@ +/* + * 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.f; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.common.DiesCreatureTriggeredAbility; +import mage.abilities.effects.OneShotEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Outcome; +import mage.constants.Zone; +import mage.filter.StaticFilters; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.players.Player; + +/** + * + * @author LevelX2 & L_J + */ +public class FacesOfThePast extends CardImpl { + + public FacesOfThePast(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{U}"); + + // Whenever a creature dies, tap all untapped creatures that share a creature type with it or untap all tapped creatures that share a creature type with it. + this.addAbility(new DiesCreatureTriggeredAbility(new FacesOfThePastEffect(), false, false, true)); + } + + public FacesOfThePast(final FacesOfThePast card) { + super(card); + } + + @Override + public FacesOfThePast copy() { + return new FacesOfThePast(this); + } +} + +class FacesOfThePastEffect extends OneShotEffect { + + public FacesOfThePastEffect() { + super(Outcome.Benefit); + this.staticText = "tap all untapped creatures that share a creature type with it or untap all tapped creatures that share a creature type with it"; + } + + public FacesOfThePastEffect(final FacesOfThePastEffect effect) { + super(effect); + } + + @Override + public FacesOfThePastEffect copy() { + return new FacesOfThePastEffect(this); + } + + @Override + public boolean apply(Game game, Ability source) { + Permanent targetPermanent = (Permanent) game.getLastKnownInformation(this.getTargetPointer().getFirst(game, source), Zone.BATTLEFIELD); + if (targetPermanent != null) { + Player controller = game.getPlayer(targetPermanent.getControllerId()); + if (controller != null) { + if (controller.chooseUse(outcome, "Tap all untapped creatures that share a creature type with " + targetPermanent.getLogName() + "? (Otherwise, untaps all tapped)", source, game)) { + for (Permanent permanent : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, game)) { + if (!permanent.isTapped() && targetPermanent.shareSubtypes(permanent, game)) { + permanent.tap(game); + } + } + } else { + for (Permanent permanent : game.getBattlefield().getAllActivePermanents(StaticFilters.FILTER_PERMANENT_CREATURE, game)) { + if (permanent.isTapped() && targetPermanent.shareSubtypes(permanent, game)) { + permanent.untap(game); + } + } + } + return true; + } + } + return false; + } +} diff --git a/Mage.Sets/src/mage/cards/f/ForceBubble.java b/Mage.Sets/src/mage/cards/f/ForceBubble.java new file mode 100644 index 00000000000..1432f5ac6a9 --- /dev/null +++ b/Mage.Sets/src/mage/cards/f/ForceBubble.java @@ -0,0 +1,141 @@ +/* + * 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.f; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.StateTriggeredAbility; +import mage.abilities.common.BeginningOfEndStepTriggeredAbility; +import mage.abilities.common.SimpleStaticAbility; +import mage.abilities.effects.ReplacementEffectImpl; +import mage.abilities.effects.common.RemoveAllCountersSourceEffect; +import mage.abilities.effects.common.SacrificeSourceEffect; +import mage.abilities.effects.common.counter.AddCountersSourceEffect; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.Duration; +import mage.constants.Outcome; +import mage.constants.TargetController; +import mage.constants.Zone; +import mage.counters.CounterType; +import mage.game.Game; +import mage.game.events.DamageEvent; +import mage.game.events.GameEvent; +import mage.game.events.GameEvent.EventType; +import mage.game.permanent.Permanent; + +/** + * + * @author emerald000 & L_J + */ +public class ForceBubble extends CardImpl { + + public ForceBubble(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{2}{W}{W}"); + + // If damage would be dealt to you, put that many depletion counters on Force Bubble instead. + this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new ForceBubbleReplacementEffect())); + + // When there are four or more depletion counters on Force Bubble, sacrifice it. + this.addAbility(new ForceBubbleStateTriggeredAbility()); + + // At the beginning of each end step, remove all depletion counters from Force Bubble. + this.addAbility(new BeginningOfEndStepTriggeredAbility(new RemoveAllCountersSourceEffect(CounterType.DEPLETION), TargetController.ANY, false)); + } + + public ForceBubble(final ForceBubble card) { + super(card); + } + + @Override + public ForceBubble copy() { + return new ForceBubble(this); + } +} + +class ForceBubbleReplacementEffect extends ReplacementEffectImpl { + + ForceBubbleReplacementEffect() { + super(Duration.WhileOnBattlefield, Outcome.PreventDamage); + staticText = "If damage would be dealt to you, put that many depletion counters on {this} instead"; + } + + ForceBubbleReplacementEffect(final ForceBubbleReplacementEffect effect) { + super(effect); + } + + @Override + public boolean replaceEvent(GameEvent event, Ability source, Game game) { + DamageEvent damageEvent = (DamageEvent) event; + new AddCountersSourceEffect(CounterType.DEPLETION.createInstance(damageEvent.getAmount()), true).apply(game, source); + return true; + } + + @Override + public boolean checksEventType(GameEvent event, Game game) { + return event.getType() == EventType.DAMAGE_PLAYER; + } + + @Override + public boolean applies(GameEvent event, Ability source, Game game) { + return event.getTargetId().equals(source.getControllerId()); + } + + @Override + public ForceBubbleReplacementEffect copy() { + return new ForceBubbleReplacementEffect(this); + } +} + +class ForceBubbleStateTriggeredAbility extends StateTriggeredAbility { + + public ForceBubbleStateTriggeredAbility() { + super(Zone.BATTLEFIELD, new SacrificeSourceEffect()); + } + + public ForceBubbleStateTriggeredAbility(final ForceBubbleStateTriggeredAbility ability) { + super(ability); + } + + @Override + public ForceBubbleStateTriggeredAbility copy() { + return new ForceBubbleStateTriggeredAbility(this); + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + Permanent permanent = game.getPermanent(getSourceId()); + return permanent != null && permanent.getCounters(game).getCount(CounterType.DEPLETION) >= 4; + } + + @Override + public String getRule() { + return "When there are four or more depletion counters on {this}, sacrifice it."; + } +} diff --git a/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java new file mode 100644 index 00000000000..112b5900dc7 --- /dev/null +++ b/Mage.Sets/src/mage/cards/f/FrontlineStrategist.java @@ -0,0 +1,78 @@ +/* + * 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.f; + +import java.util.UUID; +import mage.MageInt; +import mage.abilities.common.TurnedFaceUpSourceTriggeredAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.common.PreventAllDamageByAllPermanentsEffect; +import mage.abilities.keyword.MorphAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; +import mage.constants.Duration; +import mage.filter.common.FilterCreaturePermanent; +import mage.filter.predicate.Predicates; +import mage.filter.predicate.mageobject.SubtypePredicate; + +/** + * + * @author L_J + */ +public class FrontlineStrategist extends CardImpl { + + private static final FilterCreaturePermanent filter = new FilterCreaturePermanent("non-Soldier creatures"); + + static { + filter.add(Predicates.not(new SubtypePredicate(SubType.SOLDIER))); + } + + public FrontlineStrategist(UUID ownerId, CardSetInfo setInfo) { + super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{W}"); + this.subtype.add(SubType.HUMAN); + this.subtype.add(SubType.SOLDIER); + this.power = new MageInt(1); + this.toughness = new MageInt(1); + + // Morph {W} + this.addAbility(new MorphAbility(this, new ManaCostsImpl("{W}"))); + // When Frontline Strategist is turned face up, prevent all combat damage non-Soldier creatures would deal this turn. + this.addAbility(new TurnedFaceUpSourceTriggeredAbility(new PreventAllDamageByAllPermanentsEffect(filter, Duration.EndOfTurn, true).setText("prevent all combat damage non-Soldier creatures would deal this turn"))); + } + + public FrontlineStrategist(final FrontlineStrategist card) { + super(card); + } + + @Override + public FrontlineStrategist copy() { + return new FrontlineStrategist(this); + } +} diff --git a/Mage.Sets/src/mage/cards/g/GeneralJarkeld.java b/Mage.Sets/src/mage/cards/g/GeneralJarkeld.java index 4528cc583d3..319a619cf8d 100644 --- a/Mage.Sets/src/mage/cards/g/GeneralJarkeld.java +++ b/Mage.Sets/src/mage/cards/g/GeneralJarkeld.java @@ -166,30 +166,32 @@ class GeneralJarkeldSwitchBlockersEffect extends OneShotEffect { private void handleMultiBlockers(Set blockers, CombatGroup chosenGroup1, CombatGroup chosenGroup2, Player controller, Game game) { // for handling multi-blockers (Two Headed Giant of Foriys, etc.) + blockerIteration: for (Permanent blocker : blockers) { if (blocker.getBlocking() > 1) { CombatGroup blockGroup = null; for (CombatGroup group : game.getCombat().getBlockingGroups()) { if (group.getBlockers().contains(blocker.getId())) { blockGroup = group; + break; } } if (blockGroup != null) { CombatGroup chosenGroup = null; - int sameBlocked = 0; + boolean sameBlocked = false; for (CombatGroup group : game.getCombat().getGroups()) { if (group.getBlocked() && group.getBlockers().contains(blocker.getId())) { if (group == chosenGroup1 || group == chosenGroup2) { - sameBlocked++; - if (sameBlocked > 1) { - break; + if (sameBlocked) { + continue blockerIteration; } + sameBlocked = true; chosenGroup = group; } } } - if (sameBlocked == 1 && chosenGroup != null) { // if none (should not happen) or all the blockers correspond to Jarkeld's targets, the blockers remain the same + if (sameBlocked && chosenGroup != null) { // if none (should not happen) or all the blockers correspond to Jarkeld's targets, the blockers remain the same CombatGroup otherGroup = (chosenGroup.equals(chosenGroup1) ? chosenGroup2 : chosenGroup1); chosenGroup.remove(blocker.getId()); for (UUID attacker : chosenGroup.getAttackers()) { diff --git a/Mage.Sets/src/mage/cards/h/HollowOne.java b/Mage.Sets/src/mage/cards/h/HollowOne.java index 3232b899252..f37f64c564b 100644 --- a/Mage.Sets/src/mage/cards/h/HollowOne.java +++ b/Mage.Sets/src/mage/cards/h/HollowOne.java @@ -35,17 +35,15 @@ import mage.abilities.common.SimpleStaticAbility; import mage.abilities.costs.mana.ManaCostsImpl; import mage.abilities.effects.common.cost.CostModificationEffectImpl; import mage.abilities.keyword.CyclingAbility; -import mage.cards.Card; import mage.cards.CardImpl; import mage.cards.CardSetInfo; import mage.constants.CardType; -import mage.constants.SubType; import mage.constants.CostModificationType; import mage.constants.Duration; import mage.constants.Outcome; +import mage.constants.SubType; import mage.constants.Zone; import mage.game.Game; -import mage.players.Player; import mage.util.CardUtil; import mage.watchers.common.CardsCycledOrDiscardedThisTurnWatcher; @@ -94,17 +92,9 @@ class HollowOneReductionEffect extends CostModificationEffectImpl { @Override public boolean apply(Game game, Ability source, Ability abilityToModify) { - Player controller = game.getPlayer(source.getControllerId()); CardsCycledOrDiscardedThisTurnWatcher watcher = (CardsCycledOrDiscardedThisTurnWatcher) game.getState().getWatchers().get(CardsCycledOrDiscardedThisTurnWatcher.class.getSimpleName()); - int reductionAmount = 0; - if (controller != null - && watcher != null) { - for (Card card : watcher.getCardsCycledOrDiscardedThisTurn(controller.getId()).getCards(game)) { - if (card.getOwnerId().equals(controller.getId())) { - reductionAmount++; - } - } - CardUtil.reduceCost(abilityToModify, reductionAmount * 2); + if (watcher != null) { + CardUtil.reduceCost(abilityToModify, watcher.getNumberOfCardsCycledOrDiscardedThisTurn(source.getControllerId()) * 2); return true; } return false; diff --git a/Mage.Sets/src/mage/cards/l/LingeringDeath.java b/Mage.Sets/src/mage/cards/l/LingeringDeath.java new file mode 100644 index 00000000000..705c53e3821 --- /dev/null +++ b/Mage.Sets/src/mage/cards/l/LingeringDeath.java @@ -0,0 +1,119 @@ +/* + * 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.l; + +import java.util.UUID; +import mage.abilities.Ability; +import mage.abilities.TriggeredAbilityImpl; +import mage.abilities.effects.common.AttachEffect; +import mage.abilities.effects.common.SacrificeTargetEffect; +import mage.abilities.keyword.EnchantAbility; +import mage.cards.CardImpl; +import mage.cards.CardSetInfo; +import mage.constants.CardType; +import mage.constants.SubType; +import mage.constants.Outcome; +import mage.constants.Zone; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.game.events.GameEvent; +import mage.target.TargetPermanent; +import mage.target.common.TargetCreaturePermanent; +import mage.target.targetpointer.FixedTarget; + +/** + * + * @author L_J + */ +public class LingeringDeath extends CardImpl { + + public LingeringDeath(UUID ownerId, CardSetInfo setInfo) { + super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{B}"); + this.subtype.add(SubType.AURA); + + // Enchant creature + TargetPermanent auraTarget = new TargetCreaturePermanent(); + this.getSpellAbility().addTarget(auraTarget); + this.getSpellAbility().addEffect(new AttachEffect(Outcome.DestroyPermanent)); + Ability ability = new EnchantAbility(auraTarget.getTargetName()); + this.addAbility(ability); + + // At the beginning of the end step of enchanted creature's controller, that player sacrifices that creature. + this.addAbility(new LingeringDeathAbility()); + } + + public LingeringDeath(final LingeringDeath card) { + super(card); + } + + @Override + public LingeringDeath copy() { + return new LingeringDeath(this); + } +} + +class LingeringDeathAbility extends TriggeredAbilityImpl { + public LingeringDeathAbility() { + super(Zone.BATTLEFIELD, new SacrificeTargetEffect()); + } + + public LingeringDeathAbility(final LingeringDeathAbility ability) { + super(ability); + } + + + @Override + public LingeringDeathAbility copy() { + return new LingeringDeathAbility(this); + } + + @Override + public boolean checkEventType(GameEvent event, Game game) { + return event.getType() == GameEvent.EventType.END_TURN_STEP_PRE; + } + + @Override + public boolean checkTrigger(GameEvent event, Game game) { + Permanent enchantment = game.getPermanentOrLKIBattlefield(this.getSourceId()); + if (enchantment != null && enchantment.getAttachedTo() != null) { + Permanent enchantedCreature = game.getPermanent(enchantment.getAttachedTo()); + if (enchantedCreature != null) { + if (event.getPlayerId().equals(enchantedCreature.getControllerId())) { + getEffects().get(0).setTargetPointer(new FixedTarget(enchantment.getAttachedTo())); + return true; + } + } + } + return false; + } + + @Override + public String getRule() { + return "At the beginning of the end step of enchanted creature's controller, that player sacrifices that creature."; + } +} diff --git a/Mage.Sets/src/mage/cards/t/ToxinSliver.java b/Mage.Sets/src/mage/cards/t/ToxinSliver.java index 36cfe08f38b..a8259c7ea57 100644 --- a/Mage.Sets/src/mage/cards/t/ToxinSliver.java +++ b/Mage.Sets/src/mage/cards/t/ToxinSliver.java @@ -45,7 +45,7 @@ import mage.filter.common.FilterCreaturePermanent; public class ToxinSliver extends CardImpl { public ToxinSliver(UUID ownerId, CardSetInfo setInfo) { - super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{3}{B}"); + super(ownerId, setInfo, new CardType[]{CardType.CREATURE}, "{3}{B}"); this.subtype.add(SubType.SLIVER); this.power = new MageInt(3); @@ -53,9 +53,9 @@ public class ToxinSliver extends CardImpl { // Whenever a Sliver deals combat damage to a creature, destroy that creature. It can't be regenerated. this.addAbility(new DealsDamageToACreatureAllTriggeredAbility( - new DestroyTargetEffect(true), false, - new FilterCreaturePermanent(SubType.SLIVER,"a Sliver"), - SetTargetPointer.PERMANENT, true)); + new DestroyTargetEffect(true), false, + new FilterCreaturePermanent(SubType.SLIVER, "a Sliver"), + SetTargetPointer.PERMANENT_TARGET, true)); } diff --git a/Mage.Sets/src/mage/sets/Scourge.java b/Mage.Sets/src/mage/sets/Scourge.java index 122d20e4058..ad8585d5827 100644 --- a/Mage.Sets/src/mage/sets/Scourge.java +++ b/Mage.Sets/src/mage/sets/Scourge.java @@ -108,11 +108,14 @@ public class Scourge extends ExpansionSet { cards.add(new SetCardInfo("Enrage", 91, Rarity.UNCOMMON, mage.cards.e.Enrage.class)); cards.add(new SetCardInfo("Eternal Dragon", 12, Rarity.RARE, mage.cards.e.EternalDragon.class)); cards.add(new SetCardInfo("Extra Arms", 92, Rarity.UNCOMMON, mage.cards.e.ExtraArms.class)); + cards.add(new SetCardInfo("Faces of the Past", 35, Rarity.RARE, mage.cards.f.FacesOfThePast.class)); cards.add(new SetCardInfo("Fatal Mutation", 66, Rarity.UNCOMMON, mage.cards.f.FatalMutation.class)); cards.add(new SetCardInfo("Fierce Empath", 119, Rarity.COMMON, mage.cards.f.FierceEmpath.class)); cards.add(new SetCardInfo("Final Punishment", 67, Rarity.RARE, mage.cards.f.FinalPunishment.class)); cards.add(new SetCardInfo("Forgotten Ancient", 120, Rarity.RARE, mage.cards.f.ForgottenAncient.class)); cards.add(new SetCardInfo("Form of the Dragon", 93, Rarity.RARE, mage.cards.f.FormOfTheDragon.class)); + cards.add(new SetCardInfo("Force Bubble", 14, Rarity.RARE, mage.cards.f.ForceBubble.class)); + cards.add(new SetCardInfo("Frontline Strategist", 15, Rarity.COMMON, mage.cards.f.FrontlineStrategist.class)); cards.add(new SetCardInfo("Frozen Solid", 36, Rarity.COMMON, mage.cards.f.FrozenSolid.class)); cards.add(new SetCardInfo("Gilded Light", 16, Rarity.UNCOMMON, mage.cards.g.GildedLight.class)); cards.add(new SetCardInfo("Goblin Brigand", 94, Rarity.COMMON, mage.cards.g.GoblinBrigand.class)); @@ -128,6 +131,7 @@ public class Scourge extends ExpansionSet { cards.add(new SetCardInfo("Krosan Warchief", 123, Rarity.UNCOMMON, mage.cards.k.KrosanWarchief.class)); cards.add(new SetCardInfo("Kurgadon", 124, Rarity.UNCOMMON, mage.cards.k.Kurgadon.class)); cards.add(new SetCardInfo("Lethal Vapors", 68, Rarity.RARE, mage.cards.l.LethalVapors.class)); + cards.add(new SetCardInfo("Lingering Death", 69, Rarity.COMMON, mage.cards.l.LingeringDeath.class)); cards.add(new SetCardInfo("Long-Term Plans", 38, Rarity.UNCOMMON, mage.cards.l.LongTermPlans.class)); cards.add(new SetCardInfo("Mercurial Kite", 39, Rarity.COMMON, mage.cards.m.MercurialKite.class)); cards.add(new SetCardInfo("Metamorphose", 40, Rarity.UNCOMMON, mage.cards.m.Metamorphose.class)); diff --git a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ZurTheEnchanterTest.java b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ZurTheEnchanterTest.java index d5462cb059e..b291d73332e 100644 --- a/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ZurTheEnchanterTest.java +++ b/Mage.Tests/src/test/java/org/mage/test/cards/triggers/ZurTheEnchanterTest.java @@ -66,7 +66,7 @@ public class ZurTheEnchanterTest extends CardTestPlayerBase { addCard(Zone.HAND, playerB, "Diplomatic Immunity"); // {1}{U} // Enchant creature // Enchanted creature gets +1/+1 for each card in your hand. - addCard(Zone.LIBRARY, playerB, "Empyrial Armor"); + addCard(Zone.LIBRARY, playerB, "Empyrial Armor", 2); castSpell(2, PhaseStep.PRECOMBAT_MAIN, playerB, "Diplomatic Immunity", "Zur the Enchanter"); diff --git a/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAllTriggeredAbility.java b/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAllTriggeredAbility.java index ee6215d7396..87f28e4dfc5 100644 --- a/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAllTriggeredAbility.java +++ b/Mage/src/main/java/mage/abilities/common/DealsDamageToACreatureAllTriggeredAbility.java @@ -19,14 +19,29 @@ import mage.target.targetpointer.FixedTarget; /** * - * @author Ludwig.Hirth + * @author LevelX2 */ public class DealsDamageToACreatureAllTriggeredAbility extends TriggeredAbilityImpl { private final boolean combatDamageOnly; private final FilterPermanent filterPermanent; private final SetTargetPointer setTargetPointer; - + + /** + * This ability works only for permanents doing damage. + * + * @param effect + * @param optional + * @param filterPermanent The filter that restricts which permanets have to + * trigger + * @param setTargetPointer The target to be set to target pointer of the + * effect.
+ * - PLAYER = player controlling the damage source.
+ * - PERMANENT = source permanent.
+ * - PERMANENT_TARGET = damaged creature. + * @param combatDamageOnly The flag to determine if only combat damage has + * to trigger + */ public DealsDamageToACreatureAllTriggeredAbility(Effect effect, boolean optional, FilterPermanent filterPermanent, SetTargetPointer setTargetPointer, boolean combatDamageOnly) { super(Zone.BATTLEFIELD, effect, optional); this.combatDamageOnly = combatDamageOnly; @@ -64,7 +79,13 @@ public class DealsDamageToACreatureAllTriggeredAbility extends TriggeredAbilityI effect.setTargetPointer(new FixedTarget(permanent.getControllerId())); break; case PERMANENT: - effect.setTargetPointer(new FixedTarget(permanent.getId(), permanent.getZoneChangeCounter(game))); + effect.setTargetPointer(new FixedTarget(permanent, game)); + break; + case PERMANENT_TARGET: + Permanent permanent_target = game.getPermanentOrLKIBattlefield(event.getTargetId()); + if (permanent_target != null) { + effect.setTargetPointer(new FixedTarget(permanent_target, game)); + } break; } @@ -77,7 +98,7 @@ public class DealsDamageToACreatureAllTriggeredAbility extends TriggeredAbilityI @Override public String getRule() { - return "Whenever " + filterPermanent.getMessage() + " deals " - + (combatDamageOnly ? "combat ":"") + "damage to a creature, " + super.getRule(); + return "Whenever " + filterPermanent.getMessage() + " deals " + + (combatDamageOnly ? "combat " : "") + "damage to a creature, " + super.getRule(); } -} \ No newline at end of file +} diff --git a/Mage/src/main/java/mage/constants/SetTargetPointer.java b/Mage/src/main/java/mage/constants/SetTargetPointer.java index 04c3afb9245..edb71ab241c 100644 --- a/Mage/src/main/java/mage/constants/SetTargetPointer.java +++ b/Mage/src/main/java/mage/constants/SetTargetPointer.java @@ -33,5 +33,11 @@ package mage.constants; */ public enum SetTargetPointer { - NONE, PLAYER, SPELL, CARD, PERMANENT, ATTACHED_TO_CONTROLLER + NONE, + PLAYER, + SPELL, + CARD, + PERMANENT, + PERMANENT_TARGET, + ATTACHED_TO_CONTROLLER } diff --git a/Mage/src/main/java/mage/game/combat/CombatGroup.java b/Mage/src/main/java/mage/game/combat/CombatGroup.java index 7ad9391ceac..1717901b6e6 100644 --- a/Mage/src/main/java/mage/game/combat/CombatGroup.java +++ b/Mage/src/main/java/mage/game/combat/CombatGroup.java @@ -256,7 +256,7 @@ public class CombatGroup implements Serializable, Copyable { if (attacker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) { lethalDamage = 1; } else { - lethalDamage = blocker.getToughness().getValue() - blocker.getDamage(); + lethalDamage = Math.max(blocker.getToughness().getValue() - blocker.getDamage(), 0); } if (lethalDamage >= damage) { blocker.markDamage(damage, attacker.getId(), game, true, true); @@ -311,7 +311,7 @@ public class CombatGroup implements Serializable, Copyable { if (attacker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) { lethalDamage = 1; } else { - lethalDamage = blocker.getToughness().getValue() - blocker.getDamage(); + lethalDamage = Math.max(blocker.getToughness().getValue() - blocker.getDamage(), 0); } if (lethalDamage >= damage) { if (!oldRuleDamage) { @@ -483,7 +483,7 @@ public class CombatGroup implements Serializable, Copyable { if (blocker.getAbilities().containsKey(DeathtouchAbility.getInstance().getId())) { lethalDamage = 1; } else { - lethalDamage = attacker.getToughness().getValue() - attacker.getDamage(); + lethalDamage = Math.max(attacker.getToughness().getValue() - attacker.getDamage(), 0); } if (lethalDamage >= damage) { assigned.put(attackerId, damage); diff --git a/Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java b/Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java index 3dc715174a3..021ed7bdedd 100644 --- a/Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java +++ b/Mage/src/main/java/mage/watchers/common/CardsCycledOrDiscardedThisTurnWatcher.java @@ -28,9 +28,12 @@ package mage.watchers.common; import java.util.HashMap; +import java.util.HashSet; import java.util.Map; import java.util.Map.Entry; +import java.util.Set; import java.util.UUID; +import mage.MageObjectReference; import mage.cards.Card; import mage.cards.Cards; import mage.cards.CardsImpl; @@ -47,6 +50,7 @@ import mage.watchers.Watcher; public class CardsCycledOrDiscardedThisTurnWatcher extends Watcher { private final Map cycledOrDiscardedCardsThisTurn = new HashMap<>(); + private final Map> numberOfCycledOrDiscardedCardsThisTurn = new HashMap<>(); public CardsCycledOrDiscardedThisTurnWatcher() { super(CardsCycledOrDiscardedThisTurnWatcher.class.getSimpleName(), WatcherScope.GAME); @@ -57,11 +61,17 @@ public class CardsCycledOrDiscardedThisTurnWatcher extends Watcher { for (Entry entry : watcher.cycledOrDiscardedCardsThisTurn.entrySet()) { cycledOrDiscardedCardsThisTurn.put(entry.getKey(), entry.getValue().copy()); } + for (Entry> entry : watcher.numberOfCycledOrDiscardedCardsThisTurn.entrySet()) { + Set cycledOrDiscardedCards = new HashSet<>(); + cycledOrDiscardedCards.addAll(entry.getValue()); + numberOfCycledOrDiscardedCardsThisTurn.put(entry.getKey(), cycledOrDiscardedCards); + } + numberOfCycledOrDiscardedCardsThisTurn.putAll(watcher.numberOfCycledOrDiscardedCardsThisTurn); } @Override public void watch(GameEvent event, Game game) { - if (event.getType() == GameEvent.EventType.DISCARDED_CARD + if (event.getType() == GameEvent.EventType.DISCARDED_CARD || event.getType() == GameEvent.EventType.CYCLED_CARD && event.getPlayerId() != null) { Card card = game.getCard(event.getTargetId()); @@ -69,6 +79,12 @@ public class CardsCycledOrDiscardedThisTurnWatcher extends Watcher { Cards c = getCardsCycledOrDiscardedThisTurn(event.getPlayerId()); c.add(card); cycledOrDiscardedCardsThisTurn.put(event.getPlayerId(), c); + Set cycledOrDiscardedCards = numberOfCycledOrDiscardedCardsThisTurn.get(event.getPlayerId()); + if (cycledOrDiscardedCards == null) { + cycledOrDiscardedCards = new HashSet<>(); + numberOfCycledOrDiscardedCardsThisTurn.put(event.getPlayerId(), cycledOrDiscardedCards); + } + cycledOrDiscardedCards.add(new MageObjectReference(card, game)); } } } @@ -77,10 +93,18 @@ public class CardsCycledOrDiscardedThisTurnWatcher extends Watcher { return cycledOrDiscardedCardsThisTurn.getOrDefault(playerId, new CardsImpl()); } + public int getNumberOfCardsCycledOrDiscardedThisTurn(UUID playerId) { + if (numberOfCycledOrDiscardedCardsThisTurn.containsKey(playerId)) { + return numberOfCycledOrDiscardedCardsThisTurn.get(playerId).size(); + } + return 0; + } + @Override public void reset() { super.reset(); cycledOrDiscardedCardsThisTurn.clear(); + numberOfCycledOrDiscardedCardsThisTurn.clear(); } @Override