From eb1012e730427a424badb34de0e24ef0bf4f6c6c Mon Sep 17 00:00:00 2001
From: moomarc <moomarc@cardforge.org>
Date: Fri, 13 Apr 2012 10:06:41 +0000
Subject: [PATCH] Removed my initial work on remembered integer values in favor
 of Sol's StoreSVar AF.

---
 src/main/java/forge/Card.java                 | 33 -------------------
 .../card/abilityfactory/AbilityFactory.java   | 10 +-----
 .../abilityfactory/AbilityFactoryCleanup.java |  3 --
 .../card/cardfactory/CardFactoryUtil.java     |  7 ----
 4 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/src/main/java/forge/Card.java b/src/main/java/forge/Card.java
index 26dbe483d81..6bd506cd905 100644
--- a/src/main/java/forge/Card.java
+++ b/src/main/java/forge/Card.java
@@ -110,7 +110,6 @@ public class Card extends GameEntity implements Comparable<Card> {
     private ArrayList<CardKeywords> changedCardKeywords = new ArrayList<CardKeywords>();
 
     private final ArrayList<Object> rememberedObjects = new ArrayList<Object>();
-    private final ArrayList<Integer> rememberedIntegers = new ArrayList<Integer>();
     private final ArrayList<Card> imprintedCards = new ArrayList<Card>();
     private Card championedCard = null;
     private final CardList devouredCards = new CardList();
@@ -577,38 +576,6 @@ public class Card extends GameEntity implements Comparable<Card> {
         this.rememberedObjects.clear();
     }
 
-    /**
-     * <p>
-     * addRememberedInteger.
-     * </p>
-     * 
-     * @param i
-     *            a {@link java.lang.Integer} integer.
-     */
-    public final void addRememberedInteger(final Integer i) {
-        this.rememberedIntegers.add(i);
-    }
-
-    /**
-     * <p>
-     * getRememberedInteger.
-     * </p>
-     * 
-     * @return a {@link java.util.ArrayList} integer.
-     */
-    public final ArrayList<Integer> getRememberedInteger() {
-        return this.rememberedIntegers;
-    }
-
-    /**
-     * <p>
-     * clearRememberedInteger.
-     * </p>
-     */
-    public final void clearRememberedInteger() {
-        this.rememberedIntegers.clear();
-    }
-
     /**
      * <p>
      * addImprinted.
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactory.java b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
index c933c2bd4c3..70e18fb1907 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactory.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactory.java
@@ -1206,7 +1206,7 @@ public class AbilityFactory {
                 spellAbility = AbilityFactoryStoreSVar.createDrawbackStoreSVar(this);
             }
         }
-        
+
         else if (this.api.equals("Tap")) {
             if (this.isAb) {
                 spellAbility = AbilityFactoryPermanentState.createAbilityTap(this);
@@ -2479,14 +2479,6 @@ public class AbilityFactory {
                 host.addRemembered(o);
             }
         }
-
-        // Remember current integer values (for cards like Tree of Redemption)
-        // TODO - It would be better to expand this to the form "RememberValue$ Toughness"
-        // to make it neater to expand for other values.
-        if (params.containsKey("RememberToughness")) {
-            final Integer remToughness = host.getNetDefense();
-            host.addRememberedInteger(remToughness);
-        }
     }
 
     /**
diff --git a/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java b/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java
index 45bf140121f..6fbb4072007 100644
--- a/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java
+++ b/src/main/java/forge/card/abilityfactory/AbilityFactoryCleanup.java
@@ -105,9 +105,6 @@ public final class AbilityFactoryCleanup {
         if (params.containsKey("ClearTriggered")) {
             AllZone.getTriggerHandler().clearDelayedTrigger(source);
         }
-        if (params.containsKey("ClearValueRemembered")) {
-            source.clearRememberedInteger();
-        }
     }
 
 } // end class AbilityFactory_Cleanup
diff --git a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
index ffcd0d17165..61f47efa981 100644
--- a/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
+++ b/src/main/java/forge/card/cardfactory/CardFactoryUtil.java
@@ -2692,13 +2692,6 @@ public class CardFactoryUtil {
             final String number = l[0].replace("Number$", "");
             if (number.equals("ChosenNumber")) {
                 return CardFactoryUtil.doXMath(c.getChosenNumber(), m, c);
-            }
-            if (number.equals("RememberedValue")) {
-                for (final Integer i : c.getRememberedInteger()) {
-                    if (i instanceof Integer) {
-                        return CardFactoryUtil.doXMath(Integer.valueOf(i), m, c);
-                    }
-                }
             } else {
                 return CardFactoryUtil.doXMath(Integer.parseInt(number), m, c);
             }