From ad46d3afc7b0440ad48043d1861a541958ecb491 Mon Sep 17 00:00:00 2001 From: North Date: Thu, 15 Sep 2011 23:50:23 +0300 Subject: [PATCH] Painfull Quandary changed to fixedTarget --- Mage.Sets/src/mage/sets/magic2010/Fireball.java | 2 +- .../src/mage/sets/scarsofmirrodin/PainfulQuandary.java | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/Mage.Sets/src/mage/sets/magic2010/Fireball.java b/Mage.Sets/src/mage/sets/magic2010/Fireball.java index a4f2d5afdd..6bb39d3932 100644 --- a/Mage.Sets/src/mage/sets/magic2010/Fireball.java +++ b/Mage.Sets/src/mage/sets/magic2010/Fireball.java @@ -77,7 +77,7 @@ class FireballEffect extends OneShotEffect { public FireballEffect() { super(Outcome.Damage); - staticText = "{this} deals X damage divided evenly, rounded down, among any number of target creatures and/or players.\n {this} costs {1} more to cast for each target beyond the first."; + staticText = "{this} deals X damage divided evenly, rounded down, among any number of target creatures and/or players.\n {this} costs {1} more to cast for each target beyond the first"; } public FireballEffect(final FireballEffect effect) { diff --git a/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java b/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java index 4f70bfb346..b885dbcd89 100644 --- a/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java +++ b/Mage.Sets/src/mage/sets/scarsofmirrodin/PainfulQuandary.java @@ -42,8 +42,8 @@ import mage.game.Game; import mage.game.events.GameEvent; import mage.game.events.GameEvent.EventType; import mage.players.Player; -import mage.target.TargetPlayer; import mage.target.common.TargetCardInHand; +import mage.target.targetpointer.FixedTarget; /** * @@ -73,7 +73,6 @@ class PainfulQuandryAbility extends TriggeredAbilityImpl public PainfulQuandryAbility() { super(Zone.BATTLEFIELD, new PainfulQuandryEffect()); - this.addTarget(new TargetPlayer()); } public PainfulQuandryAbility(final PainfulQuandryAbility ability) { @@ -88,7 +87,7 @@ class PainfulQuandryAbility extends TriggeredAbilityImpl @Override public boolean checkTrigger(GameEvent event, Game game) { if (event.getType() == EventType.SPELL_CAST && game.getOpponents(controllerId).contains(event.getPlayerId())) { - this.getTargets().get(0).add(event.getPlayerId(), game); + this.getEffects().get(0).setTargetPointer(new FixedTarget(event.getPlayerId())); return true; } return false; @@ -118,7 +117,7 @@ class PainfulQuandryEffect extends OneShotEffect { @Override public boolean apply(Game game, Ability source) { - Player player = game.getPlayer(source.getFirstTarget()); + Player player = game.getPlayer(targetPointer.getFirst(source)); if (player != null) { Cost cost = new DiscardTargetCost(new TargetCardInHand()); if (!cost.pay(source, game, player.getId(), player.getId(), false)) {