convert Adamaro, First to Desire, Aven Trailblazer, Broodstar, Cantivore, and Master of Etherium to stSetPT

res/cardsfolder/adamaro_first_to_desire.txt

@@ -1,8 +1,9 @@
 Name:Adamaro, First to Desire
 ManaCost:1 R R
 Types:Legendary Creature Spirit
-Text:Adamaro's power and toughness are equal to number of cards in opponent's hand.
+Text:no text
-PT:1/1
+PT:*/*
+K:stSetPT:Count$InOppHand:Count$InOppHand:Adamaro, First to Desire's power and toughness are each equal to the number of cards in the hand of the opponent with the most cards in hand.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/adamaro_first_to_desire.jpg
 SetInfo:SOK|Rare|http://magiccards.info/scans/en/sok/91.jpg

res/cardsfolder/aven_trailblazer.txt

@@ -1,9 +1,10 @@
 Name:Aven Trailblazer
 ManaCost:2 W
 Types:Creature Bird Soldier
-Text:Domain - Aven Trailblazer's toughness is equal to the number of basic land types among lands you control.
+Text:no text
-PT:2/1
+PT:2/*
 K:Flying
+K:stSetPT:2:Count$Domain:Domain <20> Aven Trailblazer's toughness is equal to the number of basic land types among lands you control.
 SVar:Rarity:Common
 SVar:Picture:http://www.wizards.com/global/images/magic/general/aven_trailblazer.jpg
 SetInfo:CFX|Common|http://magiccards.info/scans/en/cfx/4.jpg

res/cardsfolder/broodstar.txt

@@ -1,10 +1,11 @@
 Name:Broodstar
 ManaCost:8 U U
 Types:Creature Beast
-Text:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)\r\nBroodstar's power and toughness are each equal to the number of artifacts you control.
+Text:Affinity for artifacts (This spell costs 1 less to cast for each artifact you control.)
-PT:1/1
+PT:*/*
 K:Flying
 K:CostChange:Player:Less:1:Self:All:All:Affinity/Artifact
+K:stSetPT:Count$NumTypeYouCtrl.Artifact:Count$NumTypeYouCtrl.Artifact:Broodstar's power and toughness are each equal to the number of artifacts you control.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/broodstar.jpg
 SetInfo:MRD|Rare|http://magiccards.info/scans/en/mi/31.jpg

res/cardsfolder/cantivore.txt

@@ -1,9 +1,10 @@
 Name:Cantivore
 ManaCost:1 W W
 Types:Creature Lhurgoyf
-Text:Cantivore's power and toughness are equal to the number of enchantment cards in all graveyards.
+Text:no text
-PT:1/1
+PT:*/*
 K:Vigilance
+K:stSetPT:Count$TypeInAllYards.Enchantment:Count$TypeInAllYards.Enchantment:Cantivore's power and toughness are each equal to the number of enchantment cards in all graveyards.
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/cantivore.jpg
 SetInfo:ODY|Rare|http://magiccards.info/scans/en/od/13.jpg

res/cardsfolder/master_of_etherium.txt

@@ -1,9 +1,10 @@
 Name:Master of Etherium
 ManaCost:2 U
 Types:Artifact Creature Vedalken Wizard
-Text:Master of Etherium's power and toughness are each equal to the number of artifacts you control.
+Text:no text
-PT:1/1
+PT:*/*
 K:stPumpAll:Creature.Artifact+Other+YouCtrl:1/1:No Condition:Other artifact creatures you control get +1/+1.
+K:stSetPT:Count$NumTypeYouCtrl.Artifact:Count$NumTypeYouCtrl.Artifact:Master of Etherium's power and toughness are each equal to the number of artifacts you control.
 SVar:PlayMain1:TRUE
 SVar:BuffedBy:Artifact
 SVar:Rarity:Rare

src/forge/GameActionUtil.java

@@ -14660,7 +14660,7 @@ public class GameActionUtil {
 		}//execute()
 	};
 
