From 23d36af841bb6aa0d28a17c4ea20535444e21e95 Mon Sep 17 00:00:00 2001 From: melvin Date: Sat, 22 Sep 2012 10:40:31 +0800 Subject: [PATCH] replace player with PN --- src/magic/card/Blade_Splicer.java | 3 +-- src/magic/card/Bone_Dancer.java | 26 +++++++----------- src/magic/card/Dragon_s_Claw.java | 27 +++++++++---------- src/magic/card/Gwafa_Hazid__Profiteer.java | 12 ++++----- src/magic/card/Kodama_of_the_Center_Tree.java | 11 ++------ src/magic/card/Looter_il_Kor.java | 12 ++++----- src/magic/card/Phyrexian_Arena.java | 12 ++++----- 7 files changed, 41 insertions(+), 62 deletions(-) diff --git a/src/magic/card/Blade_Splicer.java b/src/magic/card/Blade_Splicer.java index d4baff989e..f4874884b9 100644 --- a/src/magic/card/Blade_Splicer.java +++ b/src/magic/card/Blade_Splicer.java @@ -27,9 +27,8 @@ public class Blade_Splicer { public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer player) { return new MagicEvent( permanent, - player, this, - player + " puts a 3/3 colorless Golem artifact creature token onto the battlefield."); + "PN puts a 3/3 colorless Golem artifact creature token onto the battlefield."); } @Override diff --git a/src/magic/card/Bone_Dancer.java b/src/magic/card/Bone_Dancer.java index 0e7aff7a13..4325b24776 100644 --- a/src/magic/card/Bone_Dancer.java +++ b/src/magic/card/Bone_Dancer.java @@ -20,22 +20,16 @@ public class Bone_Dancer { public static final MagicWhenAttacksUnblockedTrigger T = new MagicWhenAttacksUnblockedTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent creature) { - if (creature == permanent) { - final MagicPlayer player = permanent.getController(); - final MagicPlayer opponent = player.getOpponent(); - return new MagicEvent( - permanent, - player, - new MagicMayChoice( - player + " may put the top creature card of " + - opponent + "'s graveyard onto the " + - "battlefield under his or her control."), - this, - player + " may$ put the top creature card of " + - opponent + "'s graveyard onto the " + - "battlefield under his or her control."); - } - return MagicEvent.NONE; + return (creature == permanent) ? + new MagicEvent( + permanent, + new MagicMayChoice(), + this, + "PN may$ put the top creature card of " + + "opponent's graveyard onto the " + + "battlefield under his or her control." + ): + MagicEvent.NONE; } @Override diff --git a/src/magic/card/Dragon_s_Claw.java b/src/magic/card/Dragon_s_Claw.java index 7da93e8e04..572c01150c 100644 --- a/src/magic/card/Dragon_s_Claw.java +++ b/src/magic/card/Dragon_s_Claw.java @@ -15,21 +15,18 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger; public class Dragon_s_Claw { public static final MagicWhenOtherSpellIsCastTrigger T = new MagicWhenOtherSpellIsCastTrigger() { @Override - public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) { - final MagicPlayer player = permanent.getController(); - final MagicCard card = data.getCard(); - return (MagicColor.Red.hasColor(card.getColorFlags())) ? - new MagicEvent( - permanent, - player, - new MagicSimpleMayChoice( - player + " may gain 1 life.", - MagicSimpleMayChoice.GAIN_LIFE, - 1, - MagicSimpleMayChoice.DEFAULT_YES), - this, - player + " may$ gain 1 life.") : - MagicEvent.NONE; + public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack spell) { + return MagicColor.Red.hasColor(spell.getColorFlags()) ? + new MagicEvent( + permanent, + new MagicSimpleMayChoice( + MagicSimpleMayChoice.GAIN_LIFE, + 1, + MagicSimpleMayChoice.DEFAULT_YES), + this, + "PN may$ gain 1 life." + ) : + MagicEvent.NONE; } @Override diff --git a/src/magic/card/Gwafa_Hazid__Profiteer.java b/src/magic/card/Gwafa_Hazid__Profiteer.java index 0f5642d1eb..ef7b28b509 100644 --- a/src/magic/card/Gwafa_Hazid__Profiteer.java +++ b/src/magic/card/Gwafa_Hazid__Profiteer.java @@ -55,25 +55,25 @@ public class Gwafa_Hazid__Profiteer { @Override public MagicEvent[] getCostEvent(final MagicSource source) { return new MagicEvent[]{ - new MagicPayManaCostTapEvent( + new MagicPayManaCostTapEvent( source, source.getController(), - MagicManaCost.WHITE_BLUE)}; + MagicManaCost.WHITE_BLUE + ) + }; } @Override public MagicEvent getPermanentEvent( final MagicPermanent source, final MagicPayedCost payedCost) { - final MagicPlayer player = source.getController(); return new MagicEvent( source, - player, MagicTargetChoice.TARGET_CREATURE_YOUR_OPPONENT_CONTROLS, new MagicNoCombatTargetPicker(true,true,true), this, - player + " puts a bribery counter on target creature$. " + - "Its controller draws a card."); + "PN puts a bribery counter on target creature$. " + + "Its controller draws a card."); } @Override diff --git a/src/magic/card/Kodama_of_the_Center_Tree.java b/src/magic/card/Kodama_of_the_Center_Tree.java index 8cdc5182b0..b9bab8699f 100644 --- a/src/magic/card/Kodama_of_the_Center_Tree.java +++ b/src/magic/card/Kodama_of_the_Center_Tree.java @@ -48,19 +48,12 @@ public class Kodama_of_the_Center_Tree { new MagicTargetChoice( targetFilter,false,MagicTargetHint.None, "a Spirit card from your graveyard)"); - final MagicChoice mayChoice = - new MagicMayChoice( - player + " may return target Spirit card with " + - "converted mana cost " + cmc + " or less " + - "from his or her graveyard to his or her hand.", - targetChoice); return new MagicEvent( permanent, - player, - mayChoice, + new MagicMayChoice(targetChoice), new MagicGraveyardTargetPicker(false), this, - player + " may$ return target Spirit card$ with " + + "PN may$ return target Spirit card$ with " + "converted mana cost " + cmc + " or less " + "from his or her graveyard to his or her hand."); } diff --git a/src/magic/card/Looter_il_Kor.java b/src/magic/card/Looter_il_Kor.java index 0586998c61..2710ff44fe 100644 --- a/src/magic/card/Looter_il_Kor.java +++ b/src/magic/card/Looter_il_Kor.java @@ -13,15 +13,13 @@ public class Looter_il_Kor { public static final MagicWhenDamageIsDealtTrigger T = new MagicWhenDamageIsDealtTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { - final MagicPlayer player = permanent.getController(); return (damage.getSource() == permanent && - damage.getTarget().isPlayer() && - damage.getTarget() != player) ? + permanent.isOpponent(damage.getTarget())) ? new MagicEvent( - permanent, - player, - this, - player + " draws a card, then discards a card."): + permanent, + this, + "PN draws a card, then discards a card." + ): MagicEvent.NONE; } @Override diff --git a/src/magic/card/Phyrexian_Arena.java b/src/magic/card/Phyrexian_Arena.java index 2d2fd1b054..37c9e6601b 100644 --- a/src/magic/card/Phyrexian_Arena.java +++ b/src/magic/card/Phyrexian_Arena.java @@ -12,14 +12,12 @@ import magic.model.trigger.MagicAtUpkeepTrigger; public class Phyrexian_Arena { public static final MagicAtUpkeepTrigger T = new MagicAtUpkeepTrigger() { @Override - public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer data) { - final MagicPlayer player=permanent.getController(); - return (player==data) ? + public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) { + return permanent.isController(upkeepPlayer) ? new MagicEvent( - permanent, - player, - this, - player + " draws a card and loses 1 life."): + permanent, + this, + "PN draws a card and loses 1 life."): MagicEvent.NONE; } @Override