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

Update DeckRecognizer.java

Browse Source 
Remove extra manaSymbolsMap
This commit is contained in:
Hans Mackowiak
2025-10-10 12:25:30 +02:00
parent 010f917550
commit fdbdffd874
1 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
forge-core/src/main/java/forge/deck/DeckRecognizer.java
View File

@@ -22,6 +22,7 @@ import forge.StaticData;
import forge.card.CardDb; import forge.card.CardDb;
import forge.card.CardEdition; import forge.card.CardEdition;
import forge.card.CardType; import forge.card.CardType;
import forge.card.ColorSet;
import forge.card.MagicColor; import forge.card.MagicColor;
import forge.item.IPaperCard; import forge.item.IPaperCard;
import forge.item.PaperCard; import forge.item.PaperCard;
@@ -997,26 +998,13 @@ public class DeckRecognizer {
return String.format("%s %s", magicColor.getTranslatedName(), magicColor.getSymbol()); return String.format("%s %s", magicColor.getTranslatedName(), magicColor.getSymbol());
} }
private static final HashMap<Integer, String> manaSymbolsMap = new HashMap<Integer, String>() {{
put(MagicColor.WHITE | MagicColor.BLUE, "WU");
put(MagicColor.BLUE | MagicColor.BLACK, "UB");
put(MagicColor.BLACK | MagicColor.RED, "BR");
put(MagicColor.RED | MagicColor.GREEN, "RG");
put(MagicColor.GREEN | MagicColor.WHITE, "GW");
put(MagicColor.WHITE | MagicColor.BLACK, "WB");
put(MagicColor.BLUE | MagicColor.RED, "UR");
put(MagicColor.BLACK | MagicColor.GREEN, "BG");
put(MagicColor.RED | MagicColor.WHITE, "RW");
put(MagicColor.GREEN | MagicColor.BLUE, "GU");
}};
private static String getMagicColourLabel(MagicColor.Color magicColor1, MagicColor.Color magicColor2) { private static String getMagicColourLabel(MagicColor.Color magicColor1, MagicColor.Color magicColor2) {
if (magicColor2 == null || magicColor2 == MagicColor.Color.COLORLESS if (magicColor2 == null || magicColor2 == MagicColor.Color.COLORLESS
|| magicColor1 == MagicColor.Color.COLORLESS) || magicColor1 == MagicColor.Color.COLORLESS)
return String.format("%s // %s", getMagicColourLabel(magicColor1), getMagicColourLabel(magicColor2)); return String.format("%s // %s", getMagicColourLabel(magicColor1), getMagicColourLabel(magicColor2));
String localisedName1 = magicColor1.getTranslatedName(); String localisedName1 = magicColor1.getTranslatedName();
String localisedName2 = magicColor2.getTranslatedName(); String localisedName2 = magicColor2.getTranslatedName();
String comboManaSymbol = manaSymbolsMap.get(magicColor1.getColorMask() | magicColor2.getColorMask()); return String.format("%s/%s {%s}", localisedName1, localisedName2, ColorSet.fromEnums(magicColor1, magicColor2));
return String.format("%s/%s {%s}", localisedName1, localisedName2, comboManaSymbol);
} }
private static MagicColor.Color getMagicColor(String colorName){ private static MagicColor.Color getMagicColor(String colorName){