From c8629e6add110058c0d76f41f01f0bf8457865e3 Mon Sep 17 00:00:00 2001
From: jendave <jendave@cardforge.org>
Date: Sat, 6 Aug 2011 19:42:49 +0000
Subject: [PATCH] add eqPump 2:0/0 to Umezawa's Jitte so it is completely
 scripted.

---
 res/cardsfolder/umezawas_jitte.txt   |  1 +
 src/forge/CardFactory_Equipment.java | 69 ----------------------------
 2 files changed, 1 insertion(+), 69 deletions(-)

diff --git a/res/cardsfolder/umezawas_jitte.txt b/res/cardsfolder/umezawas_jitte.txt
index bc3c0729e68..88ce4a1a9e2 100644
--- a/res/cardsfolder/umezawas_jitte.txt
+++ b/res/cardsfolder/umezawas_jitte.txt
@@ -2,6 +2,7 @@ Name:Umezawa's Jitte
 ManaCost:2
 Types:Legendary Artifact Equipment
 Text:no text
+K:eqPump 2:0/0
 T:Mode$ DamageDone | ValidSource$ Creature.AttachedBy | ValidTarget$ Creature,Player,Planeswalker | CombatDamage$ True | Execute$ TrigPutCounter | TriggerZones$ Battlefield | TriggerDescription$ Whenever equipped creature deals combat damage, put two charge counters on CARDNAME.
 A:AB$Pump | Cost$ SubCounter<1/CHARGE> | Defined$ Equipped | NumAtt$ +2 | NumDef$ +2 | SpellDescription$ Equipped creature gets +2/+2 until end of turn.
 A:AB$Pump | Cost$ SubCounter<1/CHARGE> | ValidTgts$ Creature | TgtPrompt$ Select target creature | NumAtt$ -1 | NumDef$ -1 | IsCurse$ True | SpellDescription$ Target creature gets -1/-1 until end of turn.
diff --git a/src/forge/CardFactory_Equipment.java b/src/forge/CardFactory_Equipment.java
index abd98dbfaab..9b8983a3b12 100644
--- a/src/forge/CardFactory_Equipment.java
+++ b/src/forge/CardFactory_Equipment.java
@@ -121,75 +121,6 @@ class CardFactory_Equipment {
             
             card.addEquipCommand(onEquip);
             card.addUnEquipCommand(onUnEquip);
-        } //*************** END ************ END **************************  
-        
-        
-        //*************** START *********** START **************************
-        else if (cardName.equals("Umezawa's Jitte")) {
-            final Ability equip = new Ability(card, "2") {
-            	
-                @Override
-                public void resolve() {
-                    if (AllZone.GameAction.isCardInPlay(getTargetCard())
-                            && CardFactoryUtil.canTarget(card, getTargetCard())) {
-                    	
-                        if (card.isEquipping()) {
-                            Card crd = card.getEquipping().get(0);
-                            if (crd.equals(getTargetCard())) return;
-                            
-                            card.unEquipCard(crd);
-                        }
-                        card.equipCard(getTargetCard());
-                    }
-                }
-                
-                @Override
-                public boolean canPlay() {
-                    return AllZone.getZone(card).is(Constant.Zone.Battlefield)
-                            && Phase.canCastSorcery(getSourceCard().getController())
-                            && super.canPlay();
-                }
-                
-                @Override
-                public boolean canPlayAI() {
-                    return getCreature().size() != 0 
-                    		&& !card.isEquipping()
-                    		&& super.canPlayAI();
-                }
-                
-                @Override
-                public void chooseTargetAI() {
-                    Card target = CardFactoryUtil.AI_getBestCreature(getCreature());
-                    setTargetCard(target);
-                }
-                
-                CardList getCreature() {
-                    CardList list = new CardList(AllZone.Computer_Battlefield.getCards());
-                    list = list.filter(new CardListFilter() {
-                        public boolean addCard(Card c) {
-                            return c.isCreature() 
-                            		&& CardFactoryUtil.AI_doesCreatureAttack(c)
-                                    && CardFactoryUtil.canTarget(card, c)
-                                    && (!c.getKeyword().contains("Defender"));
-                        }
-                    });
-                    
-                    // Is there at least 1 Loxodon Punisher and/or Goblin Gaveleer to target
-                    CardList equipMagnetList = list;
-                    equipMagnetList = equipMagnetList.getEquipMagnets();
-                    
-                    if (equipMagnetList.size() != 0) {
-                        return equipMagnetList;
-                    }
-                    
-                    return list;
-                }//getCreature()
-            };//equip ability
-
-            equip.setBeforePayMana(CardFactoryUtil.input_equipCreature(equip));
-            equip.setDescription("Equip: 2");
-            card.addSpellAbility(equip);
-            
         } //*************** END ************ END **************************