diff --git a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java index 6c189882472..bc8e97e63e5 100644 --- a/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java +++ b/forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java @@ -372,9 +372,9 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl CardStateView cardStateView = card.getCurrentState(); if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && !CardStateName.Original.equals(cardStateView.getState())) { if (CardStateName.RightSplit.equals(cardStateView.getState())) { - FSkin.drawImage(g, FSkin.getIcon(FSkinProp.ICO_RIGHTLOCK), cardXOffset, cardYOffset, cardWidth, cardHeight); + FSkin.drawImage(g, FSkin.getIcon(FSkinProp.ICO_PADLOCK), cardXOffset, cardYOffset + cardHeight / 2, cardWidth, cardHeight); } else if (CardStateName.LeftSplit.equals(cardStateView.getState())) { - FSkin.drawImage(g, FSkin.getIcon(FSkinProp.ICO_LEFTLOCK), cardXOffset, cardYOffset, cardWidth, cardHeight); + FSkin.drawImage(g, FSkin.getIcon(FSkinProp.ICO_PADLOCK), cardXOffset, cardYOffset, cardWidth, cardHeight); } } diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 2a2caa222df..42ba43b073c 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -220,8 +220,7 @@ public enum FSkinImage implements FSkinImageInterface { UNKNOWN (FSkinProp.ICO_UNKNOWN), LOGO (FSkinProp.ICO_LOGO), CARDART (FSkinProp.ICO_CARDART), - LEFTLOCK (FSkinProp.ICO_LEFTLOCK), - RIGHTLOCK (FSkinProp.ICO_RIGHTLOCK), + PADLOCK (FSkinProp.ICO_PADLOCK), FLIPCARD (FSkinProp.ICO_FLIPCARD), HDFLIPCARD (FSkinProp.ICO_HDFLIPCARD), diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index c43ddb2f629..ed019aa4456 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -747,9 +747,9 @@ public class CardRenderer { //locked room if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && !CardStateName.Original.equals(details.getState())) { if (CardStateName.RightSplit.equals(details.getState())) { - g.drawImage(FSkinImage.RIGHTLOCK, cx, cy, cw, ch); + g.drawImage(FSkinImage.PADLOCK, cx, cy + ch / 2, cw, ch); } else if (CardStateName.LeftSplit.equals(details.getState())) { - g.drawImage(FSkinImage.LEFTLOCK, cx, cy, cw, ch); + g.drawImage(FSkinImage.PADLOCK, cx, cy, cw, ch); } } } diff --git a/forge-gui/res/skins/default/sprite_icons.png b/forge-gui/res/skins/default/sprite_icons.png index 759943cd660..de522a9d8f8 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/localinstance/skin/FSkinProp.java b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java index 41d0d477423..5a0f6fec4c7 100644 --- a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java @@ -360,8 +360,7 @@ public enum FSkinProp { ICO_UNKNOWN (new int[] {0, 720, 80, 80}, PropType.ICON), ICO_LOGO (new int[] {480, 0, 200, 200}, PropType.ICON), ICO_CARDART (new int[] {0, 1600, 200, 200}, PropType.ICON), - ICO_LEFTLOCK (new int[] {200, 1600, 143, 200}, PropType.ICON), - ICO_RIGHTLOCK (new int[] {343, 1600, 143, 200}, PropType.ICON), + ICO_PADLOCK (new int[] {200, 1600, 143, 200}, PropType.ICON), ICO_FLIPCARD (new int[] {400, 0, 80, 120}, PropType.ICON), ICO_HDFLIPCARD (new int[] {2, 1268, 387, 500}, PropType.BUTTONS),