merged card changes

release/Magarena/scripts/Hagra_Crocodile.txt

@@ -9,5 +9,5 @@ color=b
 converted=4
 cost={3}{B}
 pt=3/1
-ability=can't block,landfall pump
+ability=can't block,landfall pump +2/+2
 timing=main

release/Magarena/scripts/Hedron_Rover.txt

@@ -8,5 +8,5 @@ subtype=Construct
 converted=4
 cost={4}
 pt=2/2
-ability=landfall pump
+ability=landfall pump +2/+2
 timing=main

release/Magarena/scripts/Hedron_Scrabbler.txt

@@ -8,5 +8,5 @@ subtype=Construct
 converted=2
 cost={2}
 pt=1/1
+ability=landfall pump +1/+1
 timing=main
-requires_card_code

release/Magarena/scripts/Plated_Geopede.txt

@@ -9,5 +9,5 @@ color=r
 converted=2
 cost={1}{R}
 pt=1/1
-ability=first strike,landfall pump
+ability=first strike,landfall pump +2/+2
 timing=main

release/Magarena/scripts/Steppe_Lynx.txt

@@ -9,5 +9,5 @@ color=w
 converted=1
 cost={W}
 pt=0/1
-ability=landfall pump
+ability=landfall pump +2/+2
 timing=main

release/Magarena/scripts/Territorial_Baloth.txt

@@ -9,5 +9,5 @@ color=g
 converted=5
 cost={4}{G}
 pt=4/4
-ability=landfall pump
+ability=landfall pump +2/+2
 timing=main

release/Magarena/scripts/Windrider_Eel.txt

@@ -9,5 +9,5 @@ color=u
 converted=4
 cost={3}{U}
 pt=2/2
-ability=flying,landfall pump
+ability=flying,landfall pump +2/+2
 timing=main

src/magic/card/Hedron_Scrabbler.java

@@ -1,34 +0,0 @@
-package magic.card;
-
-import magic.model.MagicGame;
-import magic.model.MagicPermanent;
-import magic.model.MagicPlayer;
-import magic.model.action.MagicChangeTurnPTAction;
-import magic.model.event.MagicEvent;
-import magic.model.trigger.MagicWhenOtherComesIntoPlayTrigger;
-
-public class Hedron_Scrabbler {
-    public static final MagicWhenOtherComesIntoPlayTrigger T = new MagicWhenOtherComesIntoPlayTrigger() {
-		@Override
-		public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent played) {
-			final MagicPlayer player = permanent.getController();
-			return (player == played.getController() && played.isLand()) ?
-				new MagicEvent(
-                    permanent,
-                    player,
-                    new Object[]{permanent},
-                    this,
-                    permanent + " gets +1/+1 until end of turn."):
-                MagicEvent.NONE;
-		}
-		
-		@Override
-		public void executeEvent(
-                final MagicGame game,
-                final MagicEvent event,
-                final Object data[],
-                final Object[] choiceResults) {
-			game.doAction(new MagicChangeTurnPTAction((MagicPermanent)data[0],1,1));
-		}		
-    };
-}

src/magic/model/MagicAbility.java

@@ -234,7 +234,10 @@ public enum MagicAbility {
     },
     LandfallPump("landfall pump",20) {
         public void addAbilityImpl(final MagicCardDefinition card, final String arg) {
-	        card.add(MagicLandfallPumpTrigger.create());
+        	final String[] pt = arg.replace("+","").split("/");
+            final int power = Integer.parseInt(pt[0]);
+            final int toughness = Integer.parseInt(pt[1]);
+	        card.add(new MagicLandfallPumpTrigger(power,toughness));
         }
     },
     TapAddMana("tap add mana",10) {

src/magic/model/trigger/MagicLandfallPumpTrigger.java

@@ -8,17 +8,19 @@ import magic.model.event.MagicEvent;
 import magic.model.trigger.MagicWhenOtherComesIntoPlayTrigger;
 
 public class MagicLandfallPumpTrigger extends MagicWhenOtherComesIntoPlayTrigger {
+	private final int power;
+    private final int toughness;
     
-    private static final MagicLandfallPumpTrigger INSTANCE = new MagicLandfallPumpTrigger();
+    public MagicLandfallPumpTrigger(final int power, final int toughness) {
-
+        this.power = power;
-    private MagicLandfallPumpTrigger() {}
+        this.toughness = toughness;
-
-    public static final MagicLandfallPumpTrigger create() {
-        return INSTANCE;
     }
 
     @Override
-    public MagicEvent executeTrigger(final MagicGame game,final MagicPermanent permanent,final MagicPermanent played) {
+	public MagicEvent executeTrigger(
+			final MagicGame game,
+			final MagicPermanent permanent,
+			final MagicPermanent played) {
         final MagicPlayer player = permanent.getController();
         return (player == played.getController() && played.isLand()) ?
             new MagicEvent(
@@ -26,7 +28,8 @@ public class MagicLandfallPumpTrigger extends MagicWhenOtherComesIntoPlayTrigger
                 player,
                 new Object[]{permanent},
                 this,
-                permanent + " gets +2/+2 until end of turn."):
+                permanent + " gets " + getString(power) + 
+                "/" + getString(toughness) + " until end of turn.") :
             MagicEvent.NONE;
     }
     
@@ -36,6 +39,15 @@ public class MagicLandfallPumpTrigger extends MagicWhenOtherComesIntoPlayTrigger
             final MagicEvent event,
             final Object data[],
             final Object[] choiceResults) {
-        game.doAction(new MagicChangeTurnPTAction((MagicPermanent)data[0],2,2));
+    	game.doAction(new MagicChangeTurnPTAction(
+				(MagicPermanent)data[0],
+				power,
+				toughness));
+    }
+    
+    private String getString(final int pt) {
+		return pt >= 0 ?
+				"+" + pt :
+				Integer.toString(pt);
 	}
 }