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

Upscaled Zone Icons and FlipCard Icons

Browse Source
This commit is contained in:
Anthony Calosa
2020-02-25 12:23:04 +08:00
parent c916c4da31
commit 01a17b4b2c
6 changed files with 63 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,10 +19,22 @@ import forge.util.ImageUtil;
public enum FSkinImage implements FImage {
//Zones
HAND (FSkinProp.IMG_ZONE_HAND, SourceFile.ICONS),
HDHAND (FSkinProp.IMG_HDZONE_HAND, SourceFile.BUTTONS),
LIBRARY (FSkinProp.IMG_ZONE_LIBRARY, SourceFile.ICONS),
HDLIBRARY (FSkinProp.IMG_HDZONE_LIBRARY, SourceFile.BUTTONS),
EXILE (FSkinProp.IMG_ZONE_EXILE, SourceFile.ICONS),
HDEXILE (FSkinProp.IMG_HDZONE_EXILE, SourceFile.BUTTONS),
FLASHBACK (FSkinProp.IMG_ZONE_FLASHBACK, SourceFile.ICONS),
HDFLASHBACK (FSkinProp.IMG_HDZONE_FLASHBACK, SourceFile.BUTTONS),
GRAVEYARD (FSkinProp.IMG_ZONE_GRAVEYARD, SourceFile.ICONS),
HDGRAVEYARD (FSkinProp.IMG_HDZONE_GRAVEYARD, SourceFile.BUTTONS),
HDMANAPOOL (FSkinProp.IMG_HDZONE_MANAPOOL, SourceFile.BUTTONS),
POISON (FSkinProp.IMG_ZONE_POISON, SourceFile.ICONS),
//Mana symbols
@@ -180,7 +192,10 @@ public enum FSkinImage implements FImage {
SEARCH (FSkinProp.ICO_SEARCH, SourceFile.ICONS),
UNKNOWN (FSkinProp.ICO_UNKNOWN, SourceFile.ICONS),
LOGO (FSkinProp.ICO_LOGO, SourceFile.ICONS),
FLIPCARD (FSkinProp.ICO_FLIPCARD, SourceFile.ICONS),
HDFLIPCARD (FSkinProp.ICO_HDFLIPCARD, SourceFile.BUTTONS),
FAVICON (FSkinProp.ICO_FAVICON, SourceFile.ICONS),
LOCK (FSkinProp.ICO_LOCK, SourceFile.ICONS),

12
forge-gui-mobile/src/forge/card/CardZoom.java
View File

@@ -275,9 +275,15 @@ public class CardZoom extends FOverlay {
if (flipIconBounds != null) {
float imageWidth = cardWidth / 2;
float imageHeight = imageWidth * FSkinImage.FLIPCARD.getHeight() / FSkinImage.FLIPCARD.getWidth();
flipIconBounds.set(x + (cardWidth - imageWidth) / 2, y + (cardHeight - imageHeight) / 2, imageWidth, imageHeight);
g.drawImage(FSkinImage.FLIPCARD, flipIconBounds.x, flipIconBounds.y, flipIconBounds.width, flipIconBounds.height);
if (Forge.hdbuttons){
float imageHeight = imageWidth * FSkinImage.HDFLIPCARD.getHeight() / FSkinImage.HDFLIPCARD.getWidth();
flipIconBounds.set(x + (cardWidth - imageWidth) / 2, y + (cardHeight - imageHeight) / 2, imageWidth, imageHeight);
g.drawImage(FSkinImage.HDFLIPCARD, flipIconBounds.x, flipIconBounds.y, flipIconBounds.width, flipIconBounds.height);
} else {
float imageHeight = imageWidth * FSkinImage.FLIPCARD.getHeight() / FSkinImage.FLIPCARD.getWidth();
flipIconBounds.set(x + (cardWidth - imageWidth) / 2, y + (cardHeight - imageHeight) / 2, imageWidth, imageHeight);
g.drawImage(FSkinImage.FLIPCARD, flipIconBounds.x, flipIconBounds.y, flipIconBounds.width, flipIconBounds.height);
}
}
if (currentActivateAction != null) {

12
forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java
View File

@@ -61,16 +61,16 @@ public class VPlayerPanel extends FContainer {
field = add(new VField(player));
avatar = add(new VAvatar(player, avatarHeight));
lblLife = add(new LifeLabel());
addZoneDisplay(ZoneType.Hand, FSkinImage.HAND);
addZoneDisplay(ZoneType.Graveyard, FSkinImage.GRAVEYARD);
addZoneDisplay(ZoneType.Library, FSkinImage.LIBRARY);
addZoneDisplay(ZoneType.Flashback, FSkinImage.FLASHBACK);
addZoneDisplay(ZoneType.Hand, Forge.hdbuttons ? FSkinImage.HDHAND : FSkinImage.HAND);
addZoneDisplay(ZoneType.Graveyard, Forge.hdbuttons ? FSkinImage.HDGRAVEYARD : FSkinImage.GRAVEYARD);
addZoneDisplay(ZoneType.Library, Forge.hdbuttons ? FSkinImage.HDLIBRARY : FSkinImage.LIBRARY);
addZoneDisplay(ZoneType.Flashback, Forge.hdbuttons ? FSkinImage.HDFLASHBACK :FSkinImage.FLASHBACK);
VManaPool manaPool = add(new VManaPool(player));
tabManaPool = add(new InfoTab(FSkinImage.MANA_X, manaPool));
tabManaPool = add(new InfoTab(Forge.hdbuttons ? FSkinImage.HDMANAPOOL : FSkinImage.MANA_X, manaPool));
tabs.add(tabManaPool);
addZoneDisplay(ZoneType.Exile, FSkinImage.EXILE);
addZoneDisplay(ZoneType.Exile, Forge.hdbuttons ? FSkinImage.HDEXILE : FSkinImage.EXILE);
commandZone = add(new CommandZoneDisplay(player));

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 136 KiB

After

Width:  |  Height:  |  Size: 107 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 50 KiB

After

Width:  |  Height:  |  Size: 62 KiB

51
forge-gui/src/main/java/forge/assets/FSkinProp.java
View File

@@ -48,10 +48,22 @@ public enum FSkinProp {
//zone images
IMG_ZONE_HAND (new int[] {280, 40, 40, 40}, PropType.IMAGE),
IMG_HDZONE_HAND (new int[] {2, 132, 128, 128}, PropType.BUTTONS),
IMG_ZONE_LIBRARY (new int[] {280, 0, 40, 40}, PropType.IMAGE),
IMG_HDZONE_LIBRARY (new int[] {132, 132, 128, 128}, PropType.BUTTONS),
IMG_ZONE_EXILE (new int[] {320, 40, 40, 40}, PropType.IMAGE),
IMG_HDZONE_EXILE (new int[] {262, 132, 128, 128}, PropType.BUTTONS),
IMG_ZONE_FLASHBACK (new int[] {280, 80, 40, 40}, PropType.IMAGE),
IMG_HDZONE_FLASHBACK (new int[] {262, 2, 128, 128}, PropType.BUTTONS),
IMG_ZONE_GRAVEYARD (new int[] {320, 0, 40, 40}, PropType.IMAGE),
IMG_HDZONE_GRAVEYARD (new int[] {132, 2, 128, 128}, PropType.BUTTONS),
IMG_HDZONE_MANAPOOL (new int[] {2, 2, 128, 128}, PropType.BUTTONS),
IMG_ZONE_POISON (new int[] {320, 80, 40, 40}, PropType.IMAGE),
//mana images
@@ -216,7 +228,10 @@ public enum FSkinProp {
ICO_SEARCH (new int[] {660, 680, 20, 20}, PropType.ICON),
ICO_UNKNOWN (new int[] {0, 720, 80, 80}, PropType.ICON),
ICO_LOGO (new int[] {480, 0, 200, 200}, PropType.ICON),
ICO_FLIPCARD (new int[] {400, 0, 80, 120}, PropType.ICON),
ICO_HDFLIPCARD (new int[] {2, 1264, 387, 500}, PropType.BUTTONS),
ICO_FAVICON (new int[] {0, 640, 80, 80}, PropType.ICON),
ICO_LOCK (new int[] {620, 800, 48, 48}, PropType.ICON),
@@ -288,24 +303,24 @@ public enum FSkinProp {
IMG_HDBTN_START_UP (new int[] {2, 2, 588, 312}, PropType.BTNSTART),
IMG_HDBTN_START_OVER (new int[] {1183, 2, 588, 312}, PropType.BTNSTART),
IMG_HDBTN_START_DOWN (new int[] {593, 2, 588, 312}, PropType.BTNSTART),
IMG_HDBTN_UP_LEFT (new int[] {2, 2, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_UP_CENTER (new int[] {162, 2, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_UP_RIGHT (new int[] {322, 2, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_OVER_LEFT (new int[] {2, 169, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_OVER_CENTER (new int[] {162, 169, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_OVER_RIGHT (new int[] {322, 169, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_DOWN_LEFT (new int[] {2, 336, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_DOWN_CENTER (new int[] {162, 336, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_DOWN_RIGHT (new int[] {322, 336, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_FOCUS_LEFT (new int[] {2, 503, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_FOCUS_CENTER (new int[] {162, 503, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_FOCUS_RIGHT (new int[] {322, 503, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_TOGGLE_LEFT (new int[] {2, 670, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_TOGGLE_CENTER (new int[] {162, 670, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_TOGGLE_RIGHT (new int[] {322, 670, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_DISABLED_LEFT (new int[] {2, 837, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_DISABLED_CENTER (new int[] {162, 837, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_DISABLED_RIGHT (new int[] {322, 837, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_UP_LEFT (new int[] {2, 262, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_UP_CENTER (new int[] {162, 262, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_UP_RIGHT (new int[] {322, 262, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_OVER_LEFT (new int[] {2, 429, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_OVER_CENTER (new int[] {162, 429, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_OVER_RIGHT (new int[] {322, 429, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_DOWN_LEFT (new int[] {2, 596, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_DOWN_CENTER (new int[] {162, 596, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_DOWN_RIGHT (new int[] {322, 596, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_FOCUS_LEFT (new int[] {2, 763, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_FOCUS_CENTER (new int[] {162, 763, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_FOCUS_RIGHT (new int[] {322, 763, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_TOGGLE_LEFT (new int[] {2, 930, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_TOGGLE_CENTER (new int[] {162, 930, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_TOGGLE_RIGHT (new int[] {322, 930, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_DISABLED_LEFT (new int[] {2, 1097, 160, 165}, PropType.BUTTONS),
IMG_HDBTN_DISABLED_CENTER (new int[] {162, 1097, 1, 165}, PropType.BUTTONS),
IMG_HDBTN_DISABLED_RIGHT (new int[] {322, 1097, 160, 165}, PropType.BUTTONS),
IMG_FAV1 (new int[] {0, 0, 100, 100}, PropType.FAVICON),
IMG_FAV2 (new int[] {100, 0, 100, 100}, PropType.FAVICON),