external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-20 12:48:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

*Spellcheck ;P CardCharactersticName -> CardCharacter/i/sticName.

Browse Source 
*Moved curSetCode to CardCharacteristic. Fixes clone Set crash.
This commit is contained in:
Hellfish
2012-08-21 19:12:15 +00:00
parent aa4fb71039
commit 4d865f765d
18 changed files with 166 additions and 153 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@@ -11836,7 +11836,7 @@ src/main/config/support/template.applescript -text
src/main/java/forge/AllZone.java svneol=native#text/plain
src/main/java/forge/AllZoneUtil.java svneol=native#text/plain
src/main/java/forge/Card.java svneol=native#text/plain
src/main/java/forge/CardCharactersticName.java -text
src/main/java/forge/CardCharacteristicName.java -text
src/main/java/forge/CardColor.java svneol=native#text/plain
src/main/java/forge/CardDamageHistory.java -text
src/main/java/forge/CardKeywords.java svneol=native#text/plain

96
src/main/java/forge/Card.java
View File

@@ -72,15 +72,15 @@ public class Card extends GameEntity implements Comparable<Card> {
private static int nextUniqueNumber = 1;
private int uniqueNumber;
private final Map<CardCharactersticName, CardCharacteristics> characteristicsMap
= new EnumMap<CardCharactersticName, CardCharacteristics>(CardCharactersticName.class);
private CardCharactersticName curCharacteristics = CardCharactersticName.Original;
private CardCharactersticName preTFDCharacteristic = CardCharactersticName.Original;
private final Map<CardCharacteristicName, CardCharacteristics> characteristicsMap
= new EnumMap<CardCharacteristicName, CardCharacteristics>(CardCharacteristicName.class);
private CardCharacteristicName curCharacteristics = CardCharacteristicName.Original;
private CardCharacteristicName preTFDCharacteristic = CardCharacteristicName.Original;
private boolean isDoubleFaced = false;
private boolean isFlipCard = false;
private boolean isFlipped = false;
private CardCharactersticName otherTransformable = null;
private CardCharacteristicName otherTransformable = null;
private ZoneType castFrom = null;
@@ -230,8 +230,8 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public Card() {
refreshUniqueNumber();
this.characteristicsMap.put(CardCharactersticName.Original, new CardCharacteristics());
this.characteristicsMap.put(CardCharactersticName.FaceDown, CardUtil.getFaceDownCharacteristic());
this.characteristicsMap.put(CardCharacteristicName.Original, new CardCharacteristics());
this.characteristicsMap.put(CardCharacteristicName.FaceDown, CardUtil.getFaceDownCharacteristic());
}
/**
@@ -248,16 +248,16 @@ public class Card extends GameEntity implements Comparable<Card> {
* the state
* @return true, if successful
*/
public boolean changeToState(final CardCharactersticName state) {
public boolean changeToState(final CardCharacteristicName state) {
CardCharactersticName cur = this.curCharacteristics;
CardCharacteristicName cur = this.curCharacteristics;
if (!setState(state)) {
return false;
}
if ((cur == CardCharactersticName.Original && state == CardCharactersticName.Transformed)
|| (cur == CardCharactersticName.Transformed && state == CardCharactersticName.Original)) {
if ((cur == CardCharacteristicName.Original && state == CardCharacteristicName.Transformed)
|| (cur == CardCharacteristicName.Transformed && state == CardCharacteristicName.Original)) {
HashMap<String, Object> runParams = new HashMap<String, Object>();
runParams.put("Transformer", this);
AllZone.getTriggerHandler().runTrigger(TriggerType.Transformed, runParams);
@@ -273,8 +273,8 @@ public class Card extends GameEntity implements Comparable<Card> {
* the state
* @return true, if successful
*/
public boolean setState(final CardCharactersticName state) {
if (state == CardCharactersticName.FaceDown && this.isDoubleFaced) {
public boolean setState(final CardCharacteristicName state) {
if (state == CardCharacteristicName.FaceDown && this.isDoubleFaced) {
return false; // Doublefaced cards can't be turned face-down.
}
@@ -297,7 +297,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*
* @return the states
*/
public Set<CardCharactersticName> getStates() {
public Set<CardCharacteristicName> getStates() {
return this.characteristicsMap.keySet();
}
@@ -306,7 +306,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*
* @return the cur state
*/
public CardCharactersticName getCurState() {
public CardCharacteristicName getCurState() {
return this.curCharacteristics;
}
@@ -318,7 +318,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param to
* the to
*/
public void switchStates(final CardCharactersticName from, final CardCharactersticName to) {
public void switchStates(final CardCharacteristicName from, final CardCharacteristicName to) {
final CardCharacteristics tmp = this.characteristicsMap.get(from);
this.characteristicsMap.put(from, this.characteristicsMap.get(to));
this.characteristicsMap.put(to, tmp);
@@ -330,7 +330,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param state
* the state
*/
public void clearStates(final CardCharactersticName state) {
public void clearStates(final CardCharacteristicName state) {
this.characteristicsMap.remove(state);
}
@@ -342,7 +342,7 @@ public class Card extends GameEntity implements Comparable<Card> {
public boolean turnFaceDown() {
if (!this.isDoubleFaced) {
this.preTFDCharacteristic = this.curCharacteristics;
return this.setState(CardCharactersticName.FaceDown);
return this.setState(CardCharacteristicName.FaceDown);
}
return false;
@@ -354,7 +354,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return true, if successful
*/
public boolean turnFaceUp() {
if (this.curCharacteristics == CardCharactersticName.FaceDown) {
if (this.curCharacteristics == CardCharacteristicName.FaceDown) {
return this.setState(this.preTFDCharacteristic);
}
@@ -367,8 +367,8 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return true, if is cloned
*/
public boolean isCloned() {
for (final CardCharactersticName state : this.characteristicsMap.keySet()) {
if (state == CardCharactersticName.Cloner) {
for (final CardCharacteristicName state : this.characteristicsMap.keySet()) {
if (state == CardCharacteristicName.Cloner) {
return true;
}
}
@@ -382,7 +382,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* the state
* @return the state
*/
public CardCharacteristics getState(final CardCharactersticName state) {
public CardCharacteristics getState(final CardCharacteristicName state) {
return this.characteristicsMap.get(state);
}
@@ -401,7 +401,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param state
* the state
*/
public final void addAlternateState(final CardCharactersticName state) {
public final void addAlternateState(final CardCharacteristicName state) {
this.characteristicsMap.put(state, new CardCharacteristics());
}
@@ -432,8 +432,8 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return boolean
*/
public final boolean isInAlternateState() {
return this.curCharacteristics != CardCharactersticName.Original
&& this.curCharacteristics != CardCharactersticName.Cloned;
return this.curCharacteristics != CardCharacteristicName.Original
&& this.curCharacteristics != CardCharacteristicName.Cloned;
}
/**
@@ -509,7 +509,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*
* @return a boolean
*/
public final CardCharactersticName isTransformable() {
public final CardCharacteristicName isTransformable() {
return this.otherTransformable;
}
@@ -520,7 +520,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @param otherTransformable0
* a String
*/
public final void setTransformable(final CardCharactersticName otherTransformable0) {
public final void setTransformable(final CardCharacteristicName otherTransformable0) {
this.otherTransformable = otherTransformable0;
}
@@ -705,11 +705,11 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link forge.card.trigger.Trigger} object.
*
* @param state
* a {@link forge.CardCharactersticName} object.
* a {@link forge.CardCharacteristicName} object.
*
* @return a {@link forge.card.trigger.Trigger} object.
*/
public final Trigger addTrigger(final Trigger t, final CardCharactersticName state) {
public final Trigger addTrigger(final Trigger t, final CardCharacteristicName state) {
final Trigger newtrig = t.getCopy();
newtrig.setHostCard(this);
CardCharacteristics stateCharacteristics = this.getState(state);
@@ -752,9 +752,9 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link forge.card.trigger.Trigger} object.
*
* @param state
* a {@link forge.CardCharactersticName} object.
* a {@link forge.CardCharacteristicName} object.
*/
public final void removeTrigger(final Trigger t, final CardCharactersticName state) {
public final void removeTrigger(final Trigger t, final CardCharacteristicName state) {
CardCharacteristics stateCharacteristics = this.getState(state);
stateCharacteristics.getTriggers().remove(t);
}
@@ -2142,8 +2142,8 @@ public class Card extends GameEntity implements Comparable<Card> {
sb.append("\r\n");
}
if (this.characteristicsMap.get(CardCharactersticName.Cloner) != null) {
sb.append("\r\nCloned by: ").append(this.characteristicsMap.get(CardCharactersticName.Cloner).getName()).append(" (")
if (this.characteristicsMap.get(CardCharacteristicName.Cloner) != null) {
sb.append("\r\nCloned by: ").append(this.characteristicsMap.get(CardCharacteristicName.Cloner).getName()).append(" (")
.append(this.getUniqueNumber()).append(")");
}
@@ -2826,9 +2826,9 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link forge.card.spellability.SpellAbility} object.
*
* @param state
* a {@link forge.CardCharactersticName} object.
* a {@link forge.CardCharacteristicName} object.
*/
public final void addSpellAbility(final SpellAbility a, final CardCharactersticName state) {
public final void addSpellAbility(final SpellAbility a, final CardCharacteristicName state) {
a.setSourceCard(this);
CardCharacteristics stateCharacteristics = this.getState(state);
if (a instanceof AbilityMana) {
@@ -2865,9 +2865,9 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link forge.card.spellability.SpellAbility} object.
*
* @param state
* a {@link forge.CardCharactersticName} object.
* a {@link forge.CardCharacteristicName} object.
*/
public final void removeSpellAbility(final SpellAbility a, final CardCharactersticName state) {
public final void removeSpellAbility(final SpellAbility a, final CardCharacteristicName state) {
CardCharacteristics stateCharacteristics = this.getState(state);
if (a instanceof AbilityMana) {
// if (a.isExtrinsic()) //never remove intrinsic mana abilities, is
@@ -2962,7 +2962,7 @@ public class Card extends GameEntity implements Comparable<Card> {
public final ArrayList<SpellAbility> getAllSpellAbilities() {
final ArrayList<SpellAbility> res = new ArrayList<SpellAbility>();
for (final CardCharactersticName key : this.characteristicsMap.keySet()) {
for (final CardCharacteristicName key : this.characteristicsMap.keySet()) {
res.addAll(this.getState(key).getSpellAbility());
res.addAll(this.getState(key).getManaAbility());
}
@@ -3275,7 +3275,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return a boolean.
*/
public final boolean isFaceDown() {
return this.curCharacteristics == CardCharactersticName.FaceDown;
return this.curCharacteristics == CardCharacteristicName.FaceDown;
}
/**
@@ -5551,11 +5551,11 @@ public class Card extends GameEntity implements Comparable<Card> {
* the s
*
* @param state
* a {@link forge.CardCharactersticName} object.
* a {@link forge.CardCharacteristicName} object.
*
* @return a {@link forge.card.staticability.StaticAbility} object.
*/
public final StaticAbility addStaticAbility(final String s, final CardCharactersticName state) {
public final StaticAbility addStaticAbility(final String s, final CardCharacteristicName state) {
if (s.trim().length() != 0) {
final StaticAbility stAb = new StaticAbility(s, this);
@@ -8257,8 +8257,6 @@ public class Card extends GameEntity implements Comparable<Card> {
return true;
}
private String curSetCode = "";
/**
* <p>
* addSet.
@@ -8303,7 +8301,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* a {@link java.lang.String} object.
*/
public final void setCurSetCode(final String setCode) {
this.curSetCode = setCode;
this.getCharacteristics().setCurSetCode(setCode);
}
/**
@@ -8314,7 +8312,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return a {@link java.lang.String} object.
*/
public final String getCurSetCode() {
return this.curSetCode;
return this.getCharacteristics().getCurSetCode();
}
/**
@@ -8331,7 +8329,7 @@ public class Card extends GameEntity implements Comparable<Card> {
final EditionInfo si = this.getCharacteristics().getSets()
.get(r.nextInt(this.getCharacteristics().getSets().size()));
this.curSetCode = si.getCode();
this.getCharacteristics().setCurSetCode(si.getCode());
}
/**
@@ -8355,7 +8353,7 @@ public class Card extends GameEntity implements Comparable<Card> {
* @return a {@link java.lang.String} object.
*/
public final String getCurSetImage() {
return this.getSetImageName(this.curSetCode);
return this.getSetImageName(this.getCharacteristics().getCurSetCode());
}
/**
@@ -8367,7 +8365,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public final String getCurSetRarity() {
for (int i = 0; i < this.getCharacteristics().getSets().size(); i++) {
if (this.getCharacteristics().getSets().get(i).getCode().equals(this.curSetCode)) {
if (this.getCharacteristics().getSets().get(i).getCode().equals(getCharacteristics().getCurSetCode())) {
return this.getCharacteristics().getSets().get(i).getRarity();
}
}
@@ -8384,7 +8382,7 @@ public class Card extends GameEntity implements Comparable<Card> {
*/
public final String getCurSetURL() {
for (int i = 0; i < this.getCharacteristics().getSets().size(); i++) {
if (this.getCharacteristics().getSets().get(i).getCode().equals(this.curSetCode)) {
if (this.getCharacteristics().getSets().get(i).getCode().equals(this.getCharacteristics().getCurSetCode())) {
return this.getCharacteristics().getSets().get(i).getUrl();
}
}

10
src/main/java/forge/CardCharactersticName.java → src/main/java/forge/CardCharacteristicName.java
View File

@@ -4,7 +4,7 @@ package forge;
* TODO: Write javadoc for this type.
*
*/
public enum CardCharactersticName {
public enum CardCharacteristicName {
Original,
FaceDown,
Flipped,
@@ -18,7 +18,7 @@ public enum CardCharactersticName {
* @param substring
* @return
*/
public static CardCharactersticName smartValueOf(String value) {
public static CardCharacteristicName smartValueOf(String value) {
if (value == null) {
return null;
}
@@ -26,16 +26,16 @@ public enum CardCharactersticName {
return null;
}
final String valToCompate = value.trim();
for (final CardCharactersticName v : CardCharactersticName.values()) {
for (final CardCharacteristicName v : CardCharacteristicName.values()) {
if (v.name().compareToIgnoreCase(valToCompate) == 0) {
return v;
}
}
if ("Flip".equalsIgnoreCase(value)) {
return CardCharactersticName.Flipped;
return CardCharacteristicName.Flipped;
}
if ("DoubleFaced".equalsIgnoreCase(value)) {
return CardCharactersticName.Transformed;
return CardCharacteristicName.Transformed;
}
throw new IllegalArgumentException("No element named " + value + " in enum CardCharactersticName");

14
src/main/java/forge/CardReader.java
View File

@@ -336,7 +336,7 @@ public class CardReader {
} // while !End
if (card.isInAlternateState()) {
card.setState(CardCharactersticName.Original);
card.setState(CardCharacteristicName.Original);
}
return card;
@@ -348,11 +348,11 @@ public class CardReader {
switch(firstCh) { // this is a simple state machine to gain some performance
case 'A':
if (line.equals("ALTERNATE")) {
CardCharactersticName mode;
CardCharacteristicName mode;
if (card.isFlipCard()) {
mode = CardCharactersticName.Flipped;
mode = CardCharacteristicName.Flipped;
} else if (card.isDoubleFaced()) {
mode = CardCharactersticName.Transformed;
mode = CardCharacteristicName.Transformed;
} else {
mode = card.isTransformable();
}
@@ -362,10 +362,10 @@ public class CardReader {
card.addIntrinsicAbility(line.substring(2));
} else if (line.startsWith("AlternateMode")) {
//System.out.println(card.getName());
final CardCharactersticName value = CardCharactersticName.smartValueOf(line.substring("AlternateMode:".length()));
if (value == CardCharactersticName.Flipped) {
final CardCharacteristicName value = CardCharacteristicName.smartValueOf(line.substring("AlternateMode:".length()));
if (value == CardCharacteristicName.Flipped) {
card.setFlipCard(true);
} else if (value == CardCharactersticName.Transformed) {
} else if (value == CardCharacteristicName.Transformed) {
card.setDoubleFaced(true);
} else {
card.setTransformable(value);

4
src/main/java/forge/CardUtil.java
View File

@@ -909,9 +909,9 @@ public final class CardUtil {
if (c.isToken()) {
return c;
}
final CardCharactersticName state = c.getCurState();
final CardCharacteristicName state = c.getCurState();
if (c.isInAlternateState()) {
c.setState(CardCharactersticName.Original);
c.setState(CardCharacteristicName.Original);
}
final Card res = AllZone.getCardFactory().copyCard(c);
c.setState(state);

12
src/main/java/forge/GameAction.java
View File

@@ -149,11 +149,11 @@ public class GameAction {
lastKnownInfo = CardUtil.getLKICopy(c);
if (c.isCloned()) {
c.switchStates(CardCharactersticName.Cloner, CardCharactersticName.Original);
c.setState(CardCharactersticName.Original);
c.clearStates(CardCharactersticName.Cloner);
c.switchStates(CardCharacteristicName.Cloner, CardCharacteristicName.Original);
c.setState(CardCharacteristicName.Original);
c.clearStates(CardCharacteristicName.Cloner);
if (c.isFlipCard()) {
c.clearStates(CardCharactersticName.Flipped);
c.clearStates(CardCharacteristicName.Flipped);
}
}
// reset flip status when card leaves battlefield
@@ -231,7 +231,7 @@ public class GameAction {
if (zoneTo.is(ZoneType.Hand) || zoneTo.is(ZoneType.Library) || !c.getName().equals("Skullbriar, the Walking Grave")) {
copied.clearCounters();
}
copied.setState(CardCharactersticName.Original);
copied.setState(CardCharacteristicName.Original);
// Soulbond unpairing
if (c.isPaired()) {
c.getPairedWith().setPairedWith(null);
@@ -647,7 +647,7 @@ public class GameAction {
}
if (c.isInAlternateState()) {
c.setState(CardCharactersticName.Original);
c.setState(CardCharacteristicName.Original);
}
if ((libPosition == -1) || (libPosition > library.size())) {

16
src/main/java/forge/card/CardCharacteristics.java
View File

@@ -53,6 +53,7 @@ public class CardCharacteristics {
private String imageName = "";
private ArrayList<EditionInfo> sets = new ArrayList<EditionInfo>();
private Map<String, String> sVars = new TreeMap<String, String>();
private String curSetCode = "";
/**
* Gets the name.
@@ -485,6 +486,21 @@ public class CardCharacteristics {
this.sets = source.getSets();
// Map<String, String> sVars
this.sVars = new TreeMap<String, String>(source.getSVars());
// String curSetCode = "";
this.curSetCode = source.getCurSetCode();
}
/**
* @return the curSetCode
*/
public String getCurSetCode() {
return curSetCode;
}
/**
* @param curSetCode0 the curSetCode to set
*/
public void setCurSetCode(String curSetCode0) {
this.curSetCode = curSetCode0;
}
}

10
src/main/java/forge/card/abilityfactory/AbilityFactoryChangeZone.java
View File

@@ -25,7 +25,7 @@ import java.util.Random;
import forge.AllZone;
import forge.AllZoneUtil;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardList;
import forge.CardListFilter;
import forge.CardListUtil;
@@ -1014,7 +1014,7 @@ public final class AbilityFactoryChangeZone {
} else if (destination.equals(ZoneType.Exile)) {
movedCard = Singletons.getModel().getGameAction().exile(c);
if (params.containsKey("ExileFaceDown")) {
movedCard.setState(CardCharactersticName.FaceDown);
movedCard.setState(CardCharacteristicName.FaceDown);
}
} else {
movedCard = Singletons.getModel().getGameAction().moveTo(destination, c);
@@ -1260,7 +1260,7 @@ public final class AbilityFactoryChangeZone {
} else if (destination.equals(ZoneType.Exile)) {
newCard = Singletons.getModel().getGameAction().exile(c);
if (params.containsKey("ExileFaceDown")) {
newCard.setState(CardCharactersticName.FaceDown);
newCard.setState(CardCharacteristicName.FaceDown);
}
} else {
newCard = Singletons.getModel().getGameAction().moveTo(destination, c);
@@ -2226,7 +2226,7 @@ public final class AbilityFactoryChangeZone {
}
}
if (params.containsKey("ExileFaceDown")) {
movedCard.setState(CardCharactersticName.FaceDown);
movedCard.setState(CardCharacteristicName.FaceDown);
}
}
}
@@ -2877,7 +2877,7 @@ public final class AbilityFactoryChangeZone {
} else {
final Card movedCard = Singletons.getModel().getGameAction().moveTo(destination, c, libraryPos);
if (params.containsKey("ExileFaceDown")) {
movedCard.setState(CardCharactersticName.FaceDown);
movedCard.setState(CardCharacteristicName.FaceDown);
}
if (params.containsKey("Tapped")) {
movedCard.setTapped(true);

36
src/main/java/forge/card/abilityfactory/AbilityFactoryClone.java
View File

@@ -24,7 +24,7 @@ import java.util.Map;
import forge.AllZone;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardUtil;
import forge.GameActionUtil;
import forge.Singletons;
@@ -473,30 +473,30 @@ public final class AbilityFactoryClone {
if (!copyingSelf) {
if (tgtCard.isCloned()) { // cloning again
tgtCard.switchStates(CardCharactersticName.Cloner, CardCharactersticName.Original);
tgtCard.setState(CardCharactersticName.Original);
tgtCard.clearStates(CardCharactersticName.Cloner);
tgtCard.switchStates(CardCharacteristicName.Cloner, CardCharacteristicName.Original);
tgtCard.setState(CardCharacteristicName.Original);
tgtCard.clearStates(CardCharacteristicName.Cloner);
}
// add "Cloner" state to clone
tgtCard.addAlternateState(CardCharactersticName.Cloner);
tgtCard.switchStates(CardCharactersticName.Original, CardCharactersticName.Cloner);
tgtCard.setState(CardCharactersticName.Original);
tgtCard.addAlternateState(CardCharacteristicName.Cloner);
tgtCard.switchStates(CardCharacteristicName.Original, CardCharacteristicName.Cloner);
tgtCard.setState(CardCharacteristicName.Original);
}
else {
//copy Original state to Cloned
tgtCard.addAlternateState(CardCharactersticName.Cloned);
tgtCard.switchStates(CardCharactersticName.Original, CardCharactersticName.Cloned);
tgtCard.addAlternateState(CardCharacteristicName.Cloned);
tgtCard.switchStates(CardCharacteristicName.Original, CardCharacteristicName.Cloned);
if (tgtCard.isFlipCard()) {
tgtCard.setState(CardCharactersticName.Original);
tgtCard.setState(CardCharacteristicName.Original);
}
}
CardCharactersticName stateToCopy = null;
CardCharacteristicName stateToCopy = null;
if (copyingSelf) {
stateToCopy = CardCharactersticName.Cloned;
stateToCopy = CardCharacteristicName.Cloned;
}
else if (cardToCopy.isFlipCard()) {
stateToCopy = CardCharactersticName.Original;
stateToCopy = CardCharacteristicName.Original;
}
else {
stateToCopy = cardToCopy.getCurState();
@@ -517,10 +517,10 @@ public final class AbilityFactoryClone {
// state.
if (cardToCopy.isFlipCard()) {
if (!copyingSelf) {
tgtCard.addAlternateState(CardCharactersticName.Flipped);
tgtCard.setState(CardCharactersticName.Flipped);
tgtCard.addAlternateState(CardCharacteristicName.Flipped);
tgtCard.setState(CardCharacteristicName.Flipped);
}
CardFactoryUtil.copyState(cardToCopy, CardCharactersticName.Flipped, tgtCard);
CardFactoryUtil.copyState(cardToCopy, CardCharacteristicName.Flipped, tgtCard);
addExtraCharacteristics(tgtCard, params, origSVars);
CardFactoryUtil.addAbilityFactoryAbilities(tgtCard);
for (int i = 0; i < tgtCard.getStaticAbilityStrings().size(); i++) {
@@ -534,7 +534,7 @@ public final class AbilityFactoryClone {
tgtCard.setImageFilename(imageFileName);
if (!tgtCard.isFlipped()) {
tgtCard.setState(CardCharactersticName.Original);
tgtCard.setState(CardCharacteristicName.Original);
}
} else {
tgtCard.setFlipCard(false);
@@ -542,7 +542,7 @@ public final class AbilityFactoryClone {
//Clean up copy of cloned state
if (copyingSelf) {
tgtCard.clearStates(CardCharactersticName.Cloned);
tgtCard.clearStates(CardCharacteristicName.Cloned);
}
//Clear Remembered and Imprint lists

18
src/main/java/forge/card/abilityfactory/AbilityFactoryCopy.java
View File

@@ -26,7 +26,7 @@ import java.util.Random;
import forge.AllZone;
import forge.AllZoneUtil;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardList;
import forge.CardListFilter;
import forge.Command;
@@ -392,11 +392,11 @@ public final class AbilityFactoryCopy {
if ((tgt == null) || c.canBeTargetedBy(sa)) {
boolean wasInAlt = false;
CardCharactersticName stateName = CardCharactersticName.Original;
CardCharacteristicName stateName = CardCharacteristicName.Original;
if (c.isInAlternateState()) {
stateName = c.getCurState();
wasInAlt = true;
c.setState(CardCharactersticName.Original);
c.setState(CardCharacteristicName.Original);
}
// start copied Kiki code
@@ -445,22 +445,22 @@ public final class AbilityFactoryCopy {
if (c.isDoubleFaced()) { // Cloned DFC's can't transform
if (wasInAlt) {
copy.setState(CardCharactersticName.Transformed);
copy.setState(CardCharacteristicName.Transformed);
}
}
if (c.isFlipCard()) { // Cloned Flips CAN flip.
copy.setState(CardCharactersticName.Original);
c.setState(CardCharactersticName.Original);
copy.setState(CardCharacteristicName.Original);
c.setState(CardCharacteristicName.Original);
copy.setImageFilename(c.getImageFilename());
if (!c.isInAlternateState()) {
copy.setState(CardCharactersticName.Flipped);
copy.setState(CardCharacteristicName.Flipped);
}
c.setState(CardCharactersticName.Flipped);
c.setState(CardCharacteristicName.Flipped);
}
if (c.isFaceDown()) {
c.setState(CardCharactersticName.FaceDown);
c.setState(CardCharacteristicName.FaceDown);
}
copy = Singletons.getModel().getGameAction().moveToPlay(copy);

6
src/main/java/forge/card/abilityfactory/AbilityFactoryPlay.java
View File

@@ -25,7 +25,7 @@ import java.util.Random;
import forge.AllZone;
import forge.AllZoneUtil;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardList;
import forge.CardListFilter;
import forge.GameActionUtil;
@@ -420,7 +420,7 @@ public final class AbilityFactoryPlay {
}
}
if (tgtCard.isFaceDown()) {
tgtCard.setState(CardCharactersticName.Original);
tgtCard.setState(CardCharacteristicName.Original);
wasFaceDown = true;
}
final StringBuilder sb = new StringBuilder();
@@ -429,7 +429,7 @@ public final class AbilityFactoryPlay {
&& !GameActionUtil.showYesNoDialog(source, sb.toString())) {
// i--; // This causes an infinite loop (ArsenalNut)
if (wasFaceDown) {
tgtCard.setState(CardCharactersticName.FaceDown);
tgtCard.setState(CardCharacteristicName.FaceDown);
}
continue;
}

4
src/main/java/forge/card/abilityfactory/AbilityFactoryReveal.java
View File

@@ -28,7 +28,7 @@ import javax.swing.JOptionPane;
import forge.AllZone;
import forge.AllZoneUtil;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardList;
import forge.CardUtil;
import forge.GameActionUtil;
@@ -590,7 +590,7 @@ public final class AbilityFactoryReveal {
}
}
if (params.containsKey("ExileFaceDown")) {
c.setState(CardCharactersticName.FaceDown);
c.setState(CardCharacteristicName.FaceDown);
}
if (params.containsKey("Imprint")) {
host.addImprinted(c);

46
src/main/java/forge/card/abilityfactory/AbilityFactorySetState.java
View File

@@ -24,7 +24,7 @@ import java.util.Map;
import forge.AllZoneUtil;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardList;
import forge.card.spellability.AbilityActivated;
import forge.card.spellability.AbilitySub;
@@ -268,14 +268,14 @@ public class AbilityFactorySetState {
continue;
}
if (tgt.isDoubleFaced()) {
if (tgt.getCurState() == CardCharactersticName.Original) {
if (tgt.changeToState(CardCharactersticName.Transformed)) {
if (tgt.getCurState() == CardCharacteristicName.Original) {
if (tgt.changeToState(CardCharacteristicName.Transformed)) {
if (remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
}
} else if (tgt.getCurState() == CardCharactersticName.Transformed) {
if (tgt.changeToState(CardCharactersticName.Original)) {
} else if (tgt.getCurState() == CardCharacteristicName.Transformed) {
if (tgt.changeToState(CardCharacteristicName.Original)) {
if (remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
@@ -285,16 +285,16 @@ public class AbilityFactorySetState {
}
} else if (mode.equals("Flip")) {
if (tgt.isFlipCard()) {
if (tgt.getCurState() == CardCharactersticName.Original) {
if (tgt.changeToState(CardCharactersticName.Flipped)) {
if (tgt.getCurState() == CardCharacteristicName.Original) {
if (tgt.changeToState(CardCharacteristicName.Flipped)) {
abilityFactory.getHostCard().setFlipStaus(true);
if (remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
}
} else if (tgt.getCurState() == CardCharactersticName.Flipped) {
if (tgt.changeToState(CardCharactersticName.Original)) {
} else if (tgt.getCurState() == CardCharacteristicName.Flipped) {
if (tgt.changeToState(CardCharacteristicName.Original)) {
abilityFactory.getHostCard().setFlipStaus(false);
if (remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
@@ -303,18 +303,18 @@ public class AbilityFactorySetState {
}
}
} else if (mode.equals("TurnFace")) {
if (tgt.getCurState() == CardCharactersticName.Original) {
if (tgt.getCurState() == CardCharacteristicName.Original) {
if (tgt.turnFaceDown() && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
} else if (tgt.getCurState() == CardCharactersticName.FaceDown) {
} else if (tgt.getCurState() == CardCharacteristicName.FaceDown) {
if (tgt.turnFaceUp() && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
}
}
} else {
tgt.changeToState(CardCharactersticName.smartValueOf(abilityFactory.getMapParams().get("NewState")));
tgt.changeToState(CardCharacteristicName.smartValueOf(abilityFactory.getMapParams().get("NewState")));
}
}
@@ -490,12 +490,12 @@ public class AbilityFactorySetState {
continue;
}
if (list.get(i).isDoubleFaced()) {
if (list.get(i).getCurState() == CardCharactersticName.Original) {
if (list.get(i).changeToState(CardCharactersticName.Transformed) && remChanged) {
if (list.get(i).getCurState() == CardCharacteristicName.Original) {
if (list.get(i).changeToState(CardCharacteristicName.Transformed) && remChanged) {
abilityFactory.getHostCard().addRemembered(list.get(i));
}
} else if (list.get(i).getCurState() == CardCharactersticName.Transformed) {
if (list.get(i).changeToState(CardCharactersticName.Original)) {
} else if (list.get(i).getCurState() == CardCharacteristicName.Transformed) {
if (list.get(i).changeToState(CardCharacteristicName.Original)) {
if (remChanged) {
abilityFactory.getHostCard().addRemembered(list.get(i));
}
@@ -505,15 +505,15 @@ public class AbilityFactorySetState {
}
} else if (mode.equals("Flip")) {
if (list.get(i).isFlipCard()) {
if (list.get(i).getCurState() == CardCharactersticName.Original) {
if (list.get(i).changeToState(CardCharactersticName.Flipped)) {
if (list.get(i).getCurState() == CardCharacteristicName.Original) {
if (list.get(i).changeToState(CardCharacteristicName.Flipped)) {
list.get(i).setFlipStaus(true);
if (remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
}
} else if (list.get(i).getCurState() == CardCharactersticName.Flipped) {
if (list.get(i).changeToState(CardCharactersticName.Original)) {
} else if (list.get(i).getCurState() == CardCharacteristicName.Flipped) {
if (list.get(i).changeToState(CardCharacteristicName.Original)) {
list.get(i).setFlipStaus(false);
if (remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
@@ -522,18 +522,18 @@ public class AbilityFactorySetState {
}
}
} else if (mode.equals("TurnFace")) {
if (list.get(i).getCurState() == CardCharactersticName.Original) {
if (list.get(i).getCurState() == CardCharacteristicName.Original) {
if (list.get(i).turnFaceDown() && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
} else if (list.get(i).getCurState() == CardCharactersticName.FaceDown) {
} else if (list.get(i).getCurState() == CardCharacteristicName.FaceDown) {
if (list.get(i).turnFaceUp() && remChanged) {
abilityFactory.getHostCard().addRemembered(tgt);
}
}
}
} else {
list.get(i).changeToState(CardCharactersticName.smartValueOf(abilityFactory.getMapParams().get("NewState")));
list.get(i).changeToState(CardCharacteristicName.smartValueOf(abilityFactory.getMapParams().get("NewState")));
}
}

22
src/main/java/forge/card/cardfactory/CardFactory.java
View File

@@ -22,7 +22,7 @@ import java.util.ArrayList;
import java.util.List;
import forge.AllZone;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardReader;
import forge.CardUtil;
import forge.Singletons;
@@ -96,18 +96,18 @@ public class CardFactory implements CardFactoryInterface {
*/
@Override
public final Card copyCard(final Card in) {
final CardCharactersticName curState = in.getCurState();
final CardCharacteristicName curState = in.getCurState();
if (in.isInAlternateState()) {
in.setState(CardCharactersticName.Original);
in.setState(CardCharacteristicName.Original);
}
final Card out = this.getCard(CardDb.instance().getCard(in), in.getOwner());
out.setUniqueNumber(in.getUniqueNumber());
CardFactoryUtil.copyCharacteristics(in, out);
if (in.hasAlternateState()) {
for (final CardCharactersticName state : in.getStates()) {
for (final CardCharacteristicName state : in.getStates()) {
in.setState(state);
if (state == CardCharactersticName.Cloner) {
if (state == CardCharacteristicName.Cloner) {
out.addAlternateState(state);
}
out.setState(state);
@@ -221,13 +221,13 @@ public class CardFactory implements CardFactoryInterface {
if (c.hasAlternateState()) {
if (c.isFlipCard()) {
c.setState(CardCharactersticName.Flipped);
c.setState(CardCharacteristicName.Flipped);
}
if (c.isDoubleFaced()) {
c.setState(CardCharactersticName.Transformed);
c.setState(CardCharacteristicName.Transformed);
}
c.setImageFilename(CardUtil.buildFilename(c));
c.setState(CardCharactersticName.Original);
c.setState(CardCharacteristicName.Original);
}
}
// else throw "Unsupported card";
@@ -264,8 +264,8 @@ public class CardFactory implements CardFactoryInterface {
CardFactoryUtil.parseKeywords(card, cardName);
for (final CardCharactersticName state : card.getStates()) {
if (card.isDoubleFaced() && state == CardCharactersticName.FaceDown) {
for (final CardCharacteristicName state : card.getStates()) {
if (card.isDoubleFaced() && state == CardCharacteristicName.FaceDown) {
continue; // Ignore FaceDown for DFC since they have none.
}
card.setState(state);
@@ -278,7 +278,7 @@ public class CardFactory implements CardFactoryInterface {
}
}
card.setState(CardCharactersticName.Original);
card.setState(CardCharacteristicName.Original);
// ******************************************************************
// ************** Link to different CardFactories *******************

9
src/main/java/forge/card/cardfactory/CardFactoryUtil.java
View File

@@ -31,7 +31,7 @@ import com.esotericsoftware.minlog.Log;
import forge.AllZone;
import forge.AllZoneUtil;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardList;
import forge.CardListFilter;
import forge.CardListUtil;
@@ -3925,8 +3925,8 @@ public class CardFactoryUtil {
c.setDoubleFaced(sim.isDoubleFaced());
c.setCurSetCode(sim.getCurSetCode());
final CardCharactersticName origState = sim.getCurState();
for (final CardCharactersticName state : sim.getStates()) {
final CardCharacteristicName origState = sim.getCurState();
for (final CardCharacteristicName state : sim.getStates()) {
c.addAlternateState(state);
c.setState(state);
sim.setState(state);
@@ -3980,10 +3980,9 @@ public class CardFactoryUtil {
* @param to
* the to
*/
public static void copyState(final Card from, final CardCharactersticName stateToCopy, final Card to) {
public static void copyState(final Card from, final CardCharacteristicName stateToCopy, final Card to) {
// copy characteristics not associated with a state
to.setCurSetCode(from.getCurSetCode());
to.setBaseLoyalty(from.getBaseLoyalty());
to.setBaseAttackString(from.getBaseAttackString());
to.setBaseDefenseString(from.getBaseDefenseString());

4
src/main/java/forge/card/spellability/AbilityTriggered.java
View File

@@ -20,7 +20,7 @@ package forge.card.spellability;
import java.util.Arrays;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardList;
import forge.Command;
import forge.card.CardCharacteristics;
@@ -95,7 +95,7 @@ public class AbilityTriggered extends Ability implements Command {
this.restrictions = new String[] { "named " + sourceCard.getName() };
}
else {
CardCharacteristics origChar = sourceCard.getState(CardCharactersticName.Original);
CardCharacteristics origChar = sourceCard.getState(CardCharacteristicName.Original);
this.restrictions = new String[] { "named " + origChar.getName() };
}
}

4
src/main/java/forge/gui/GuiDisplayUtil.java
View File

@@ -35,7 +35,7 @@ import javax.swing.border.Border;
import forge.AllZone;
import forge.AllZoneUtil;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.CardList;
import forge.CardUtil;
import forge.Constant;
@@ -597,7 +597,7 @@ public final class GuiDisplayUtil {
} else if (info.equalsIgnoreCase("SummonSick:True")) {
c.setSickness(true);
} else if (info.equalsIgnoreCase("FaceDown:True")) {
c.setState(CardCharactersticName.FaceDown);
c.setState(CardCharacteristicName.FaceDown);
}
}

6
src/main/java/forge/gui/match/controllers/CPicture.java
View File

@@ -20,7 +20,7 @@ import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent;
import forge.Card;
import forge.CardCharactersticName;
import forge.CardCharacteristicName;
import forge.Command;
import forge.gui.framework.ICDoc;
import forge.gui.match.views.VPicture;
@@ -104,12 +104,12 @@ public enum CPicture implements ICDoc {
public void flipCard() {
if (flipped) {
flipped = false;
VPicture.SINGLETON_INSTANCE.getPnlPicture().getCard().setState(CardCharactersticName.Original);
VPicture.SINGLETON_INSTANCE.getPnlPicture().getCard().setState(CardCharacteristicName.Original);
CDetail.SINGLETON_INSTANCE.showCard(this.currentCard);
}
else {
flipped = true;
VPicture.SINGLETON_INSTANCE.getPnlPicture().getCard().setState(CardCharactersticName.Transformed);
VPicture.SINGLETON_INSTANCE.getPnlPicture().getCard().setState(CardCharacteristicName.Transformed);
CDetail.SINGLETON_INSTANCE.showCard(this.currentCard);
}
VPicture.SINGLETON_INSTANCE.getPnlPicture().setImage();