diff --git a/forge-adventure/fallback_skin/bg_splash.png b/forge-adventure/fallback_skin/bg_splash.png index 66249347632..0bcba091a57 100644 Binary files a/forge-adventure/fallback_skin/bg_splash.png and b/forge-adventure/fallback_skin/bg_splash.png differ diff --git a/forge-adventure/fallback_skin/bg_texture.jpg b/forge-adventure/fallback_skin/bg_texture.jpg index 7c925524eb3..50f37309ff0 100644 Binary files a/forge-adventure/fallback_skin/bg_texture.jpg and b/forge-adventure/fallback_skin/bg_texture.jpg differ diff --git a/forge-adventure/fallback_skin/font1.ttf b/forge-adventure/fallback_skin/font1.ttf index 4b4ecc66671..28cf43d7e7f 100644 Binary files a/forge-adventure/fallback_skin/font1.ttf and b/forge-adventure/fallback_skin/font1.ttf differ diff --git a/forge-gui-android/assets/fallback_skin/bg_splash.png b/forge-gui-android/assets/fallback_skin/bg_splash.png index 66249347632..0bcba091a57 100644 Binary files a/forge-gui-android/assets/fallback_skin/bg_splash.png and b/forge-gui-android/assets/fallback_skin/bg_splash.png differ diff --git a/forge-gui-android/assets/fallback_skin/bg_texture.jpg b/forge-gui-android/assets/fallback_skin/bg_texture.jpg index 7c925524eb3..50f37309ff0 100644 Binary files a/forge-gui-android/assets/fallback_skin/bg_texture.jpg and b/forge-gui-android/assets/fallback_skin/bg_texture.jpg differ diff --git a/forge-gui-android/assets/fallback_skin/font1.ttf b/forge-gui-android/assets/fallback_skin/font1.ttf index 4b4ecc66671..28cf43d7e7f 100644 Binary files a/forge-gui-android/assets/fallback_skin/font1.ttf and b/forge-gui-android/assets/fallback_skin/font1.ttf differ diff --git a/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java b/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java index 5186889f9dc..911444b6be7 100644 --- a/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java +++ b/forge-gui-desktop/src/main/java/forge/toolbox/imaging/FCardImageRenderer.java @@ -698,7 +698,8 @@ public class FCardImageRenderer { } } else { fillColorBackground(g, colors, x, y, w, h); - SkinIcon icon = FSkin.getIcon(FSkinProp.ICO_LOGO); + //Card Art Logo + SkinIcon icon = FSkin.getIcon(FSkinProp.ICO_CARDART); float artWidth = (float)icon.getSizeForPaint(g).getWidth(); float artHeight = (float)icon.getSizeForPaint(g).getHeight(); if (artWidth / artHeight >= (float)w / (float)h) { diff --git a/forge-gui-mobile-dev/fallback_skin/bg_splash.png b/forge-gui-mobile-dev/fallback_skin/bg_splash.png index 66249347632..0bcba091a57 100644 Binary files a/forge-gui-mobile-dev/fallback_skin/bg_splash.png and b/forge-gui-mobile-dev/fallback_skin/bg_splash.png differ diff --git a/forge-gui-mobile-dev/fallback_skin/bg_texture.jpg b/forge-gui-mobile-dev/fallback_skin/bg_texture.jpg index 7c925524eb3..50f37309ff0 100644 Binary files a/forge-gui-mobile-dev/fallback_skin/bg_texture.jpg and b/forge-gui-mobile-dev/fallback_skin/bg_texture.jpg differ diff --git a/forge-gui-mobile-dev/fallback_skin/font1.ttf b/forge-gui-mobile-dev/fallback_skin/font1.ttf index 4b4ecc66671..28cf43d7e7f 100644 Binary files a/forge-gui-mobile-dev/fallback_skin/font1.ttf and b/forge-gui-mobile-dev/fallback_skin/font1.ttf differ diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 300d18dd752..9a72f34b8f2 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -128,6 +128,17 @@ public class FSkin { //reset hd buttons/icons Forge.hdbuttons = false; Forge.hdstart = false; + // TODO: the "v2" string should be a property of the default skin. + FileHandle v2File = Gdx.files.absolute(ForgeConstants.FONTS_DIR + "v2"); + if (v2File == null || !v2File.exists()) { + //delete cached fonts + FSkinFont.deleteCachedFiles(); + try { + v2File.file().createNewFile(); + } catch (Exception e) { + e.printStackTrace(); + } + } //ensure skins directory exists final FileHandle dir = Gdx.files.absolute(ForgeConstants.CACHE_SKINS_DIR); diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 5689db2d006..2b5e42de076 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -219,9 +219,10 @@ public enum FSkinImage implements FSkinImageInterface { UNKNOWN (FSkinProp.ICO_UNKNOWN), LOGO (FSkinProp.ICO_LOGO), + CARDART (FSkinProp.ICO_CARDART), FLIPCARD (FSkinProp.ICO_FLIPCARD), - HDFLIPCARD (FSkinProp.ICO_HDFLIPCARD), + HDFLIPCARD (FSkinProp.ICO_HDFLIPCARD), FAVICON (FSkinProp.ICO_FAVICON), LOCK (FSkinProp.ICO_LOCK), @@ -313,15 +314,15 @@ public enum FSkinImage implements FSkinImageInterface { HDBTN_DOWN_LEFT (FSkinProp.IMG_HDBTN_DOWN_LEFT), HDBTN_DOWN_CENTER (FSkinProp.IMG_HDBTN_DOWN_CENTER), HDBTN_DOWN_RIGHT (FSkinProp.IMG_HDBTN_DOWN_RIGHT), - HDBTN_FOCUS_LEFT (FSkinProp.IMG_HDBTN_FOCUS_LEFT), - HDBTN_FOCUS_CENTER (FSkinProp.IMG_HDBTN_FOCUS_CENTER), - HDBTN_FOCUS_RIGHT (FSkinProp.IMG_HDBTN_FOCUS_RIGHT), - HDBTN_TOGGLE_LEFT (FSkinProp.IMG_HDBTN_TOGGLE_LEFT), - HDBTN_TOGGLE_CENTER (FSkinProp.IMG_HDBTN_TOGGLE_CENTER), - HDBTN_TOGGLE_RIGHT (FSkinProp.IMG_HDBTN_TOGGLE_RIGHT), - HDBTN_DISABLED_LEFT (FSkinProp.IMG_HDBTN_DISABLED_LEFT), - HDBTN_DISABLED_CENTER (FSkinProp.IMG_HDBTN_DISABLED_CENTER), - HDBTN_DISABLED_RIGHT (FSkinProp.IMG_HDBTN_DISABLED_RIGHT), + HDBTN_FOCUS_LEFT (FSkinProp.IMG_HDBTN_FOCUS_LEFT), + HDBTN_FOCUS_CENTER (FSkinProp.IMG_HDBTN_FOCUS_CENTER), + HDBTN_FOCUS_RIGHT (FSkinProp.IMG_HDBTN_FOCUS_RIGHT), + HDBTN_TOGGLE_LEFT (FSkinProp.IMG_HDBTN_TOGGLE_LEFT), + HDBTN_TOGGLE_CENTER (FSkinProp.IMG_HDBTN_TOGGLE_CENTER), + HDBTN_TOGGLE_RIGHT (FSkinProp.IMG_HDBTN_TOGGLE_RIGHT), + HDBTN_DISABLED_LEFT (FSkinProp.IMG_HDBTN_DISABLED_LEFT), + HDBTN_DISABLED_CENTER (FSkinProp.IMG_HDBTN_DISABLED_CENTER), + HDBTN_DISABLED_RIGHT (FSkinProp.IMG_HDBTN_DISABLED_RIGHT), //Foils FOIL_01 (FSkinProp.FOIL_01), diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index b76cefdc408..f689f2eb570 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -156,19 +156,20 @@ public class CardImageRenderer { } //space for artist textBoxHeight -= 2 * PT_FONT.getCapHeight(); - PaperCard paperCard = ImageUtil.getPaperCardFromImageKey(state.getImageKey()); + PaperCard paperCard = null; + try { + paperCard = ImageUtil.getPaperCardFromImageKey(state.getImageKey()); + } catch (Exception e) {} String artist = "WOTC"; if (paperCard != null && !paperCard.getArtist().isEmpty()) artist = paperCard.getArtist(); float minTextBoxHeight = 2 * headerHeight; if (textBoxHeight < minTextBoxHeight) { - if (textBoxHeight < minTextBoxHeight) { - artHeight -= (minTextBoxHeight - textBoxHeight); //subtract from art height if text box not big enough otherwise - textBoxHeight = minTextBoxHeight; - if (artHeight < 0) { - textBoxHeight += artHeight; - artHeight = 0; - } + artHeight -= (minTextBoxHeight - textBoxHeight); //subtract from art height if text box not big enough otherwise + textBoxHeight = minTextBoxHeight; + if (artHeight < 0) { + textBoxHeight += artHeight; + artHeight = 0; } } @@ -302,8 +303,8 @@ public class CardImageRenderer { private static final FBufferedImage stretchedArt; static { - final float logoWidth = FSkinImage.LOGO.getWidth(); - final float logoHeight = FSkinImage.LOGO.getHeight(); + final float logoWidth = FSkinImage.CARDART.getWidth(); + final float logoHeight = FSkinImage.CARDART.getHeight(); float h = logoHeight * 1.1f; float w = h * CardRenderer.CARD_ART_RATIO; forgeArt = new FBufferedImage(w, h) { @@ -311,7 +312,7 @@ public class CardImageRenderer { protected void draw(Graphics g, float w, float h) { g.drawImage(Forge.isMobileAdventureMode ? FSkinTexture.ADV_BG_TEXTURE : FSkinTexture.BG_TEXTURE, 0, 0, w, h); g.fillRect(FScreen.getTextureOverlayColor(), 0, 0, w, h); - g.drawImage(FSkinImage.LOGO, (w - logoWidth) / 2, (h - logoHeight) / 2, logoWidth, logoHeight); + g.drawImage(FSkinImage.CARDART, (w - logoWidth) / 2, (h - logoHeight) / 2, logoWidth, logoHeight); } }; stretchedArt = new FBufferedImage(w, h) { @@ -319,20 +320,24 @@ public class CardImageRenderer { protected void draw(Graphics g, float w, float h) { g.drawImage(Forge.isMobileAdventureMode ? FSkinTexture.ADV_BG_TEXTURE : FSkinTexture.BG_TEXTURE, 0, 0, w, h); g.fillRect(FScreen.getTextureOverlayColor(), 0, 0, w, h); - g.drawImage(FSkinImage.LOGO, (w - logoWidth) / 2, ((h - logoHeight) / 2) + h / 3.5f, logoWidth, logoHeight / 3); + int newW = Math.round((h * (logoWidth / logoHeight)) * 1.5f); + int newH = Math.round(logoHeight / 2); + g.drawImage(FSkinImage.CARDART, (w - newW) /2, (h - newH) / 2, newW, newH); } }; } private static void drawArt(CardView cv, Graphics g, float x, float y, float w, float h, boolean altState, boolean isFaceDown) { - boolean isSaga = cv.getCurrentState().getType().hasSubtype("Saga"); - boolean isClass = cv.getCurrentState().getType().hasSubtype("Class") || cv.getCurrentState().getType().hasSubtype("Case"); - boolean isDungeon = cv.getCurrentState().getType().isDungeon(); + boolean useStretchedArt = cv.getCurrentState().getType().hasSubtype("Saga") + || cv.getCurrentState().getType().hasSubtype("Class") + || cv.getCurrentState().getType().hasSubtype("Case") + || cv.getCurrentState().getType().isDungeon(); ColorSet colorSet = cv.getCurrentState().getColors(); if (altState && cv.hasAlternateState()) { - isSaga = cv.getAlternateState().getType().hasSubtype("Saga"); - isClass = cv.getAlternateState().getType().hasSubtype("Class") || cv.getAlternateState().getType().hasSubtype("Case"); - isDungeon = cv.getAlternateState().getType().isDungeon(); + useStretchedArt = cv.getAlternateState().getType().hasSubtype("Saga") + || cv.getAlternateState().getType().hasSubtype("Class") + || cv.getAlternateState().getType().hasSubtype("Case") + || cv.getAlternateState().getType().isDungeon(); colorSet = cv.getAlternateState().getColors(); } if (cv == null) { @@ -344,7 +349,7 @@ public class CardImageRenderer { } } //fallback - if (isSaga || isClass || isDungeon) { + if (useStretchedArt) { g.drawImage(stretchedArt, x, y, w, h); } else { g.drawImage(forgeArt, x, y, w, h); @@ -359,7 +364,7 @@ public class CardImageRenderer { || cv.getCurrentState().getImageKey().equals(ImageKeys.getTokenKey(ImageKeys.FORETELL_IMAGE))); if (cardArt != null) { if (isHidden && !altState) { - if (isSaga || isClass || isDungeon) { + if (useStretchedArt) { g.drawImage(stretchedArt, x, y, w, h); } else { g.drawImage(forgeArt, x, y, w, h); @@ -391,14 +396,14 @@ public class CardImageRenderer { } } } else { - if (isSaga || isClass || isDungeon) { + if (useStretchedArt) { g.drawImage(stretchedArt, x, y, w, h); } else { g.drawImage(forgeArt, x, y, w, h); } } } else { - if (isSaga || isClass || isDungeon) { + if (useStretchedArt) { g.drawImage(stretchedArt, x, y, w, h); } else { g.drawImage(forgeArt, x, y, w, h); diff --git a/forge-gui/res/lists/skinsList.txt b/forge-gui/res/lists/skinsList.txt index af3af64b853..6490bdc118d 100644 --- a/forge-gui/res/lists/skinsList.txt +++ b/forge-gui/res/lists/skinsList.txt @@ -143,3 +143,103 @@ https://downloads.cardforge.org/skins/magic_blue/sprite_buttons.png https://downloads.cardforge.org/skins/magic_blue/sprite_icons.png https://downloads.cardforge.org/skins/magic_blue/sprite_start.png https://downloads.cardforge.org/skins/magic_blue/sprite_trophies.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_WU.png +https://downloads.cardforge.org/skins/old_forge/loader.gif +https://downloads.cardforge.org/skins/old_forge/overlay_alpha.png +https://downloads.cardforge.org/skins/old_forge/splatter.png +https://downloads.cardforge.org/skins/old_forge/sprite_ability.png +https://downloads.cardforge.org/skins/old_forge/sprite_adv_buttons.png +https://downloads.cardforge.org/skins/old_forge/sprite_adventure.png +https://downloads.cardforge.org/skins/old_forge/sprite_attraction_lights.png +https://downloads.cardforge.org/skins/old_forge/sprite_avatars.png +https://downloads.cardforge.org/skins/old_forge/sprite_border.png +https://downloads.cardforge.org/skins/old_forge/sprite_buttons.png +https://downloads.cardforge.org/skins/old_forge/sprite_cracks.png +https://downloads.cardforge.org/skins/old_forge/sprite_cursor.png +https://downloads.cardforge.org/skins/old_forge/sprite_deckbox.png +https://downloads.cardforge.org/skins/old_forge/sprite_draftranks.png +https://downloads.cardforge.org/skins/old_forge/sprite_favicons.png +https://downloads.cardforge.org/skins/old_forge/sprite_foils.png +https://downloads.cardforge.org/skins/old_forge/sprite_hybrid_colorless.png +https://downloads.cardforge.org/skins/old_forge/sprite_icons.png +https://downloads.cardforge.org/skins/old_forge/sprite_manaicons.png +https://downloads.cardforge.org/skins/old_forge/sprite_old_foils.png +https://downloads.cardforge.org/skins/old_forge/sprite_phyrexian.png +https://downloads.cardforge.org/skins/old_forge/sprite_planar_conquest.png +https://downloads.cardforge.org/skins/old_forge/sprite_setlogo.png +https://downloads.cardforge.org/skins/old_forge/sprite_sleeves.png +https://downloads.cardforge.org/skins/old_forge/sprite_sleeves2.png +https://downloads.cardforge.org/skins/old_forge/sprite_start.png +https://downloads.cardforge.org/skins/old_forge/sprite_trophies.png +https://downloads.cardforge.org/skins/old_forge/sprite_watermark.png +https://downloads.cardforge.org/skins/old_forge/adv_bg_castle.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_cave.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_common.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_dungeon.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_forest.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_island.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_match.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_match_day.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_match_nigh.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_mountain.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_plains.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_splash.png +https://downloads.cardforge.org/skins/old_forge/adv_bg_swamp.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_texture.jpg +https://downloads.cardforge.org/skins/old_forge/adv_bg_waste.jpg +https://downloads.cardforge.org/skins/old_forge/adv_logo.png +https://downloads.cardforge.org/skins/old_forge/bg_chaos_wheel.png +https://downloads.cardforge.org/skins/old_forge/bg_day.jpg +https://downloads.cardforge.org/skins/old_forge/bg_draft_deck.png +https://downloads.cardforge.org/skins/old_forge/bg_match.jpg +https://downloads.cardforge.org/skins/old_forge/bg_night.jpg +https://downloads.cardforge.org/skins/old_forge/bg_space.png +https://downloads.cardforge.org/skins/old_forge/bg_splash.png +https://downloads.cardforge.org/skins/old_forge/bg_splash_hd.png +https://downloads.cardforge.org/skins/old_forge/bg_texture.jpg +https://downloads.cardforge.org/skins/old_forge/font1.ttf +https://downloads.cardforge.org/skins/old_forge/grid_icons.png +https://downloads.cardforge.org/skins/old_forge/hd_logo.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_A.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_B.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_BG.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_BR.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_C.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_G.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_L.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_M.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_R.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_RG.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_U.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_UB.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_UG.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_UR.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_V.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_W.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_WB.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_WG.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_WR.png +https://downloads.cardforge.org/skins/old_forge/IMG_CARDBG_WU.png +https://downloads.cardforge.org/skins/old_forge/IMG_NYX_B.png +https://downloads.cardforge.org/skins/old_forge/IMG_NYX_C.png +https://downloads.cardforge.org/skins/old_forge/IMG_NYX_G.png +https://downloads.cardforge.org/skins/old_forge/IMG_NYX_M.png +https://downloads.cardforge.org/skins/old_forge/IMG_NYX_R.png +https://downloads.cardforge.org/skins/old_forge/IMG_NYX_U.png +https://downloads.cardforge.org/skins/old_forge/IMG_NYX_W.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_B.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_BG.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_BR.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_C.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_G.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_M.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_R.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_RG.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_U.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_UB.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_UG.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_UR.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_W.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_WB.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_WG.png +https://downloads.cardforge.org/skins/old_forge/IMG_PWBG_WR.png diff --git a/forge-gui/res/skins/default/bg_chaos_wheel.png b/forge-gui/res/skins/default/bg_chaos_wheel.png index 607aee4d149..fb42c050942 100644 Binary files a/forge-gui/res/skins/default/bg_chaos_wheel.png and b/forge-gui/res/skins/default/bg_chaos_wheel.png differ diff --git a/forge-gui/res/skins/default/bg_match.jpg b/forge-gui/res/skins/default/bg_match.jpg index ce143a5381d..b0630064e21 100644 Binary files a/forge-gui/res/skins/default/bg_match.jpg and b/forge-gui/res/skins/default/bg_match.jpg differ diff --git a/forge-gui/res/skins/default/bg_space.png b/forge-gui/res/skins/default/bg_space.png index c1cdad089cc..4e397df298c 100644 Binary files a/forge-gui/res/skins/default/bg_space.png and b/forge-gui/res/skins/default/bg_space.png differ diff --git a/forge-gui/res/skins/default/bg_splash.png b/forge-gui/res/skins/default/bg_splash.png index dca090ee57f..0bcba091a57 100644 Binary files a/forge-gui/res/skins/default/bg_splash.png and b/forge-gui/res/skins/default/bg_splash.png differ diff --git a/forge-gui/res/skins/default/bg_splash_hd.png b/forge-gui/res/skins/default/bg_splash_hd.png index d4b3279275a..2fca0a004d8 100644 Binary files a/forge-gui/res/skins/default/bg_splash_hd.png and b/forge-gui/res/skins/default/bg_splash_hd.png differ diff --git a/forge-gui/res/skins/default/bg_texture.jpg b/forge-gui/res/skins/default/bg_texture.jpg index 7c925524eb3..50f37309ff0 100644 Binary files a/forge-gui/res/skins/default/bg_texture.jpg and b/forge-gui/res/skins/default/bg_texture.jpg differ diff --git a/forge-gui/res/skins/default/font1.ttf b/forge-gui/res/skins/default/font1.ttf index 8723f9e2252..28cf43d7e7f 100644 Binary files a/forge-gui/res/skins/default/font1.ttf and b/forge-gui/res/skins/default/font1.ttf differ diff --git a/forge-gui/res/skins/default/hd_logo.png b/forge-gui/res/skins/default/hd_logo.png index b4ea23cf2db..c89614178e0 100644 Binary files a/forge-gui/res/skins/default/hd_logo.png and b/forge-gui/res/skins/default/hd_logo.png differ diff --git a/forge-gui/res/skins/default/sprite_avatars.png b/forge-gui/res/skins/default/sprite_avatars.png index 5f5e4c32a53..9aac05003f5 100644 Binary files a/forge-gui/res/skins/default/sprite_avatars.png and b/forge-gui/res/skins/default/sprite_avatars.png differ diff --git a/forge-gui/res/skins/default/sprite_buttons.png b/forge-gui/res/skins/default/sprite_buttons.png index b92e016be99..d8d343eb308 100644 Binary files a/forge-gui/res/skins/default/sprite_buttons.png and b/forge-gui/res/skins/default/sprite_buttons.png differ diff --git a/forge-gui/res/skins/default/sprite_deckbox.png b/forge-gui/res/skins/default/sprite_deckbox.png index 71dc02f164d..b5148bb344b 100644 Binary files a/forge-gui/res/skins/default/sprite_deckbox.png and b/forge-gui/res/skins/default/sprite_deckbox.png differ diff --git a/forge-gui/res/skins/default/sprite_icons.png b/forge-gui/res/skins/default/sprite_icons.png index 774067843b0..c5a9e927a95 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/res/skins/default/sprite_planar_conquest.png b/forge-gui/res/skins/default/sprite_planar_conquest.png index fdd23e45b0a..97d36b0673a 100644 Binary files a/forge-gui/res/skins/default/sprite_planar_conquest.png and b/forge-gui/res/skins/default/sprite_planar_conquest.png differ diff --git a/forge-gui/res/skins/default/sprite_sleeves.png b/forge-gui/res/skins/default/sprite_sleeves.png index 8182a942d9b..130b8b84750 100644 Binary files a/forge-gui/res/skins/default/sprite_sleeves.png and b/forge-gui/res/skins/default/sprite_sleeves.png differ diff --git a/forge-gui/res/skins/default/sprite_sleeves2.png b/forge-gui/res/skins/default/sprite_sleeves2.png index 0a5f0565eb1..75c4e5f5891 100644 Binary files a/forge-gui/res/skins/default/sprite_sleeves2.png and b/forge-gui/res/skins/default/sprite_sleeves2.png differ diff --git a/forge-gui/res/skins/default/sprite_start.png b/forge-gui/res/skins/default/sprite_start.png index 3b20b24c5b7..dc5e7ea6e68 100644 Binary files a/forge-gui/res/skins/default/sprite_start.png and b/forge-gui/res/skins/default/sprite_start.png differ diff --git a/forge-gui/res/skins/default/sprite_trophies.png b/forge-gui/res/skins/default/sprite_trophies.png index baebc020b1b..a8c2847ea48 100644 Binary files a/forge-gui/res/skins/default/sprite_trophies.png and b/forge-gui/res/skins/default/sprite_trophies.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 f07f1d21d44..7491d40d5ca 100644 --- a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java @@ -359,6 +359,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_FLIPCARD (new int[] {400, 0, 80, 120}, PropType.ICON), ICO_HDFLIPCARD (new int[] {2, 1268, 387, 500}, PropType.BUTTONS),