From 3ff462e20b23e4df6ee17cb01d648a85c12b395c Mon Sep 17 00:00:00 2001 From: North Date: Wed, 21 Sep 2011 23:11:31 +0300 Subject: [PATCH] Modified ExaltedAbility to use fixed target --- Mage.Server/UW Control.dck | 29 ------------------- .../keyword/AffinityForArtifactsAbility.java | 2 +- .../abilities/keyword/ExaltedAbility.java | 6 ++-- 3 files changed, 3 insertions(+), 34 deletions(-) delete mode 100644 Mage.Server/UW Control.dck diff --git a/Mage.Server/UW Control.dck b/Mage.Server/UW Control.dck deleted file mode 100644 index 3033c88566..0000000000 --- a/Mage.Server/UW Control.dck +++ /dev/null @@ -1,29 +0,0 @@ -NAME:UW Control -2 [ROE:236] Island -1 [ROE:235] Island -1 [ROE:234] Island -2 [ROE:233] Island -2 [CON:15] Path to Exile -3 [ROE:21] Gideon Jura -1 [CON:11] Martial Coup -2 [ZEN:9] Day of Judgment -1 [ZEN:216] Kabira Crossroads -4 [WWK:31] Jace, the Mind Sculptor -3 [M10:64] Mind Spring -3 [WWK:123] Everflowing Chalice -1 [ROE:232] Plains -4 [ROE:53] Wall of Omens -1 [ROE:229] Plains -1 [ROE:230] Plains -1 [ROE:231] Plains -3 [ALA:20] Oblivion Ring -4 [ZEN:70] Spreading Seas -4 [WWK:145] Tectonic Edge -1 [ALA:9] Elspeth, Knight-Errant -2 [ROE:59] Deprive -1 [ZEN:220] Misty Rainforest -4 [WWK:133] Celestial Colonnade -1 [ZEN:211] Arid Mesa -4 [M10:226] Glacial Fortress -1 [WWK:142] Sejiri Steppe -2 [M10:65] Negate diff --git a/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java b/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java index 6b9eca92f6..6bcd46532b 100644 --- a/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java +++ b/Mage/src/mage/abilities/keyword/AffinityForArtifactsAbility.java @@ -41,7 +41,7 @@ import mage.game.Game; * Affinity for artifacts */ public class AffinityForArtifactsAbility extends SimpleStaticAbility implements AdjustingSourceCosts { - private static FilterControlledPermanent filter = new FilterControlledPermanent(); + private static final FilterControlledPermanent filter = new FilterControlledPermanent(); static { filter.getCardType().add(Constants.CardType.ARTIFACT); diff --git a/Mage/src/mage/abilities/keyword/ExaltedAbility.java b/Mage/src/mage/abilities/keyword/ExaltedAbility.java index 8faee0f53c..f24ccbba29 100644 --- a/Mage/src/mage/abilities/keyword/ExaltedAbility.java +++ b/Mage/src/mage/abilities/keyword/ExaltedAbility.java @@ -35,7 +35,7 @@ import mage.abilities.effects.common.continious.BoostTargetEffect; import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; -import mage.target.common.TargetCreaturePermanent; +import mage.target.targetpointer.FixedTarget; /** * @@ -60,9 +60,7 @@ public class ExaltedAbility extends TriggeredAbilityImpl { public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == EventType.DECLARED_ATTACKERS && game.getActivePlayerId().equals(this.controllerId) ) { if (game.getCombat().attacksAlone()) { - TargetCreaturePermanent target = new TargetCreaturePermanent(); - this.addTarget(target); - this.getTargets().get(0).add(game.getCombat().getAttackers().get(0),game); + this.getEffects().get(0).setTargetPointer(new FixedTarget(game.getCombat().getAttackers().get(0))); return true; } }