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

fixed Orim's Thunder's effect to have only one item on stack

master
melvin 2012-08-19 10:55:30 +08:00
parent e47a7716eb
commit c077f0b75b
2 changed files with 27 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
release/Magarena/scripts/Orim_s_Thunder.txt Normal file
View File

@ -0,0 +1,9 @@
name=Orim's Thunder
url=http://magiccards.info/cmd/en/24.html
image=http://magiccards.info/scans/en/cmd/24.jpg
value=3.750
removal=2
rarity=C
type=Instant
cost={2}{W}
timing=removal

52
src/magic/card/Orim_s_Thunder.java
View File

@ -25,37 +25,8 @@ import magic.model.target.MagicDamageTargetPicker;
import magic.model.target.MagicDestroyTargetPicker;
import magic.model.target.MagicTarget;
//Backed out this card because it doesn't function properly.
//It creates two effects on the stack where it should be one.
//
//>Orim's Thunder
//image=http://magiccards.info/scans/en/cmd/24.jpg
//value=3
//removal=2
//rarity=C
//type=Instant
//color=w
//converted=3
//cost={2}{W}
//timing=removal
public class Orim_s_Thunder {
private static final MagicEventAction KICKED = new MagicEventAction() {
@Override
public void executeEvent(
final MagicGame game,
final MagicEvent event,
final Object[] data,
final Object[] choiceResults) {
event.processTarget(game,choiceResults,0,new MagicTargetAction() {
public void doAction(final MagicTarget target) {
final MagicDamage damage = new MagicDamage((MagicCard)data[0],target,(Integer)data[1],false);
game.doAction(new MagicDealDamageAction(damage));
}
});
}
};
public static final MagicSpellCardEvent S = new MagicSpellCardEvent() {
@Override
public MagicEvent getEvent(final MagicCardOnStack cardOnStack,final MagicPayedCost payedCost) {
@ -82,26 +53,39 @@ public class Orim_s_Thunder {
final Object[] choiceResults) {
final int kickerCount = (Integer)choiceResults[1];
final MagicCardOnStack cardOnStack = (MagicCardOnStack)data[0];
game.doAction(new MagicMoveCardAction(cardOnStack));
event.processTargetPermanent(game,choiceResults,0,new MagicPermanentAction() {
public void doAction(final MagicPermanent target) {
game.doAction(new MagicDestroyAction(target));
if (kickerCount > 0) {
final MagicSource source = cardOnStack.getSource();
final int amount = target.getCardDefinition().getConvertedCost();
final MagicEvent triggerEvent = new MagicEvent(
game.addEvent(new MagicEvent(
source,
cardOnStack.getController(),
MagicTargetChoice.NEG_TARGET_CREATURE,
new MagicDamageTargetPicker(amount),
new Object[]{cardOnStack,amount},
KICKED,
new MagicEventAction() {
@Override
public void executeEvent(
final MagicGame game,
final MagicEvent event,
final Object[] data,
final Object[] choiceResults) {
event.processTarget(game,choiceResults,0,new MagicTargetAction() {
public void doAction(final MagicTarget target) {
final MagicDamage damage = new MagicDamage((MagicCard)data[0],target,(Integer)data[1],false);
game.doAction(new MagicDealDamageAction(damage));
}
});
}
},
source + " deals " + amount + " damage to target creature$."
);
game.doAction(new MagicPutItemOnStackAction(new MagicTriggerOnStack(triggerEvent)));
));
}
}
});
game.doAction(new MagicMoveCardAction(cardOnStack));
}
};
}