mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 10:48:00 +00:00
- Removed two unnecessary variables in the card class.
This commit is contained in:
@@ -114,7 +114,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
|
|
||||||
// if this card is an Aura, what Entity is it enchanting?
|
// if this card is an Aura, what Entity is it enchanting?
|
||||||
private GameEntity enchanting = null;
|
private GameEntity enchanting = null;
|
||||||
private ArrayList<String> choicesMade = null;
|
|
||||||
private ArrayList<String> optionalAdditionalCostsPaid = null;
|
private ArrayList<String> optionalAdditionalCostsPaid = null;
|
||||||
|
|
||||||
// changes by AF animate and continuous static effects
|
// changes by AF animate and continuous static effects
|
||||||
@@ -152,7 +151,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
|
|
||||||
private boolean levelUp = false;
|
private boolean levelUp = false;
|
||||||
|
|
||||||
private boolean unearth = false;
|
|
||||||
private boolean unearthed;
|
private boolean unearthed;
|
||||||
|
|
||||||
private boolean suspendCast = false;
|
private boolean suspendCast = false;
|
||||||
@@ -3029,42 +3027,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
return this.copiedSpell;
|
return this.copiedSpell;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* setSpellChoice.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @param strings
|
|
||||||
* a ArrayList<String> object.
|
|
||||||
*/
|
|
||||||
public final void setSpellChoice(final ArrayList<String> strings) {
|
|
||||||
this.choicesMade = strings;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* getChoices.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @return a {@link java.util.ArrayList} object.
|
|
||||||
*/
|
|
||||||
public final ArrayList<String> getChoices() {
|
|
||||||
return this.choicesMade;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* getChoice.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @param i
|
|
||||||
* a int.
|
|
||||||
* @return a {@link java.lang.String} object.
|
|
||||||
*/
|
|
||||||
public final String getChoice(final int i) {
|
|
||||||
return this.choicesMade.get(i);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* setSpellWithChoices.
|
* setSpellWithChoices.
|
||||||
@@ -5546,29 +5508,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
return this.getName() + " (" + this.getUniqueNumber() + ")";
|
return this.getName() + " (" + this.getUniqueNumber() + ")";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* hasUnearth.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @return a boolean.
|
|
||||||
*/
|
|
||||||
public final boolean hasUnearth() {
|
|
||||||
return this.unearth;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* Setter for the field <code>unearth</code>.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @param b
|
|
||||||
* a boolean.
|
|
||||||
*/
|
|
||||||
public final void setUnearth(final boolean b) {
|
|
||||||
this.unearth = b;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* isUnearthed.
|
* isUnearthed.
|
||||||
|
|||||||
@@ -916,10 +916,6 @@ public class CardFactoryUtil {
|
|||||||
cl = Iterables.filter(cl, new Predicate<Card>() {
|
cl = Iterables.filter(cl, new Predicate<Card>() {
|
||||||
@Override
|
@Override
|
||||||
public boolean apply(final Card c) {
|
public boolean apply(final Card c) {
|
||||||
if (zone.is(ZoneType.Graveyard) && c.hasUnearth()) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (c.hasKeyword("You may look at this card.")) {
|
if (c.hasKeyword("You may look at this card.")) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
@@ -3575,7 +3571,6 @@ public class CardFactoryUtil {
|
|||||||
final String manacost = k[1];
|
final String manacost = k[1];
|
||||||
|
|
||||||
card.addSpellAbility(CardFactoryUtil.abilityUnearth(card, manacost));
|
card.addSpellAbility(CardFactoryUtil.abilityUnearth(card, manacost));
|
||||||
card.setUnearth(true);
|
|
||||||
}
|
}
|
||||||
} // unearth
|
} // unearth
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user