-	
+	/*
 	public static Command Master_of_Etherium          = new Command() {
 		private static final long serialVersionUID   = -5406532269375480827L;
 		
@@ -14682,6 +14682,7 @@ public class GameActionUtil {
 
 		}// execute()
 	}; // Master of Etherium + Broodstar
+	*/
 
 	public static Command Loxodon_Punisher            = new Command() {
 
@@ -15197,6 +15198,7 @@ public class GameActionUtil {
 
 	}; //Svogthos, the Restless Tomb
 
+	/*
 	public static Command Nightmare                   = new Command() {
 		private static final long serialVersionUID = 1987511205573387864L;
 
@@ -15215,8 +15217,8 @@ public class GameActionUtil {
 			CardList swamps = AllZoneUtil.getPlayerTypeInPlay(c.getController(), "Swamp");
 			return swamps.size();
 		}
-	};
+	};*/
-
+	/*
 	public static Command Aven_Trailblazer            = new Command() {
 		private static final long serialVersionUID = 2731050781896531776L;
 
@@ -15230,7 +15232,7 @@ public class GameActionUtil {
 
 		}// execute()
 	};
-	
+	*/
 	public static Command Matca_Rioters            = new Command() {
 		private static final long serialVersionUID = 1090204321481353143L;
 
@@ -16375,11 +16377,11 @@ public class GameActionUtil {
 	static {
 		//Please add cards in alphabetical order so they are easier to find
 		
-		commands.put("Adamaro_First_to_Desire", Adamaro_First_to_Desire);
+		//commands.put("Adamaro_First_to_Desire", Adamaro_First_to_Desire);
 		commands.put("Ajani_Avatar_Token", Ajani_Avatar_Token);
 		commands.put("Akromas_Memorial", Akromas_Memorial);
 		//commands.put("Angry_Mob", Angry_Mob);
-		commands.put("Aven_Trailblazer", Aven_Trailblazer);
+		//commands.put("Aven_Trailblazer", Aven_Trailblazer);
 		
 		commands.put("Bant_Sureblade", Bant_Sureblade);
 		commands.put("Beastbreaker_of_Bala_Ged", Beastbreaker_of_Bala_Ged);
@@ -16444,7 +16446,7 @@ public class GameActionUtil {
 		commands.put("Maraxus_of_Keld", Maraxus_of_Keld);
 		commands.put("Maro", Maro);
 		commands.put("Marrow_Gnawer", Marrow_Gnawer);
-		commands.put("Master_of_Etherium", Master_of_Etherium);
+		//commands.put("Master_of_Etherium", Master_of_Etherium);
 		commands.put("Masumaro_First_to_Live", Masumaro_First_to_Live);
 		commands.put("Matca_Rioters", Matca_Rioters);
 		commands.put("Meddling_Mage", Meddling_Mage);

src/forge/StaticEffects.java

@@ -21,16 +21,16 @@ public class StaticEffects
 	{	
 		//value has to be an array, since certain cards have multiple commands associated with them
 		
-		cardToEffectsList.put("Adamaro, First to Desire", new String[] {"Adamaro_First_to_Desire"});
+		//cardToEffectsList.put("Adamaro, First to Desire", new String[] {"Adamaro_First_to_Desire"});
 		cardToEffectsList.put("Akroma's Memorial", new String[] {"Akromas_Memorial"});
 		//cardToEffectsList.put("Angry Mob", new String[] {"Angry_Mob"});
 		cardToEffectsList.put("Avatar",  new String[] {"Ajani_Avatar_Token"});
-		cardToEffectsList.put("Aven Trailblazer", new String[] {"Aven_Trailblazer"});
+		//cardToEffectsList.put("Aven Trailblazer", new String[] {"Aven_Trailblazer"});
 		
 		cardToEffectsList.put("Bant Sureblade", new String[] {"Bant_Sureblade"});
 		cardToEffectsList.put("Beastbreaker of Bala Ged", new String[] {"Beastbreaker_of_Bala_Ged"});
 		cardToEffectsList.put("Bloodghast", new String[] {"Bloodghast"});
-		cardToEffectsList.put("Broodstar", new String[] {"Master_of_Etherium"});
+		//cardToEffectsList.put("Broodstar", new String[] {"Master_of_Etherium"});
 		cardToEffectsList.put("Broodwarden", new String[] {"Broodwarden"});
 		
 		cardToEffectsList.put("Cantivore", new String[] {"Cantivore"});
@@ -90,7 +90,7 @@ public class StaticEffects
 		cardToEffectsList.put("Maraxus of Keld", new String[] {"Maraxus_of_Keld"});
 		cardToEffectsList.put("Maro", new String[] {"Maro"});
 		cardToEffectsList.put("Marrow-Gnawer", new String[] {"Marrow_Gnawer"});
-		cardToEffectsList.put("Master of Etherium", new String[] {"Master_of_Etherium"});
+		//cardToEffectsList.put("Master of Etherium", new String[] {"Master_of_Etherium"});
 		cardToEffectsList.put("Masumaro, First to Live", new String[] {"Masumaro_First_to_Live"});
 		cardToEffectsList.put("Matca Rioters", new String[] {"Matca_Rioters"});
 		cardToEffectsList.put("Meddling Mage", new String[] {"Meddling_Mage"});