From 504506763dbfda497cb6e11043c8514f53647df0 Mon Sep 17 00:00:00 2001 From: melvin Date: Sat, 13 Aug 2011 11:11:43 +0800 Subject: [PATCH] removed card name from constructor --- src/magic/card/Galvanic_Arc.java | 26 +++++++----- src/magic/card/Ghostway.java | 27 ++++++------ src/magic/card/Giant_Growth.java | 24 ++++++----- src/magic/card/Glorious_Charge.java | 25 ++++++----- src/magic/card/Go_for_the_Throat.java | 24 ++++++----- src/magic/card/Goblin_Ruinblaster.java | 58 ++++++++++++++------------ src/magic/card/Goblin_War_Paint.java | 6 +-- src/magic/card/Grasp_of_Darkness.java | 24 ++++++----- src/magic/card/Griffin_Guide.java | 25 ++++++----- 9 files changed, 135 insertions(+), 104 deletions(-) diff --git a/src/magic/card/Galvanic_Arc.java b/src/magic/card/Galvanic_Arc.java index b48b16344c..bb060637ca 100644 --- a/src/magic/card/Galvanic_Arc.java +++ b/src/magic/card/Galvanic_Arc.java @@ -16,21 +16,26 @@ import magic.model.trigger.MagicTrigger; import magic.model.trigger.MagicTriggerType; public class Galvanic_Arc { + public static final MagicSpellCardEvent S = new MagicPlayAuraEvent( + MagicTargetChoice.TARGET_CREATURE, + MagicFirstStrikeTargetPicker.getInstance()); - public static final MagicSpellCardEvent V6502 =new MagicPlayAuraEvent("Galvanic Arc", - MagicTargetChoice.TARGET_CREATURE,MagicFirstStrikeTargetPicker.getInstance()); - public static final MagicTrigger V10571 =new MagicTrigger(MagicTriggerType.WhenComesIntoPlay,"Galvanic Arc") { - + public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.WhenComesIntoPlay) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final Object data) { - - return new MagicEvent(permanent,permanent.getController(),MagicTargetChoice.NEG_TARGET_CREATURE_OR_PLAYER,new MagicDamageTargetPicker(3), - new Object[]{permanent},this,"Galvanic Arc deals 3 damage to target creature or player$."); + return new MagicEvent( + permanent, + permanent.getController(), + MagicTargetChoice.NEG_TARGET_CREATURE_OR_PLAYER, + new MagicDamageTargetPicker(3), + new Object[]{permanent},this,"Galvanic Arc deals 3 damage to target creature or player$."); } - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object data[],final Object[] choiceResults) { - + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object data[], + final Object[] choiceResults) { final MagicTarget target=event.getTarget(game,choiceResults,0); if (target!=null) { final MagicDamage damage=new MagicDamage((MagicSource)data[0],target,3,false); @@ -38,5 +43,4 @@ public class Galvanic_Arc { } } }; - } diff --git a/src/magic/card/Ghostway.java b/src/magic/card/Ghostway.java index 8cd1c365c2..30b95de366 100644 --- a/src/magic/card/Ghostway.java +++ b/src/magic/card/Ghostway.java @@ -15,27 +15,30 @@ import magic.model.target.MagicTargetFilter; import java.util.Collection; public class Ghostway { - - public static final MagicSpellCardEvent V3816 =new MagicSpellCardEvent("Ghostway") { - + 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, - "Exile each creature you control. Return those cards to the battlefield under their owners' control at end of turn."); + return new MagicEvent( + cardOnStack.getCard(), + player, + new Object[]{cardOnStack,player}, + this, + "Exile each creature you control. " + + "Return those cards to the battlefield under their owners' control at end of turn."); } - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object[] data, + final Object[] choiceResults) { game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0])); - final Collection targets=game.filterTargets((MagicPlayer)data[1],MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL); + final Collection targets= + game.filterTargets((MagicPlayer)data[1],MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL); for (final MagicTarget target : targets) { - game.doAction(new MagicExileUntilEndOfTurnAction((MagicPermanent)target)); } } }; - } diff --git a/src/magic/card/Giant_Growth.java b/src/magic/card/Giant_Growth.java index ff714991fb..9844226d48 100644 --- a/src/magic/card/Giant_Growth.java +++ b/src/magic/card/Giant_Growth.java @@ -12,19 +12,24 @@ import magic.model.stack.MagicCardOnStack; import magic.model.target.MagicPumpTargetPicker; public class Giant_Growth { - - public static final MagicSpellCardEvent V3838 =new MagicSpellCardEvent("Giant Growth") { - + 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.POS_TARGET_CREATURE,MagicPumpTargetPicker.getInstance(), - new Object[]{cardOnStack},this,"Target creature$ gets +3/+3 until end of turn."); + return new MagicEvent( + cardOnStack.getCard(), + cardOnStack.getController(), + MagicTargetChoice.POS_TARGET_CREATURE, + MagicPumpTargetPicker.getInstance(), + new Object[]{cardOnStack}, + this, + "Target creature$ gets +3/+3 until end of turn."); } - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object[] data, + final Object[] choiceResults) { game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0])); final MagicPermanent creature=event.getTarget(game,choiceResults,0); if (creature!=null) { @@ -32,5 +37,4 @@ public class Giant_Growth { } } }; - } diff --git a/src/magic/card/Glorious_Charge.java b/src/magic/card/Glorious_Charge.java index 7435178059..84e75a40df 100644 --- a/src/magic/card/Glorious_Charge.java +++ b/src/magic/card/Glorious_Charge.java @@ -15,26 +15,29 @@ import magic.model.target.MagicTargetFilter; import java.util.Collection; public class Glorious_Charge { - - public static final MagicSpellCardEvent V3858 =new MagicSpellCardEvent("Glorious Charge") { - + 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,"Creatures you control get +1/+1 until end of turn."); + return new MagicEvent( + cardOnStack.getCard(), + player, + new Object[]{cardOnStack,player}, + this, + "Creatures you control get +1/+1 until end of turn."); } - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object[] data, + final Object[] choiceResults) { game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0])); - final Collection targets=game.filterTargets((MagicPlayer)data[1],MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL); + final Collection targets= + game.filterTargets((MagicPlayer)data[1],MagicTargetFilter.TARGET_CREATURE_YOU_CONTROL); for (final MagicTarget target : targets) { - game.doAction(new MagicChangeTurnPTAction((MagicPermanent)target,1,1)); } } }; - } diff --git a/src/magic/card/Go_for_the_Throat.java b/src/magic/card/Go_for_the_Throat.java index 4c2ea27007..7601c1f07a 100644 --- a/src/magic/card/Go_for_the_Throat.java +++ b/src/magic/card/Go_for_the_Throat.java @@ -12,19 +12,24 @@ import magic.model.stack.MagicCardOnStack; import magic.model.target.MagicDestroyTargetPicker; public class Go_for_the_Throat { - - public static final MagicSpellCardEvent V3879 =new MagicSpellCardEvent("Go for the Throat") { - + 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_CREATURE, - new MagicDestroyTargetPicker(false),new Object[]{cardOnStack},this,"Destroy target nonartifact creature$."); + return new MagicEvent( + cardOnStack.getCard(), + cardOnStack.getController(), + MagicTargetChoice.NEG_TARGET_NONARTIFACT_CREATURE, + new MagicDestroyTargetPicker(false), + new Object[]{cardOnStack}, + this, + "Destroy target nonartifact creature$."); } - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object[] data, + final Object[] choiceResults) { game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0])); final MagicPermanent creature=event.getTarget(game,choiceResults,0); if (creature!=null) { @@ -32,5 +37,4 @@ public class Go_for_the_Throat { } } }; - } diff --git a/src/magic/card/Goblin_Ruinblaster.java b/src/magic/card/Goblin_Ruinblaster.java index b9c28e0fd4..fd4a9aa9c5 100644 --- a/src/magic/card/Goblin_Ruinblaster.java +++ b/src/magic/card/Goblin_Ruinblaster.java @@ -14,22 +14,25 @@ import magic.model.stack.MagicTriggerOnStack; import magic.model.target.MagicDestroyTargetPicker; public class Goblin_Ruinblaster { - - public static final MagicSpellCardEvent V6270 =new MagicSpellCardEvent("Goblin Ruinblaster") { - + 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 MagicKickerChoice(null,MagicManaCost.RED,false), - new Object[]{cardOnStack,player},this, - "$Play Goblin Ruinblaster. When Goblin Ruinblaster enters the battlefield, if it is was kicked$, "+ - "destroy target nonbasic land."); + return new MagicEvent( + cardOnStack.getCard(), + player, + new MagicKickerChoice(null,MagicManaCost.RED,false), + new Object[]{cardOnStack,player}, + this, + "$Play Goblin Ruinblaster. When Goblin Ruinblaster enters the battlefield, " + + "if it is was kicked$, destroy target nonbasic land."); } - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object[] data, + final Object[] choiceResults) { final int kickerCount=(Integer)choiceResults[1]; final MagicCardOnStack cardOnStack=(MagicCardOnStack)data[0]; final MagicPlayCardFromStackAction action=new MagicPlayCardFromStackAction(cardOnStack,null); @@ -38,24 +41,25 @@ public class Goblin_Ruinblaster { final MagicPermanent permanent=action.getPermanent(); final MagicPlayer player=permanent.getController(); final MagicEvent triggerEvent=new MagicEvent(permanent,player, - MagicTargetChoice.NEG_TARGET_NONBASIC_LAND,new MagicDestroyTargetPicker(false), - MagicEvent.NO_DATA, - new MagicEventAction() { - - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - - final MagicPermanent land=event.getTarget(game,choiceResults,0); - if (land!=null) { - game.doAction(new MagicDestroyAction(land)); - } - } - }, - "Destroy target nonbasic land$."); + MagicTargetChoice.NEG_TARGET_NONBASIC_LAND,new MagicDestroyTargetPicker(false), + MagicEvent.NO_DATA, + new MagicEventAction() { + @Override + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object[] data, + final Object[] choiceResults) { + final MagicPermanent land=event.getTarget(game,choiceResults,0); + if (land!=null) { + game.doAction(new MagicDestroyAction(land)); + } + } + }, + "Destroy target nonbasic land$." + ); game.doAction(new MagicPutItemOnStackAction(new MagicTriggerOnStack(permanent,triggerEvent))); } } }; - - } diff --git a/src/magic/card/Goblin_War_Paint.java b/src/magic/card/Goblin_War_Paint.java index 058819c814..3c67869de3 100644 --- a/src/magic/card/Goblin_War_Paint.java +++ b/src/magic/card/Goblin_War_Paint.java @@ -6,7 +6,7 @@ import magic.model.event.MagicSpellCardEvent; import magic.model.target.MagicHasteTargetPicker; public class Goblin_War_Paint { - - public static final MagicSpellCardEvent V6504 =new MagicPlayAuraEvent("Goblin War Paint", - MagicTargetChoice.POS_TARGET_CREATURE,MagicHasteTargetPicker.getInstance()); + public static final MagicSpellCardEvent S = new MagicPlayAuraEvent( + MagicTargetChoice.POS_TARGET_CREATURE, + MagicHasteTargetPicker.getInstance()); } diff --git a/src/magic/card/Grasp_of_Darkness.java b/src/magic/card/Grasp_of_Darkness.java index 5553d45a5d..ae93e954d8 100644 --- a/src/magic/card/Grasp_of_Darkness.java +++ b/src/magic/card/Grasp_of_Darkness.java @@ -12,19 +12,24 @@ import magic.model.stack.MagicCardOnStack; import magic.model.target.MagicWeakenTargetPicker; public class Grasp_of_Darkness { - - public static final MagicSpellCardEvent V3899 =new MagicSpellCardEvent("Grasp of Darkness") { - + 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_CREATURE,new MagicWeakenTargetPicker(-4,-4), - new Object[]{cardOnStack},this,"Target creature$ gets -4/-4 until end of turn."); + return new MagicEvent( + cardOnStack.getCard(), + cardOnStack.getController(), + MagicTargetChoice.NEG_TARGET_CREATURE, + new MagicWeakenTargetPicker(-4,-4), + new Object[]{cardOnStack}, + this, + "Target creature$ gets -4/-4 until end of turn."); } - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object[] data,final Object[] choiceResults) { - + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object[] data, + final Object[] choiceResults) { game.doAction(new MagicMoveCardAction((MagicCardOnStack)data[0])); final MagicPermanent creature=event.getTarget(game,choiceResults,0); if (creature!=null) { @@ -32,5 +37,4 @@ public class Grasp_of_Darkness { } } }; - } diff --git a/src/magic/card/Griffin_Guide.java b/src/magic/card/Griffin_Guide.java index 96a83ecfc6..9d2e49a4c0 100644 --- a/src/magic/card/Griffin_Guide.java +++ b/src/magic/card/Griffin_Guide.java @@ -14,26 +14,31 @@ import magic.model.trigger.MagicTrigger; import magic.model.trigger.MagicTriggerType; public class Griffin_Guide { + public static final MagicSpellCardEvent S = new MagicPlayAuraEvent( + MagicTargetChoice.POS_TARGET_CREATURE, + MagicPumpTargetPicker.getInstance()); - public static final MagicSpellCardEvent V6506 =new MagicPlayAuraEvent("Griffin Guide", - MagicTargetChoice.POS_TARGET_CREATURE,MagicPumpTargetPicker.getInstance()); - public static final MagicTrigger V10591 =new MagicTrigger(MagicTriggerType.WhenOtherPutIntoGraveyardFromPlay,"Griffin Guide") { - + public static final MagicTrigger T = new MagicTrigger(MagicTriggerType.WhenOtherPutIntoGraveyardFromPlay) { @Override public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final Object data) { - if (permanent.getEnchantedCreature()==data) { final MagicPlayer player=permanent.getController(); - return new MagicEvent(permanent,player,new Object[]{player},this,"Put a 2/2 white Griffin creature token with flying onto the battlefield."); + return new MagicEvent( + permanent, + player, + new Object[]{player}, + this, + "Put a 2/2 white Griffin creature token with flying onto the battlefield."); } return null; } - @Override - public void executeEvent(final MagicGame game,final MagicEvent event,final Object data[],final Object[] choiceResults) { - + public void executeEvent( + final MagicGame game, + final MagicEvent event, + final Object data[], + final Object[] choiceResults) { game.doAction(new MagicPlayTokenAction((MagicPlayer)data[0],TokenCardDefinitions.GRIFFIN_TOKEN_CARD)); } }; - }