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

Merge branch 'descriptions' into 'master'

Browse Source 
Fix alternate state descriptions when viewed from original

See merge request core-developers/forge!4277
This commit is contained in:
Michael Kamensky
2021-03-29 07:59:43 +00:00
parent 1c0a7d8475 82f0c85bd0
commit 7b585aaa05
4 changed files with 29 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-game/src/main/java/forge/game/replacement/ReplacementEffect.java
View File

@@ -216,7 +216,13 @@ public abstract class ReplacementEffect extends TriggerReplacementBase {
public String getDescription() { public String getDescription() {
if (hasParam("Description") && !this.isSuppressed()) { if (hasParam("Description") && !this.isSuppressed()) {
String desc = AbilityUtils.applyDescriptionTextChangeEffects(getParam("Description"), this); String desc = AbilityUtils.applyDescriptionTextChangeEffects(getParam("Description"), this);
String currentName = getHostCard().getName(); String currentName;
if (this.isIntrinsic() && !this.getHostCard().isMutated() && cardState != null) {
currentName = cardState.getName();
}
else {
currentName = getHostCard().getName();
}
desc = CardTranslation.translateSingleDescriptionText(desc, currentName); desc = CardTranslation.translateSingleDescriptionText(desc, currentName);
desc = TextUtil.fastReplace(desc, "CARDNAME", CardTranslation.getTranslatedName(currentName)); desc = TextUtil.fastReplace(desc, "CARDNAME", CardTranslation.getTranslatedName(currentName));
desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(CardTranslation.getTranslatedName(currentName))); desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(CardTranslation.getTranslatedName(currentName)));

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

@@ -842,7 +842,14 @@ public abstract class SpellAbility extends CardTraitBase implements ISpellAbilit
} }
String desc = node.getDescription(); String desc = node.getDescription();
if (node.getHostCard() != null) { if (node.getHostCard() != null) {
String currentName = node.getHostCard().getName(); String currentName;
// if alternate state is viewed while card uses original
if (node.isIntrinsic() && !node.getHostCard().isMutated() && node.cardState != null) {
currentName = node.cardState.getName();
}
else {
currentName = node.getHostCard().getName();
}
desc = CardTranslation.translateMultipleDescriptionText(desc, currentName); desc = CardTranslation.translateMultipleDescriptionText(desc, currentName);
desc = TextUtil.fastReplace(desc, "CARDNAME", CardTranslation.getTranslatedName(currentName)); desc = TextUtil.fastReplace(desc, "CARDNAME", CardTranslation.getTranslatedName(currentName));
desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(CardTranslation.getTranslatedName(currentName))); desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(CardTranslation.getTranslatedName(currentName)));

8
forge-game/src/main/java/forge/game/staticability/StaticAbility.java
View File

@@ -208,7 +208,13 @@ public class StaticAbility extends CardTraitBase implements IIdentifiable, Clone
@Override @Override
public final String toString() { public final String toString() {
if (hasParam("Description") && !this.isSuppressed()) { if (hasParam("Description") && !this.isSuppressed()) {
String currentName = this.hostCard.getName(); String currentName;
if (this.isIntrinsic() && !this.getHostCard().isMutated() && cardState != null) {
currentName = cardState.getName();
}
else {
currentName = getHostCard().getName();
}
String desc = CardTranslation.translateSingleDescriptionText(getParam("Description"), currentName); String desc = CardTranslation.translateSingleDescriptionText(getParam("Description"), currentName);
desc = TextUtil.fastReplace(desc, "CARDNAME", CardTranslation.getTranslatedName(currentName)); desc = TextUtil.fastReplace(desc, "CARDNAME", CardTranslation.getTranslatedName(currentName));
desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(CardTranslation.getTranslatedName(currentName))); desc = TextUtil.fastReplace(desc, "NICKNAME", Lang.getInstance().getNickName(CardTranslation.getTranslatedName(currentName)));

8
forge-game/src/main/java/forge/game/trigger/Trigger.java
View File

@@ -131,7 +131,13 @@ public abstract class Trigger extends TriggerReplacementBase {
if (hasParam("TriggerDescription") && !this.isSuppressed()) { if (hasParam("TriggerDescription") && !this.isSuppressed()) {
StringBuilder sb = new StringBuilder(); StringBuilder sb = new StringBuilder();
String currentName = getHostCard().getName(); String currentName;
if (this.isIntrinsic() && !this.getHostCard().isMutated() && cardState != null) {
currentName = cardState.getName();
}
else {
currentName = getHostCard().getName();
}
String desc = getParam("TriggerDescription"); String desc = getParam("TriggerDescription");
if (!desc.contains("ABILITY")) { if (!desc.contains("ABILITY")) {
desc = CardTranslation.translateSingleDescriptionText(getParam("TriggerDescription"), currentName); desc = CardTranslation.translateSingleDescriptionText(getParam("TriggerDescription"), currentName);