From 660c0f69c4bebddf81b03560fa855ed43f503a03 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 15:55:58 +0000
Subject: [PATCH] Added Bitterblossom for jhhh.

---
 res/cardsfolder/bitterblossom.txt |  7 +++++--
 src/forge/GameActionUtil.java     | 24 ------------------------
 2 files changed, 5 insertions(+), 26 deletions(-)

diff --git a/res/cardsfolder/bitterblossom.txt b/res/cardsfolder/bitterblossom.txt
index b9ad4666511..e40c511df14 100644
--- a/res/cardsfolder/bitterblossom.txt
+++ b/res/cardsfolder/bitterblossom.txt
@@ -1,8 +1,11 @@
 Name:Bitterblossom
 ManaCost:1 B
 Types:Tribal Enchantment Faerie
-Text:At the beginning of your upkeep, you lose 1 life and put a 1/1 black Faerie Rogue creature token with flying onto the battlefield.
+Text:no text
+T:Mode$ Phase | Phase$ Upkeep | ValidPlayer$ You |TriggerZones$ Battlefield | Execute$ TrigToken | TriggerDescription$ At the beginning of your upkeep, you lose 1 life and put a 1/1 black Faerie Rogue creature token with flying onto the battlefield.
+SVar:TrigToken:AB$Token | Cost$ 0 | TokenAmount$ 1 | TokenName$ Faerie Rogue | TokenTypes$ Creature,Faerie Rogue | TokenOwner$ Controller | TokenColors$ Black | TokenPower$ 1 | TokenToughness$ 1 | TokenKeywords$ Flying | SubAbility$ SVar=DB
+SVar:DB:DB$LoseLife | LifeAmount$ 1
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/bitterblossom.jpg
 SetInfo:MOR|Rare|http://magiccards.info/scans/en/mt/58.jpg
-End
\ No newline at end of file
+End
diff --git a/src/forge/GameActionUtil.java b/src/forge/GameActionUtil.java
index 5ae17ea10f1..d62fc36c1bc 100644
--- a/src/forge/GameActionUtil.java
+++ b/src/forge/GameActionUtil.java
@@ -108,7 +108,6 @@ public class GameActionUtil {
 		upkeep_Mirror_Sigil_Sergeant();
 		upkeep_Verdant_Force();
 		upkeep_Dragon_Broodmother(); //put this before bitterblossom and mycoloth, so that they will resolve FIRST
-		upkeep_Bitterblossom();
 		upkeep_Goblin_Assault();
 		upkeep_Awakening_Zone();
 		upkeep_Nut_Collector();
@@ -9790,29 +9789,6 @@ public class GameActionUtil {
 		}//else
 	}// upkeep_Greener_Pastures()
 
-	private static void upkeep_Bitterblossom() {
-		final Player player = AllZone.Phase.getPlayerTurn();
-		CardList list = AllZoneUtil.getPlayerCardsInPlay(player, "Bitterblossom");
-
-		Ability ability;
-		for(int i = 0; i < list.size(); i++) {
-			final Card crd = list.get(i);
-			ability = new Ability(list.get(i), "0") {
-				@Override
-				public void resolve() {
-					player.loseLife(1,crd);
-					CardFactoryUtil.makeToken("Faerie Rogue", "B 1 1 Faerie Rogue", crd.getController(), "B", new String[] {
-							"Creature", "Faerie", "Rogue"}, 1, 1, new String[] {"Flying"});
-				}// resolve()
-			};// Ability
-			
-			StringBuilder sb = new StringBuilder();
-			sb.append("Bitterblossom - ").append(player).append(" loses 1 life and puts a 1/1 token onto the battlefield.");
-			ability.setStackDescription(sb.toString());
-
-			AllZone.Stack.add(ability);
-		}// for
-	}// upkeep_Bitterblossom()
 
 	private static void upkeep_Goblin_Assault() {
 		final Player player = AllZone.Phase.getPlayerTurn();