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

Merge branch 'sd' into 'master'

Browse Source 
some StackDescription tweaking

See merge request core-developers/forge!6271
This commit is contained in:
Michael Kamensky
2022-02-20 20:21:35 +00:00
parent 9686b14dbc df2ada6f31
commit 29f4b04ced
2 changed files with 25 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
forge-game/src/main/java/forge/game/ability/effects/AnimateEffect.java
View File

@@ -233,19 +233,32 @@ public class AnimateEffect extends AnimateEffectBase {
final StringBuilder sb = new StringBuilder(); final StringBuilder sb = new StringBuilder();
final List<Card> tgts = getCardsfromTargets(sa); final List<Card> tgts = getCardsfromTargets(sa);
final boolean justOne = tgts.size() == 1;
if (sa.hasParam("IfDesc")) {
if (sa.getParam("IfDesc").equals("True") && sa.hasParam("SpellDescription")) {
String ifDesc = sa.getParam("SpellDescription");
sb.append(ifDesc, 0, ifDesc.indexOf(",") + 1);
} else {
sb.append(sa.getParam("IfDesc"));
}
sb.append(" ");
}
sb.append(Lang.joinHomogenous(tgts)).append(" "); sb.append(Lang.joinHomogenous(tgts)).append(" ");
// if power is -1, we'll assume it's not just setting toughness // if power is -1, we'll assume it's not just setting toughness
if (power != null && toughness != null) { if (power != null || toughness != null) {
sb.append(tgts.size() == 1 ? "becomes " : "become "); sb.append(justOne ? "has" : "have" ).append(" base ");
sb.append(" ").append(power).append("/").append(toughness); if (power != null && toughness != null) {
} else if (power != null) { sb.append("power and toughness ").append(power).append("/").append(toughness).append(" ");
sb.append("power becomes ").append(power); } else if (power != null) {
} else if (toughness != null) { sb.append("power ").append(power).append(" ");
sb.append("toughness becomes ").append(toughness); } else {
sb.append("toughness ").append(toughness).append(" ");
}
} else { } else {
sb.append(tgts.size() == 1 ? "becomes " : "become "); sb.append(justOne ? "becomes " : "become ");
} }
if (colors.contains("ChosenColor")) { if (colors.contains("ChosenColor")) {
@@ -264,20 +277,14 @@ public class AnimateEffect extends AnimateEffectBase {
} else { } else {
for (int i = 0; i < types.size(); i++) { for (int i = 0; i < types.size(); i++) {
String type = types.get(i); String type = types.get(i);
if (i == 0 && tgts.size() == 1) { if (i == 0 && justOne) {
sb.append(Lang.startsWithVowel(type) ? "an " : "a "); sb.append(Lang.startsWithVowel(type) ? "an " : "a ");
} }
sb.append(CardType.CoreType.isValidEnum(type) ? type.toLowerCase() : type).append(" "); sb.append(CardType.CoreType.isValidEnum(type) ? type.toLowerCase() : type).append(" ");
} }
} }
if (keywords.size() > 0) { if (keywords.size() > 0) {
sb.append("with "); sb.append("and gains ").append(Lang.joinHomogenous(keywords).toLowerCase()).append(" ");
}
for (int i = 0; i < keywords.size(); i++) {
sb.append(keywords.get(i)).append(" ");
if (i < (keywords.size() - 1)) {
sb.append("and ");
}
} }
// sb.append(abilities) // sb.append(abilities)
// sb.append(triggers) // sb.append(triggers)

4
forge-game/src/main/java/forge/game/ability/effects/PlayEffect.java
View File

@@ -68,10 +68,10 @@ public class PlayEffect extends SpellAbilityEffect {
sb.append(Lang.joinHomogenous(tgtCards)); sb.append(Lang.joinHomogenous(tgtCards));
} }
if (sa.hasParam("WithoutManaCost")) { if (sa.hasParam("WithoutManaCost")) {
sb.append(" without paying ").append(tgtCards.size()==1 ? "its" : "their").append(" mana cost "); sb.append(" without paying ").append(tgtCards.size()==1 ? "its" : "their").append(" mana cost");
} }
if (sa.hasParam("IfDesc")) { if (sa.hasParam("IfDesc")) {
sb.append(sa.getParam("IfDesc")); sb.append(" ").append(sa.getParam("IfDesc"));
} }
sb.append("."); sb.append(".");
return sb.toString(); return sb.toString();