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

move may choice into trigger

master
melvin 2013-10-29 14:01:05 +08:00
parent 3be126a270
commit 722909200c
3 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
release/Magarena/scripts/Silverglade_Elemental.groovy
View File

@ -4,20 +4,19 @@
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPayedCost payedCost) {
return new MagicEvent(
permanent,
new MagicMayChoice(),
this,
"PN may search his or her library for a Forest card and put that card onto the battlefield, then shuffle PN's library."
"PN may\$ search his or her library for a Forest card and put that card onto the battlefield, then shuffle PN's library."
);
}
@Override
public void executeEvent(final MagicGame game, final MagicEvent event) {
game.addEvent(new MagicSearchOntoBattlefieldEvent(
event,
new MagicMayChoice(
"Search for a forest card?",
MagicTargetChoice.FOREST_CARD_FROM_LIBRARY
),
MagicPlayMod.unTAPPED
));
if (event.isYes()) {
game.addEvent(new MagicSearchOntoBattlefieldEvent(
event,
new MagicTargetChoice("a Forest card from your library")
));
}
}
}
]

3
src/magic/model/target/MagicTargetFilter.java
View File

@ -1121,6 +1121,9 @@ public interface MagicTargetFilter<T extends MagicTarget> {
MagicCardFilterImpl TARGET_FOREST_OR_ISLAND_CARD_FROM_LIBRARY =
Factory.card(MagicTargetType.Library, MagicSubType.Forest, MagicSubType.Island);
MagicCardFilterImpl TARGET_FOREST_CARD_FROM_LIBRARY =
Factory.card(MagicTargetType.Library, MagicSubType.Forest);
MagicCardFilterImpl TARGET_LAND_CARD_FROM_HAND = Factory.card(MagicTargetType.Hand, MagicType.Land);

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

@ -157,6 +157,7 @@ public class MagicTargetFilterFactory {
single.put("Mountain or Forest card from your library", TARGET_MOUNTAIN_OR_FOREST_CARD_FROM_LIBRARY);
single.put("Mountain or Plains card from your library", TARGET_MOUNTAIN_OR_PLAINS_CARD_FROM_LIBRARY);
single.put("Forest or Plains card from your library", TARGET_FOREST_OR_PLAINS_CARD_FROM_LIBRARY);
single.put("Forest card from your library", TARGET_FOREST_CARD_FROM_LIBRARY);
single.put("Forest or Island card from your library", TARGET_FOREST_OR_ISLAND_CARD_FROM_LIBRARY);
single.put("Plains, Island, Swamp, or Mountain card from your library", TARGET_PLAINS_ISLAND_SWAMP_OR_MOUNTAIN_CARD_FROM_LIBRARY);
single.put("Goblin permanent card from your library", TARGET_GOBLIN_CARD_FROM_LIBRARY);