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

added Glint Hawk and Gold Myr

master
beholder 2011-10-04 11:03:17 +02:00
parent a454a0fc71
commit 658a575fb9
5 changed files with 100 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
resources/magic/data/cards.txt
View File

@ -11645,6 +11645,18 @@ pt=1/1
timing=smain
mana_or_combat
>Gold Myr
image=http://magiccards.info/scans/en/som/157.jpg
value=3
rarity=C
type=Artifact,Creature
subtype=Myr
converted=2
cost={2}
pt=1/1
timing=smain
mana_or_combat
>Copperhorn Scout
image=http://magiccards.info/scans/en/som/116.jpg
value=2
@ -11790,3 +11802,25 @@ converted=4
cost={3}{W}
pt=2/2
timing=main
>Glint Hawk
image=http://magiccards.info/scans/en/som/10.jpg
value=2
rarity=C
type=Creature
subtype=Bird
color=w
converted=1
cost={W}
pt=2/2
ability=flying
timing=main
>Glint Hawk Idol
image=http://magiccards.info/scans/en/som/156.jpg
value=2
rarity=C
type=Artifact
converted=2
cost={2}
timing=artifact

50
src/magic/card/Glint_Hawk.java Normal file
View File

@ -0,0 +1,50 @@
package magic.card;
import magic.model.MagicGame;
import magic.model.MagicLocationType;
import magic.model.MagicPermanent;
import magic.model.MagicPlayer;
import magic.model.action.MagicPermanentAction;
import magic.model.action.MagicRemoveFromPlayAction;
import magic.model.action.MagicSacrificeAction;
import magic.model.choice.MagicMayChoice;
import magic.model.choice.MagicTargetChoice;
import magic.model.event.MagicEvent;
import magic.model.target.MagicBounceTargetPicker;
import magic.model.trigger.MagicWhenComesIntoPlayTrigger;
public class Glint_Hawk {
public static final MagicWhenComesIntoPlayTrigger T = new MagicWhenComesIntoPlayTrigger() {
@Override
public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent, final MagicPlayer player) {
return new MagicEvent(
permanent,
player,
new MagicMayChoice(
"You may return an artifact you control to its owner's hand.",
MagicTargetChoice.TARGET_ARTIFACT_YOU_CONTROL),
MagicBounceTargetPicker.getInstance(),
new Object[]{permanent},
this,
"You may$ return an artifact you control to its owner's hand. " +
"If you don't, sacrifice " + permanent + ".");
}
@Override
public void executeEvent(
final MagicGame game,
final MagicEvent event,
final Object data[],
final Object[] choiceResults) {
if (MagicMayChoice.isNoChoice(choiceResults[0])) {
game.doAction(new MagicSacrificeAction((MagicPermanent)data[0]));
}
else {
event.processTargetPermanent(game,choiceResults,1,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) {
game.doAction(new MagicRemoveFromPlayAction(creature,MagicLocationType.OwnersHand));
}
});
}
}
};
}

13
src/magic/card/Gold_Myr.java Normal file
View File

@ -0,0 +1,13 @@
package magic.card;
import magic.model.MagicManaType;
import magic.model.event.MagicManaActivation;
import magic.model.event.MagicTapManaActivation;
import java.util.Arrays;
public class Gold_Myr {
public static final MagicManaActivation M =
new MagicTapManaActivation(Arrays.asList(MagicManaType.Colorless, MagicManaType.White), 1);
}

1
src/magic/model/choice/MagicSimpleMayChoice.java
View File

@ -20,6 +20,7 @@ public class MagicSimpleMayChoice extends MagicChoice {
public static final int LOSE_LIFE = 3;
public static final int OPPONENT_LOSE_LIFE = 4; // always returns YES_CHOICE_LIST
public static final int UNTAP = 5; // always returns YES_CHOICE_LIST
public static final int BECOME_CREATURE = 6; // always returns YES_CHOICE_LIST
public static final int DEFAULT_NONE = 0;
public static final int DEFAULT_NO = 1;

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

@ -88,6 +88,8 @@ public class MagicTargetChoice extends MagicChoice {
new MagicTargetChoice(MagicTargetFilter.TARGET_NONLAND_PERMANENT,true,MagicTargetHint.None,"target nonland permanent");
public static final MagicTargetChoice NEG_TARGET_NONLAND_PERMANENT=
new MagicTargetChoice(MagicTargetFilter.TARGET_NONLAND_PERMANENT,true,MagicTargetHint.Negative,"target nonland permanent");
public static final MagicTargetChoice TARGET_ARTIFACT_YOU_CONTROL=
new MagicTargetChoice(MagicTargetFilter.TARGET_ARTIFACT_YOU_CONTROL,true,MagicTargetHint.None,"target artifact you control");
public static final MagicTargetChoice NEG_TARGET_ARTIFACT=
new MagicTargetChoice(MagicTargetFilter.TARGET_ARTIFACT,true,MagicTargetHint.Negative,"target artifact");
public static final MagicTargetChoice TARGET_NONCREATURE_ARTIFACT=