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

CardCloneStates: EmptyRoom should be affected by CloneStates

Browse Source
This commit is contained in:
Hans Mackowiak
2025-10-23 23:02:18 +02:00
parent 4063ac55e6
commit 0eb3062c64
4 changed files with 44 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
forge-game/src/main/java/forge/game/card/Card.java
View File

@@ -499,9 +499,6 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
if (state == CardStateName.FaceDown) { if (state == CardStateName.FaceDown) {
return getFaceDownState(); return getFaceDownState();
} }
if (state == CardStateName.EmptyRoom) {
return getEmptyRoomState();
}
CardCloneStates clStates = getLastClonedState(); CardCloneStates clStates = getLastClonedState();
if (clStates == null) { if (clStates == null) {
return getOriginalState(state); return getOriginalState(state);
@@ -560,7 +557,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars, ITr
boolean needsTransformAnimation = transform || rollback; boolean needsTransformAnimation = transform || rollback;
// faceDown has higher priority over clone states // faceDown has higher priority over clone states
// while text change states doesn't apply while the card is faceDown // while text change states doesn't apply while the card is faceDown
if (state != CardStateName.FaceDown && state != CardStateName.EmptyRoom) { if (state != CardStateName.FaceDown) {
CardCloneStates cloneStates = getLastClonedState(); CardCloneStates cloneStates = getLastClonedState();
if (cloneStates != null) { if (cloneStates != null) {
if (!cloneStates.containsKey(state)) { if (!cloneStates.containsKey(state)) {

4
forge-game/src/main/java/forge/game/card/CardCloneStates.java
View File

@@ -49,6 +49,10 @@ public class CardCloneStates extends ForwardingMap<CardStateName, CardState> {
return result; return result;
} }
public void add(CardState state) {
put(state.getStateName(), state);
}
public CardCloneStates copy(final Card host, final boolean lki) { public CardCloneStates copy(final Card host, final boolean lki) {
CardCloneStates result = new CardCloneStates(origin, ctb); CardCloneStates result = new CardCloneStates(origin, ctb);
for (Map.Entry<CardStateName, CardState> e : dataMap.entrySet()) { for (Map.Entry<CardStateName, CardState> e : dataMap.entrySet()) {

89
forge-game/src/main/java/forge/game/card/CardFactory.java
View File

@@ -477,6 +477,7 @@ public class CardFactory {
final CardCloneStates result = new CardCloneStates(in, cause); final CardCloneStates result = new CardCloneStates(in, cause);
final String newName = cause.getParam("NewName"); final String newName = cause.getParam("NewName");
ManaCost manaCost = null;
ColorSet colors = null; ColorSet colors = null;
if (cause.hasParam("AddTypes")) { if (cause.hasParam("AddTypes")) {
@@ -508,11 +509,10 @@ public class CardFactory {
colors = ColorSet.fromNames(cause.getParam("SetColor").split(",")); colors = ColorSet.fromNames(cause.getParam("SetColor").split(","));
} }
if (cause.hasParam("SetColorByManaCost")) { if (cause.hasParam("SetManaCost")) {
if (cause.hasParam("SetManaCost")) { manaCost = new ManaCost(new ManaCostParser(cause.getParam("SetManaCost")));
colors = ColorSet.fromManaCost(new ManaCost(new ManaCostParser(cause.getParam("SetManaCost")))); if (cause.hasParam("SetColorByManaCost")) {
} else { colors = ColorSet.fromManaCost(manaCost);
colors = ColorSet.fromManaCost(host.getManaCost());
} }
} }
@@ -521,57 +521,34 @@ public class CardFactory {
if (in.isFaceDown()) { if (in.isFaceDown()) {
// if something is cloning a facedown card, it only clones the // if something is cloning a facedown card, it only clones the
// facedown state into original // facedown state into original
final CardState ret = new CardState(out, CardStateName.Original); result.add(in.getFaceDownState().copy(out, CardStateName.Original, cause));
ret.copyFrom(in.getFaceDownState(), false, cause);
result.put(CardStateName.Original, ret);
} else if (in.isFlipCard()) { } else if (in.isFlipCard()) {
// if something is cloning a flip card, copy both original and // if something is cloning a flip card, copy both original and
// flipped state // flipped state
final CardState ret1 = new CardState(out, CardStateName.Original); result.add(in.getState(CardStateName.Original).copy(out, cause));
ret1.copyFrom(in.getState(CardStateName.Original), false, cause); result.add(in.getState(CardStateName.Flipped).copy(out, cause));
result.put(CardStateName.Original, ret1);
final CardState ret2 = new CardState(out, CardStateName.Flipped);
ret2.copyFrom(in.getState(CardStateName.Flipped), false, cause);
result.put(CardStateName.Flipped, ret2);
} else if (in.hasState(CardStateName.Secondary)) { } else if (in.hasState(CardStateName.Secondary)) {
final CardState ret1 = new CardState(out, CardStateName.Original); result.add(in.getState(CardStateName.Original).copy(out, cause));
ret1.copyFrom(in.getState(CardStateName.Original), false, cause); result.add(in.getState(CardStateName.Secondary).copy(out, cause));
result.put(CardStateName.Original, ret1);
final CardState ret2 = new CardState(out, CardStateName.Secondary);
ret2.copyFrom(in.getState(CardStateName.Secondary), false, cause);
result.put(CardStateName.Secondary, ret2);
} else if (in.isTransformable() && cause instanceof SpellAbility sa && ( } else if (in.isTransformable() && cause instanceof SpellAbility sa && (
ApiType.CopyPermanent.equals(sa.getApi()) || ApiType.CopyPermanent.equals(sa.getApi()) ||
ApiType.CopySpellAbility.equals(sa.getApi()) || ApiType.CopySpellAbility.equals(sa.getApi()) ||
ApiType.ReplaceToken.equals(sa.getApi()))) { ApiType.ReplaceToken.equals(sa.getApi()))) {
// CopyPermanent can copy token // CopyPermanent can copy token
final CardState ret1 = new CardState(out, CardStateName.Original); result.add(in.getState(CardStateName.Original).copy(out, cause));
ret1.copyFrom(in.getState(CardStateName.Original), false, cause); result.add(in.getState(CardStateName.Backside).copy(out, cause));
result.put(CardStateName.Original, ret1);
final CardState ret2 = new CardState(out, CardStateName.Backside);
ret2.copyFrom(in.getState(CardStateName.Backside), false, cause);
result.put(CardStateName.Backside, ret2);
} else if (in.isSplitCard()) { } else if (in.isSplitCard()) {
// for split cards, copy all three states // for split cards, copy all three states
final CardState ret1 = new CardState(out, CardStateName.Original);
ret1.copyFrom(in.getState(CardStateName.Original), false, cause);
result.put(CardStateName.Original, ret1);
final CardState ret2 = new CardState(out, CardStateName.LeftSplit); result.add(in.getState(CardStateName.Original).copy(out, cause));
ret2.copyFrom(in.getState(CardStateName.LeftSplit), false, cause); result.add(in.getState(CardStateName.LeftSplit).copy(out, cause));
result.put(CardStateName.LeftSplit, ret2); result.add(in.getState(CardStateName.RightSplit).copy(out, cause));
if (in.isPermanent()) {
final CardState ret3 = new CardState(out, CardStateName.RightSplit); result.add(in.getState(CardStateName.EmptyRoom).copy(out, cause));
ret3.copyFrom(in.getState(CardStateName.RightSplit), false, cause); }
result.put(CardStateName.RightSplit, ret3);
} else { } else {
// in all other cases just copy the current state to original // in all other cases just copy the current state to original
final CardState ret = new CardState(out, CardStateName.Original); result.add(in.getState(in.getCurrentStateName()).copy(out, CardStateName.Original, cause));
ret.copyFrom(in.getState(in.getCurrentStateName()), false, cause);
result.put(CardStateName.Original, ret);
} }
// update all states, both for flip cards // update all states, both for flip cards
@@ -614,21 +591,9 @@ public class CardFactory {
state.setCreatureTypes(creatureTypes); state.setCreatureTypes(creatureTypes);
} }
List<String> finalizedKWs = KWifNew ? Lists.newArrayList() : keywords; List<String> finalizedKWs = keywords;
if (KWifNew) { if (KWifNew) {
for (String k : keywords) { finalizedKWs = keywords.stream().filter(k -> !state.hasIntrinsicKeyword(Keyword.getInstance(k).getKeyword())).collect(Collectors.toList());
Keyword toAdd = Keyword.getInstance(k).getKeyword();
boolean match = false;
for (KeywordInterface kw : state.getIntrinsicKeywords()) {
if (kw.getKeyword().equals(toAdd)) {
match = true;
break;
}
}
if (!match) {
finalizedKWs.add(k);
}
}
} }
state.addIntrinsicKeywords(finalizedKWs); state.addIntrinsicKeywords(finalizedKWs);
for (String kw : removeKeywords) { for (String kw : removeKeywords) {
@@ -656,7 +621,7 @@ public class CardFactory {
} }
if (cause.hasParam("SetManaCost")) { if (cause.hasParam("SetManaCost")) {
state.setManaCost(new ManaCost(new ManaCostParser(cause.getParam("SetManaCost")))); state.setManaCost(manaCost);
} }
// SVars to add to clone // SVars to add to clone
@@ -793,11 +758,11 @@ public class CardFactory {
public static CardCloneStates getMutatedCloneStates(final Card card, final CardTraitBase sa) { public static CardCloneStates getMutatedCloneStates(final Card card, final CardTraitBase sa) {
final Card top = card.getTopMergedCard(); final Card top = card.getTopMergedCard();
final CardStateName state = top.getCurrentStateName(); final CardStateName state = top.getCurrentStateName();
final CardState ret = new CardState(card, state); CardState ret;
if (top.isCloned()) { if (top.isCloned()) {
ret.copyFrom(top.getState(state), false, sa); ret = top.getState(state).copy(card, sa);
} else { } else {
ret.copyFrom(top.getOriginalState(state), false, sa); ret = top.getOriginalState(state).copy(card, sa);
} }
boolean first = true; boolean first = true;
@@ -814,9 +779,7 @@ public class CardFactory {
// For face down, flipped, transformed, melded or MDFC card, also copy the original state to avoid crash // For face down, flipped, transformed, melded or MDFC card, also copy the original state to avoid crash
if (state != CardStateName.Original) { if (state != CardStateName.Original) {
final CardState ret1 = new CardState(card, CardStateName.Original); result.add(top.getState(CardStateName.Original).copy(card, sa));
ret1.copyFrom(top.getState(CardStateName.Original), false, sa);
result.put(CardStateName.Original, ret1);
} }
return result; return result;

14
forge-game/src/main/java/forge/game/card/CardState.java
View File

@@ -309,6 +309,9 @@ public class CardState implements GameObject, IHasSVars, ITranslatable {
public final boolean hasIntrinsicKeyword(String k) { public final boolean hasIntrinsicKeyword(String k) {
return intrinsicKeywords.contains(k); return intrinsicKeywords.contains(k);
} }
public final boolean hasIntrinsicKeyword(Keyword k) {
return intrinsicKeywords.contains(k);
}
public final void setIntrinsicKeywords(final Iterable<KeywordInterface> intrinsicKeyword0, final boolean lki) { public final void setIntrinsicKeywords(final Iterable<KeywordInterface> intrinsicKeyword0, final boolean lki) {
intrinsicKeywords.clear(); intrinsicKeywords.clear();
for (KeywordInterface k : intrinsicKeyword0) { for (KeywordInterface k : intrinsicKeyword0) {
@@ -841,8 +844,17 @@ public class CardState implements GameObject, IHasSVars, ITranslatable {
} }
public CardState copy(final Card host, CardStateName name, final boolean lki) { public CardState copy(final Card host, CardStateName name, final boolean lki) {
return copy(host, name, lki, null);
}
public CardState copy(final Card host, final CardTraitBase ctb) {
return copy(host, this.getStateName(), false, ctb);
}
public CardState copy(final Card host, CardStateName name, final CardTraitBase ctb) {
return copy(host, name, false, ctb);
}
public CardState copy(final Card host, CardStateName name, final boolean lki, final CardTraitBase ctb) {
CardState result = new CardState(host, name); CardState result = new CardState(host, name);
result.copyFrom(this, lki); result.copyFrom(this, lki, ctb);
return result; return result;
} }