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

Fix game log revealing opponent's morphed creatures in messages.

Browse Source
This commit is contained in:
Myrd
2014-12-01 06:09:54 +00:00
parent b3a2ca8291
commit 319cd97d83
4 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
forge-game/src/main/java/forge/game/ability/effects/DestroyEffect.java
View File

@@ -27,12 +27,7 @@ public class DestroyEffect extends SpellAbilityEffect {
final Iterator<Card> it = tgtCards.iterator(); final Iterator<Card> it = tgtCards.iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Card tgtC = it.next(); sb.append(it.next());
if (tgtC.isFaceDown()) {
sb.append("Morph ").append("(").append(tgtC.getId()).append(")");
} else {
sb.append(tgtC);
}
if (it.hasNext()) { if (it.hasNext()) {
sb.append(", "); sb.append(", ");

7
forge-game/src/main/java/forge/game/ability/effects/SetStateEffect.java
View File

@@ -26,12 +26,7 @@ public class SetStateEffect extends SpellAbilityEffect {
final Iterator<Card> it = tgtCards.iterator(); final Iterator<Card> it = tgtCards.iterator();
while (it.hasNext()) { while (it.hasNext()) {
final Card tgtC = it.next(); sb.append(it.next());
if (tgtC.isFaceDown()) {
sb.append("Morph ").append("(").append(tgtC.getId()).append(")");
} else {
sb.append(tgtC);
}
if (it.hasNext()) { if (it.hasNext()) {
sb.append(", "); sb.append(", ");

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

@@ -3120,9 +3120,12 @@ public class Card extends GameEntity implements Comparable<Card>, IIdentifiable
/** {@inheritDoc} */ /** {@inheritDoc} */
@Override @Override
public final String toString() { public final String toString() {
String name = getName(); String name = "Morph";
if (StringUtils.isEmpty(name) && paperCard != null) { if (!isFaceDown()) {
name = paperCard.getName(); //make it possible to see likely card name before it's set name = getName();
if (StringUtils.isEmpty(name) && paperCard != null) {
name = paperCard.getName(); //make it possible to see likely card name before it's set
}
} }
return name + " (" + id + ")"; return name + " (" + id + ")";
} }

10
forge-game/src/main/java/forge/game/spellability/SpellAbility.java
View File

@@ -935,15 +935,7 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
resetTargets(); resetTargets();
targetChosen.add(card); targetChosen.add(card);
setStackDescription(getHostCard().getName() + " - targeting " + card);
final String desc;
if (!card.isFaceDown()) {
desc = getHostCard().getName() + " - targeting " + card;
}
else {
desc = getHostCard().getName() + " - targeting Morph(" + card.getId() + ")";
}
setStackDescription(desc);
} }
/** /**