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

Merge branch 'textchange' into 'master'

Browse Source 
applyTextChangeEffects: fix replacing Self

See merge request core-developers/forge!6372
This commit is contained in:
Michael Kamensky
2022-03-09 03:19:55 +00:00
parent dcf240eb61 58197e7daa
commit dc038e8bc6
1 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-game/src/main/java/forge/game/ability/AbilityUtils.java
View File

@@ -80,6 +80,8 @@ import io.sentry.event.BreadcrumbBuilder;
public class AbilityUtils { public class AbilityUtils {
private final static ImmutableList<String> cmpList = ImmutableList.of("LT", "LE", "EQ", "GE", "GT", "NE"); private final static ImmutableList<String> cmpList = ImmutableList.of("LT", "LE", "EQ", "GE", "GT", "NE");
static public final String WITH_DELIMITER = "((?<=%1$s)|(?=%1$s))";
// should the three getDefined functions be merged into one? Or better to // should the three getDefined functions be merged into one? Or better to
// have separate? // have separate?
// If we only have one, each function needs to Cast the Object to the // If we only have one, each function needs to Cast the Object to the
@@ -3042,15 +3044,21 @@ public class AbilityUtils {
replaced = replaced.replaceAll("(?<!>)" + key, value); replaced = replaced.replaceAll("(?<!>)" + key, value);
} }
} }
StringBuilder sb = new StringBuilder();
for (String replacedPart : replaced.split(String.format(WITH_DELIMITER, "\\."))) {
if (!replacedPart.equals("Self") && !replacedPart.equals(".")) {
for (final Entry<String, String> e : typeMap.entrySet()) { for (final Entry<String, String> e : typeMap.entrySet()) {
final String key = e.getKey(); final String key = e.getKey();
final String pkey = CardType.getPluralType(key); final String pkey = CardType.getPluralType(key);
final String pvalue = getReplacedText(pkey, CardType.getPluralType(e.getValue()), isDescriptive); final String pvalue = getReplacedText(pkey, CardType.getPluralType(e.getValue()), isDescriptive);
replaced = replaced.replaceAll("(?<!>)" + pkey, pvalue); replacedPart = replacedPart.replaceAll("(?<!>)" + pkey, pvalue);
final String value = getReplacedText(key, e.getValue(), isDescriptive); final String value = getReplacedText(key, e.getValue(), isDescriptive);
replaced = replaced.replaceAll("(?<!>)" + key, value); replacedPart = replacedPart.replaceAll("(?<!>)" + key, value);
} }
return replaced; }
sb.append(replacedPart);
}
return sb.toString();
} }
private static final String getReplacedText(final String originalWord, final String newWord, final boolean isDescriptive) { private static final String getReplacedText(final String originalWord, final String newWord, final boolean isDescriptive) {
@@ -3782,7 +3790,7 @@ public class AbilityUtils {
// "Clerics you control" - Count$TypeYouCtrl.Cleric // "Clerics you control" - Count$TypeYouCtrl.Cleric
if (sq[0].contains("Type")) { if (sq[0].contains("Type")) {
someCards = CardLists.filter(someCards, CardPredicates.isType(sq[1])); someCards = CardLists.getType(someCards, sq[1]);
} }
// "Named <CARDNAME> in all graveyards" - Count$NamedAllYards.<CARDNAME> // "Named <CARDNAME> in all graveyards" - Count$NamedAllYards.<CARDNAME>