From 371220fb3edf2393e121f3a6f842b8a7148eb7dc Mon Sep 17 00:00:00 2001 From: melvin Date: Sat, 22 Sep 2012 11:34:08 +0800 Subject: [PATCH] replace player with PN --- src/magic/card/Caustic_Crawler.java | 17 +++++++------- src/magic/card/Exquisite_Blood.java | 6 ++--- src/magic/card/Kami_of_the_Honored_Dead.java | 11 ++++----- src/magic/card/Mesa_Enchantress.java | 24 +++++++++----------- src/magic/card/Rejuvenation_Chamber.java | 9 ++++---- src/magic/card/Scroll_of_Griselbrand.java | 9 ++++---- src/magic/card/Sphinx_of_Lost_Truths.java | 17 ++++++-------- 7 files changed, 41 insertions(+), 52 deletions(-) diff --git a/src/magic/card/Caustic_Crawler.java b/src/magic/card/Caustic_Crawler.java index faf02d8ddb..96853086cd 100644 --- a/src/magic/card/Caustic_Crawler.java +++ b/src/magic/card/Caustic_Crawler.java @@ -15,16 +15,15 @@ public class Caustic_Crawler { public static final MagicLandfallTrigger T = new MagicLandfallTrigger() { @Override public MagicEvent getEvent(final MagicPermanent permanent) { - final MagicPlayer player = permanent.getController(); return new MagicEvent( - permanent, - player, - new MagicMayChoice( - player + " may have target creature get -1/-1 until end of turn.", - MagicTargetChoice.NEG_TARGET_CREATURE), - new MagicWeakenTargetPicker(1,1), - this, - player + " may$ have target creature$ get -1/-1 until end of turn."); + permanent, + new MagicMayChoice( + MagicTargetChoice.NEG_TARGET_CREATURE + ), + new MagicWeakenTargetPicker(1,1), + this, + "PN may$ have target creature$ get -1/-1 until end of turn." + ); } @Override diff --git a/src/magic/card/Exquisite_Blood.java b/src/magic/card/Exquisite_Blood.java index c993c57864..c13df19458 100644 --- a/src/magic/card/Exquisite_Blood.java +++ b/src/magic/card/Exquisite_Blood.java @@ -15,15 +15,13 @@ public class Exquisite_Blood { final MagicGame game, final MagicPermanent permanent, final MagicLifeChangeTriggerData lifeChange) { - final MagicPlayer player = permanent.getController(); final int amount = lifeChange.amount; - return (player.getOpponent() == lifeChange.player) ? + return permanent.isOpponent(lifeChange.player) ? new MagicEvent( permanent, - player, new Object[]{amount}, this, - player + " gains " + amount + " life."): + "PN gains " + amount + " life."): MagicEvent.NONE; } @Override diff --git a/src/magic/card/Kami_of_the_Honored_Dead.java b/src/magic/card/Kami_of_the_Honored_Dead.java index 0eceed8d00..b545f31892 100644 --- a/src/magic/card/Kami_of_the_Honored_Dead.java +++ b/src/magic/card/Kami_of_the_Honored_Dead.java @@ -12,15 +12,14 @@ public class Kami_of_the_Honored_Dead { public static final MagicWhenDamageIsDealtTrigger T2 = new MagicWhenDamageIsDealtTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { - final MagicPlayer player = permanent.getController(); final int amount = damage.getDealtAmount(); return (damage.getTarget() == permanent) ? new MagicEvent( - permanent, - player, - new Object[]{amount}, - this, - player + " gains " + amount + " life.") : + permanent, + new Object[]{amount}, + this, + "PN gains " + amount + " life." + ) : MagicEvent.NONE; } diff --git a/src/magic/card/Mesa_Enchantress.java b/src/magic/card/Mesa_Enchantress.java index a9a89b4894..89ef893fc7 100644 --- a/src/magic/card/Mesa_Enchantress.java +++ b/src/magic/card/Mesa_Enchantress.java @@ -15,20 +15,18 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger; public class Mesa_Enchantress { 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 (card.getOwner() == player && card.getCardDefinition().isEnchantment()) ? + public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack spell) { + return (permanent.isFriend(spell) && + spell.getCardDefinition().isEnchantment()) ? new MagicEvent( - permanent, - player, - new MagicSimpleMayChoice( - player + " may draw a card.", - MagicSimpleMayChoice.DRAW_CARDS, - 1, - MagicSimpleMayChoice.DEFAULT_NONE), - this, - player + " may$ draw a card."): + permanent, + new MagicSimpleMayChoice( + MagicSimpleMayChoice.DRAW_CARDS, + 1, + MagicSimpleMayChoice.DEFAULT_NONE), + this, + "PN may$ draw a card." + ): MagicEvent.NONE; } diff --git a/src/magic/card/Rejuvenation_Chamber.java b/src/magic/card/Rejuvenation_Chamber.java index 46150db0e9..8806c39933 100644 --- a/src/magic/card/Rejuvenation_Chamber.java +++ b/src/magic/card/Rejuvenation_Chamber.java @@ -28,12 +28,11 @@ public class Rejuvenation_Chamber { public MagicEvent getPermanentEvent( final MagicPermanent source, final MagicPayedCost payedCost) { - final MagicPlayer player = source.getController(); return new MagicEvent( - source, - player, - this, - player + " gains 2 life"); + source, + this, + "PN gains 2 life" + ); } @Override diff --git a/src/magic/card/Scroll_of_Griselbrand.java b/src/magic/card/Scroll_of_Griselbrand.java index d1a114f3cd..6abd24ac9e 100644 --- a/src/magic/card/Scroll_of_Griselbrand.java +++ b/src/magic/card/Scroll_of_Griselbrand.java @@ -29,20 +29,19 @@ public class Scroll_of_Griselbrand { final MagicPermanent permanent = (MagicPermanent)source; return new MagicEvent[]{ new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.ONE), - new MagicSacrificeEvent(permanent)}; + new MagicSacrificeEvent(permanent) + }; } @Override public MagicEvent getPermanentEvent( final MagicPermanent source, final MagicPayedCost payedCost) { - final MagicPlayer player = source.getController(); return new MagicEvent( source, - player, this, - "Opponent discards a card. If " + player + - " controls a Demon, opponent loses 3 life."); + "Opponent discards a card. If PN controls a Demon, opponent loses 3 life." + ); } @Override diff --git a/src/magic/card/Sphinx_of_Lost_Truths.java b/src/magic/card/Sphinx_of_Lost_Truths.java index 4a1a96a52f..157306701e 100644 --- a/src/magic/card/Sphinx_of_Lost_Truths.java +++ b/src/magic/card/Sphinx_of_Lost_Truths.java @@ -19,15 +19,13 @@ public class Sphinx_of_Lost_Truths { public static final MagicWhenComesIntoPlayTrigger T = new MagicWhenComesIntoPlayTrigger() { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) { - final boolean kicked=permanent.isKicked(); return new MagicEvent( - permanent, - player, - new Object[]{kicked}, - this, - kicked ? - player + " draws three cards." : - player + " draws three cards. Then discards three cards."); + permanent, + this, + permanent.isKicked() ? + "PN draws three cards." : + "PN draws three cards. Then discards three cards." + ); } @Override public void executeEvent( @@ -37,8 +35,7 @@ public class Sphinx_of_Lost_Truths { final Object[] choiceResults) { final MagicPlayer player=event.getPlayer(); game.doAction(new MagicDrawAction(player,3)); - final boolean kicked=(Boolean)data[0]; - if (!kicked) { + if (event.getPermanent().isKicked()) { game.addEvent(new MagicDiscardEvent(event.getPermanent(),player,3,false)); } }