Added Aquamorph Entity and converted Primal Clay and Primal Plasma to script. (Thanks Squee!)

.gitattributes

@@ -355,6 +355,7 @@ res/cardsfolder/a/apprentice_necromancer.txt svneol=native#text/plain
 res/cardsfolder/a/apprentice_sorcerer.txt svneol=native#text/plain
 res/cardsfolder/a/apprentice_wizard.txt svneol=native#text/plain
 res/cardsfolder/a/aquamoeba.txt svneol=native#text/plain
+res/cardsfolder/a/aquamorph_entity.txt -text
 res/cardsfolder/a/aquastrand_spider.txt -text
 res/cardsfolder/a/aquitects_will.txt svneol=native#text/plain
 res/cardsfolder/a/araba_mothrider.txt svneol=native#text/plain

res/cardsfolder/a/aquamorph_entity.txt

@@ -0,0 +1,16 @@
+Name:Aquamorph Entity
+ManaCost:2 U U
+Types:Creature Shapeshifter
+Text:no text
+PT:*/*
+K:Morph:2 U
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ MorphChoice | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.
+T:Mode$ TurnFaceUp | ValidCard$ Card.Self | Execute$ MorphChoice | Secondary$ True | Static$ True | TriggerDescription$ When CARDNAME enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.
+SVar:MorphChoice:AB$ Charm | Cost$ 0 | Defined$ You | Choices$ BigPower,BigTough | CharmNum$ 1
+SVar:BigPower:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 5 | Toughness$ 1 | SpellDescription$ CARDNAME is 5/1
+SVar:BigTough:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 5 | SpellDescription$ CARDNAME is 1/5
+SVar:Rarity:Common
+SVar:Picture:http://www.wizards.com/global/images/magic/general/aquamorph_entity.jpg
+SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/33.jpg
+Oracle:As Aquamorph Entity enters the battlefield or is turned face up, it becomes your choice of 5/1 or 1/5.\nMorph {2}{U} (You may cast this face down as a 2/2 creature for {3}. Turn it face up any time for its morph cost.)
+End

res/cardsfolder/p/primal_clay.txt

@@ -1,8 +1,13 @@
 Name:Primal Clay
 ManaCost:4
 Types:Artifact Creature Shapeshifter
-Text:As CARDNAME enters the battlefield, it becomes your choice of a 3/3 artifact creature, a 2/2 artifact creature with flying, or a 1/6 Wall artifact creature with defender in addition to its other types.
+Text:no text
 PT:*/*
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ MoldChoice | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, it becomes your choice of a 3/3 artifact creature, a 2/2 artifact creature with flying, or a 1/6 Wall artifact creature with defender in addition to its other types.
+SVar:MoldChoice:AB$ Charm | Cost$ 0 | Defined$ You | Choices$ GroundMold,AirMold,WallMold | CharmNum$ 1
+SVar:GroundMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 3 | Toughness$ 3 | SpellDescription$ CARDNAME is 3/3
+SVar:AirMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 2 | Toughness$ 2 | Keywords$ Flying | SpellDescription$ CARDNAME is 2/2 with flying
+SVar:WallMold:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 6 | Types$ Wall | Keywords$ Defender | SpellDescription$ CARDNAME is 1/6 with defender and is a wall in addition to its other types
 SVar:Rarity:Rare
 SVar:Picture:http://resources.wizards.com/magic/cards/4e/en-us/card2065.jpg
 SetInfo:5ED|Rare|http://magiccards.info/scans/en/5e/395.jpg

res/cardsfolder/p/primal_plasma.txt

@@ -1,8 +1,13 @@
 Name:Primal Plasma
 ManaCost:3 U
 Types:Creature Elemental Shapeshifter
