mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 10:48:00 +00:00
Removed my initial work on remembered integer values in favor of Sol's StoreSVar AF.
This commit is contained in:
@@ -110,7 +110,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
private ArrayList<CardKeywords> changedCardKeywords = new ArrayList<CardKeywords>();
|
private ArrayList<CardKeywords> changedCardKeywords = new ArrayList<CardKeywords>();
|
||||||
|
|
||||||
private final ArrayList<Object> rememberedObjects = new ArrayList<Object>();
|
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 final ArrayList<Card> imprintedCards = new ArrayList<Card>();
|
||||||
private Card championedCard = null;
|
private Card championedCard = null;
|
||||||
private final CardList devouredCards = new CardList();
|
private final CardList devouredCards = new CardList();
|
||||||
@@ -577,38 +576,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
this.rememberedObjects.clear();
|
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>
|
* <p>
|
||||||
* addImprinted.
|
* addImprinted.
|
||||||
|
|||||||
@@ -2479,14 +2479,6 @@ public class AbilityFactory {
|
|||||||
host.addRemembered(o);
|
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);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -105,9 +105,6 @@ public final class AbilityFactoryCleanup {
|
|||||||
if (params.containsKey("ClearTriggered")) {
|
if (params.containsKey("ClearTriggered")) {
|
||||||
AllZone.getTriggerHandler().clearDelayedTrigger(source);
|
AllZone.getTriggerHandler().clearDelayedTrigger(source);
|
||||||
}
|
}
|
||||||
if (params.containsKey("ClearValueRemembered")) {
|
|
||||||
source.clearRememberedInteger();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} // end class AbilityFactory_Cleanup
|
} // end class AbilityFactory_Cleanup
|
||||||
|
|||||||
@@ -2692,13 +2692,6 @@ public class CardFactoryUtil {
|
|||||||
final String number = l[0].replace("Number$", "");
|
final String number = l[0].replace("Number$", "");
|
||||||
if (number.equals("ChosenNumber")) {
|
if (number.equals("ChosenNumber")) {
|
||||||
return CardFactoryUtil.doXMath(c.getChosenNumber(), m, c);
|
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 {
|
} else {
|
||||||
return CardFactoryUtil.doXMath(Integer.parseInt(number), m, c);
|
return CardFactoryUtil.doXMath(Integer.parseInt(number), m, c);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user