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

changed MagicThiefTrigger to make use of MagicSimpleMayChoice. added a mustDraw parameter

master
beholder 2011-09-20 13:28:54 +02:00
parent 44e4ddf1a6
commit b72a6f05ac
3 changed files with 53 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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

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

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

61
src/magic/model/trigger/MagicThiefTrigger.java
View File

@ -3,28 +3,69 @@ package magic.model.trigger;
import magic.model.MagicDamage;
import magic.model.MagicGame;
import magic.model.MagicPermanent;
import magic.model.event.MagicDrawEvent;
import magic.model.MagicPlayer;
import magic.model.action.MagicDrawAction;
import magic.model.choice.MagicMayChoice;
import magic.model.choice.MagicSimpleMayChoice;
import magic.model.event.MagicEvent;
public class MagicThiefTrigger extends MagicWhenDamageIsDealtTrigger {
private final boolean combat;
private final boolean mustDraw;
private final int amount;
public MagicThiefTrigger(final boolean combat,final int amount) {
this.combat=combat;
this.amount=amount;
public MagicThiefTrigger(final boolean combat,final boolean mustDraw,final int amount) {
this.combat = combat;
this.mustDraw = mustDraw;
this.amount = amount;
}
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicDamage damage) {
return (damage.getSource()==permanent&&damage.getTarget().isPlayer()&&(!combat||damage.isCombat())) ?
new MagicDrawEvent(permanent,permanent.getController(),amount):
MagicEvent.NONE;
if (damage.getSource() == permanent &&
damage.getTarget().isPlayer() &&
(!combat || damage.isCombat())) {
final MagicPlayer player = permanent.getController();
if (mustDraw) {
return new MagicEvent(
permanent,
player,
new Object[]{player},
this,
(amount > 1) ?
player + " draws " + amount + " cards." :
player + " draws a card.");
}
else {
return new MagicEvent(
permanent,
player,
new MagicSimpleMayChoice(
player + " may draw a card.",
MagicSimpleMayChoice.DRAW_CARDS,
amount,
MagicSimpleMayChoice.DEFAULT_NONE),
new Object[]{player},
this,
(amount > 1) ?
player + " may$ draw " + amount + " cards." :
player + " may$ draw a card.");
}
}
return MagicEvent.NONE;
}
@Override
public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choices) {
}
public void executeEvent(
final MagicGame game,
final MagicEvent event,
final Object data[],
final Object[] choiceResults) {
if (mustDraw) {
game.doAction(new MagicDrawAction((MagicPlayer)data[0],amount));
} else if (MagicMayChoice.isYesChoice(choiceResults[0])) {
game.doAction(new MagicDrawAction((MagicPlayer)data[0],amount));
}
}
}