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

Merge pull request #2970 from Northmoc/kicker

Browse Source 
improve non-mana Kicker keyword to text + CostSacrifice.toString parsing
This commit is contained in:
Anthony Calosa
2023-04-20 04:37:51 +08:00
committed by GitHub
parent be4d63a5ad 0552937ad1
commit 5e38fe606a
2 changed files with 50 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2139,25 +2139,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
sbLong.append(" (").append(inst.getReminderText()).append(")").append("\r\n"); sbLong.append(" (").append(inst.getReminderText()).append(")").append("\r\n");
} }
} else if (keyword.startsWith("Kicker")) { } else if (keyword.startsWith("Kicker")) {
final StringBuilder sbx = new StringBuilder(); sbLong.append(kickerDesc(keyword, inst.getReminderText())).append("\r\n");
final String[] n = keyword.split(":");
final Cost cost = new Cost(n[1], false);
if (!keyword.endsWith("Generic")) {
sbx.append("Kicker ");
sbx.append(cost.toSimpleString());
if (Lists.newArrayList(n).size() > 2) {
sbx.append(" and/or ");
final Cost cost2 = new Cost(n[2], false);
sbx.append(cost2.toSimpleString());
}
sbx.append(" (").append(inst.getReminderText()).append(")");
} else {
sbx.append("As an additional cost to cast this spell, you may ");
String costS = StringUtils.uncapitalize(cost.toSimpleString());
sbx.append(cost.hasManaCost() ? "pay " + costS : costS);
sbx.append(".");
}
sbLong.append(sbx).append("\r\n");
} else if (keyword.startsWith("Trample:")) { } else if (keyword.startsWith("Trample:")) {
sbLong.append("Trample over planeswalkers").append(" (").append(inst.getReminderText()).append(")").append("\r\n"); sbLong.append("Trample over planeswalkers").append(" (").append(inst.getReminderText()).append(")").append("\r\n");
} else if (keyword.startsWith("Hexproof:")) { } else if (keyword.startsWith("Hexproof:")) {
@@ -2414,6 +2396,50 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
return CardTranslation.translateMultipleDescriptionText(sb.toString(), getName()); return CardTranslation.translateMultipleDescriptionText(sb.toString(), getName());
} }
private String kickerDesc (String keyword, String remText) {
final StringBuilder sbx = new StringBuilder();
final String[] n = keyword.split(":");
final Cost cost = new Cost(n[1], false);
final String costStr = cost.toSimpleString();
final boolean manaOnly = cost.isOnlyManaCost();
if (!keyword.endsWith("Generic")) {
sbx.append("Kicker").append(manaOnly ? " " + costStr : "—" + costStr + ".");
if (Lists.newArrayList(n).size() > 2) {
sbx.append(" and/or ");
final Cost cost2 = new Cost(n[2], false);
sbx.append(cost2.toSimpleString());
}
if (!manaOnly) {
if (cost.hasNoManaCost()) {
remText = remText.replaceFirst(" pay an additional", "");
remText = remText.replace(remText.charAt(8), Character.toLowerCase(remText.charAt(8)));
} else {
remText = remText.replaceFirst(" an additional", "");
char c = remText.charAt(remText.indexOf(",") + 2);
remText = remText.replace(c, Character.toLowerCase(c));
remText = remText.replaceFirst(", ", " and ");
}
remText = remText.replaceFirst("as", "in addition to any other costs as");
if (remText.contains(" tap ")) {
if (remText.contains("tap a")) {
String noun = remText.substring(remText.indexOf("untapped") + 9, remText.indexOf(" in "));
remText = remText.replace(remText.substring(12, remText.indexOf(" in ")),
Lang.nounWithNumeralExceptOne(1, noun) + " ");
} else {
remText = remText.replaceFirst(" untapped ", "");
}
}
}
sbx.append(" (").append(remText).append(")\r\n");
} else {
sbx.append("As an additional cost to cast this spell, you may ");
String costS = StringUtils.uncapitalize(costStr);
sbx.append(cost.hasManaCost() ? "pay " + costS : costS);
sbx.append(".").append("\r\n");
}
return sbx.toString();
}
// get the text of the abilities of a card // get the text of the abilities of a card
public String getAbilityText() { public String getAbilityText() {
return getAbilityText(currentState); return getAbilityText(currentState);
@@ -2792,25 +2818,7 @@ public class Card extends GameEntity implements Comparable<Card>, IHasSVars {
sbBefore.append("Multikicker ").append(cost.toSimpleString()).append(" (").append(inst.getReminderText()).append(")").append("\r\n"); sbBefore.append("Multikicker ").append(cost.toSimpleString()).append(" (").append(inst.getReminderText()).append(")").append("\r\n");
} }
} else if (keyword.startsWith("Kicker")) { } else if (keyword.startsWith("Kicker")) {
final StringBuilder sbx = new StringBuilder(); sbBefore.append(kickerDesc(keyword, inst.getReminderText())).append("\r\n");
final String[] n = keyword.split(":");
final Cost cost = new Cost(n[1], false);
if (!keyword.endsWith("Generic")) {
sbx.append("Kicker ");
sbx.append(cost.toSimpleString());
if (Lists.newArrayList(n).size() > 2) {
sbx.append(" and/or ");
final Cost cost2 = new Cost(n[2], false);
sbx.append(cost2.toSimpleString());
}
sbx.append(" (").append(inst.getReminderText()).append(")\r\n");
} else {
sbx.append("As an additional cost to cast this spell, you may ");
String costS = StringUtils.uncapitalize(cost.toSimpleString());
sbx.append(cost.hasManaCost() ? "pay " + costS : costS);
sbx.append(".\r\n");
}
sbBefore.append(sbx).append("\r\n");
} else if (keyword.startsWith("AlternateAdditionalCost")) { } else if (keyword.startsWith("AlternateAdditionalCost")) {
final String[] costs = keyword.split(":", 2)[1].split(":"); final String[] costs = keyword.split(":", 2)[1].split(":");
sbBefore.append("As an additional cost to cast this spell, "); sbBefore.append("As an additional cost to cast this spell, ");

5
forge-game/src/main/java/forge/game/cost/CostSacrifice.java
View File

@@ -32,6 +32,7 @@ import forge.game.card.CardPredicates;
import forge.game.player.Player; import forge.game.player.Player;
import forge.game.spellability.SpellAbility; import forge.game.spellability.SpellAbility;
import forge.game.zone.ZoneType; import forge.game.zone.ZoneType;
import forge.util.Lang;
/** /**
* The Class CostSacrifice. * The Class CostSacrifice.
@@ -97,7 +98,9 @@ public class CostSacrifice extends CostPartWithList {
} else { } else {
desc = this.getTypeDescription(); desc = this.getTypeDescription();
} }
sb.append(Cost.convertAmountTypeToWords(convertAmount(), getAmount(), desc));
sb.append(convertAmount() == null ? Lang.nounWithNumeralExceptOne(getAmount(), desc)
: Lang.nounWithNumeralExceptOne(convertAmount(), desc));
} }
return sb.toString(); return sb.toString();
} }