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

replace groovy code with card script

master
melvin 2014-05-06 12:43:31 +08:00
parent c5d0ad70bc
commit b01279223c
3 changed files with 9 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
release/Magarena/scripts/Eyeblight_s_Ending.groovy
View File

@ -1,34 +0,0 @@
def NON_ELF_CREATURE = new MagicPermanentFilterImpl() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicPermanent target) {
return target.isCreature() &&
!target.hasSubType(MagicSubType.Elf);
}
};
def TARGET_NON_ELF_CREATURE = new MagicTargetChoice(
NON_ELF_CREATURE,
MagicTargetHint.Negative,
"target non-Elf creature"
);
[
new MagicSpellCardEvent() {
@Override
public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
return new MagicEvent(
cardOnStack,
TARGET_NON_ELF_CREATURE,
MagicDestroyTargetPicker.Destroy,
this,
"Destroy target non-Elf creature\$."
);
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
event.processTargetPermanent(game, {
final MagicPermanent creature ->
game.doAction(new MagicDestroyAction(creature));
});
}
}
]

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

@ -6,5 +6,5 @@ rarity=C
type=Tribal,Instant type=Tribal,Instant
subtype=Elf subtype=Elf
cost={2}{B} cost={2}{B}
effect=Destroy target non-Elf creature.
timing=removal timing=removal
requires_groovy_code

8
src/magic/model/target/MagicTargetFilterFactory.java
View File

@ -610,6 +610,13 @@ public class MagicTargetFilterFactory {
} }
}; };
public static final MagicPermanentFilterImpl NONELF_CREATURE = new MagicPermanentFilterImpl() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicPermanent target) {
return target.isCreature() &&
!target.hasSubType(MagicSubType.Elf);
}
};
public static final MagicPermanentFilterImpl NONENCHANTMENT_CREATURE = new MagicPermanentFilterImpl() { public static final MagicPermanentFilterImpl NONENCHANTMENT_CREATURE = new MagicPermanentFilterImpl() {
public boolean accept(final MagicGame game,final MagicPlayer player,final MagicPermanent target) { public boolean accept(final MagicGame game,final MagicPlayer player,final MagicPermanent target) {
return target.isCreature() && return target.isCreature() &&
@ -1588,6 +1595,7 @@ public class MagicTargetFilterFactory {
single.put("non-Demon creature", NON_DEMON_CREATURE); single.put("non-Demon creature", NON_DEMON_CREATURE);
single.put("non-Zombie creature", NONZOMBIE_CREATURE); single.put("non-Zombie creature", NONZOMBIE_CREATURE);
single.put("non-Human creature", NONHUMAN_CREATURE); single.put("non-Human creature", NONHUMAN_CREATURE);
single.put("non-Elf creature", NONELF_CREATURE);
single.put("non-Vampire, non-Werewolf, non-Zombie creature", NONVAMPIRE_NONWEREWOLF_NONZOMBIE_CREATURE); single.put("non-Vampire, non-Werewolf, non-Zombie creature", NONVAMPIRE_NONWEREWOLF_NONZOMBIE_CREATURE);
single.put("Skeleton, Vampire, or Zombie", SKELETON_VAMPIRE_OR_ZOMBIE); single.put("Skeleton, Vampire, or Zombie", SKELETON_VAMPIRE_OR_ZOMBIE);
single.put("noncreature", NONCREATURE); single.put("noncreature", NONCREATURE);