From 0085f1d8792320b45e8195fbb31944b90712fbc0 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 09:18:35 +0000
Subject: [PATCH] - Keyworded Mindless Automaton. - Fixed type of Workhorse and
 keyworded the etbcounter ability.

---
 res/cardsfolder/mindless_automaton.txt |  5 +++-
 res/cardsfolder/workhorse.txt          |  5 ++--
 src/forge/CardFactory_Creatures.java   | 33 +++++++-------------------
 3 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/res/cardsfolder/mindless_automaton.txt b/res/cardsfolder/mindless_automaton.txt
index c0f93db426c..dc54c121851 100644
--- a/res/cardsfolder/mindless_automaton.txt
+++ b/res/cardsfolder/mindless_automaton.txt
@@ -1,8 +1,11 @@
 Name:Mindless Automaton
 ManaCost:4
 Types:Artifact Creature Construct
-Text:Mindless Automaton comes into play with two +1/+1 counters. 1,Discard a card: put a +1/+1 counter on Mindless Automaton. Remove two +1/+1 counters: draw a card. 
+Text:no text
 PT:0/0
+K:etbCounter:P1P1:2
+A:AB$PutCounter|Cost$1 Discard<1/Any>|CounterType$P1P1|CounterNum$1|SpellDescription$Put a +1/+1 counter on Mindless Automaton.
+K:abDrawCards SubCounter<2/P1P1>:1:Draw a card.:Mindless Automaton - Controller draws a card.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/mindless_automaton.jpg
 End
diff --git a/res/cardsfolder/workhorse.txt b/res/cardsfolder/workhorse.txt
index 4256cd40d75..912f081bcdd 100644
--- a/res/cardsfolder/workhorse.txt
+++ b/res/cardsfolder/workhorse.txt
@@ -1,8 +1,9 @@
 Name:Workhorse
 ManaCost:6
-Types:Artifact Creature Construct
-Text:Workhorse enters the battlefield with four +1/+1 counters. 
+Types:Artifact Creature Horse
+Text:no text
 PT:0/0
+K:etbCounter:P1P1:4
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/workhorse.jpg
 End
diff --git a/src/forge/CardFactory_Creatures.java b/src/forge/CardFactory_Creatures.java
index 7079eb002e6..19b2eb65956 100644
--- a/src/forge/CardFactory_Creatures.java
+++ b/src/forge/CardFactory_Creatures.java
@@ -15789,10 +15789,11 @@ public class CardFactory_Creatures {
             card.addComesIntoPlayCommand(intoPlay);
         }//*************** END ************ END **************************
         
+        
         //*************** START *********** START **************************
         else if(cardName.equals("Workhorse")) {      
             
-            final Ability_Mana ability = new Ability_Mana(card, "0: add 1") {
+            final Ability_Mana ability = new Ability_Mana(card, "0: Add 1") {
 				private static final long serialVersionUID = -6764282980691397966L;
 
 				@Override
@@ -15813,21 +15814,12 @@ public class CardFactory_Creatures {
 					return "1";
             	}
             };
-            ability.setStackDescription(card + " adds 1 mana to mana pool. ");
-            ability.setDescription("Remove a +1/+1 counter: add 1 to your mana pool.");
+            ability.setStackDescription(cardName + " add 1 mana to mana pool. ");
+            ability.setDescription("Remove a +1/+1 counter from Workhorse: Add 1 to your mana pool.");
             card.addSpellAbility(ability);
-            
-            Command intoPlay = new Command() {
-                
-                private static final long serialVersionUID = 255901529244894L;
-                
-                public void execute() {
-                    card.addCounter(Counters.P1P1, 4);                   
-                }//execute()
-            };//Command
-            card.addComesIntoPlayCommand(intoPlay);
         }//*************** END ************ END **************************
         
+        /*keyworded
         //*************** START *********** START **************************
         else if(cardName.equals("Mindless Automaton")) {      
             
@@ -15854,7 +15846,7 @@ public class CardFactory_Creatures {
                 }
             };
             
-            ability1.setStackDescription(card + " gets a +1/+1 counter. ");
+            ability1.setStackDescription(cardName + " gets a +1/+1 counter. ");
             ability1.setDescription("1, Discard a card: put a +1/+1 counter on Mindless Automaton.");
             card.addSpellAbility(ability1);
             ability1.setBeforePayMana(runtime1);
@@ -15869,19 +15861,10 @@ public class CardFactory_Creatures {
         	};
         	
             ability2.setStackDescription("Remove two +1/+1 counters: Draw a card.");
-            ability2.setDescription("Remove two +1/+1 counters: Draw a card.");
+            ability2.setDescription("Remove two +1/+1 counters from Mindless Automaton: Draw a card.");
             card.addSpellAbility(ability2);
-            
-            Command intoPlay = new Command() {
-                
-                private static final long serialVersionUID = 255901520244894L;
-                
-                public void execute() {
-                    card.addCounter(Counters.P1P1, 2);                   
-                }//execute()
-            };//Command
-            card.addComesIntoPlayCommand(intoPlay);
         }//*************** END ************ END **************************
+        */
         
         //*************** START *********** START **************************
         else if(cardName.equals("Spitting Hydra")) {