-Text:As CARDNAME enters the battlefield, it becomes your choice of a 3/3 creature, a 2/2 creature with flying, or a 1/6 creature with defender.
+Text:no text
 PT:*/*
+T:Mode$ ChangesZone | Origin$ Any | Destination$ Battlefield | ValidCard$ Card.Self | Execute$ PlasmaChoice | Static$ True | TriggerDescription$ As CARDNAME enters the battlefield, it becomes your choice of a 3/3 creature, a 2/2 creature with flying, or a 1/6 creature with defender.
+SVar:PlasmaChoice:AB$ Charm | Cost$ 0 | Defined$ You | Choices$ GroundPlasma,AirPlasma,WallPlasma | CharmNum$ 1
+SVar:GroundPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 3 | Toughness$ 3 | SpellDescription$ CARDNAME is 3/3
+SVar:AirPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 2 | Toughness$ 2 | Keywords$ Flying | SpellDescription$ CARDNAME is 2/2 with flying
+SVar:WallPlasma:DB$ Animate | Defined$ Self | Permanent$ True | Power$ 1 | Toughness$ 6 | Keywords$ Defender | SpellDescription$ CARDNAME is 1/6 with defender
 SVar:Rarity:Common
 SVar:Picture:http://resources.wizards.com/magic/cards/plc/en-us/card124757.jpg
 SetInfo:PLC|Common|http://magiccards.info/scans/en/pc/59.jpg

src/main/java/forge/card/cardfactory/CardFactoryCreatures.java

@@ -140,51 +140,6 @@ public class CardFactoryCreatures {
         a1.setDescription(sb.toString());
     }
 
-    private static void getCard_PrimalPlasma(final Card card, final String cardName) {
-        card.setBaseAttack(3);
-        card.setBaseDefense(3);
-        final SpellAbility ability = new Ability(card, "0") {
-            @Override
-            public void resolve() {
-                String choice = "";
-                final String[] choices = { "3/3", "2/2 with flying", "1/6 with defender" };
-
-                if (card.getController().isHuman()) {
-                    choice = GuiUtils.chooseOne("Choose one", choices);
-                } else {
-                    choice = choices[MyRandom.getRandom().nextInt(3)];
-                }
-
-                if (choice.equals("2/2 with flying")) {
-                    card.setBaseAttack(2);
-                    card.setBaseDefense(2);
-                    card.addIntrinsicKeyword("Flying");
-                }
-                if (choice.equals("1/6 with defender")) {
-                    card.setBaseAttack(1);
-                    card.setBaseDefense(6);
-                    card.addIntrinsicKeyword("Defender");
-                    card.addType("Wall");
-                }
-
-            } // resolve()
-        }; // SpellAbility
-        final Command intoPlay = new Command() {
-            private static final long serialVersionUID = 8957338395786245312L;
-
-            @Override
-            public void execute() {
-                final StringBuilder sb = new StringBuilder();
-                sb.append(card.getName()).append(" - choose: 3/3, 2/2 flying, 1/6 defender");
-                ability.setStackDescription(sb.toString());
-
-                AllZone.getStack().addSimultaneousStackEntry(ability);
-
-            }
-        };
-        card.addComesIntoPlayCommand(intoPlay);
-    }
-
     private static void getCard_MinotaurExplorer(final Card card, final String cardName) {
         final SpellAbility creature = new SpellPermanent(card) {
             private static final long serialVersionUID = -7326018877172328480L;
@@ -1964,8 +1919,6 @@ public class CardFactoryCreatures {
             getCard_ForceOfSavagery(card, cardName);
         } else if (cardName.equals("Gilder Bairn")) {
             getCard_GilderBairn(card, cardName);
-        } else if (cardName.equals("Primal Plasma") || cardName.equals("Primal Clay")) {
-            getCard_PrimalPlasma(card, cardName);
         } else if (cardName.equals("Minotaur Explorer") || cardName.equals("Balduvian Horde") || cardName.equals("Pillaging Horde")) {
             getCard_MinotaurExplorer(card, cardName);
         } else if (cardName.equals("Phylactery Lich")) {