diff --git a/forge-gui-mobile/src/forge/menu/FMenuBar.java b/forge-gui-mobile/src/forge/menu/FMenuBar.java index dc08d820f7b..1dd7bea5a10 100644 --- a/forge-gui-mobile/src/forge/menu/FMenuBar.java +++ b/forge-gui-mobile/src/forge/menu/FMenuBar.java @@ -6,6 +6,7 @@ import com.badlogic.gdx.Input; import forge.Forge; import forge.Graphics; +import forge.assets.FSkinColor; import forge.screens.FScreen.Header; import forge.screens.match.MatchController; @@ -74,9 +75,13 @@ protected void doLayout(float width, float height) { @Override protected void drawBackground(Graphics g) { - float w = getWidth(); - float h = getHeight(); - g.fillRect(getBackColor(), 0, 0, w, h); + g.fillRect( + FSkinColor.getStandardColor(38, 43, 48), + 0, + 0, + getWidth(), + getHeight() + ); } @Override diff --git a/forge-gui-mobile/src/forge/menu/FMenuTab.java b/forge-gui-mobile/src/forge/menu/FMenuTab.java index e0d93a97ebb..66198ed42c1 100644 --- a/forge-gui-mobile/src/forge/menu/FMenuTab.java +++ b/forge-gui-mobile/src/forge/menu/FMenuTab.java @@ -8,7 +8,6 @@ import forge.Graphics; import forge.assets.FImage; import forge.assets.FSkinColor; -import forge.assets.FSkinColor.Colors; import forge.assets.FSkinFont; import forge.assets.FSkinImage; import forge.toolbox.FDisplayObject; @@ -19,23 +18,23 @@ public class FMenuTab extends FDisplayObject { boolean iconOnly = false; boolean active = false; private static FSkinColor getSelBackColor() { - if (Forge.isMobileAdventureMode) - return FSkinColor.get(Colors.ADV_CLR_ACTIVE); - return FSkinColor.get(Colors.CLR_ACTIVE); + return FSkinColor.getStandardColor(52, 58, 64); } + private static FSkinColor getSelBorderColor() { - return FDropDown.getBorderColor(); + return FSkinColor.getStandardColor(78, 86, 94); } + private static FSkinColor getSelForeColor() { - if (Forge.isMobileAdventureMode) - return FSkinColor.get(Colors.ADV_CLR_TEXT); - return FSkinColor.get(Colors.CLR_TEXT); + return FSkinColor.getStandardColor(235, 238, 240); } + private static FSkinColor getForeColor() { - return getSelForeColor().alphaColor(0.5f); + return FSkinColor.getStandardColor(170, 176, 182); } + private static FSkinColor getSeparatorColor() { - return getSelForeColor().alphaColor(0.3f); + return FSkinColor.getStandardColor(0, 0, 0).alphaColor(0f); } public static final float PADDING = Utils.scale(2); private static final float SEPARATOR_WIDTH = Utils.scale(1); @@ -144,41 +143,35 @@ public void draw(Graphics g) { FSkinColor foreColor; if (dropDown.isVisible()) { - x = PADDING; //round so lines show up reliably + x = PADDING; y = PADDING; w = getWidth() - 2 * x + 1; h = getHeight() - y + 1; g.startClip(x, y, w, h); - g.fillRect(getSelBackColor(), x, y, w, h); - g.drawRect(2, getSelBorderColor(), x, y, w, h); + g.fillRect(FSkinColor.getStandardColor(52, 58, 64), x, y, w, h); g.endClip(); - foreColor = getSelForeColor(); - } - else { - foreColor = getForeColor(); + foreColor = FSkinColor.getStandardColor(235, 238, 240); } - - //draw right separator - if (index < menuBar.getTabCount() - 1) { - x = getWidth(); - y = getHeight() / 4; - g.drawLine(SEPARATOR_WIDTH, getSeparatorColor(), x, y, x, getHeight() - y); + else { + foreColor = FSkinColor.getStandardColor(170, 176, 182); } x = PADDING; y = PADDING; w = getWidth() - 2 * PADDING; h = getHeight() - 2 * PADDING; - if (isHovered()) - g.fillRect(getSelBackColor().brighter(), x, y, w, h); - //flash overlay while a recent unread message highlights the tab + if (isHovered()) { + g.fillRect(FSkinColor.getStandardColor(66, 72, 78), x, y, w, h); + foreColor = FSkinColor.getStandardColor(235, 238, 240); + } + if (flashStartMs > 0) { long elapsed = System.currentTimeMillis() - flashStartMs; if (elapsed < FLASH_DURATION_MS) { - float alpha = 0.55f * (1f - (float) elapsed / FLASH_DURATION_MS); + float alpha = 0.45f * (1f - (float) elapsed / FLASH_DURATION_MS); g.fillRect(BADGE_COLOR.alphaColor(alpha), x, y, w, h); Gdx.graphics.requestRendering(); } else { @@ -187,15 +180,13 @@ public void draw(Graphics g) { } if (iconOnly) { - float mod = w * 0.75f; FImage icon = active ? FSkinImage.SEE : FSkinImage.UNSEE; - float scaleW = w * 0.8f; + float scaleW = w * 0.76f; float scaleH = scaleW * 0.6f; g.drawImage(icon, x + w/2 - scaleW/2, y + h/2 - scaleH/2, scaleW, scaleH); } else g.drawText(text, FONT, foreColor, x, y, w, h, false, Align.center, true); - //unread badge in the top-right corner if (unreadCount > 0) { String label = unreadCount > 99 ? "99+" : Integer.toString(unreadCount); float textW = BADGE_FONT.getBounds(label).width; diff --git a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java index c78f31e7346..029ec89a438 100644 --- a/forge-gui-mobile/src/forge/screens/match/MatchScreen.java +++ b/forge-gui-mobile/src/forge/screens/match/MatchScreen.java @@ -1061,27 +1061,27 @@ public void drawOverlay(Graphics g) { float w = getWidth(); //field separator lines - if (!Forge.isLandscapeMode()) { - for (VPlayerPanel playerPanel : playerPanelsList) { - midField = playerPanel.getTop(); - y = midField - playerPanel.getField().getHeight(); - if (playerPanel.getSelectedTab() == null) { - y++; - } - g.drawLine(1, getBorderColor(), x, y, w, y); - } - } - - for (VPlayerPanel playerPanel : playerPanelsList) { - midField = playerPanel.getTop(); - y = midField - 0.5f; - g.drawLine(1, getBorderColor(), x, y, w, y); - } - - if (!Forge.isLandscapeMode()) { - y = bottomPlayerPanel.getTop() + bottomPlayerPanel.getField().getHeight(); - g.drawLine(1, getBorderColor(), x, y, w, y); - } + // if (!Forge.isLandscapeMode()) { + // for (VPlayerPanel playerPanel : playerPanelsList) { + // midField = playerPanel.getTop(); + // y = midField - playerPanel.getField().getHeight(); + // if (playerPanel.getSelectedTab() == null) { + // y++; + // } + // g.drawLine(1, getBorderColor(), x, y, w, y); + // } + // } + + // for (VPlayerPanel playerPanel : playerPanelsList) { + // midField = playerPanel.getTop(); + // y = midField - 0.5f; + // g.drawLine(1, getBorderColor(), x, y, w, y); + // } + + // if (!Forge.isLandscapeMode()) { + // y = bottomPlayerPanel.getTop() + bottomPlayerPanel.getField().getHeight(); + // g.drawLine(1, getBorderColor(), x, y, w, y); + // } } protected ScrollBounds layoutAndGetScrollBounds(float visibleWidth, float visibleHeight) { diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java index 9c166e6632b..cd2fffb96a5 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPhaseIndicator.java @@ -6,10 +6,8 @@ import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.utils.Align; -import forge.Forge; import forge.Graphics; import forge.assets.FSkinColor; -import forge.assets.FSkinColor.Colors; import forge.assets.FSkinFont; import forge.game.phase.PhaseType; import forge.toolbox.FContainer; @@ -179,31 +177,51 @@ public boolean longPress(float x, float y) { @Override public void draw(final Graphics g) { float x = PADDING_X; + float y = Utils.scale(1); float w = getWidth() - 2 * PADDING_X; - float h = getHeight(); + float h = getHeight() - 2 * Utils.scale(1); + float radius = Math.min(w, h) * 0.22f; - //determine back color according to skip or active state of label if (yieldMarked) { - g.fillRect(YIELD_MARKER_COLOR, x, 0, w, h); + FSkinColor markerColor = FSkinColor.getStandardColor(120, 85, 150); + + g.fillRoundRect(markerColor, x, y, w, h, radius); drawChevron(g, x, w, h); - // Skip the caption when marked — chevron replaces the phase abbreviation. - } else { - FSkinColor backColor; - if (active && stopAtPhase) { - backColor = Forge.isMobileAdventureMode ? FSkinColor.get(Colors.ADV_CLR_PHASE_ACTIVE_ENABLED) : FSkinColor.get(Colors.CLR_PHASE_ACTIVE_ENABLED); - } - else if (!active && stopAtPhase) { - backColor = Forge.isMobileAdventureMode ? FSkinColor.get(Colors.ADV_CLR_PHASE_INACTIVE_ENABLED) : FSkinColor.get(Colors.CLR_PHASE_INACTIVE_ENABLED); - } - else if (active && !stopAtPhase) { - backColor = Forge.isMobileAdventureMode ? FSkinColor.get(Colors.ADV_CLR_PHASE_ACTIVE_DISABLED) : FSkinColor.get(Colors.CLR_PHASE_ACTIVE_DISABLED); - } - else { - backColor = Forge.isMobileAdventureMode ? FSkinColor.get(Colors.ADV_CLR_PHASE_INACTIVE_DISABLED) : FSkinColor.get(Colors.CLR_PHASE_INACTIVE_DISABLED); - } - g.fillRect(isHovered() ? backColor.brighter() : backColor, x, 0, w, h); - g.drawText(caption, isHovered() && font.canIncrease() ? font.increase() : font, Color.BLACK, x, 0, w, h, false, Align.center, true); + return; + } + + FSkinColor backColor; + if (active && stopAtPhase) { + backColor = FSkinColor.getStandardColor(80, 210, 200); } + else if (!active && stopAtPhase) { + backColor = FSkinColor.getStandardColor(54, 94, 91); + } + else if (active && !stopAtPhase) { + backColor = FSkinColor.getStandardColor(255, 150, 70); + } + else { + backColor = FSkinColor.getStandardColor(105, 54, 45); + } + + if (isHovered()) { + backColor = backColor.brighter(); + } + + g.fillRoundRect(backColor, x, y, w, h, radius); + + g.drawText( + caption, + isHovered() && font.canIncrease() ? font.increase() : font, + FSkinColor.getStandardColor(235, 238, 240), + x, + y, + w, + h, + false, + Align.center, + true + ); } private void drawChevron(final Graphics g, float x, float w, float h) { diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java index 69f8c6d40f9..8d57c15b489 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPlayerPanel.java @@ -504,41 +504,17 @@ protected void drawOverlay(Graphics g) { @Override public void drawBackground(Graphics g) { float y; - InfoTab infoTab = selectedTab; - float pad = Forge.isHorizontalTabLayout() ? avatarWidth / 16f : 0f; - if (infoTab != null) { //draw background and border for selected zone if needed - VDisplayArea selectedDisplayArea = infoTab.getDisplayArea(); - float x = selectedDisplayArea == null ? 0 : selectedDisplayArea.getLeft(); - float w = selectedDisplayArea == null ? 0 : selectedDisplayArea.getWidth(); - float top = selectedDisplayArea == null ? 0 : selectedDisplayArea.getTop(); - float h = selectedDisplayArea == null ? 0 : selectedDisplayArea.getHeight(); - float bottom = selectedDisplayArea == null ? 0 : selectedDisplayArea.getBottom(); - g.fillRect(Forge.isHorizontalTabLayout() ? getAltDisplayAreaBackColor() : getDisplayAreaBackColor(), x - pad, top, w + pad, h + pad); - if (Forge.isHorizontalTabLayout()) - g.drawLine(1, MatchScreen.getBorderColor(), x, isFlipped() ? bottom : top, x + w, isFlipped() ? bottom : top); - - if (Forge.isLandscapeMode()) { - g.drawLine(1, MatchScreen.getBorderColor(), x, top, x, bottom); - } else { - y = isFlipped() ? top + 1 : bottom; - //don't know why infotab gets null here, either way don't crash the gui.. - float left = infoTab == null ? 0 : infoTab.getLeft(); - float right = infoTab == null ? 0 : infoTab.getRight(); - //leave gap at selected zone tab - g.drawLine(1, MatchScreen.getBorderColor(), x, y, left, y); - g.drawLine(1, MatchScreen.getBorderColor(), right, y, w, y); - } - } - if (commandZone != null && commandZone.isVisible()) { //draw border for command zone if needed - float x = commandZone.getLeft(); - y = commandZone.getTop(); - g.drawLine(1, MatchScreen.getBorderColor(), x, y, x, y + commandZone.getHeight()); - /*if (Forge.isHorizontalTabLayout()) - g.fillRect(getAltDisplayAreaBackColor(), x - pad, y, commandZoneWidth + pad, commandZone.getHeight() + pad);*/ - if (isFlipped()) { - y += commandZone.getHeight(); - } - g.drawLine(1, MatchScreen.getBorderColor(), x, y, x + commandZone.getWidth(), y); + + if (Forge.isLandscapeMode()) { + float leftPanelWidth = avatar.getWidth() + phaseIndicator.getWidth(); + + g.fillRect( + FSkinColor.getStandardColor(38, 43, 48), + 0, + 0, + leftPanelWidth, + getHeight() + ); } } @@ -600,6 +576,14 @@ public boolean tap(float x, float y, int count) { @Override public void draw(Graphics g) { + g.fillRect( + FSkinColor.getStandardColor(38, 43, 48), + 0, + 0, + getWidth(), + getHeight() + ); + adjustHeight = 1; float divider = Gdx.app.getGraphics().getHeight() > 900 ? 1.2f : 2f; if (Forge.altPlayerLayout && !Forge.altZoneTabs && Forge.isLandscapeMode()) { @@ -722,8 +706,14 @@ public void draw(Graphics g) { float x, y, w, h; boolean drawOverlay = MatchController.getView().selectedPlayerPanel().getPlayer() == player && Forge.hasGamepad(); if (Forge.altZoneTabs && this.isAlignedRightForAltDisplay()) { - //draw extra - g.fillRect(FSkinColor.get(Forge.isMobileAdventureMode ? Colors.ADV_CLR_THEME2 : Colors.CLR_THEME2), 0, 0, getWidth(), getHeight()); + // Dark Slate background + g.fillRect( + FSkinColor.getStandardColor(38, 43, 48), + 0, + 0, + getWidth(), + getHeight() + ); if (isSelected()) { if (drawOverlay) g.fillRect(FSkinColor.getStandardColor(50, 200, 150).alphaColor(0.3f), 0, isFlipped() ? INFO_TAB_PADDING_Y : 0, getWidth(), getHeight() - INFO_TAB_PADDING_Y); diff --git a/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java b/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java index 6b8e457456d..fe8567d1470 100644 --- a/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java +++ b/forge-gui-mobile/src/forge/screens/match/views/VPrompt.java @@ -22,7 +22,7 @@ import forge.util.Utils; public class VPrompt extends FContainer { - public static final float HEIGHT = Utils.AVG_FINGER_HEIGHT; + public static final float HEIGHT = Utils.AVG_FINGER_HEIGHT * 1.15f; public static final float BTN_WIDTH = HEIGHT * 1.5f; public static final float PADDING = Utils.scale(2); public static final FSkinFont FONT = FSkinFont.get(14); @@ -101,7 +101,13 @@ protected void doLayout(float width, float height) { @Override protected void drawBackground(Graphics g) { - g.fillRect(getBackColor(), 0, 0, getWidth(), getHeight()); + g.fillRect( + FSkinColor.getStandardColor(38, 43, 48), + 0, + 0, + getWidth(), + getHeight() + ); } private class MessageLabel extends FDisplayObject { @@ -138,10 +144,12 @@ public boolean longPress(float x, float y) { @Override public void draw(Graphics g) { if (!StringUtils.isEmpty(message)) { - float x = PADDING; - float y = PADDING; - float w = getWidth() - 2 * PADDING; - float h = getHeight() - 2 * PADDING; + float paddingX = Utils.scale(8); + float paddingY = Utils.scale(8); + float x = paddingX; + float y = paddingY; + float w = getWidth() - 2 * paddingX; + float h = getHeight() - 2 * paddingY; renderer.drawText(g, message, FONT, getForeColor(), x, y, w, h, y, h, true, Align.center, true); } } diff --git a/forge-gui-mobile/src/forge/toolbox/FButton.java b/forge-gui-mobile/src/forge/toolbox/FButton.java index 416086538c7..630c7990692 100644 --- a/forge-gui-mobile/src/forge/toolbox/FButton.java +++ b/forge-gui-mobile/src/forge/toolbox/FButton.java @@ -265,79 +265,43 @@ public void draw(Graphics g) { float w = getWidth(); float h = getHeight(); - float cornerButtonWidth = w / 2; - float cornerButtonHeight = h * 1.5f; - float cornerTextOffsetX = cornerButtonWidth / 2; - float cornerTextOffsetY = (cornerButtonHeight - h) / 2; - - if (imgL.getTextureRegion() == null) { - //handle rendering buttons before textures loaded - FLabel.drawButtonBackground(g, w, h, imgL == FSkinImage.BTN_DOWN_LEFT); - } else { - //determine images to draw and text alignment based on which corner button is in (if any) - FSkinImage btnOverL = hdbuttonskin() ? FSkinImage.HDBTN_OVER_LEFT : FSkinImage.BTN_OVER_LEFT; - FSkinImage btnOverC = hdbuttonskin() ? FSkinImage.HDBTN_OVER_CENTER : FSkinImage.BTN_OVER_CENTER; - FSkinImage btnOverR = hdbuttonskin() ? FSkinImage.HDBTN_OVER_RIGHT : FSkinImage.BTN_OVER_RIGHT; - if (Forge.isMobileAdventureMode) { - btnOverL = FSkinImage.ADV_BTN_OVER_LEFT; - btnOverC = FSkinImage.ADV_BTN_OVER_CENTER; - btnOverR = FSkinImage.ADV_BTN_OVER_RIGHT; - } - switch (corner) { - case None: - if (w > 2 * h) { - g.drawImage(isHovered() && !pressed ? btnOverL : imgL, 0, 0, h, h); - g.drawImage(isHovered() && !pressed ? btnOverC : imgM, h, 0, w - (2 * h), h); - g.drawImage(isHovered() && !pressed ? btnOverR : imgR, w - h, 0, h, h); - } - else { - g.drawImage(isHovered() && !pressed ? btnOverL : imgL, 0, 0, cornerButtonWidth, h); - g.drawImage(isHovered() && !pressed ? btnOverR : imgR, cornerButtonWidth, 0, w - cornerButtonWidth, h); - } - x += PADDING; - w -= 2 * PADDING; - break; - case BottomLeft: - g.startClip(x, y, w, h); - g.drawImage(isHovered() && !pressed ? btnOverC : imgM, 0, 0, cornerButtonWidth, cornerButtonHeight); - g.drawImage(isHovered() && !pressed ? btnOverR : imgR, cornerButtonWidth, 0, cornerButtonWidth, cornerButtonHeight); - g.endClip(); - w -= cornerTextOffsetX; - y += cornerTextOffsetY; - h -= cornerTextOffsetY; - break; - case BottomRight: - g.startClip(x, y, w, h); - g.drawImage(isHovered() && !pressed ? btnOverL : imgL, 0, 0, cornerButtonWidth, cornerButtonHeight); - g.drawImage(isHovered() && !pressed ? btnOverC : imgM, cornerButtonWidth, 0, cornerButtonWidth, cornerButtonHeight); - g.endClip(); - x += cornerTextOffsetX; - w -= cornerTextOffsetX; - y += cornerTextOffsetY; - h -= cornerTextOffsetY; - break; - case BottomMiddle: - g.startClip(x, y, w, h); - cornerButtonWidth = w / 3; - cornerTextOffsetX = cornerButtonWidth / 2; - g.drawImage(isHovered() && !pressed ? btnOverL : imgL, 0, 0, cornerButtonWidth, cornerButtonHeight); - g.drawImage(isHovered() && !pressed ? btnOverC : imgM, cornerButtonWidth, 0, w - 2 * cornerButtonWidth, cornerButtonHeight); - g.drawImage(isHovered() && !pressed ? btnOverR : imgR, w - cornerButtonWidth, 0, cornerButtonWidth, cornerButtonHeight); - g.endClip(); - x += cornerTextOffsetX / 2; - w -= cornerTextOffsetX; - y += cornerTextOffsetY; - h -= cornerTextOffsetY; - break; - } + FSkinColor backgroundColor = FSkinColor.getStandardColor(38, 43, 48); + + if (pressed || isToggled()) { + backgroundColor = FSkinColor.getStandardColor(58, 64, 70); } + else if (isHovered()) { + backgroundColor = FSkinColor.getStandardColor(48, 54, 60); + } + + if (!isEnabled()) { + backgroundColor = FSkinColor.getStandardColor(32, 36, 40); + } + + g.fillRect(backgroundColor, x, y, w, h); + + x += PADDING; + w -= 2 * PADDING; String displayText = text; + if (!StringUtils.isEmpty(displayText)) { if (corner == Corner.BottomLeft || corner == Corner.BottomRight) { - displayText = displayText.replaceFirst(" ", "\n"); //allow second word to wrap if corner button + displayText = displayText.replaceFirst(" ", "\n"); } - g.drawText(displayText, font, foreColor, x, y, w, h, false, Align.center, true); + + g.drawText( + displayText, + font, + foreColor, + x, + y, + w, + h, + false, + Align.center, + true + ); } } diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_castle.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_castle.jpg deleted file mode 100644 index caba043b437..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_castle.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_cave.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_cave.jpg deleted file mode 100644 index 4cad068a469..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_cave.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_common.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_common.jpg deleted file mode 100644 index df43dd63f64..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_common.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_dungeon.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_dungeon.jpg deleted file mode 100644 index 17f8b037437..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_dungeon.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_forest.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_forest.jpg deleted file mode 100644 index db1d7f70c78..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_forest.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_island.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_island.jpg deleted file mode 100644 index 10423b36833..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_island.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_match.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_match.jpg deleted file mode 100644 index b48056d7e9e..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_match.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_mountain.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_mountain.jpg deleted file mode 100644 index 1fec6807c3a..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_mountain.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_plains.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_plains.jpg deleted file mode 100644 index 67eabda2690..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_plains.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_swamp.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_swamp.jpg deleted file mode 100644 index 66673ca9f94..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_swamp.jpg and /dev/null differ diff --git a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_waste.jpg b/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_waste.jpg deleted file mode 100644 index fcf83c6e473..00000000000 Binary files a/forge-gui/res/adventure/Shandalar Old Border/skin/adv_bg_waste.jpg and /dev/null differ diff --git a/forge-gui/res/skins/default/adv_bg_castle.jpg b/forge-gui/res/skins/default/adv_bg_castle.jpg index ecb5bb67a5e..8dcf17fa246 100644 Binary files a/forge-gui/res/skins/default/adv_bg_castle.jpg and b/forge-gui/res/skins/default/adv_bg_castle.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_cave.jpg b/forge-gui/res/skins/default/adv_bg_cave.jpg index 718751fe913..78495de6ae8 100644 Binary files a/forge-gui/res/skins/default/adv_bg_cave.jpg and b/forge-gui/res/skins/default/adv_bg_cave.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_common.jpg b/forge-gui/res/skins/default/adv_bg_common.jpg index 54e971880d9..8b725d3e291 100644 Binary files a/forge-gui/res/skins/default/adv_bg_common.jpg and b/forge-gui/res/skins/default/adv_bg_common.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_dungeon.jpg b/forge-gui/res/skins/default/adv_bg_dungeon.jpg index 7f60274aa67..29a3be0edbf 100644 Binary files a/forge-gui/res/skins/default/adv_bg_dungeon.jpg and b/forge-gui/res/skins/default/adv_bg_dungeon.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_forest.jpg b/forge-gui/res/skins/default/adv_bg_forest.jpg index 3aa388716f0..97874f73afc 100644 Binary files a/forge-gui/res/skins/default/adv_bg_forest.jpg and b/forge-gui/res/skins/default/adv_bg_forest.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_island.jpg b/forge-gui/res/skins/default/adv_bg_island.jpg index 9c988e71a1c..8cdaaaaf0fe 100644 Binary files a/forge-gui/res/skins/default/adv_bg_island.jpg and b/forge-gui/res/skins/default/adv_bg_island.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_match.jpg b/forge-gui/res/skins/default/adv_bg_match.jpg index 327699d3878..45ed6ad69ed 100644 Binary files a/forge-gui/res/skins/default/adv_bg_match.jpg and b/forge-gui/res/skins/default/adv_bg_match.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_mountain.jpg b/forge-gui/res/skins/default/adv_bg_mountain.jpg index 64ffbe24de8..23d2c99d36d 100644 Binary files a/forge-gui/res/skins/default/adv_bg_mountain.jpg and b/forge-gui/res/skins/default/adv_bg_mountain.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_plains.jpg b/forge-gui/res/skins/default/adv_bg_plains.jpg index 34018b9ebd1..e6a4c5a5788 100644 Binary files a/forge-gui/res/skins/default/adv_bg_plains.jpg and b/forge-gui/res/skins/default/adv_bg_plains.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_swamp.jpg b/forge-gui/res/skins/default/adv_bg_swamp.jpg index e4f6f89a03b..34530c15bfe 100644 Binary files a/forge-gui/res/skins/default/adv_bg_swamp.jpg and b/forge-gui/res/skins/default/adv_bg_swamp.jpg differ diff --git a/forge-gui/res/skins/default/adv_bg_waste.jpg b/forge-gui/res/skins/default/adv_bg_waste.jpg index 57ab798bd4a..bbf05a01691 100644 Binary files a/forge-gui/res/skins/default/adv_bg_waste.jpg and b/forge-gui/res/skins/default/adv_bg_waste.jpg differ