diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java index a5c3872551c..59ec12349cf 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java @@ -1079,7 +1079,7 @@ public class FSkin { return str; } //format mana symbols to display as icons - pattern = "\\{([A-Z0-9]+)\\}|\\{([A-Z0-9]+)/([A-Z0-9]+)\\}|\\{([A-Z0-9]+)/([A-Z0-9]+)/([A-Z0-9]+)\\}"; //fancy pattern needed so "/" can be omitted from replacement + pattern = "\\{([A-Z0-9]+)\\}|\\{([A-Z0-9]+)/([A-Z0-9]+)\\}|(A-)|\\{([A-Z0-9]+)/([A-Z0-9]+)/([A-Z0-9]+)\\}"; //fancy pattern needed so "/" can be omitted from replacement try { replacement = ""; str = str.replaceAll(pattern, replacement); @@ -1464,6 +1464,7 @@ public class FSkin { addEncodingSymbol("T", FSkinProp.IMG_TAP); addEncodingSymbol("E", FSkinProp.IMG_ENERGY); addEncodingSymbol("EXPERIENCE", FSkinProp.IMG_EXPERIENCE); + addEncodingSymbol("A-", FSkinProp.IMG_ALCHEMY); // Set look and feel after skin loaded FView.SINGLETON_INSTANCE.setSplashProgessBarMessage("Setting look and feel..."); diff --git a/forge-gui/res/skins/default/sprite_manaicons.png b/forge-gui/res/skins/default/sprite_manaicons.png index 1f4f70bb0ca..510a9f70688 100644 Binary files a/forge-gui/res/skins/default/sprite_manaicons.png and b/forge-gui/res/skins/default/sprite_manaicons.png differ diff --git a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java index db0c4422f2e..9cde7e75aa1 100644 --- a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java @@ -338,6 +338,7 @@ public enum FSkinProp { IMG_PACK (new int[] {80, 760, 40, 40}, PropType.IMAGE), IMG_SORCERY (new int[] {412, 740, 80, 80}, PropType.MANAICONS), IMG_COMMANDER (new int[] {120, 760, 40, 40}, PropType.IMAGE), + IMG_ALCHEMY (new int[] {248, 822, 80, 80}, PropType.MANAICONS), //achievement trophies and shelf IMG_COMMON_TROPHY (new int[] {0, 0, 135, 185}, PropType.TROPHY),