replace player with PN

master
melvin 2012-09-22 11:34:08 +08:00
parent a50db2e228
commit 371220fb3e
7 changed files with 41 additions and 52 deletions

View File

@ -15,16 +15,15 @@ public class Caustic_Crawler {
public static final MagicLandfallTrigger T = new MagicLandfallTrigger() { public static final MagicLandfallTrigger T = new MagicLandfallTrigger() {
@Override @Override
public MagicEvent getEvent(final MagicPermanent permanent) { public MagicEvent getEvent(final MagicPermanent permanent) {
final MagicPlayer player = permanent.getController();
return new MagicEvent( return new MagicEvent(
permanent, permanent,
player,
new MagicMayChoice( new MagicMayChoice(
player + " may have target creature get -1/-1 until end of turn.", MagicTargetChoice.NEG_TARGET_CREATURE
MagicTargetChoice.NEG_TARGET_CREATURE), ),
new MagicWeakenTargetPicker(1,1), new MagicWeakenTargetPicker(1,1),
this, this,
player + " may$ have target creature$ get -1/-1 until end of turn."); "PN may$ have target creature$ get -1/-1 until end of turn."
);
} }
@Override @Override

View File

@ -15,15 +15,13 @@ public class Exquisite_Blood {
final MagicGame game, final MagicGame game,
final MagicPermanent permanent, final MagicPermanent permanent,
final MagicLifeChangeTriggerData lifeChange) { final MagicLifeChangeTriggerData lifeChange) {
final MagicPlayer player = permanent.getController();
final int amount = lifeChange.amount; final int amount = lifeChange.amount;
return (player.getOpponent() == lifeChange.player) ? return permanent.isOpponent(lifeChange.player) ?
new MagicEvent( new MagicEvent(
permanent, permanent,
player,
new Object[]{amount}, new Object[]{amount},
this, this,
player + " gains " + amount + " life."): "PN gains " + amount + " life."):
MagicEvent.NONE; MagicEvent.NONE;
} }
@Override @Override

View File

@ -12,15 +12,14 @@ public class Kami_of_the_Honored_Dead {
public static final MagicWhenDamageIsDealtTrigger T2 = new MagicWhenDamageIsDealtTrigger() { public static final MagicWhenDamageIsDealtTrigger T2 = new MagicWhenDamageIsDealtTrigger() {
@Override @Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) { public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
final MagicPlayer player = permanent.getController();
final int amount = damage.getDealtAmount(); final int amount = damage.getDealtAmount();
return (damage.getTarget() == permanent) ? return (damage.getTarget() == permanent) ?
new MagicEvent( new MagicEvent(
permanent, permanent,
player,
new Object[]{amount}, new Object[]{amount},
this, this,
player + " gains " + amount + " life.") : "PN gains " + amount + " life."
) :
MagicEvent.NONE; MagicEvent.NONE;
} }

View File

@ -15,20 +15,18 @@ import magic.model.trigger.MagicWhenOtherSpellIsCastTrigger;
public class Mesa_Enchantress { public class Mesa_Enchantress {
public static final MagicWhenOtherSpellIsCastTrigger T = new MagicWhenOtherSpellIsCastTrigger() { public static final MagicWhenOtherSpellIsCastTrigger T = new MagicWhenOtherSpellIsCastTrigger() {
@Override @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().isEnchantment()) ?
return (card.getOwner() == player && card.getCardDefinition().isEnchantment()) ?
new MagicEvent( new MagicEvent(
permanent, permanent,
player,
new MagicSimpleMayChoice( new MagicSimpleMayChoice(
player + " may draw a card.",
MagicSimpleMayChoice.DRAW_CARDS, MagicSimpleMayChoice.DRAW_CARDS,
1, 1,
MagicSimpleMayChoice.DEFAULT_NONE), MagicSimpleMayChoice.DEFAULT_NONE),
this, this,
player + " may$ draw a card."): "PN may$ draw a card."
):
MagicEvent.NONE; MagicEvent.NONE;
} }

View File

@ -28,12 +28,11 @@ public class Rejuvenation_Chamber {
public MagicEvent getPermanentEvent( public MagicEvent getPermanentEvent(
final MagicPermanent source, final MagicPermanent source,
final MagicPayedCost payedCost) { final MagicPayedCost payedCost) {
final MagicPlayer player = source.getController();
return new MagicEvent( return new MagicEvent(
source, source,
player,
this, this,
player + " gains 2 life"); "PN gains 2 life"
);
} }
@Override @Override

View File

@ -29,20 +29,19 @@ public class Scroll_of_Griselbrand {
final MagicPermanent permanent = (MagicPermanent)source; final MagicPermanent permanent = (MagicPermanent)source;
return new MagicEvent[]{ return new MagicEvent[]{
new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.ONE), new MagicPayManaCostEvent(source,source.getController(),MagicManaCost.ONE),
new MagicSacrificeEvent(permanent)}; new MagicSacrificeEvent(permanent)
};
} }
@Override @Override
public MagicEvent getPermanentEvent( public MagicEvent getPermanentEvent(
final MagicPermanent source, final MagicPermanent source,
final MagicPayedCost payedCost) { final MagicPayedCost payedCost) {
final MagicPlayer player = source.getController();
return new MagicEvent( return new MagicEvent(
source, source,
player,
this, this,
"Opponent discards a card. If " + player + "Opponent discards a card. If PN controls a Demon, opponent loses 3 life."
" controls a Demon, opponent loses 3 life."); );
} }
@Override @Override

View File

@ -19,15 +19,13 @@ public class Sphinx_of_Lost_Truths {
public static final MagicWhenComesIntoPlayTrigger T = new MagicWhenComesIntoPlayTrigger() { public static final MagicWhenComesIntoPlayTrigger T = new MagicWhenComesIntoPlayTrigger() {
@Override @Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) { public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
final boolean kicked=permanent.isKicked();
return new MagicEvent( return new MagicEvent(
permanent, permanent,
player,
new Object[]{kicked},
this, this,
kicked ? permanent.isKicked() ?
player + " draws three cards." : "PN draws three cards." :
player + " draws three cards. Then discards three cards."); "PN draws three cards. Then discards three cards."
);
} }
@Override @Override
public void executeEvent( public void executeEvent(
@ -37,8 +35,7 @@ public class Sphinx_of_Lost_Truths {
final Object[] choiceResults) { final Object[] choiceResults) {
final MagicPlayer player=event.getPlayer(); final MagicPlayer player=event.getPlayer();
game.doAction(new MagicDrawAction(player,3)); game.doAction(new MagicDrawAction(player,3));
final boolean kicked=(Boolean)data[0]; if (event.getPermanent().isKicked()) {
if (!kicked) {
game.addEvent(new MagicDiscardEvent(event.getPermanent(),player,3,false)); game.addEvent(new MagicDiscardEvent(event.getPermanent(),player,3,false));
} }
} }