Droog71
/
magarena
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed MagicSpecterTrigger to accept opponent parameter, fixes Hypnotic Specter

master
beholder 2011-10-21 07:23:16 +02:00
parent ff1656f26b
commit 3aed7b40e9
4 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/magic/card/Blazing_Specter.java
View File

@ -4,5 +4,5 @@ import magic.model.trigger.MagicSpecterTrigger;
import magic.model.trigger.MagicTrigger;
public class Blazing_Specter {
public static final MagicTrigger T = new MagicSpecterTrigger(true,false);
public static final MagicTrigger T = new MagicSpecterTrigger(true,false,false);
}

2
src/magic/card/Guul_Draz_Specter.java
View File

@ -18,5 +18,5 @@ public class Guul_Draz_Specter {
}
};
public static final MagicTrigger T = new MagicSpecterTrigger(true,false);
public static final MagicTrigger T = new MagicSpecterTrigger(true,false,false);
}

3
src/magic/card/Hypnotic_Specter.java
View File

@ -4,6 +4,5 @@ import magic.model.trigger.MagicSpecterTrigger;
import magic.model.trigger.MagicTrigger;
public class Hypnotic_Specter {
//should not cause discard if player is not opponent
public static final MagicTrigger T = new MagicSpecterTrigger(false,true);
public static final MagicTrigger T = new MagicSpecterTrigger(false,true,true);
}

34
src/magic/model/trigger/MagicSpecterTrigger.java
View File

@ -11,36 +11,38 @@ import magic.model.target.MagicTarget;
public class MagicSpecterTrigger extends MagicWhenDamageIsDealtTrigger {
private final boolean combat;
private final boolean opponent;
private final boolean random;
public MagicSpecterTrigger(final boolean combat,final boolean random) {
this.combat=combat;
this.random=random;
public MagicSpecterTrigger(final boolean combat,final boolean opponent,final boolean random) {
this.combat = combat;
this.opponent = opponent;
this.random = random;
}
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
final MagicTarget target = damage.getTarget();
final MagicTarget player = target;
final String playerName = player.getName();
final String opponentName = permanent.getController().getName();
final String prefix = (player == permanent.getController() ? opponentName : playerName) + " discards a card";
return (damage.getSource()==permanent &&
target.isPlayer() &&
(!combat||damage.isCombat())) ?
final MagicTarget target = damage.getTarget();
final String prefix = target + " discards a card";
return (damage.getSource() == permanent &&
target.isPlayer() &&
(!opponent || target != permanent.getController()) &&
(!combat || damage.isCombat())) ?
new MagicEvent(
permanent,
permanent.getController(),
new Object[]{permanent,player},
new Object[]{permanent,target},
this,
(random?prefix+" at random.":prefix)+'.'):
random ? prefix + " at random." : prefix + "."):
MagicEvent.NONE;
}
@Override
public void executeEvent(final MagicGame game,final MagicEvent event,final Object data[],final Object[] choices) {
final MagicPermanent permanent=(MagicPermanent)data[0];
final MagicPlayer player=(MagicPlayer)data[1];
game.addEvent(new MagicDiscardEvent(permanent,player,1,random));
game.addEvent(new MagicDiscardEvent(
(MagicPermanent)data[0],
(MagicPlayer)data[1],
1,
random));
}
}