diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java index f5ab22d1e22..07f255bd11d 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/CardFaceSymbols.java @@ -85,6 +85,7 @@ public class CardFaceSymbols { MANA_IMAGES.put("S", FSkin.getImage(FSkinProp.IMG_MANA_SNOW, manaImageSize, manaImageSize)); MANA_IMAGES.put("T", FSkin.getImage(FSkinProp.IMG_TAP, manaImageSize, manaImageSize)); + MANA_IMAGES.put("E", FSkin.getImage(FSkinProp.IMG_PLAYER_ENERGY, 40, 40)); MANA_IMAGES.put("slash", FSkin.getImage(FSkinProp.IMG_SLASH, manaImageSize, manaImageSize)); MANA_IMAGES.put("attack", FSkin.getImage(FSkinProp.IMG_ATTACK, 32, 32)); MANA_IMAGES.put("defend", FSkin.getImage(FSkinProp.IMG_DEFEND, 32, 32)); 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 339ca3f147f..d12e8e229d8 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/FSkin.java @@ -1273,6 +1273,7 @@ public class FSkin { addEncodingSymbol("Q", FSkinProp.IMG_UNTAP); addEncodingSymbol("S", FSkinProp.IMG_MANA_SNOW); addEncodingSymbol("T", FSkinProp.IMG_TAP); + addEncodingSymbol("E", FSkinProp.IMG_PLAYER_ENERGY); // Set look and feel after skin loaded FView.SINGLETON_INSTANCE.setSplashProgessBarMessage("Setting look and feel..."); diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 93c45cc222f..cd66806607a 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -97,6 +97,7 @@ public enum FSkinImage implements FImage { COUNTERS2 (FSkinProp.IMG_COUNTERS2, SourceFile.ICONS), COUNTERS3 (FSkinProp.IMG_COUNTERS3, SourceFile.ICONS), COUNTERS_MULTI (FSkinProp.IMG_COUNTERS_MULTI, SourceFile.ICONS), + ENERGY (FSkinProp.IMG_PLAYER_ENERGY, SourceFile.ICONS), //Dock Icons SHORTCUTS (FSkinProp.ICO_SHORTCUTS, SourceFile.ICONS), diff --git a/forge-gui/res/skins/default/sprite_icons.png b/forge-gui/res/skins/default/sprite_icons.png index d1f1fcff6f8..59ffba90b74 100644 Binary files a/forge-gui/res/skins/default/sprite_icons.png and b/forge-gui/res/skins/default/sprite_icons.png differ diff --git a/forge-gui/src/main/java/forge/assets/FSkinProp.java b/forge-gui/src/main/java/forge/assets/FSkinProp.java index 19dce68703b..3564a49358d 100644 --- a/forge-gui/src/main/java/forge/assets/FSkinProp.java +++ b/forge-gui/src/main/java/forge/assets/FSkinProp.java @@ -128,6 +128,7 @@ public enum FSkinProp { IMG_COUNTERS2 (new int[] {0, 400, 80, 80}, PropType.IMAGE), IMG_COUNTERS3 (new int[] {80, 320, 80, 80}, PropType.IMAGE), IMG_COUNTERS_MULTI (new int[] {80, 400, 80, 80}, PropType.IMAGE), + IMG_PLAYER_ENERGY (new int[] {320, 120, 40, 40}, PropType.IMAGE), //foils FOIL_01 (new int[] {0, 0, 400, 570}, PropType.FOIL),