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

update code as suggested

Browse Source
This commit is contained in:
Anthony Calosa
2024-10-22 23:05:47 +08:00
parent b9a06e14a4
commit f7f9943436
5 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
forge-gui-desktop/src/main/java/forge/view/arcane/CardPanel.java
View File

@@ -372,9 +372,9 @@ public class CardPanel extends SkinnedPanel implements CardContainer, IDisposabl
CardStateView cardStateView = card.getCurrentState(); CardStateView cardStateView = card.getCurrentState();
if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && !CardStateName.Original.equals(cardStateView.getState())) { if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && !CardStateName.Original.equals(cardStateView.getState())) {
if (CardStateName.RightSplit.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())) { } 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);
} }
} }

3
forge-gui-mobile/src/forge/assets/FSkinImage.java
View File

@@ -220,8 +220,7 @@ public enum FSkinImage implements FSkinImageInterface {
UNKNOWN (FSkinProp.ICO_UNKNOWN), UNKNOWN (FSkinProp.ICO_UNKNOWN),
LOGO (FSkinProp.ICO_LOGO), LOGO (FSkinProp.ICO_LOGO),
CARDART (FSkinProp.ICO_CARDART), CARDART (FSkinProp.ICO_CARDART),
LEFTLOCK (FSkinProp.ICO_LEFTLOCK), PADLOCK (FSkinProp.ICO_PADLOCK),
RIGHTLOCK (FSkinProp.ICO_RIGHTLOCK),
FLIPCARD (FSkinProp.ICO_FLIPCARD), FLIPCARD (FSkinProp.ICO_FLIPCARD),
HDFLIPCARD (FSkinProp.ICO_HDFLIPCARD), HDFLIPCARD (FSkinProp.ICO_HDFLIPCARD),

4
forge-gui-mobile/src/forge/card/CardRenderer.java
View File

@@ -747,9 +747,9 @@ public class CardRenderer {
//locked room //locked room
if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && !CardStateName.Original.equals(details.getState())) { if (card.isSplitCard() && card.hasAlternateState() && !card.isFaceDown() && !CardStateName.Original.equals(details.getState())) {
if (CardStateName.RightSplit.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())) { } else if (CardStateName.LeftSplit.equals(details.getState())) {
g.drawImage(FSkinImage.LEFTLOCK, cx, cy, cw, ch); g.drawImage(FSkinImage.PADLOCK, cx, cy, cw, ch);
} }
} }
} }

BIN
forge-gui/res/skins/default/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 581 KiB

After

Width:  |  Height:  |  Size: 578 KiB

3
forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java
View File

@@ -360,8 +360,7 @@ public enum FSkinProp {
ICO_UNKNOWN (new int[] {0, 720, 80, 80}, PropType.ICON), ICO_UNKNOWN (new int[] {0, 720, 80, 80}, PropType.ICON),
ICO_LOGO (new int[] {480, 0, 200, 200}, PropType.ICON), ICO_LOGO (new int[] {480, 0, 200, 200}, PropType.ICON),
ICO_CARDART (new int[] {0, 1600, 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_PADLOCK (new int[] {200, 1600, 143, 200}, PropType.ICON),
ICO_RIGHTLOCK (new int[] {343, 1600, 143, 200}, PropType.ICON),
ICO_FLIPCARD (new int[] {400, 0, 80, 120}, PropType.ICON), ICO_FLIPCARD (new int[] {400, 0, 80, 120}, PropType.ICON),
ICO_HDFLIPCARD (new int[] {2, 1268, 387, 500}, PropType.BUTTONS), ICO_HDFLIPCARD (new int[] {2, 1268, 387, 500}, PropType.BUTTONS),