From f2d3c1b1a2c45afb9f3ef6fa29ef428a9ab736d8 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sun, 7 Aug 2011 00:06:33 +0000
Subject: [PATCH] - Completed conversion of Energy Storm.

---
 res/cardsfolder/energy_storm.txt |  1 +
 src/forge/Card.java              | 25 +++----------------------
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/res/cardsfolder/energy_storm.txt b/res/cardsfolder/energy_storm.txt
index 40d784609e2..8548e139c44 100644
--- a/res/cardsfolder/energy_storm.txt
+++ b/res/cardsfolder/energy_storm.txt
@@ -5,6 +5,7 @@ Text:no text
 K:Cumulative upkeep:1
 K:Permanents don't untap during their controllers' untap steps:Creature.withFlying
 K:stPreventDamage:Player:Instant,Sorcery:All:Prevent all damage that would be dealt by instant and sorcery spells. Creatures with flying don't untap during their controller's untap step.
+K:stPreventDamage:Permanent:Spell:1:no text
 SVar:RemRandomDeck:True
 SVar:Rarity:Rare
 SVar:Picture:http://www.wizards.com/global/images/magic/general/energy_storm.jpg
diff --git a/src/forge/Card.java b/src/forge/Card.java
index 737192b88f6..61a36ec67ae 100644
--- a/src/forge/Card.java
+++ b/src/forge/Card.java
@@ -3171,12 +3171,8 @@ public class Card extends MyObservable {
     	
     	restDamage = staticReplaceDamage(restDamage, source, isCombat);
     	
-    	if(AllZoneUtil.isCardInPlay("Leyline of Punishment")) return restDamage;
-    	
     	restDamage = staticDamagePrevention(restDamage, source, isCombat);
     	
-    	if(getName().equals("Swans of Bryn Argoll")) return 0;
-    	
     	return restDamage;
     }
     
@@ -3237,30 +3233,15 @@ public class Card extends MyObservable {
 		
 		// specific Cards
     	if(isCreature()) { //and not a planeswalker
+        	if(getName().equals("Swans of Bryn Argoll")) return 0;
+        	
     		if((source.isCreature() && AllZoneUtil.isCardInPlay("Well-Laid Plans") && source.sharesColorWith(this)))return 0;
     	
     		if((!isCombat && AllZoneUtil.isCardInPlay("Mark of Asylum", player)))return 0;
-    		
-    		/*
-    		if((AllZoneUtil.isCardInPlay("Light of Sanction", player) && source.getController().isPlayer(player)))
-    			return 0;
-    	
-    		if (AllZoneUtil.isCardInPlay("Plated Pegasus") && source.isSpell()&& restDamage > 0) {
-        		int amount = AllZoneUtil.getCardsInPlay("Plated Pegasus").size();
-				for (int i = 0; i < amount;i++)
-					if ( restDamage > 0 )	%
-						restDamage -= 1;
-    		}
-    		
-    		if (isType("Cleric") && AllZoneUtil.isCardInPlay("Daunting Defender", player))
-    			restDamage = restDamage - AllZoneUtil.getPlayerCardsInPlay(player, "Daunting Defender").size();
-    		*/
-    		
+
     		if(getName().equals("Callous Giant") && restDamage <= 3) return 0;
     	} //Creature end
     	
-		if (AllZoneUtil.isCardInPlay("Energy Storm") && source.isSpell()) return 0;
-    	
 		if ( restDamage > 0)
 			return restDamage;
 		else return 0;