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

added Terror and Night's Whisper

master
beholder 2011-09-12 15:42:03 +02:00
parent 4c7b3bd7b5
commit f8a383aaf4
4 changed files with 100 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3229,6 +3229,17 @@ converted=2
cost={1}{B}
timing=removal
>Terror
image=http://magiccards.info/scans/en/dpa/34.jpg
value=2
removal=3
rarity=C
type=Instant
color=b
converted=2
cost={1}{B}
timing=removal
>To Arms!
image=http://magiccards.info/scans/en/gp/20.jpg
value=2
@ -5087,6 +5098,16 @@ converted=2
cost={B}{B}
timing=draw
>Night's Whisper
image=http://magiccards.info/scans/en/5dn/55.jpg
value=2
rarity=U
type=Sorcery
color=b
converted=2
cost={1}{B}
timing=draw
>Vision Skeins
image=http://magiccards.info/scans/en/cmd/67.jpg
value=3

37
src/magic/card/Night_s_Whisper.java Normal file
View File

@ -0,0 +1,37 @@
package magic.card;
import magic.model.MagicGame;
import magic.model.MagicPayedCost;
import magic.model.MagicPlayer;
import magic.model.action.MagicChangeLifeAction;
import magic.model.action.MagicDrawAction;
import magic.model.action.MagicMoveCardAction;
import magic.model.event.MagicEvent;
import magic.model.event.MagicSpellCardEvent;
import magic.model.stack.MagicCardOnStack;
public class Night_s_Whisper {
public static final MagicSpellCardEvent S = new MagicSpellCardEvent() {
@Override
public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
final MagicPlayer player = cardOnStack.getController();
return new MagicEvent(
cardOnStack.getCard(),
player,
new Object[]{cardOnStack,player},
this,
player + " draws two cards and loses 2 life.");
}
@Override
public void executeEvent(
final MagicGame game,
final MagicEvent event,
final Object[] data,
final Object[] choiceResults) {
game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0]));
final MagicPlayer player = (MagicPlayer)data[1];
game.doAction(new MagicDrawAction(player,2));
game.doAction(new MagicChangeLifeAction(player,-2));
}
};
}

41
src/magic/card/Terror.java Normal file
View File

@ -0,0 +1,41 @@
package magic.card;
import magic.model.MagicGame;
import magic.model.MagicPayedCost;
import magic.model.MagicPermanent;
import magic.model.MagicPermanentState;
import magic.model.action.MagicChangeStateAction;
import magic.model.action.MagicDestroyAction;
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 Terror {
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_TARGET_NONARTIFACT_NONBLACK_CREATURE,
new MagicDestroyTargetPicker(true),
MagicEvent.NO_DATA,
this,
"Destroy target nonartifact, nonblack creature$. It can't be regenerated.");
}
@Override
public void executeEvent(final MagicGame game,final MagicEvent event,final Object data[],final Object[] choiceResults) {
event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
public void doAction(final MagicPermanent creature) {
game.doAction(new MagicChangeStateAction(creature,MagicPermanentState.CannotBeRegenerated,true));
game.doAction(new MagicDestroyAction(creature));
}
});
}
};
}

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

@ -109,7 +109,7 @@ public class MagicTargetChoice extends MagicChoice {
public static final MagicTargetChoice NEG_TARGET_NONARTIFACT_CREATURE=
new MagicTargetChoice(MagicTargetFilter.TARGET_NONARTIFACT_CREATURE,true,MagicTargetHint.Negative,"target nonartifact creature");
public static final MagicTargetChoice NEG_TARGET_NONARTIFACT_NONBLACK_CREATURE =
new MagicTargetChoice(MagicTargetFilter.TARGET_NONARTIFACT_NONBLACK_CREATURE,true,MagicTargetHint.Negative,"target nonartifact creature");
new MagicTargetChoice(MagicTargetFilter.TARGET_NONARTIFACT_NONBLACK_CREATURE,true,MagicTargetHint.Negative,"target nonartifact, nonblack creature");
public static final MagicTargetChoice NEG_TARGET_TAPPED_CREATURE=
new MagicTargetChoice(MagicTargetFilter.TARGET_TAPPED_CREATURE,true,MagicTargetHint.Negative,"target tapped creature");
public static final MagicTargetChoice NEG_TARGET_UNTAPPED_CREATURE=