mirror of
https://github.com/Card-Forge/forge.git
synced 2025-11-16 18:58:00 +00:00
- removed some unused functions from the card class.
This commit is contained in:
@@ -72,8 +72,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
private static int nextUniqueNumber = 1;
|
private static int nextUniqueNumber = 1;
|
||||||
private int uniqueNumber;
|
private int uniqueNumber;
|
||||||
|
|
||||||
private long value;
|
|
||||||
|
|
||||||
private final Map<CardCharactersticName, CardCharacteristics> characteristicsMap
|
private final Map<CardCharactersticName, CardCharacteristics> characteristicsMap
|
||||||
= new EnumMap<CardCharactersticName, CardCharacteristics>(CardCharactersticName.class);
|
= new EnumMap<CardCharactersticName, CardCharacteristics>(CardCharactersticName.class);
|
||||||
private CardCharactersticName curCharacteristics = CardCharactersticName.Original;
|
private CardCharactersticName curCharacteristics = CardCharactersticName.Original;
|
||||||
@@ -5336,21 +5334,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* addNonStackingIntrinsicKeyword.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @param s
|
|
||||||
* a {@link java.lang.String} object.
|
|
||||||
*/
|
|
||||||
public final void addNonStackingIntrinsicKeyword(final String s) {
|
|
||||||
if (!this.getIntrinsicKeyword().contains(s) && (s.trim().length() != 0)) {
|
|
||||||
this.getCharacteristics().getIntrinsicKeyword()
|
|
||||||
.add((this.getName().trim().length() == 0 ? s : s.replaceAll(this.getName(), "CARDNAME")));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* removeIntrinsicKeyword.
|
* removeIntrinsicKeyword.
|
||||||
@@ -5407,22 +5390,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* addStackingExtrinsicKeyword.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @param s
|
|
||||||
* a {@link java.lang.String} object.
|
|
||||||
*/
|
|
||||||
public final void addStackingExtrinsicKeyword(final String s) {
|
|
||||||
if (s.startsWith("HIDDEN")) {
|
|
||||||
this.addHiddenExtrinsicKeyword(s);
|
|
||||||
} else {
|
|
||||||
this.extrinsicKeyword.add(s);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* <p>
|
* <p>
|
||||||
* removeExtrinsicKeyword.
|
* removeExtrinsicKeyword.
|
||||||
@@ -5620,8 +5587,7 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
* @return a boolean.
|
* @return a boolean.
|
||||||
*/
|
*/
|
||||||
public final boolean isSpell() {
|
public final boolean isSpell() {
|
||||||
return (this.isInstant() || this.isSorcery() || (this.isAura() && !AllZoneUtil.getCardsIn(ZoneType.Battlefield)
|
return (this.isInstant() || this.isSorcery() || (this.isAura() && !this.isInZone((ZoneType.Battlefield))));
|
||||||
.contains(this)));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -5826,29 +5792,6 @@ public class Card extends GameEntity implements Comparable<Card> {
|
|||||||
return this.uniqueNumber;
|
return this.uniqueNumber;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* Setter for the field <code>value</code>.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @param n
|
|
||||||
* a long.
|
|
||||||
*/
|
|
||||||
public final void setValue(final long n) {
|
|
||||||
this.value = n;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* <p>
|
|
||||||
* Getter for the field <code>value</code>.
|
|
||||||
* </p>
|
|
||||||
*
|
|
||||||
* @return a long.
|
|
||||||
*/
|
|
||||||
public final long getValue() {
|
|
||||||
return this.value;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** {@inheritDoc} */
|
/** {@inheritDoc} */
|
||||||
@Override
|
@Override
|
||||||
public final int compareTo(final Card that) {
|
public final int compareTo(final Card that) {
|
||||||
|
|||||||
Reference in New Issue
Block a user