replace player with PN

src/magic/card/Demon_s_Horn.java

@@ -16,20 +16,16 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger;
 public class Demon_s_Horn {
     public static final MagicWhenOtherSpellIsCastTrigger T = new MagicWhenOtherSpellIsCastTrigger() {
         @Override
-        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack spell) {
-            final MagicPlayer player = permanent.getController();
+            return MagicColor.Black.hasColor(spell.getColorFlags()) ?
-            final MagicCard card = data.getCard();
-            return (MagicColor.Black.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.") :
+                    "PN may$ gain 1 life.") :
                 MagicEvent.NONE;
         }
         

src/magic/card/Driver_of_the_Dead.java

@@ -19,40 +19,32 @@ import magic.model.trigger.MagicGraveyardTriggerData;
 import magic.model.trigger.MagicWhenPutIntoGraveyardTrigger;
 
 public class Driver_of_the_Dead {
+    private static final MagicTargetFilter targetFilter = new MagicTargetFilter.MagicCMCTargetFilter(
+        MagicTargetFilter.TARGET_CREATURE_CARD_FROM_GRAVEYARD,
+        MagicTargetFilter.MagicCMCTargetFilter.LESS_THAN_OR_EQUAL,
+        2
+    );
+    private static final MagicTargetChoice targetChoice = new MagicTargetChoice(
+        targetFilter,false,MagicTargetHint.None,
+        "target creature card from your graveyard)"
+    );
     public static final MagicWhenPutIntoGraveyardTrigger T = new MagicWhenPutIntoGraveyardTrigger() {
         @Override
         public MagicEvent executeTrigger(
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            if (MagicLocationType.Play == triggerData.fromLocation) {
+            return (MagicLocationType.Play == triggerData.fromLocation) ?
-                final MagicPlayer player = permanent.getController();
+                new MagicEvent(
-                final MagicTargetFilter targetFilter =
-                        new MagicTargetFilter.MagicCMCTargetFilter(
-                        MagicTargetFilter.TARGET_CREATURE_CARD_FROM_GRAVEYARD,
-                        MagicTargetFilter.MagicCMCTargetFilter.LESS_THAN_OR_EQUAL,
-                        2);
-                final MagicTargetChoice targetChoice = 
-                        new MagicTargetChoice(
-                        targetFilter,false,MagicTargetHint.None,
-                        "target creature card from your graveyard)");
-                final MagicChoice mayChoice = 
-                        new MagicMayChoice(
-                        player + " may return target creature card with " +
-                        "converted mana cost 2 or less " +
-                        "from his or her graveyard to the battlefield.",
-                        targetChoice);
-                return new MagicEvent(
                     permanent,
-                        player,
+                    new MagicMayChoice(targetChoice),
-                        mayChoice,
                     new MagicGraveyardTargetPicker(false),
                     this,
-                        player + " may$ return target creature card$ with " +
+                    "PN may$ return target creature card$ with " +
                     "converted mana cost 2 or less " +
-                        "from his or her graveyard to the battlefield.");
+                    "from his or her graveyard to the battlefield."
-            }
+                ):
-            return MagicEvent.NONE;
+                MagicEvent.NONE;
         }
         @Override
         public void executeEvent(

src/magic/card/Kraken_s_Eye.java

@@ -16,20 +16,16 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger;
 public class Kraken_s_Eye {
     public static final MagicWhenOtherSpellIsCastTrigger T = new MagicWhenOtherSpellIsCastTrigger() {
         @Override
-        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack data) {
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicCardOnStack spell) {
-            final MagicPlayer player = permanent.getController();
+            return MagicColor.Blue.hasColor(spell.getColorFlags()) ?
-            final MagicCard card = data.getCard();
-            return (MagicColor.Blue.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.") :
+                    "PN may$ gain 1 life.") :
                 MagicEvent.NONE;
         }
         

src/magic/card/Moroii.java

@@ -11,14 +11,13 @@ import magic.model.trigger.MagicAtUpkeepTrigger;
 public class Moroii {
     public static final MagicAtUpkeepTrigger T = new MagicAtUpkeepTrigger() {
         @Override
-        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer data) {
+        public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPlayer upkeepPlayer) {
-            final MagicPlayer player=permanent.getController();
+            return permanent.isController(upkeepPlayer) ?
-            return (player==data) ?
                 new MagicEvent(
                     permanent,
-                        player,
                     this,
-                        player + " loses 1 life.") :
+                    "PN loses 1 life."
+                ):
                 MagicEvent.NONE;
         }
         

src/magic/card/Soltari_Champion.java

@@ -17,15 +17,13 @@ public class Soltari_Champion {
         public MagicEvent executeTrigger(
                 final MagicGame game,
                 final MagicPermanent permanent,
-                final MagicPermanent data) {
+                final MagicPermanent attacker) {
-            final MagicPlayer player = permanent.getController();
+            return (permanent == attacker) ?
-            return (permanent == data) ?
                 new MagicEvent(
                     permanent,
-                    player,
                     this,
-                    "Other creatures " + player +
+                    "Other creatures PN controls get +1/+1 until end of turn."
-                    " controls get +1/+1 until end of turn."):
+                ):
                 MagicEvent.NONE;
         }    
         @Override

src/magic/card/Soul_Warden.java

@@ -11,13 +11,13 @@ public class Soul_Warden {
     public static final MagicWhenOtherComesIntoPlayTrigger T = new MagicWhenOtherComesIntoPlayTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent otherPermanent) {
-            final MagicPlayer player = permanent.getController();
+            return (otherPermanent != permanent && 
-            return (otherPermanent != permanent && otherPermanent.isCreature()) ?
+                    otherPermanent.isCreature()) ?
                 new MagicEvent(
                     permanent,
-                        player,
                     this,
-                        player + " gains 1 life."):
+                    "PN gains 1 life."
+                ):
                 MagicEvent.NONE;
         }
         

src/magic/card/Treasure_Hunter.java

@@ -21,14 +21,12 @@ public class Treasure_Hunter {
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
             return new MagicEvent(
                 permanent,
-                    player,
                 new MagicMayChoice(
-                        player + " may return target artifact card from " +
+                    MagicTargetChoice.TARGET_ARTIFACT_CARD_FROM_GRAVEYARD
-                        "his or her graveyard to his or her hand.",
+                ),
-                        MagicTargetChoice.TARGET_ARTIFACT_CARD_FROM_GRAVEYARD),
                 new MagicGraveyardTargetPicker(false),
                 this,
-                    player + " may$ return target artifact card$ from " +
+                "PN may$ return target artifact card$ from " +
                 "his or her graveyard to his or her hand.");
         }