From 81a701ee1cc9ef0fffc104afe042e012fa89bb83 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 03:32:56 +0000
Subject: [PATCH] - Converted Blight Sickle from code to keyword. - Simplified
 the onUnEquip Command in CardFactoryUtil.java. Removed the test to see if
 keyword is named "none". Previous update should remove all of these keywords
 named "none".

---
 res/cards.txt                        |  3 ++-
 src/forge/CardFactoryUtil.java       | 12 +++++++++---
 src/forge/CardFactory_Equipment.java |  4 ++++
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/res/cards.txt b/res/cards.txt
index a356fe6ea75..98168cc28b0 100644
--- a/res/cards.txt
+++ b/res/cards.txt
@@ -7404,7 +7404,8 @@ abPumpTgt T:Haste
 Blight Sickle
 2
 Artifact Equipment
-Equipped creature gets +1/+0 and has Wither.
+Equipped creature gets +1/+0 and has wither.
+VanillaEquipment:1:0:2:Wither:none:none
 
 Priest of Titania
 1 G
diff --git a/src/forge/CardFactoryUtil.java b/src/forge/CardFactoryUtil.java
index ff751ec63c2..aca23aef6fc 100644
--- a/src/forge/CardFactoryUtil.java
+++ b/src/forge/CardFactoryUtil.java
@@ -1330,9 +1330,15 @@ public class CardFactoryUtil {
             public void execute() {
                 if(sourceCard.isEquipping()) {
                     Card crd = sourceCard.getEquipping().get(0);
-                    if(!(Ab1 == "none")) crd.removeExtrinsicKeyword(Ab1);
-                    if(!(Ab2 == "none")) crd.removeExtrinsicKeyword(Ab2);
-                    if(!(Ab3 == "none")) crd.removeExtrinsicKeyword(Ab3);
+                    
+                    //if(!(Ab1 == "none")) crd.removeExtrinsicKeyword(Ab1);
+                    //if(!(Ab2 == "none")) crd.removeExtrinsicKeyword(Ab2);
+                    //if(!(Ab3 == "none")) crd.removeExtrinsicKeyword(Ab3);
+                    
+                    crd.removeExtrinsicKeyword(Ab1);	//no longer a need to test for a keyword named "none"
+                    crd.removeExtrinsicKeyword(Ab2);
+                    crd.removeExtrinsicKeyword(Ab3);
+                    
                     crd.addSemiPermanentAttackBoost(-1 * Power);
                     crd.addSemiPermanentDefenseBoost(-1 * Tough);
                     
diff --git a/src/forge/CardFactory_Equipment.java b/src/forge/CardFactory_Equipment.java
index 62731bf0dab..5b836767b3d 100644
--- a/src/forge/CardFactory_Equipment.java
+++ b/src/forge/CardFactory_Equipment.java
@@ -767,6 +767,8 @@ class CardFactory_Equipment {
             
         } //*************** END ************ END **************************
         
+        
+/*
         //*************** START *********** START **************************
         else if(cardName.equals("Blight Sickle")) {
             final Ability equip = new Ability(card, "2") {
@@ -875,6 +877,8 @@ class CardFactory_Equipment {
             card.addUnEquipCommand(onUnEquip);
             
         } //*************** END ************ END **************************
+*/
+        
         
         //*************** START *********** START **************************
         else if(cardName.equals("Spidersilk Net")) {