From a38e441e08d6396a975615a6babf4790fa36eb4b Mon Sep 17 00:00:00 2001 From: BetaSteward Date: Fri, 26 Aug 2011 15:42:29 -0400 Subject: [PATCH] MBS - Spin Engine + modifications to Restriction Effect --- .../mage/sets/apocalypse/ManaclesOfDecay.java | 2 +- .../sets/championsofkamigawa/CageOfHands.java | 2 +- .../mage/sets/eventide/RecumbentBliss.java | 2 +- .../src/mage/sets/magic2012/TectonicRift.java | 2 +- .../mirrodinbesieged/HeroOfOxidRidge.java | 2 +- .../sets/mirrodinbesieged/SignalPest.java | 2 +- .../sets/mirrodinbesieged/SpinEngine.java | 105 ++++++++++++++++++ .../sets/mirrodinbesieged/TrainingDrone.java | 2 +- .../sets/newphyrexia/RuthlessInvasion.java | 2 +- Mage.Sets/src/mage/sets/tenth/Juggernaut.java | 3 +- Mage.Sets/src/mage/sets/tenth/Pacifism.java | 2 +- .../abilities/common/CantBlockAbility.java | 2 +- .../abilities/effects/RestrictionEffect.java | 4 +- .../effects/common/CantBlockSourceEffect.java | 2 +- .../mage/abilities/keyword/FearAbility.java | 2 +- .../mage/abilities/keyword/FlyingAbility.java | 2 +- .../abilities/keyword/IntimidateAbility.java | 2 +- .../abilities/keyword/LandwalkAbility.java | 2 +- .../abilities/keyword/UnblockableAbility.java | 2 +- .../mage/game/permanent/PermanentImpl.java | 4 +- 20 files changed, 127 insertions(+), 21 deletions(-) create mode 100644 Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java diff --git a/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java b/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java index 828103c6cfd..8c4214da8e6 100644 --- a/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java +++ b/Mage.Sets/src/mage/sets/apocalypse/ManaclesOfDecay.java @@ -128,7 +128,7 @@ class ManaclesOfDecaySecondEffect extends RestrictionEffect { } @Override - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return false; } diff --git a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java index 8547286bfda..dcaa351063b 100644 --- a/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java +++ b/Mage.Sets/src/mage/sets/eventide/RecumbentBliss.java @@ -100,7 +100,7 @@ class RecumbentBlissEffect extends RestrictionEffect { } @Override - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return false; } diff --git a/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java b/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java index 213184a143d..a0642f6c54e 100644 --- a/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java +++ b/Mage.Sets/src/mage/sets/magic2012/TectonicRift.java @@ -92,7 +92,7 @@ class TectonicRiftEffect extends RestrictionEffect { } @Override - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return false; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java index e09c7a079f4..d7b20d3bd43 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/HeroOfOxidRidge.java @@ -99,7 +99,7 @@ class HeroOfOxidRidgeEffect extends RestrictionEffect { } @Override - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return false; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java index 0b9c976db54..14c7c9a08d9 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SignalPest.java @@ -115,7 +115,7 @@ class SignalPestEffect extends RestrictionEffect { } @Override - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Game game) { + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { if (blocker.getAbilities().contains(FlyingAbility.getInstance()) || blocker.getAbilities().contains(ReachAbility.getInstance())) { return true; } diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java new file mode 100644 index 00000000000..79d2cbf0e57 --- /dev/null +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/SpinEngine.java @@ -0,0 +1,105 @@ +/* + * Copyright 2011 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.mirrodinbesieged; + +import java.util.UUID; +import mage.Constants.CardType; +import mage.Constants.Duration; +import mage.Constants.Rarity; +import mage.Constants.Zone; +import mage.MageInt; +import mage.abilities.Ability; +import mage.abilities.common.SimpleActivatedAbility; +import mage.abilities.costs.mana.ManaCostsImpl; +import mage.abilities.effects.RestrictionEffect; +import mage.cards.CardImpl; +import mage.game.Game; +import mage.game.permanent.Permanent; +import mage.target.common.TargetCreaturePermanent; + +/** + * + * @author BetaSteward_at_googlemail.com + */ +public class SpinEngine extends CardImpl { + + public SpinEngine(UUID ownerId) { + super(ownerId, 135, "Spin Engine", Rarity.COMMON, new CardType[]{CardType.ARTIFACT, CardType.CREATURE}, "{3}"); + this.expansionSetCode = "MBS"; + this.subtype.add("Construct"); + this.power = new MageInt(3); + this.toughness = new MageInt(1); + + Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new SpinEngineEffect(), new ManaCostsImpl("{R}")); + ability.addTarget(new TargetCreaturePermanent()); + this.addAbility(ability); + } + + public SpinEngine(final SpinEngine card) { + super(card); + } + + @Override + public SpinEngine copy() { + return new SpinEngine(this); + } + +} + +class SpinEngineEffect extends RestrictionEffect { + + public SpinEngineEffect() { + super(Duration.EndOfTurn); + } + + public SpinEngineEffect(final SpinEngineEffect effect) { + super(effect); + } + + @Override + public boolean applies(Permanent permanent, Ability source, Game game) { + if (permanent.getId().equals(source.getSourceId())) { + return true; + } + return false; + } + + @Override + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { + UUID targetId = source.getFirstTarget(); + if (targetId != null && blocker.getId().equals(targetId)) + return false; + return true; + } + + @Override + public SpinEngineEffect copy() { + return new SpinEngineEffect(this); + } + +} diff --git a/Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java b/Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java index c094ec27171..5e1afe9d734 100644 --- a/Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java +++ b/Mage.Sets/src/mage/sets/mirrodinbesieged/TrainingDrone.java @@ -93,7 +93,7 @@ class TrainingDroneEffect extends RestrictionEffect { } @Override - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return false; } diff --git a/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java b/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java index 135a16a0282..efa918ac747 100644 --- a/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java +++ b/Mage.Sets/src/mage/sets/newphyrexia/RuthlessInvasion.java @@ -87,7 +87,7 @@ class RuthlessInvasionEffect extends RestrictionEffect { } @Override - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return false; } diff --git a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java index a3fd57efdf0..f362f1ba20c 100644 --- a/Mage.Sets/src/mage/sets/tenth/Juggernaut.java +++ b/Mage.Sets/src/mage/sets/tenth/Juggernaut.java @@ -33,6 +33,7 @@ import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Rarity; import mage.MageInt; +import mage.abilities.Ability; import mage.abilities.EvasionAbility; import mage.abilities.common.AttacksEachTurnStaticAbility; import mage.abilities.effects.common.CantBlockSourceEffect; @@ -101,7 +102,7 @@ class JuggernautEffect extends CantBlockSourceEffect { } @Override - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Game game) { + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { return !blocker.hasSubtype("Wall"); } diff --git a/Mage.Sets/src/mage/sets/tenth/Pacifism.java b/Mage.Sets/src/mage/sets/tenth/Pacifism.java index d1bf0f1ad3b..9830bbe5b7a 100644 --- a/Mage.Sets/src/mage/sets/tenth/Pacifism.java +++ b/Mage.Sets/src/mage/sets/tenth/Pacifism.java @@ -101,7 +101,7 @@ class PacifismEffect extends RestrictionEffect { } @Override - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return false; } diff --git a/Mage/src/mage/abilities/common/CantBlockAbility.java b/Mage/src/mage/abilities/common/CantBlockAbility.java index fbfc96bf324..0abd9e0a63e 100644 --- a/Mage/src/mage/abilities/common/CantBlockAbility.java +++ b/Mage/src/mage/abilities/common/CantBlockAbility.java @@ -61,7 +61,7 @@ class CantBlockEffect extends RestrictionEffect { } @Override - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return !blocker.getAbilities().containsKey(CantBlockAbility.getInstance().getId()); } diff --git a/Mage/src/mage/abilities/effects/RestrictionEffect.java b/Mage/src/mage/abilities/effects/RestrictionEffect.java index 37980fde355..dd44a8c6a73 100644 --- a/Mage/src/mage/abilities/effects/RestrictionEffect.java +++ b/Mage/src/mage/abilities/effects/RestrictionEffect.java @@ -61,11 +61,11 @@ public abstract class RestrictionEffect> extends return true; } - public boolean canBlock(Permanent attacker, Permanent blocker, Game game) { + public boolean canBlock(Permanent attacker, Permanent blocker, Ability source, Game game) { return true; } - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Game game) { + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { return true; } diff --git a/Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java b/Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java index 495f3e5b35e..dd170f7cfe2 100644 --- a/Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java +++ b/Mage/src/mage/abilities/effects/common/CantBlockSourceEffect.java @@ -57,7 +57,7 @@ public class CantBlockSourceEffect extends RestrictionEffect { } @Override - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Game game) { + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { if (blocker.getCardType().contains(Constants.CardType.ARTIFACT) || blocker.getColor().isBlack()) { return true; } diff --git a/Mage/src/mage/abilities/keyword/FlyingAbility.java b/Mage/src/mage/abilities/keyword/FlyingAbility.java index cd106029d12..2d856db8b88 100644 --- a/Mage/src/mage/abilities/keyword/FlyingAbility.java +++ b/Mage/src/mage/abilities/keyword/FlyingAbility.java @@ -87,7 +87,7 @@ class FlyingEffect extends RestrictionEffect { } @Override - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Game game) { + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { if (blocker.getAbilities().containsKey(FlyingAbility.getInstance().getId()) || blocker.getAbilities().containsKey(ReachAbility.getInstance().getId())) return true; return false; diff --git a/Mage/src/mage/abilities/keyword/IntimidateAbility.java b/Mage/src/mage/abilities/keyword/IntimidateAbility.java index b9e1f7ce45e..edd941caa22 100644 --- a/Mage/src/mage/abilities/keyword/IntimidateAbility.java +++ b/Mage/src/mage/abilities/keyword/IntimidateAbility.java @@ -47,7 +47,7 @@ class IntimidateEffect extends RestrictionEffect { } @Override - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Game game) { + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { boolean result = false; if (blocker.getCardType().contains(Constants.CardType.ARTIFACT) && (blocker.getCardType().contains(Constants.CardType.CREATURE))) result = true; diff --git a/Mage/src/mage/abilities/keyword/LandwalkAbility.java b/Mage/src/mage/abilities/keyword/LandwalkAbility.java index 20013d6a503..d16b8885663 100644 --- a/Mage/src/mage/abilities/keyword/LandwalkAbility.java +++ b/Mage/src/mage/abilities/keyword/LandwalkAbility.java @@ -73,7 +73,7 @@ class LandwalkEffect extends RestrictionEffect { } @Override - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Game game) { + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { return !game.getBattlefield().contains(filter, blocker.getControllerId(), 1); } diff --git a/Mage/src/mage/abilities/keyword/UnblockableAbility.java b/Mage/src/mage/abilities/keyword/UnblockableAbility.java index 0752c3031f1..32166087e24 100644 --- a/Mage/src/mage/abilities/keyword/UnblockableAbility.java +++ b/Mage/src/mage/abilities/keyword/UnblockableAbility.java @@ -87,7 +87,7 @@ class UnblockableEffect extends RestrictionEffect { } @Override - public boolean canBeBlocked(Permanent attacker, Permanent blocker, Game game) { + public boolean canBeBlocked(Permanent attacker, Permanent blocker, Ability source, Game game) { return false; } diff --git a/Mage/src/mage/game/permanent/PermanentImpl.java b/Mage/src/mage/game/permanent/PermanentImpl.java index e6ad58b70f7..8c9223588d6 100644 --- a/Mage/src/mage/game/permanent/PermanentImpl.java +++ b/Mage/src/mage/game/permanent/PermanentImpl.java @@ -680,14 +680,14 @@ public abstract class PermanentImpl> extends CardImpl Permanent attacker = game.getPermanent(attackerId); //20101001 - 509.1b for (RestrictionEffect effect : game.getContinuousEffects().getApplicableRestrictionEffects(this, game)) { - if (!effect.canBlock(attacker, this, game)) + if (!effect.canBlock(attacker, this, game.getContinuousEffects().getAbility(effect.getId()), game)) return false; } // check also attacker's restriction effects for (RestrictionEffect effect : game.getContinuousEffects().getApplicableRestrictionEffects(attacker, game)) { /*if (!effect.canBlock(attacker, this, game)) return false;*/ - if (!effect.canBeBlocked(attacker, this, game)) + if (!effect.canBeBlocked(attacker, this, game.getContinuousEffects().getAbility(effect.getId()), game)) return false; } if (attacker.hasProtectionFrom(this))