diff --git a/forge-gui-mobile/src/forge/Forge.java b/forge-gui-mobile/src/forge/Forge.java index 528839b8465..e7a15839c43 100644 --- a/forge-gui-mobile/src/forge/Forge.java +++ b/forge-gui-mobile/src/forge/Forge.java @@ -153,11 +153,8 @@ public class Forge implements ApplicationListener { GuiBase.setIsAndroid(Gdx.app.getType() == Application.ApplicationType.Android); - if (!GuiBase.isAndroid() || (androidVersion > 28 && totalDeviceRAM > 7000)) { + if (!GuiBase.isAndroid() || (androidVersion > 25 && totalDeviceRAM > 3400)) { allowCardBG = true; - } else { - // don't allow to read and process - ForgeConstants.SPRITE_CARDBG_FILE = ""; } assets = new Assets(); graphics = new Graphics(); diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 90bd5b603bb..9998d6bc8ae 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -131,53 +131,6 @@ public enum FSkinImage implements FImage { DRAFTRANK_A (FSkinProp.IMG_DRAFTRANK_A, SourceFile.DRAFTRANKS), DRAFTRANK_S (FSkinProp.IMG_DRAFTRANK_S, SourceFile.DRAFTRANKS), - //CardBG - CARDBG_A (FSkinProp.IMG_CARDBG_A, SourceFile.CARDBG), - CARDBG_B (FSkinProp.IMG_CARDBG_B, SourceFile.CARDBG), - CARDBG_BG (FSkinProp.IMG_CARDBG_BG, SourceFile.CARDBG), - CARDBG_BR (FSkinProp.IMG_CARDBG_BR, SourceFile.CARDBG), - CARDBG_C (FSkinProp.IMG_CARDBG_C, SourceFile.CARDBG), - CARDBG_G (FSkinProp.IMG_CARDBG_G, SourceFile.CARDBG), - CARDBG_L (FSkinProp.IMG_CARDBG_L, SourceFile.CARDBG), - CARDBG_M (FSkinProp.IMG_CARDBG_M, SourceFile.CARDBG), - CARDBG_R (FSkinProp.IMG_CARDBG_R, SourceFile.CARDBG), - CARDBG_RG (FSkinProp.IMG_CARDBG_RG, SourceFile.CARDBG), - CARDBG_U (FSkinProp.IMG_CARDBG_U, SourceFile.CARDBG), - CARDBG_UB (FSkinProp.IMG_CARDBG_UB, SourceFile.CARDBG), - CARDBG_UG (FSkinProp.IMG_CARDBG_UG, SourceFile.CARDBG), - CARDBG_UR (FSkinProp.IMG_CARDBG_UR, SourceFile.CARDBG), - CARDBG_V (FSkinProp.IMG_CARDBG_V, SourceFile.CARDBG), - CARDBG_W (FSkinProp.IMG_CARDBG_W, SourceFile.CARDBG), - CARDBG_WB (FSkinProp.IMG_CARDBG_WB, SourceFile.CARDBG), - CARDBG_WG (FSkinProp.IMG_CARDBG_WG, SourceFile.CARDBG), - CARDBG_WR (FSkinProp.IMG_CARDBG_WR, SourceFile.CARDBG), - CARDBG_WU (FSkinProp.IMG_CARDBG_WU, SourceFile.CARDBG), - //PWBG - PWBG_B (FSkinProp.IMG_PWBG_B, SourceFile.CARDBG), - PWBG_BG (FSkinProp.IMG_PWBG_BG, SourceFile.CARDBG), - PWBG_BR (FSkinProp.IMG_PWBG_BR, SourceFile.CARDBG), - PWBG_C (FSkinProp.IMG_PWBG_C, SourceFile.CARDBG), - PWBG_G (FSkinProp.IMG_PWBG_G, SourceFile.CARDBG), - PWBG_M (FSkinProp.IMG_PWBG_M, SourceFile.CARDBG), - PWBG_R (FSkinProp.IMG_PWBG_R, SourceFile.CARDBG), - PWBG_RG (FSkinProp.IMG_PWBG_RG, SourceFile.CARDBG), - PWBG_U (FSkinProp.IMG_PWBG_U, SourceFile.CARDBG), - PWBG_UB (FSkinProp.IMG_PWBG_UB, SourceFile.CARDBG), - PWBG_UG (FSkinProp.IMG_PWBG_UG, SourceFile.CARDBG), - PWBG_UR (FSkinProp.IMG_PWBG_UR, SourceFile.CARDBG), - PWBG_W (FSkinProp.IMG_PWBG_W, SourceFile.CARDBG), - PWBG_WB (FSkinProp.IMG_PWBG_WB, SourceFile.CARDBG), - PWBG_WG (FSkinProp.IMG_PWBG_WG, SourceFile.CARDBG), - PWBG_WR (FSkinProp.IMG_PWBG_WR, SourceFile.CARDBG), - PWBG_WU (FSkinProp.IMG_PWBG_WU, SourceFile.CARDBG), - //NYX OVERLAY - NYX_B (FSkinProp.IMG_NYX_B, SourceFile.CARDBG), - NYX_G (FSkinProp.IMG_NYX_G, SourceFile.CARDBG), - NYX_M (FSkinProp.IMG_NYX_M, SourceFile.CARDBG), - NYX_R (FSkinProp.IMG_NYX_R, SourceFile.CARDBG), - NYX_U (FSkinProp.IMG_NYX_U, SourceFile.CARDBG), - NYX_W (FSkinProp.IMG_NYX_W, SourceFile.CARDBG), - //Gameplay TAP (FSkinProp.IMG_TAP, SourceFile.MANAICONS), UNTAP (FSkinProp.IMG_UNTAP, SourceFile.MANAICONS), @@ -531,7 +484,6 @@ public enum FSkinImage implements FImage { WATERMARKS(ForgeConstants.SPRITE_WATERMARK_FILE), DRAFTRANKS(ForgeConstants.SPRITE_DRAFTRANKS_FILE), CRACKS(ForgeConstants.SPRITE_CRACKS_FILE), - CARDBG(ForgeConstants.SPRITE_CARDBG_FILE), PLANAR_CONQUEST(ForgeConstants.SPRITE_PLANAR_CONQUEST_FILE); private final String filename; diff --git a/forge-gui-mobile/src/forge/assets/FSkinTexture.java b/forge-gui-mobile/src/forge/assets/FSkinTexture.java index 8d2a5e686ca..4437f8d7e66 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinTexture.java +++ b/forge-gui-mobile/src/forge/assets/FSkinTexture.java @@ -34,6 +34,52 @@ public enum FSkinTexture implements FImage { ADV_BG_CAVE(ForgeConstants.ADV_BG_CAVE_FILE, false, false), ADV_BG_DUNGEON(ForgeConstants.ADV_BG_DUNGEON_FILE, false, false), ADV_BG_CASTLE(ForgeConstants.ADV_BG_CASTLE_FILE, false, false), + //CARD BG + CARDBG_A (ForgeConstants.IMG_CARDBG_A, false, false), + CARDBG_B (ForgeConstants.IMG_CARDBG_B, false, false), + CARDBG_BG (ForgeConstants.IMG_CARDBG_BG, false, false), + CARDBG_BR (ForgeConstants.IMG_CARDBG_BR, false, false), + CARDBG_C (ForgeConstants.IMG_CARDBG_C, false, false), + CARDBG_G (ForgeConstants.IMG_CARDBG_G, false, false), + CARDBG_L (ForgeConstants.IMG_CARDBG_L, false, false), + CARDBG_M (ForgeConstants.IMG_CARDBG_M, false, false), + CARDBG_R (ForgeConstants.IMG_CARDBG_R, false, false), + CARDBG_RG (ForgeConstants.IMG_CARDBG_RG, false, false), + CARDBG_U (ForgeConstants.IMG_CARDBG_U, false, false), + CARDBG_UB (ForgeConstants.IMG_CARDBG_UB, false, false), + CARDBG_UG (ForgeConstants.IMG_CARDBG_UG, false, false), + CARDBG_UR (ForgeConstants.IMG_CARDBG_UR, false, false), + CARDBG_V (ForgeConstants.IMG_CARDBG_V, false, false), + CARDBG_W (ForgeConstants.IMG_CARDBG_W, false, false), + CARDBG_WB (ForgeConstants.IMG_CARDBG_WB, false, false), + CARDBG_WG (ForgeConstants.IMG_CARDBG_WG, false, false), + CARDBG_WR (ForgeConstants.IMG_CARDBG_WR, false, false), + CARDBG_WU (ForgeConstants.IMG_CARDBG_WU, false, false), + PWBG_B (ForgeConstants.IMG_PWBG_B, false, false), + PWBG_BG (ForgeConstants.IMG_PWBG_BG, false, false), + PWBG_BR (ForgeConstants.IMG_PWBG_BR, false, false), + PWBG_C (ForgeConstants.IMG_PWBG_C, false, false), + PWBG_G (ForgeConstants.IMG_PWBG_G, false, false), + PWBG_M (ForgeConstants.IMG_PWBG_M, false, false), + PWBG_R (ForgeConstants.IMG_PWBG_R, false, false), + PWBG_RG (ForgeConstants.IMG_PWBG_RG, false, false), + PWBG_U (ForgeConstants.IMG_PWBG_U, false, false), + PWBG_UB (ForgeConstants.IMG_PWBG_UB, false, false), + PWBG_UG (ForgeConstants.IMG_PWBG_UG, false, false), + PWBG_UR (ForgeConstants.IMG_PWBG_UR, false, false), + PWBG_W (ForgeConstants.IMG_PWBG_W, false, false), + PWBG_WB (ForgeConstants.IMG_PWBG_WB, false, false), + PWBG_WG (ForgeConstants.IMG_PWBG_WG, false, false), + PWBG_WR (ForgeConstants.IMG_PWBG_WR, false, false), + PWBG_WU (ForgeConstants.IMG_PWBG_WU, false, false), + NYX_B (ForgeConstants.IMG_NYX_B, false, false), + NYX_G (ForgeConstants.IMG_NYX_G, false, false), + NYX_M (ForgeConstants.IMG_NYX_M, false, false), + NYX_R (ForgeConstants.IMG_NYX_R, false, false), + NYX_U (ForgeConstants.IMG_NYX_U, false, false), + NYX_W (ForgeConstants.IMG_NYX_W, false, false), + NYX_C (ForgeConstants.IMG_NYX_C, false, false), + //Planechase Academy_at_Tolaria_West(ForgeConstants.BG_1, false, true), Agyrem(ForgeConstants.BG_2, false, true), diff --git a/forge-gui-mobile/src/forge/card/CardImageRenderer.java b/forge-gui-mobile/src/forge/card/CardImageRenderer.java index e2a3385b412..ec3cb68f14d 100644 --- a/forge-gui-mobile/src/forge/card/CardImageRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardImageRenderer.java @@ -377,6 +377,10 @@ public class CardImageRenderer { } private static void drawSplitCard(CardView card, FImageComplex cardArt, Graphics g, float x, float y, float w, float h, boolean altState, boolean isFaceDown) { + if (cardArt.getTexture() == forgeArt.getTexture()) { + g.drawImage(cardArt, x, y, w, h); + return; + } CardView alt = card.getBackup(); if (alt == null) alt = card.getAlternateState().getCard(); @@ -858,7 +862,7 @@ public class CardImageRenderer { } else { borderColors = CardDetailUtil.getBorderColors(state, canShow); } - Color[] colors = fillColorBackground(g, borderColors, x, y, w, h); + Color[] colors = Forge.allowCardBG ? drawCardBackgroundTexture(state, g, !altState ? borderColors : CardDetailUtil.getBorderColors(state, canShow), x, y, w, h) : fillColorBackground(g, borderColors, x, y, w, h); Color idForeColor = FSkinColor.getHighContrastColor(colors[0]); @@ -907,79 +911,91 @@ public class CardImageRenderer { switch (backColors.size()) { case 1: if (backColors.get(0) == DetailColors.FACE_DOWN) { - g.drawImage(FSkinImage.CARDBG_C, x, y, w, h); + g.drawImage(FSkinTexture.CARDBG_C, x, y, w, h); } else if (backColors.get(0) == DetailColors.LAND) { - g.drawImage(isPW ? FSkinImage.PWBG_C : FSkinImage.CARDBG_L, x, y, w, h); + g.drawImage(isPW ? FSkinTexture.PWBG_C : FSkinTexture.CARDBG_L, x, y, w, h); } else if (backColors.get(0) == DetailColors.MULTICOLOR) { - g.drawImage(isPW ? FSkinImage.PWBG_M : FSkinImage.CARDBG_M, x, y, w, h); if (isNyx) - g.drawImage(FSkinImage.NYX_M, x, y, w, (h / 2) + (h / 5)); + g.drawImage(FSkinTexture.NYX_M, x, y, w, h); + else + g.drawImage(isPW ? FSkinTexture.PWBG_M : FSkinTexture.CARDBG_M, x, y, w, h); } else if (backColors.get(0) == DetailColors.COLORLESS) { if (isPW) - g.drawImage(FSkinImage.PWBG_C, x, y, w, h); + g.drawImage(FSkinTexture.PWBG_C, x, y, w, h); else if (state.isVehicle()) - g.drawImage(FSkinImage.CARDBG_V, x, y, w, h); + g.drawImage(FSkinTexture.CARDBG_V, x, y, w, h); else if (state.isArtifact()) - g.drawImage(FSkinImage.CARDBG_A, x, y, w, h); + g.drawImage(FSkinTexture.CARDBG_A, x, y, w, h); else - g.drawImage(FSkinImage.CARDBG_C, x, y, w, h); + g.drawImage(FSkinTexture.CARDBG_C, x, y, w, h); //todo add NYX for colorless? } else if (backColors.get(0) == DetailColors.GREEN) { - g.drawImage(isPW ? FSkinImage.PWBG_G : FSkinImage.CARDBG_G, x, y, w, h); if (isNyx) - g.drawImage(FSkinImage.NYX_G, x, y, w, (h / 2) + (h / 5)); + g.drawImage(FSkinTexture.NYX_G, x, y, w, h); + else + g.drawImage(isPW ? FSkinTexture.PWBG_G : FSkinTexture.CARDBG_G, x, y, w, h); } else if (backColors.get(0) == DetailColors.RED) { - g.drawImage(isPW ? FSkinImage.PWBG_R : FSkinImage.CARDBG_R, x, y, w, h); if (isNyx) - g.drawImage(FSkinImage.NYX_R, x, y, w, (h / 2) + (h / 5)); + g.drawImage(FSkinTexture.NYX_R, x, y, w, h); + else + g.drawImage(isPW ? FSkinTexture.PWBG_R : FSkinTexture.CARDBG_R, x, y, w, h); } else if (backColors.get(0) == DetailColors.BLACK) { - g.drawImage(isPW ? FSkinImage.PWBG_B : FSkinImage.CARDBG_B, x, y, w, h); if (isNyx) - g.drawImage(FSkinImage.NYX_B, x, y, w, (h / 2) + (h / 5)); + g.drawImage(FSkinTexture.NYX_B, x, y, w, h); + else + g.drawImage(isPW ? FSkinTexture.PWBG_B : FSkinTexture.CARDBG_B, x, y, w, h); } else if (backColors.get(0) == DetailColors.BLUE) { - g.drawImage(isPW ? FSkinImage.PWBG_U : FSkinImage.CARDBG_U, x, y, w, h); if (isNyx) - g.drawImage(FSkinImage.NYX_U, x, y, w, (h / 2) + (h / 5)); + g.drawImage(FSkinTexture.NYX_U, x, y, w, h); + else + g.drawImage(isPW ? FSkinTexture.PWBG_U : FSkinTexture.CARDBG_U, x, y, w, h); } else if (backColors.get(0) == DetailColors.WHITE) { - g.drawImage(isPW ? FSkinImage.PWBG_W : FSkinImage.CARDBG_W, x, y, w, h); if (isNyx) - g.drawImage(FSkinImage.NYX_W, x, y, w, (h / 2) + (h / 5)); + g.drawImage(FSkinTexture.NYX_W, x, y, w, h); + else + g.drawImage(isPW ? FSkinTexture.PWBG_W : FSkinTexture.CARDBG_W, x, y, w, h); } break; case 2: - if (!isHybrid) { - g.drawImage(isPW ? FSkinImage.PWBG_M : FSkinImage.CARDBG_M, x, y, w, h); - } else if (backColors.contains(DetailColors.WHITE) && backColors.contains(DetailColors.BLUE)) { - g.drawImage(isPW ? FSkinImage.PWBG_WU : FSkinImage.CARDBG_WU, x, y, w, h); - } else if (backColors.contains(DetailColors.WHITE) && backColors.contains(DetailColors.BLACK)) { - g.drawImage(isPW ? FSkinImage.PWBG_WB : FSkinImage.CARDBG_WB, x, y, w, h); - } else if (backColors.contains(DetailColors.WHITE) && backColors.contains(DetailColors.RED)) { - g.drawImage(isPW ? FSkinImage.PWBG_WR : FSkinImage.CARDBG_WR, x, y, w, h); - } else if (backColors.contains(DetailColors.WHITE) && backColors.contains(DetailColors.GREEN)) { - g.drawImage(isPW ? FSkinImage.PWBG_WG : FSkinImage.CARDBG_WG, x, y, w, h); - } else if (backColors.contains(DetailColors.BLUE) && backColors.contains(DetailColors.BLACK)) { - g.drawImage(isPW ? FSkinImage.PWBG_UB : FSkinImage.CARDBG_UB, x, y, w, h); - } else if (backColors.contains(DetailColors.BLUE) && backColors.contains(DetailColors.RED)) { - g.drawImage(isPW ? FSkinImage.PWBG_UR : FSkinImage.CARDBG_UR, x, y, w, h); - } else if (backColors.contains(DetailColors.BLUE) && backColors.contains(DetailColors.GREEN)) { - g.drawImage(isPW ? FSkinImage.PWBG_UG : FSkinImage.CARDBG_UG, x, y, w, h); - } else if (backColors.contains(DetailColors.BLACK) && backColors.contains(DetailColors.RED)) { - g.drawImage(isPW ? FSkinImage.PWBG_BR : FSkinImage.CARDBG_BR, x, y, w, h); - } else if (backColors.contains(DetailColors.BLACK) && backColors.contains(DetailColors.GREEN)) { - g.drawImage(isPW ? FSkinImage.PWBG_BG : FSkinImage.CARDBG_BG, x, y, w, h); - } else if (backColors.contains(DetailColors.RED) && backColors.contains(DetailColors.GREEN)) { - g.drawImage(isPW ? FSkinImage.PWBG_RG : FSkinImage.CARDBG_RG, x, y, w, h); - } if (isNyx) - g.drawImage(FSkinImage.NYX_M, x, y, w, (h / 2) + (h / 5)); + g.drawImage(FSkinTexture.NYX_M, x, y, w, h); + else { + if (!isHybrid) { + g.drawImage(isPW ? FSkinTexture.PWBG_M : FSkinTexture.CARDBG_M, x, y, w, h); + } else if (backColors.contains(DetailColors.WHITE) && backColors.contains(DetailColors.BLUE)) { + g.drawImage(isPW ? FSkinTexture.PWBG_WU : FSkinTexture.CARDBG_WU, x, y, w, h); + } else if (backColors.contains(DetailColors.WHITE) && backColors.contains(DetailColors.BLACK)) { + g.drawImage(isPW ? FSkinTexture.PWBG_WB : FSkinTexture.CARDBG_WB, x, y, w, h); + } else if (backColors.contains(DetailColors.WHITE) && backColors.contains(DetailColors.RED)) { + g.drawImage(isPW ? FSkinTexture.PWBG_WR : FSkinTexture.CARDBG_WR, x, y, w, h); + } else if (backColors.contains(DetailColors.WHITE) && backColors.contains(DetailColors.GREEN)) { + g.drawImage(isPW ? FSkinTexture.PWBG_WG : FSkinTexture.CARDBG_WG, x, y, w, h); + } else if (backColors.contains(DetailColors.BLUE) && backColors.contains(DetailColors.BLACK)) { + g.drawImage(isPW ? FSkinTexture.PWBG_UB : FSkinTexture.CARDBG_UB, x, y, w, h); + } else if (backColors.contains(DetailColors.BLUE) && backColors.contains(DetailColors.RED)) { + g.drawImage(isPW ? FSkinTexture.PWBG_UR : FSkinTexture.CARDBG_UR, x, y, w, h); + } else if (backColors.contains(DetailColors.BLUE) && backColors.contains(DetailColors.GREEN)) { + g.drawImage(isPW ? FSkinTexture.PWBG_UG : FSkinTexture.CARDBG_UG, x, y, w, h); + } else if (backColors.contains(DetailColors.BLACK) && backColors.contains(DetailColors.RED)) { + g.drawImage(isPW ? FSkinTexture.PWBG_BR : FSkinTexture.CARDBG_BR, x, y, w, h); + } else if (backColors.contains(DetailColors.BLACK) && backColors.contains(DetailColors.GREEN)) { + g.drawImage(isPW ? FSkinTexture.PWBG_BG : FSkinTexture.CARDBG_BG, x, y, w, h); + } else if (backColors.contains(DetailColors.RED) && backColors.contains(DetailColors.GREEN)) { + g.drawImage(isPW ? FSkinTexture.PWBG_RG : FSkinTexture.CARDBG_RG, x, y, w, h); + } + } break; case 3: - g.drawImage(isPW ? FSkinImage.PWBG_M : FSkinImage.CARDBG_M, x, y, w, h); if (isNyx) - g.drawImage(FSkinImage.NYX_M, x, y, w, (h / 2) + (h / 5)); + g.drawImage(FSkinTexture.NYX_M, x, y, w, h); + else + g.drawImage(isPW ? FSkinTexture.PWBG_M : FSkinTexture.CARDBG_M, x, y, w, h); break; default: - g.drawImage(isPW ? FSkinImage.PWBG_C : FSkinImage.CARDBG_C, x, y, w, h); + if (isNyx) + g.drawImage(FSkinTexture.NYX_C, x, y, w, h); + else + g.drawImage(isPW ? FSkinTexture.PWBG_C : FSkinTexture.CARDBG_C, x, y, w, h); break; } return colors; diff --git a/forge-gui-mobile/src/forge/card/CardRenderer.java b/forge-gui-mobile/src/forge/card/CardRenderer.java index b2db4286d10..3be0823cad2 100644 --- a/forge-gui-mobile/src/forge/card/CardRenderer.java +++ b/forge-gui-mobile/src/forge/card/CardRenderer.java @@ -594,7 +594,7 @@ public class CardRenderer { } } else { //if card has invalid or no texture due to sudden changes in ImageCache, draw CardImageRenderer instead and wait for it to refresh automatically - CardImageRenderer.drawCardImage(g, CardView.getCardForUi(pc), false, x, y, w, h, pos, Forge.enableUIMask.equals("Art"), true); + CardImageRenderer.drawCardImage(g, CardView.getCardForUi(pc), false, x, y, w, h, pos, true, true); } } @@ -662,7 +662,7 @@ public class CardRenderer { drawFoilEffect(g, card, x, y, w, h, false); } else { //if card has invalid or no texture due to sudden changes in ImageCache, draw CardImageRenderer instead and wait for it to refresh automatically - CardImageRenderer.drawCardImage(g, card, showAltState, x, y, w, h, pos, Forge.enableUIMask.equals("Art"), false, isChoiceList, !showCardIdOverlay(card)); + CardImageRenderer.drawCardImage(g, card, showAltState, x, y, w, h, pos, true, false, isChoiceList, !showCardIdOverlay(card)); } g.setAlphaComposite(oldAlpha); } diff --git a/forge-gui/res/skins/default/IMG_CARDBG_A.png b/forge-gui/res/skins/default/IMG_CARDBG_A.png new file mode 100644 index 00000000000..33d16ad327b Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_A.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_B.png b/forge-gui/res/skins/default/IMG_CARDBG_B.png new file mode 100644 index 00000000000..b98f2f1d1af Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_B.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_BG.png b/forge-gui/res/skins/default/IMG_CARDBG_BG.png new file mode 100644 index 00000000000..1fb85d92f1a Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_BG.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_BR.png b/forge-gui/res/skins/default/IMG_CARDBG_BR.png new file mode 100644 index 00000000000..38a263de520 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_BR.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_C.png b/forge-gui/res/skins/default/IMG_CARDBG_C.png new file mode 100644 index 00000000000..1be2fa1336c Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_C.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_G.png b/forge-gui/res/skins/default/IMG_CARDBG_G.png new file mode 100644 index 00000000000..3fbe9e08be6 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_G.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_L.png b/forge-gui/res/skins/default/IMG_CARDBG_L.png new file mode 100644 index 00000000000..bcc1b8f15bf Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_L.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_M.png b/forge-gui/res/skins/default/IMG_CARDBG_M.png new file mode 100644 index 00000000000..925ccb287ee Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_M.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_R.png b/forge-gui/res/skins/default/IMG_CARDBG_R.png new file mode 100644 index 00000000000..227ba4a0159 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_R.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_RG.png b/forge-gui/res/skins/default/IMG_CARDBG_RG.png new file mode 100644 index 00000000000..eefd588d88a Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_RG.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_U.png b/forge-gui/res/skins/default/IMG_CARDBG_U.png new file mode 100644 index 00000000000..e37e31d8f16 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_U.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_UB.png b/forge-gui/res/skins/default/IMG_CARDBG_UB.png new file mode 100644 index 00000000000..658f1123f10 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_UB.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_UG.png b/forge-gui/res/skins/default/IMG_CARDBG_UG.png new file mode 100644 index 00000000000..a256fe611b1 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_UG.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_UR.png b/forge-gui/res/skins/default/IMG_CARDBG_UR.png new file mode 100644 index 00000000000..488d8724b4c Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_UR.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_V.png b/forge-gui/res/skins/default/IMG_CARDBG_V.png new file mode 100644 index 00000000000..ea64df49c44 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_V.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_W.png b/forge-gui/res/skins/default/IMG_CARDBG_W.png new file mode 100644 index 00000000000..f1557ae5df0 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_W.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_WB.png b/forge-gui/res/skins/default/IMG_CARDBG_WB.png new file mode 100644 index 00000000000..1503a494dc3 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_WB.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_WG.png b/forge-gui/res/skins/default/IMG_CARDBG_WG.png new file mode 100644 index 00000000000..e5032e8d742 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_WG.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_WR.png b/forge-gui/res/skins/default/IMG_CARDBG_WR.png new file mode 100644 index 00000000000..3f2694cdcfd Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_WR.png differ diff --git a/forge-gui/res/skins/default/IMG_CARDBG_WU.png b/forge-gui/res/skins/default/IMG_CARDBG_WU.png new file mode 100644 index 00000000000..ab93905081e Binary files /dev/null and b/forge-gui/res/skins/default/IMG_CARDBG_WU.png differ diff --git a/forge-gui/res/skins/default/IMG_NYX_B.png b/forge-gui/res/skins/default/IMG_NYX_B.png new file mode 100644 index 00000000000..cd2bc9e5592 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_NYX_B.png differ diff --git a/forge-gui/res/skins/default/IMG_NYX_C.png b/forge-gui/res/skins/default/IMG_NYX_C.png new file mode 100644 index 00000000000..0699fc784f4 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_NYX_C.png differ diff --git a/forge-gui/res/skins/default/IMG_NYX_G.png b/forge-gui/res/skins/default/IMG_NYX_G.png new file mode 100644 index 00000000000..80cd49e488f Binary files /dev/null and b/forge-gui/res/skins/default/IMG_NYX_G.png differ diff --git a/forge-gui/res/skins/default/IMG_NYX_M.png b/forge-gui/res/skins/default/IMG_NYX_M.png new file mode 100644 index 00000000000..0e8fd30cccd Binary files /dev/null and b/forge-gui/res/skins/default/IMG_NYX_M.png differ diff --git a/forge-gui/res/skins/default/IMG_NYX_R.png b/forge-gui/res/skins/default/IMG_NYX_R.png new file mode 100644 index 00000000000..8f56f7f1ff4 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_NYX_R.png differ diff --git a/forge-gui/res/skins/default/IMG_NYX_U.png b/forge-gui/res/skins/default/IMG_NYX_U.png new file mode 100644 index 00000000000..dafa47d5ae0 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_NYX_U.png differ diff --git a/forge-gui/res/skins/default/IMG_NYX_W.png b/forge-gui/res/skins/default/IMG_NYX_W.png new file mode 100644 index 00000000000..0ed4b07c074 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_NYX_W.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_B.png b/forge-gui/res/skins/default/IMG_PWBG_B.png new file mode 100644 index 00000000000..e356fc51465 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_B.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_BG.png b/forge-gui/res/skins/default/IMG_PWBG_BG.png new file mode 100644 index 00000000000..1e5fee4bf6d Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_BG.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_BR.png b/forge-gui/res/skins/default/IMG_PWBG_BR.png new file mode 100644 index 00000000000..dbe696da738 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_BR.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_C.png b/forge-gui/res/skins/default/IMG_PWBG_C.png new file mode 100644 index 00000000000..da27c6aca9f Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_C.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_G.png b/forge-gui/res/skins/default/IMG_PWBG_G.png new file mode 100644 index 00000000000..b05f9c9f2df Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_G.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_M.png b/forge-gui/res/skins/default/IMG_PWBG_M.png new file mode 100644 index 00000000000..07f8c58c9b2 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_M.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_R.png b/forge-gui/res/skins/default/IMG_PWBG_R.png new file mode 100644 index 00000000000..5265966b594 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_R.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_RG.png b/forge-gui/res/skins/default/IMG_PWBG_RG.png new file mode 100644 index 00000000000..896c6c7a39e Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_RG.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_U.png b/forge-gui/res/skins/default/IMG_PWBG_U.png new file mode 100644 index 00000000000..0dcfc38d57f Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_U.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_UB.png b/forge-gui/res/skins/default/IMG_PWBG_UB.png new file mode 100644 index 00000000000..64d3bb8854d Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_UB.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_UG.png b/forge-gui/res/skins/default/IMG_PWBG_UG.png new file mode 100644 index 00000000000..7933af08444 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_UG.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_UR.png b/forge-gui/res/skins/default/IMG_PWBG_UR.png new file mode 100644 index 00000000000..03ab5e5734d Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_UR.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_W.png b/forge-gui/res/skins/default/IMG_PWBG_W.png new file mode 100644 index 00000000000..0742a258c38 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_W.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_WB.png b/forge-gui/res/skins/default/IMG_PWBG_WB.png new file mode 100644 index 00000000000..9e7e41b9b4c Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_WB.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_WG.png b/forge-gui/res/skins/default/IMG_PWBG_WG.png new file mode 100644 index 00000000000..1bfa21addf6 Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_WG.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_WR.png b/forge-gui/res/skins/default/IMG_PWBG_WR.png new file mode 100644 index 00000000000..5ad936b336f Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_WR.png differ diff --git a/forge-gui/res/skins/default/IMG_PWBG_WU.png b/forge-gui/res/skins/default/IMG_PWBG_WU.png new file mode 100644 index 00000000000..cc35cc8f5de Binary files /dev/null and b/forge-gui/res/skins/default/IMG_PWBG_WU.png differ diff --git a/forge-gui/res/skins/default/sprite_cardbg.png b/forge-gui/res/skins/default/sprite_cardbg.png deleted file mode 100644 index 1eea41c2b03..00000000000 Binary files a/forge-gui/res/skins/default/sprite_cardbg.png and /dev/null differ diff --git a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java index d0b33e1f416..d6857260cfc 100644 --- a/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/localinstance/properties/ForgeConstants.java @@ -130,7 +130,6 @@ public final class ForgeConstants { public static final String SPRITE_SETLOGO_FILE = "sprite_setlogo.png"; public static final String SPRITE_WATERMARK_FILE = "sprite_watermark.png"; public static final String SPRITE_DRAFTRANKS_FILE = "sprite_draftranks.png"; - public static String SPRITE_CARDBG_FILE = "sprite_cardbg.png"; public static final String FONT_FILE = "font1.ttf"; public static final String SPLASH_BG_FILE = "bg_splash.png"; public static final String MATCH_BG_FILE = "bg_match.jpg"; @@ -243,6 +242,51 @@ public final class ForgeConstants { public static final String BG_84 = "Morphic_Tide.jpg"; public static final String BG_85 = "Mutual_Epiphany.jpg"; public static final String BG_86 = "Time_Distortion.jpg"; + //CARD BG + public static final String IMG_CARDBG_A = "IMG_CARDBG_A.png"; + public static final String IMG_CARDBG_B = "IMG_CARDBG_B.png"; + public static final String IMG_CARDBG_BG = "IMG_CARDBG_BG.png"; + public static final String IMG_CARDBG_BR = "IMG_CARDBG_BR.png"; + public static final String IMG_CARDBG_C = "IMG_CARDBG_C.png"; + public static final String IMG_CARDBG_G = "IMG_CARDBG_G.png"; + public static final String IMG_CARDBG_L = "IMG_CARDBG_L.png"; + public static final String IMG_CARDBG_M = "IMG_CARDBG_M.png"; + public static final String IMG_CARDBG_R = "IMG_CARDBG_R.png"; + public static final String IMG_CARDBG_RG = "IMG_CARDBG_RG.png"; + public static final String IMG_CARDBG_U = "IMG_CARDBG_U.png"; + public static final String IMG_CARDBG_UB = "IMG_CARDBG_UB.png"; + public static final String IMG_CARDBG_UG = "IMG_CARDBG_UG.png"; + public static final String IMG_CARDBG_UR = "IMG_CARDBG_UR.png"; + public static final String IMG_CARDBG_V = "IMG_CARDBG_V.png"; + public static final String IMG_CARDBG_W = "IMG_CARDBG_W.png"; + public static final String IMG_CARDBG_WB = "IMG_CARDBG_WB.png"; + public static final String IMG_CARDBG_WG = "IMG_CARDBG_WG.png"; + public static final String IMG_CARDBG_WR = "IMG_CARDBG_WR.png"; + public static final String IMG_CARDBG_WU = "IMG_CARDBG_WU.png"; + public static final String IMG_PWBG_B = "IMG_PWBG_B.png"; + public static final String IMG_PWBG_BG = "IMG_PWBG_BG.png"; + public static final String IMG_PWBG_BR = "IMG_PWBG_BR.png"; + public static final String IMG_PWBG_C = "IMG_PWBG_C.png"; + public static final String IMG_PWBG_G = "IMG_PWBG_G.png"; + public static final String IMG_PWBG_M = "IMG_PWBG_M.png"; + public static final String IMG_PWBG_R = "IMG_PWBG_R.png"; + public static final String IMG_PWBG_RG = "IMG_PWBG_RG.png"; + public static final String IMG_PWBG_U = "IMG_PWBG_U.png"; + public static final String IMG_PWBG_UB = "IMG_PWBG_UB.png"; + public static final String IMG_PWBG_UG = "IMG_PWBG_UG.png"; + public static final String IMG_PWBG_UR = "IMG_PWBG_UR.png"; + public static final String IMG_PWBG_W = "IMG_PWBG_W.png"; + public static final String IMG_PWBG_WB = "IMG_PWBG_WB.png"; + public static final String IMG_PWBG_WG = "IMG_PWBG_WG.png"; + public static final String IMG_PWBG_WR = "IMG_PWBG_WR.png"; + public static final String IMG_PWBG_WU = "IMG_PWBG_WU.png"; + public static final String IMG_NYX_B = "IMG_NYX_B.png"; + public static final String IMG_NYX_G = "IMG_NYX_G.png"; + public static final String IMG_NYX_M = "IMG_NYX_M.png"; + public static final String IMG_NYX_R = "IMG_NYX_R.png"; + public static final String IMG_NYX_U = "IMG_NYX_U.png"; + public static final String IMG_NYX_W = "IMG_NYX_W.png"; + public static final String IMG_NYX_C = "IMG_NYX_C.png"; // data tree roots public static final String USER_DIR; 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 500defc2ada..d8f4f72fe2d 100644 --- a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java @@ -472,53 +472,6 @@ public enum FSkinProp { IMG_DRAFTRANK_A (new int[] {244, 244, 240, 240}, PropType.DRAFTRANKS), IMG_DRAFTRANK_S (new int[] {2, 486, 240, 240}, PropType.DRAFTRANKS), - //FOR CARDBG - IMG_CARDBG_A (new int[] {2, 2, 339, 496}, PropType.CARDBG), - IMG_CARDBG_B (new int[] {343, 2, 339, 496}, PropType.CARDBG), - IMG_CARDBG_BG (new int[] {684, 2, 339, 496}, PropType.CARDBG), - IMG_CARDBG_BR (new int[] {1025, 2, 339, 496}, PropType.CARDBG), - IMG_CARDBG_C (new int[] {1366, 2, 339, 496}, PropType.CARDBG), - IMG_CARDBG_G (new int[] {2, 500, 339, 496}, PropType.CARDBG), - IMG_CARDBG_L (new int[] {343, 500, 339, 496}, PropType.CARDBG), - IMG_CARDBG_M (new int[] {684, 500, 339, 496}, PropType.CARDBG), - IMG_CARDBG_R (new int[] {1025, 500, 339, 496}, PropType.CARDBG), - IMG_CARDBG_RG (new int[] {1366, 500, 339, 496}, PropType.CARDBG), - IMG_CARDBG_U (new int[] {2, 998, 339, 496}, PropType.CARDBG), - IMG_CARDBG_UB (new int[] {343, 998, 339, 496}, PropType.CARDBG), - IMG_CARDBG_UG (new int[] {684, 998, 339, 496}, PropType.CARDBG), - IMG_CARDBG_UR (new int[] {1025, 998, 339, 496}, PropType.CARDBG), - IMG_CARDBG_V (new int[] {1366, 998, 339, 496}, PropType.CARDBG), - IMG_CARDBG_W (new int[] {2, 1496, 339, 496}, PropType.CARDBG), - IMG_CARDBG_WB (new int[] {343, 1496, 339, 496}, PropType.CARDBG), - IMG_CARDBG_WG (new int[] {684, 1496, 339, 496}, PropType.CARDBG), - IMG_CARDBG_WR (new int[] {1025, 1496, 339, 496}, PropType.CARDBG), - IMG_CARDBG_WU (new int[] {1366, 1496, 339, 496}, PropType.CARDBG), - //FOR PW BG - IMG_PWBG_B (new int[] {2, 1994, 339, 496}, PropType.CARDBG), - IMG_PWBG_BG (new int[] {343, 1994, 339, 496}, PropType.CARDBG), - IMG_PWBG_BR (new int[] {684, 1994, 339, 496}, PropType.CARDBG), - IMG_PWBG_C (new int[] {1025, 1994, 339, 496}, PropType.CARDBG), - IMG_PWBG_G (new int[] {1366, 1994, 339, 496}, PropType.CARDBG), - IMG_PWBG_M (new int[] {2, 2492, 339, 496}, PropType.CARDBG), - IMG_PWBG_R (new int[] {343, 2492, 339, 496}, PropType.CARDBG), - IMG_PWBG_RG (new int[] {684, 2492, 339, 496}, PropType.CARDBG), - IMG_PWBG_U (new int[] {1025, 2492, 339, 496}, PropType.CARDBG), - IMG_PWBG_UB (new int[] {1366, 2492, 339, 496}, PropType.CARDBG), - IMG_PWBG_UG (new int[] {2, 2990, 339, 496}, PropType.CARDBG), - IMG_PWBG_UR (new int[] {343, 2990, 339, 496}, PropType.CARDBG), - IMG_PWBG_W (new int[] {684, 2990, 339, 496}, PropType.CARDBG), - IMG_PWBG_WB (new int[] {1025, 2990, 339, 496}, PropType.CARDBG), - IMG_PWBG_WG (new int[] {1366, 2990, 339, 496}, PropType.CARDBG), - IMG_PWBG_WR (new int[] {2, 3488, 339, 496}, PropType.CARDBG), - IMG_PWBG_WU (new int[] {343, 3488, 339, 496}, PropType.CARDBG), - //NYX OVERLAY - IMG_NYX_B (new int[] {684, 3488, 339, 248}, PropType.CARDBG), - IMG_NYX_G (new int[] {1025, 3488, 339, 248}, PropType.CARDBG), - IMG_NYX_M (new int[] {1366, 3488, 339, 248}, PropType.CARDBG), - IMG_NYX_R (new int[] {684, 3736, 339, 248}, PropType.CARDBG), - IMG_NYX_U (new int[] {1025, 3736, 339, 248}, PropType.CARDBG), - IMG_NYX_W (new int[] {1366, 3736, 339, 248}, PropType.CARDBG), - IMG_FAV1 (new int[] {0, 0, 100, 100}, PropType.FAVICON), IMG_FAV2 (new int[] {100, 0, 100, 100}, PropType.FAVICON), IMG_FAV3 (new int[] {200, 0, 100, 100}, PropType.FAVICON), @@ -626,7 +579,6 @@ public enum FSkinProp { SETLOGO, WATERMARKS, DRAFTRANKS, - CARDBG, FAVICON } }