diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index d9a13c61fa3..10e343f20d3 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -116,8 +116,13 @@ public enum FSkinImage implements FImage { TROPHY_CASE_TOP (FSkinProp.IMG_TROPHY_CASE_TOP, SourceFile.TROPHIES), TROPHY_SHELF (FSkinProp.IMG_TROPHY_SHELF, SourceFile.TROPHIES), - //Achievement Trophies + //Planar Conquest Tiles HEXAGON_TILE (FSkinProp.IMG_HEXAGON_TILE, SourceFile.PLANAR_CONQUEST), + WHITE_TILE (FSkinProp.IMG_WHITE_TILE, SourceFile.PLANAR_CONQUEST), + BLUE_TILE (FSkinProp.IMG_BLUE_TILE, SourceFile.PLANAR_CONQUEST), + BLACK_TILE (FSkinProp.IMG_BLACK_TILE, SourceFile.PLANAR_CONQUEST), + RED_TILE (FSkinProp.IMG_RED_TILE, SourceFile.PLANAR_CONQUEST), + GREEN_TILE (FSkinProp.IMG_GREEN_TILE, SourceFile.PLANAR_CONQUEST), //Quest Icons QUEST_ZEP (FSkinProp.ICO_QUEST_ZEP, SourceFile.ICONS), diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java index 212ee063972..d88a9895c99 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/CommandCenterScreen.java @@ -249,30 +249,31 @@ public class CommandCenterScreen extends FScreen implements IVCommandCenter { @Override public void draw(HexagonTile tile, int x, int y, int w, int h) { - FSkinImage manaIcon; + FSkinImage tileImage; switch (tile.getColorIndex()) { case 0: - manaIcon = FSkinImage.MANA_W; + tileImage = FSkinImage.WHITE_TILE; break; case 1: - manaIcon = FSkinImage.MANA_U; + tileImage = FSkinImage.BLUE_TILE; break; case 2: - manaIcon = FSkinImage.MANA_B; + tileImage = FSkinImage.BLACK_TILE; break; case 3: - manaIcon = FSkinImage.MANA_R; + tileImage = FSkinImage.RED_TILE; break; case 4: - manaIcon = FSkinImage.MANA_G; + tileImage = FSkinImage.GREEN_TILE; break; default: - manaIcon = FSkinImage.MANA_COLORLESS; + tileImage = null; break; } - float manaIconSize = w / 2; - g.drawImage(manaIcon, x + (w - manaIconSize) / 2, y + (h - manaIconSize) / 2, manaIconSize, manaIconSize); + if (tileImage != null) { + g.drawImage(tileImage, x, y, w, h); + } g.drawImage(FSkinImage.HEXAGON_TILE, x, y, w, h); if (x < getWidth() / 2 && x + w > getWidth() / 2 && y < getHeight() / 2 && y + h > getHeight() / 2) { diff --git a/forge-gui/res/skins/default/sprite_planar_conquest.png b/forge-gui/res/skins/default/sprite_planar_conquest.png index b47cb3bb406..0791d217163 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/src/main/java/forge/assets/FSkinProp.java b/forge-gui/src/main/java/forge/assets/FSkinProp.java index 9eb5a94996d..3ec46dab287 100644 --- a/forge-gui/src/main/java/forge/assets/FSkinProp.java +++ b/forge-gui/src/main/java/forge/assets/FSkinProp.java @@ -243,6 +243,11 @@ public enum FSkinProp { //planar conquest images IMG_HEXAGON_TILE (new int[] {0, 0, 220, 192}, PropType.PLANAR_CONQUEST), + IMG_WHITE_TILE (new int[] {0, 192, 80, 70}, PropType.PLANAR_CONQUEST), + IMG_BLUE_TILE (new int[] {80, 192, 80, 70}, PropType.PLANAR_CONQUEST), + IMG_BLACK_TILE (new int[] {160, 192, 80, 70}, PropType.PLANAR_CONQUEST), + IMG_RED_TILE (new int[] {240, 192, 80, 70}, PropType.PLANAR_CONQUEST), + IMG_GREEN_TILE (new int[] {320, 192, 80, 70}, PropType.PLANAR_CONQUEST), //button images IMG_BTN_START_UP (new int[] {480, 200, 160, 80}, PropType.ICON),