From 22bdb209ab7d1221d0e1813143088c7b0b824e89 Mon Sep 17 00:00:00 2001 From: LevelX2 Date: Sat, 11 May 2013 20:08:51 +0200 Subject: [PATCH] Some minor changes/fixes. --- .../src/mage/sets/dragonsmaze/CatchRelease.java | 14 +++++--------- .../src/mage/sets/dragonsmaze/NivixCyclops.java | 10 ++-------- Mage/src/mage/target/Target.java | 4 ++++ Mage/src/mage/target/TargetPermanent.java | 1 + 4 files changed, 12 insertions(+), 17 deletions(-) diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java b/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java index e727e553ce..55807f4016 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/CatchRelease.java @@ -36,11 +36,8 @@ import mage.Constants.CardType; import mage.Constants.Duration; import mage.Constants.Outcome; import mage.Constants.Rarity; -import mage.Constants.Zone; import mage.abilities.Ability; -import mage.abilities.common.SimpleStaticAbility; import mage.abilities.effects.OneShotEffect; -import mage.abilities.effects.common.MustBlockSourceEffect; import mage.abilities.effects.common.UntapTargetEffect; import mage.abilities.effects.common.continious.GainAbilityTargetEffect; import mage.abilities.effects.common.continious.GainControlTargetEffect; @@ -59,7 +56,6 @@ import mage.players.Player; import mage.target.Target; import mage.target.TargetPermanent; import mage.target.common.TargetControlledPermanent; -import mage.target.common.TargetCreaturePermanent; /** * @@ -149,11 +145,11 @@ class ReleaseSacrificeEffect extends OneShotEffect { target4.setRequired(true); target5.setRequired(true); - target1.setNotTarget(true); - target2.setNotTarget(true); - target3.setNotTarget(true); - target4.setNotTarget(true); - target5.setNotTarget(true); + target1.setNotTarget(false); + target2.setNotTarget(false); + target3.setNotTarget(false); + target4.setNotTarget(false); + target5.setNotTarget(false); if (target1.canChoose(player.getId(), game)) { while (!target1.isChosen() && target1.canChoose(player.getId(), game)) { diff --git a/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java b/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java index 5b5a265ca2..faaf0563c7 100644 --- a/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java +++ b/Mage.Sets/src/mage/sets/dragonsmaze/NivixCyclops.java @@ -88,20 +88,14 @@ public class NivixCyclops extends CardImpl { @Override public NivixCyclops copy() { return new NivixCyclops(this); - } - - @Override - public List getRules() { - List rules = new ArrayList(); - rules.add("Whenever you cast an instant or sorcery spell, Nivix Cyclops gets +3/+0 until end of turn and it can attack as though it didn't have defender."); - return rules; - } + } } class AsThoughNoDefenderEffect extends AsThoughEffectImpl { public AsThoughNoDefenderEffect() { super(Constants.AsThoughEffectType.ATTACK, Constants.Duration.EndOfTurn, Constants.Outcome.Benefit); + staticText ="and it can attack as though it didn't have defender"; } public AsThoughNoDefenderEffect(final AsThoughNoDefenderEffect effect) { diff --git a/Mage/src/mage/target/Target.java b/Mage/src/mage/target/Target.java index 2b4625a4c4..86fd91be9d 100644 --- a/Mage/src/mage/target/Target.java +++ b/Mage/src/mage/target/Target.java @@ -49,6 +49,10 @@ public interface Target extends Serializable { boolean doneChosing(); void clearChosen(); boolean isNotTarget(); + + // controlls if it will be checked, if the target can be targeted from source + // true = check for protection + // false = do not check for protection void setNotTarget(boolean notTarget); // methods for targets diff --git a/Mage/src/mage/target/TargetPermanent.java b/Mage/src/mage/target/TargetPermanent.java index 3658f91fba..152577a018 100644 --- a/Mage/src/mage/target/TargetPermanent.java +++ b/Mage/src/mage/target/TargetPermanent.java @@ -78,6 +78,7 @@ public class TargetPermanent> extends TargetObject< return canTarget(source.getControllerId(), id, source, game); } + @Override public boolean canTarget(UUID controllerId, UUID id, Ability source, Game game) { Permanent permanent = game.getPermanent(id); if (permanent != null) {