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

Merge remote-tracking branch 'upstream/master' into collector-number-in-card-list-and-card-db-refactoring

Browse Source
This commit is contained in:
leriomaggio
2021-07-23 22:38:23 +01:00
parent b3ce4bf9ff ef917a91b9
commit 01d117b07e
299 changed files with 3647 additions and 1286 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
forge-core/src/main/java/forge/card/CardRulesPredicates.java
View File

@@ -26,6 +26,14 @@ public final class CardRulesPredicates {
}
};
/** The Constant isKeptInAiLimitedDecks. */
public static final Predicate<CardRules> IS_KEPT_IN_AI_LIMITED_DECKS = new Predicate<CardRules>() {
@Override
public boolean apply(final CardRules card) {
return !card.getAiHints().getRemAIDecks() && !card.getAiHints().getRemNonCommanderDecks();
}
};
/** The Constant isKeptInRandomDecks. */
public static final Predicate<CardRules> IS_KEPT_IN_RANDOM_DECKS = new Predicate<CardRules>() {
@Override

12
forge-core/src/main/java/forge/util/CardTranslation.java
View File

@@ -34,7 +34,12 @@ public class CardTranslation {
translatedtypes.put(matches[0], matches[2]);
}
if (matches.length >= 4) {
translatedoracles.put(matches[0], matches[3].replace("\\n", "\r\n\r\n"));
String toracle = matches[3];
// Workaround to remove additional //Level_2// and //Level_3// lines from non-English Class cards
toracle = toracle.replace("//Level_2//\\n", "").replace("//Level_3//\\n", "");
// Workaround for roll dice cards
toracle = toracle.replace("\\n", "\r\n\r\n").replace("VERT", "|");
translatedoracles.put(matches[0], toracle);
}
}
} catch (IOException e) {
@@ -91,7 +96,7 @@ public class CardTranslation {
public static void preloadTranslation(String language, String languagesDirectory) {
languageSelected = language;
if (needsTranslation()) {
translatednames = new HashMap<>();
translatedtypes = new HashMap<>();
@@ -137,9 +142,10 @@ public class CardTranslation {
public static String translateMultipleDescriptionText(String descText, String cardName) {
if (!needsTranslation()) return descText;
String [] splitDescText = descText.split("\r\n");
String [] splitDescText = descText.split("\n");
String result = descText;
for (String text : splitDescText) {
text = text.trim();
if (text.isEmpty()) continue;
String translated = translateSingleDescriptionText(text, cardName);
if (!text.equals(translated)) {