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

replace card code for Deathmark with effect property in card script

master
melvin 2012-08-26 22:26:04 +08:00
parent 4cd3682083
commit 0915cf9a67
3 changed files with 4 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
release/Magarena/scripts/Deathmark.txt
View File

@ -7,4 +7,4 @@ rarity=U
type=Sorcery
cost={B}
timing=removal
requires_card_code
effect=Destroy target green or white creature

42
src/magic/card/Deathmark.java
View File

@ -1,42 +0,0 @@
package magic.card;
import magic.model.MagicGame;
import magic.model.MagicPayedCost;
import magic.model.MagicPermanent;
import magic.model.action.MagicDestroyAction;
import magic.model.action.MagicMoveCardAction;
import magic.model.action.MagicPermanentAction;
import magic.model.choice.MagicTargetChoice;
import magic.model.event.MagicEvent;
import magic.model.event.MagicSpellCardEvent;
import magic.model.stack.MagicCardOnStack;
import magic.model.target.MagicDestroyTargetPicker;
public class Deathmark {
public static final MagicSpellCardEvent S = new MagicSpellCardEvent() {
@Override
public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
return new MagicEvent(
cardOnStack.getCard(),
cardOnStack.getController(),
MagicTargetChoice.NEG_GREEN_OR_WHITE_CREATURE,
new MagicDestroyTargetPicker(false),
new Object[]{cardOnStack},
this,
"Destroy target green or white creature$.");
}
@Override
public void executeEvent(
final MagicGame game,
final MagicEvent event,
final Object[] data,
final Object[] choiceResults) {
game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0]));
event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) {
game.doAction(new MagicDestroyAction(creature));
}
});
}
};
}

5
src/magic/model/choice/MagicTargetChoice.java
View File

@ -212,7 +212,7 @@ public class MagicTargetChoice extends MagicChoice {
new MagicTargetChoice(MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL,false,MagicTargetHint.None,"a creature you control");
public static final MagicTargetChoice RED_OR_GREEN_CREATURE_YOU_CONTROL=
new MagicTargetChoice(MagicTargetFilter.TARGET_RED_OR_GREEN_CREATURE_YOU_CONTROL,false,MagicTargetHint.None,"a red or green creature you control");
public static final MagicTargetChoice NEG_GREEN_OR_WHITE_CREATURE =
public static final MagicTargetChoice NEG_TARGET_GREEN_OR_WHITE_CREATURE =
new MagicTargetChoice(MagicTargetFilter.TARGET_GREEN_OR_WHITE_CREATURE,true,MagicTargetHint.Negative,"target green or white creature");
public static final MagicTargetChoice NEG_WHITE_OR_BLUE_CREATURE =
new MagicTargetChoice(MagicTargetFilter.TARGET_WHITE_OR_BLUE_CREATURE,true,MagicTargetHint.Negative,"target white or blue creature");
@ -501,7 +501,8 @@ public class MagicTargetChoice extends MagicChoice {
factory.put("neg target noncreature permanent", NEG_TARGET_NONCREATURE);
factory.put("neg target creature", NEG_TARGET_CREATURE);
factory.put("neg target land", NEG_TARGET_LAND);
factory.put("neg target artifact, enchantment, or land ", NEG_TARGET_ARTIFACT_OR_ENCHANTMENT_OR_LAND);
factory.put("neg target artifact, enchantment, or land", NEG_TARGET_ARTIFACT_OR_ENCHANTMENT_OR_LAND);
factory.put("neg target green or white creature", NEG_TARGET_GREEN_OR_WHITE_CREATURE);
}
public static MagicTargetChoice build(String arg) {