diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 434f239d945..ce0657935f6 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -352,6 +352,8 @@ public enum FSkinImage implements FImage { HDSTAR_OUTLINE (FSkinProp.IMG_HDSTAR_OUTLINE, SourceFile.BUTTONS), STAR_FILLED (FSkinProp.IMG_STAR_FILLED, SourceFile.ICONS), HDSTAR_FILLED (FSkinProp.IMG_HDSTAR_FILLED, SourceFile.BUTTONS), + AI_ACTIVE (FSkinProp.IMG_AI_ACTIVE, SourceFile.ICONS), + AI_INACTIVE (FSkinProp.IMG_AI_INACTIVE, SourceFile.ICONS), ARTIFACT (FSkinProp.IMG_ARTIFACT, SourceFile.MANAICONS), CREATURE (FSkinProp.IMG_CREATURE, SourceFile.MANAICONS), diff --git a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java index 3978f871723..25df343ea0b 100644 --- a/forge-gui-mobile/src/forge/itemmanager/DeckManager.java +++ b/forge-gui-mobile/src/forge/itemmanager/DeckManager.java @@ -131,14 +131,13 @@ public final class DeckManager extends ItemManager implements IHasGam else g.drawImage(DeckPreferences.getPrefs(deck).getStarCount() > 0 ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTLINE, x, y, IMAGE_SIZE, IMAGE_SIZE); + x += IMAGE_SIZE + FList.PADDING; + //AI Icon + g.drawImage(deck.getAI().inMainDeck == 0 ? FSkinImage.AI_ACTIVE : FSkinImage.AI_INACTIVE, x, y, IMAGE_SIZE, IMAGE_SIZE); x += IMAGE_SIZE + FList.PADDING; ColorSet deckColor = deck.getColor(); float availableNameWidth = w - CardFaceSymbols.getWidth(deckColor, IMAGE_SIZE) - IMAGE_SIZE - 2 * FList.PADDING; - if (deck.getAI().inMainDeck == 0) { - g.drawOutlinedText("AI", font, Color.GREEN, Color.BLACK, x, y, w, IMAGE_SIZE, true, Align.left, true, false); - x += IMAGE_SIZE + FList.PADDING; - availableNameWidth -= IMAGE_SIZE + FList.PADDING; - } + availableNameWidth -= IMAGE_SIZE + FList.PADDING; String name = deck.getName(); if (!deck.getPath().isEmpty()) { //render path after name if needed name += " (" + deck.getPath().substring(1) + ")"; diff --git a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java index 1d73a9afb19..7009ad0521e 100644 --- a/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java +++ b/forge-gui-mobile/src/forge/itemmanager/views/ImageView.java @@ -1088,9 +1088,8 @@ public class ImageView extends ItemView { g.drawImage(DeckPreferences.getPrefs(dp).getStarCount() > 0 ? FSkinImage.HDSTAR_FILLED : FSkinImage.HDSTAR_OUTLINE, x, y, symbolSize, symbolSize); else g.drawImage(DeckPreferences.getPrefs(dp).getStarCount() > 0 ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTLINE, x, y, symbolSize, symbolSize); - if (dp.getAI().inMainDeck == 0) { - g.drawOutlinedText("AI", GROUP_HEADER_FONT, Color.GREEN, Color.BLACK, x+PADDING, y+symbolSize+PADDING, w, h, true, Align.left, false, false); - } + //AI Icon + g.drawImage(dp.getAI().inMainDeck == 0 ? FSkinImage.AI_ACTIVE : FSkinImage.AI_INACTIVE, x, y+symbolSize, symbolSize, symbolSize); } } } diff --git a/forge-gui/res/skins/default/sprite_icons.png b/forge-gui/res/skins/default/sprite_icons.png index 0f75f0c1389..78515f05cdd 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/src/main/java/forge/localinstance/skin/FSkinProp.java b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java index 93526f44f7d..db0c4422f2e 100644 --- a/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java +++ b/forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java @@ -324,6 +324,8 @@ public enum FSkinProp { IMG_HDSTAR_OUTLINE (new int[] {391, 1308, 64, 64}, PropType.BUTTONS), IMG_STAR_FILLED (new int[] {660, 460, 20, 20}, PropType.IMAGE), IMG_HDSTAR_FILLED (new int[] {391, 1440, 64, 64}, PropType.BUTTONS), + IMG_AI_ACTIVE (new int[] {145, 247, 60, 60}, PropType.IMAGE), + IMG_AI_INACTIVE (new int[] {85, 247, 60, 60}, PropType.IMAGE), IMG_ARTIFACT (new int[] {412, 658, 80, 80}, PropType.MANAICONS), IMG_CREATURE (new int[] {2, 740, 80, 80}, PropType.MANAICONS),