replace player with PN

src/magic/card/Flight_of_Fancy.java

@@ -12,10 +12,10 @@ public class Flight_of_Fancy {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
             return new MagicEvent(
-                    permanent,
+                permanent,
-                    player,
+                this,
-                    this,
+                "PN draws two cards."
-                    player + " draws two cards.");
+            );
         }
         @Override
         public void executeEvent(

src/magic/card/Jayemdae_Tome.java

@@ -22,10 +22,12 @@ public class Jayemdae_Tome {
 
         @Override
         public MagicEvent[] getCostEvent(final MagicSource source) {
-            return new MagicEvent[] { new MagicPayManaCostTapEvent(
+            return new MagicEvent[] {
-                            source,
+                new MagicPayManaCostTapEvent(
-                            source.getController(),
+                    source,
-                            MagicManaCost.FOUR)
+                    source.getController(),
+                    MagicManaCost.FOUR
+                )
             };
         }
 
@@ -33,12 +35,10 @@ public class Jayemdae_Tome {
         public MagicEvent getPermanentEvent(
                 final MagicPermanent source,
                 final MagicPayedCost payedCost) {
-            final MagicPlayer player = source.getController();
             return new MagicEvent(
                     source,
-                    player,
                     this,
-                    player + " draws a card.");
+                    "PN draws a card.");
         }
 
         @Override

src/magic/card/Maalfeld_Twins.java

@@ -17,13 +17,11 @@ public class Maalfeld_Twins {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicGraveyardTriggerData triggerData) {
-            final MagicPlayer player = permanent.getController();
             return (MagicLocationType.Play == triggerData.fromLocation) ?
                 new MagicEvent(
                     permanent,
-                    player,
                     this,
-                    player + " puts two 2/2 black Zombie " +
+                    "PN puts two 2/2 black Zombie " +
                     "creature tokens onto the battlefield.") :
                 MagicEvent.NONE;
         }

src/magic/card/Mask_of_Riddles.java

@@ -17,21 +17,19 @@ public class Mask_of_Riddles {
                 final MagicGame game,
                 final MagicPermanent permanent,
                 final MagicDamage damage) {
-            final MagicPlayer player = permanent.getController();
             return (permanent.getEquippedCreature() == damage.getSource() &&
                     damage.getTarget().isPlayer() &&
                     damage.isCombat()) ?
-                    new MagicEvent(
+                new MagicEvent(
-                            permanent,
+                    permanent,
-                            player,
+                    new MagicSimpleMayChoice(
-                            new MagicSimpleMayChoice(
+                        MagicSimpleMayChoice.DRAW_CARDS,
-                                    player + " may draw a card.",
+                        1,
-                                    MagicSimpleMayChoice.DRAW_CARDS,
+                        MagicSimpleMayChoice.DEFAULT_NONE),
-                                    1,
+                    this,
-                                    MagicSimpleMayChoice.DEFAULT_NONE),
+                    "PN may$ draw a card."
-                            this,
+                ) :
-                            player + " may$ draw a card.") :
+                MagicEvent.NONE;
-                    MagicEvent.NONE;
         }
 
         @Override

src/magic/card/Myrsmith.java

@@ -16,20 +16,18 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger;
 public class Myrsmith {
     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 (permanent.isFriend(spell) &&
-            final MagicCard card = data.getCard();
+                    spell.getCardDefinition().isArtifact()) ?
-            return (card.getOwner() == player &&
-                    data.getCardDefinition().isArtifact()) ?
                 new MagicEvent(
-                        permanent,
+                    permanent,
-                        player,
+                    new MagicMayChoice(
-                        new MagicMayChoice(
+                        new MagicPayManaCostChoice(MagicManaCost.ONE)
-                                "You may pay {1}.",
+                    ),
-                                new MagicPayManaCostChoice(MagicManaCost.ONE)),
+                    this,
-                        this,
+                    "PN may$ pay {1}$. If you do, put a 1/1 " +
-                        player + " may$ pay {1}$. If you do, put a 1/1 " +
+                    "colorless Myr artifact creature token onto the battlefield."
-                        "colorless Myr artifact creature token onto the battlefield."):
+                ) :
                 MagicEvent.NONE;
         }
         

src/magic/card/Nagao__Bound_by_Honor.java

@@ -15,14 +15,12 @@ public class Nagao__Bound_by_Honor {
     public static final MagicWhenAttacksTrigger T3 = new MagicWhenAttacksTrigger() {
         @Override
         public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent creature) {
-            final MagicPlayer player = creature.getController();
             return (permanent == creature) ?
                 new MagicEvent(
-                        permanent,
+                    permanent,
-                        player,
+                    this,
-                        this,
+                    "Samurai creatures PN controls get +1/+1 until end of turn."
-                        "Samurai creatures " + player +
+                ) :
-                        " controls get +1/+1 until end of turn.") :
                 MagicEvent.NONE;
         }
         

src/magic/card/Soul_Link.java

@@ -13,15 +13,13 @@ public class Soul_Link {
     public static final MagicWhenDamageIsDealtTrigger T1 = 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.getSource()==permanent.getEnchantedCreature()) ?
                 new MagicEvent(
                         permanent,
-                        player,
                         new Object[]{amount},
                         this,
-                        player + " gains " + amount + " life.") :
+                        "PN gains " + amount + " life.") :
                 MagicEvent.NONE;
         }
         @Override
@@ -38,15 +36,13 @@ public class Soul_Link {
     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.getEnchantedCreature()) ?
                 new MagicEvent(
                     permanent,
-                    player,
                     new Object[]{amount},
                     this,
-                    player + " gains " + amount + " life.") :
+                    "PN gains " + amount + " life.") :
                 MagicEvent.NONE;
         }
         @Override

src/magic/card/Urza_s_Blueprints.java

@@ -28,12 +28,10 @@ public class Urza_s_Blueprints {
         public MagicEvent getPermanentEvent(
                 final MagicPermanent source,
                 final MagicPayedCost payedCost) {
-            final MagicPlayer player = source.getController();
             return new MagicEvent(
                     source,
-                    player,
                     this,
-                    player + " draws a card.");
+                    "PN draws a card.");
         }
 
         @Override