external-repos/forge
1
0
Fork 0
mirror of https://github.com/Card-Forge/forge.git synced 2025-11-17 11:18:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Mobile] Update Deck AI Indicator

Browse Source 
- AI Indicator (green) means all cards on the main deck are AI playable
This commit is contained in:
Anthony Calosa
2022-03-03 15:31:28 +08:00
parent fa1561f9d4
commit d88edc4e31
5 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
forge-gui-mobile/src/forge/assets/FSkinImage.java
View File

@@ -352,6 +352,8 @@ public enum FSkinImage implements FImage {
HDSTAR_OUTLINE (FSkinProp.IMG_HDSTAR_OUTLINE, SourceFile.BUTTONS), HDSTAR_OUTLINE (FSkinProp.IMG_HDSTAR_OUTLINE, SourceFile.BUTTONS),
STAR_FILLED (FSkinProp.IMG_STAR_FILLED, SourceFile.ICONS), STAR_FILLED (FSkinProp.IMG_STAR_FILLED, SourceFile.ICONS),
HDSTAR_FILLED (FSkinProp.IMG_HDSTAR_FILLED, SourceFile.BUTTONS), 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), ARTIFACT (FSkinProp.IMG_ARTIFACT, SourceFile.MANAICONS),
CREATURE (FSkinProp.IMG_CREATURE, SourceFile.MANAICONS), CREATURE (FSkinProp.IMG_CREATURE, SourceFile.MANAICONS),

9
forge-gui-mobile/src/forge/itemmanager/DeckManager.java
View File

@@ -131,14 +131,13 @@ public final class DeckManager extends ItemManager<DeckProxy> implements IHasGam
else else
g.drawImage(DeckPreferences.getPrefs(deck).getStarCount() > 0 ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTLINE, x, y, IMAGE_SIZE, IMAGE_SIZE); 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; x += IMAGE_SIZE + FList.PADDING;
ColorSet deckColor = deck.getColor(); ColorSet deckColor = deck.getColor();
float availableNameWidth = w - CardFaceSymbols.getWidth(deckColor, IMAGE_SIZE) - IMAGE_SIZE - 2 * FList.PADDING; float availableNameWidth = w - CardFaceSymbols.getWidth(deckColor, IMAGE_SIZE) - IMAGE_SIZE - 2 * FList.PADDING;
if (deck.getAI().inMainDeck == 0) { availableNameWidth -= IMAGE_SIZE + FList.PADDING;
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;
}
String name = deck.getName(); String name = deck.getName();
if (!deck.getPath().isEmpty()) { //render path after name if needed if (!deck.getPath().isEmpty()) { //render path after name if needed
name += " (" + deck.getPath().substring(1) + ")"; name += " (" + deck.getPath().substring(1) + ")";

5
forge-gui-mobile/src/forge/itemmanager/views/ImageView.java
View File

@@ -1088,9 +1088,8 @@ public class ImageView<T extends InventoryItem> extends ItemView<T> {
g.drawImage(DeckPreferences.getPrefs(dp).getStarCount() > 0 ? FSkinImage.HDSTAR_FILLED : FSkinImage.HDSTAR_OUTLINE, x, y, symbolSize, symbolSize); g.drawImage(DeckPreferences.getPrefs(dp).getStarCount() > 0 ? FSkinImage.HDSTAR_FILLED : FSkinImage.HDSTAR_OUTLINE, x, y, symbolSize, symbolSize);
else else
g.drawImage(DeckPreferences.getPrefs(dp).getStarCount() > 0 ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTLINE, x, y, symbolSize, symbolSize); g.drawImage(DeckPreferences.getPrefs(dp).getStarCount() > 0 ? FSkinImage.STAR_FILLED : FSkinImage.STAR_OUTLINE, x, y, symbolSize, symbolSize);
if (dp.getAI().inMainDeck == 0) { //AI Icon
g.drawOutlinedText("AI", GROUP_HEADER_FONT, Color.GREEN, Color.BLACK, x+PADDING, y+symbolSize+PADDING, w, h, true, Align.left, false, false); g.drawImage(dp.getAI().inMainDeck == 0 ? FSkinImage.AI_ACTIVE : FSkinImage.AI_INACTIVE, x, y+symbolSize, symbolSize, symbolSize);
}
} }
} }
} }

BIN
forge-gui/res/skins/default/sprite_icons.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 KiB

After

Width:  |  Height:  |  Size: 463 KiB

2
forge-gui/src/main/java/forge/localinstance/skin/FSkinProp.java
View File

@@ -324,6 +324,8 @@ public enum FSkinProp {
IMG_HDSTAR_OUTLINE (new int[] {391, 1308, 64, 64}, PropType.BUTTONS), IMG_HDSTAR_OUTLINE (new int[] {391, 1308, 64, 64}, PropType.BUTTONS),
IMG_STAR_FILLED (new int[] {660, 460, 20, 20}, PropType.IMAGE), IMG_STAR_FILLED (new int[] {660, 460, 20, 20}, PropType.IMAGE),
IMG_HDSTAR_FILLED (new int[] {391, 1440, 64, 64}, PropType.BUTTONS), 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_ARTIFACT (new int[] {412, 658, 80, 80}, PropType.MANAICONS),
IMG_CREATURE (new int[] {2, 740, 80, 80}, PropType.MANAICONS), IMG_CREATURE (new int[] {2, 740, 80, 80}, PropType.MANAICONS),