From fe26ca8a5a145affe055e17fb65b35a1e366e472 Mon Sep 17 00:00:00 2001 From: drdev Date: Wed, 6 Jan 2016 04:37:30 +0000 Subject: [PATCH] Add image for AEther shards --- .../src/forge/assets/FSkinImage.java | 1 + .../planarconquest/ConquestAEtherScreen.java | 2 +- .../planarconquest/ConquestPrefsScreen.java | 2 +- .../planarconquest/ConquestRewardDialog.java | 2 +- .../planarconquest/LoadConquestScreen.java | 2 +- .../skins/default/sprite_planar_conquest.png | Bin 3707 -> 18657 bytes .../src/main/java/forge/assets/FSkinProp.java | 1 + 7 files changed, 6 insertions(+), 4 deletions(-) diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 1cb87f93828..47429556ae1 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -118,6 +118,7 @@ public enum FSkinImage implements FImage { //Planar Conquest Images PLANE_MONITOR (FSkinProp.IMG_PLANE_MONITOR, SourceFile.PLANAR_CONQUEST), + AETHER_SHARD (FSkinProp.IMG_AETHER_SHARD, SourceFile.PLANAR_CONQUEST), //Quest Icons QUEST_ZEP (FSkinProp.ICO_QUEST_ZEP, SourceFile.ICONS), diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java index c40241f1820..44d0d4fe64b 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java @@ -116,7 +116,7 @@ public class ConquestAEtherScreen extends FScreen { private class PullButton extends FLabel { protected PullButton() { super(new FLabel.ButtonBuilder().font(FSkinFont.forHeight(PULL_BTN_HEIGHT * 0.45f)) - .icon(FSkinImage.QUEST_COIN).iconScaleFactor(1f).command(new FEventHandler() { + .icon(FSkinImage.AETHER_SHARD).iconScaleFactor(1f).command(new FEventHandler() { @Override public void handleEvent(FEvent e) { pullFromTheAEther(); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java index 79c11721720..a2580983dcd 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java @@ -49,7 +49,7 @@ public class ConquestPrefsScreen extends FScreen { public ConquestPrefsScreen() { super("Conquest Preferences", ConquestMenu.getMenu()); - scroller.add(new PrefsHeader("AEther Shards", FSkinImage.QUEST_COIN, PrefsGroup.BOOSTER)); + scroller.add(new PrefsHeader("AEther Shards", FSkinImage.AETHER_SHARD, PrefsGroup.BOOSTER)); scroller.add(new PrefsOption("Base Card Value", CQPref.AETHER_BASE_VALUE, PrefsGroup.AETHER)); scroller.add(new PrefsOption("Markup Percentage", CQPref.AETHER_MARKUP, PrefsGroup.AETHER)); scroller.add(new PrefsOption("Starting Shards", CQPref.AETHER_START_SHARDS, PrefsGroup.AETHER)); diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java index 43700b7d817..deeedeeb99f 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java @@ -275,7 +275,7 @@ public class ConquestRewardDialog extends FScrollPane { reward = reward0; if (reward.isDuplicate()) { setFont(FSkinFont.get(20)); - setIcon(FSkinImage.QUEST_COIN); + setIcon(FSkinImage.AETHER_SHARD); setAlignment(HAlignment.CENTER); setText(String.valueOf(reward.getReplacementShards())); } diff --git a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java index d11e5e44376..eb2cdf5f8c5 100644 --- a/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java +++ b/forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java @@ -299,7 +299,7 @@ public class LoadConquestScreen extends LaunchScreen { g.drawText(value.getPlaneswalker().getName() + " - " + value.getCurrentPlane().getName(), font, SettingsScreen.DESC_COLOR, x, y, w - shardsWidth - cardsWidth, h, false, HAlignment.LEFT, false); g.drawImage(FSkinImage.HAND, x + w - shardsWidth - cardsWidth + iconOffset, y - SettingsScreen.SETTING_PADDING, iconSize, iconSize); g.drawText(cards, font, SettingsScreen.DESC_COLOR, x + w - shardsWidth - cardsWidth + iconSize + SettingsScreen.SETTING_PADDING, y, w, h, false, HAlignment.LEFT, false); - g.drawImage(FSkinImage.QUEST_COINSTACK, x + w - shardsWidth + iconOffset, y - SettingsScreen.SETTING_PADDING, iconSize, iconSize); + g.drawImage(FSkinImage.AETHER_SHARD, x + w - shardsWidth + iconOffset, y - SettingsScreen.SETTING_PADDING, iconSize, iconSize); g.drawText(shards, font, SettingsScreen.DESC_COLOR, x + w - shardsWidth + iconSize + SettingsScreen.SETTING_PADDING, y, w, h, false, HAlignment.LEFT, false); } }); diff --git a/forge-gui/res/skins/default/sprite_planar_conquest.png b/forge-gui/res/skins/default/sprite_planar_conquest.png index 02f1f7f0944b66bcb70d7fe90216b1ff4116a2cd..835fa4f8918167f2f8ce221c74d136996df04ef6 100644 GIT binary patch literal 18657 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 literal 3707 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 diff --git a/forge-gui/src/main/java/forge/assets/FSkinProp.java b/forge-gui/src/main/java/forge/assets/FSkinProp.java index 3da982af8b4..0b1a0fd4cc3 100644 --- a/forge-gui/src/main/java/forge/assets/FSkinProp.java +++ b/forge-gui/src/main/java/forge/assets/FSkinProp.java @@ -244,6 +244,7 @@ public enum FSkinProp { //planar conquest images IMG_PLANE_MONITOR (new int[] {0, 0, 443, 315}, PropType.PLANAR_CONQUEST), + IMG_AETHER_SHARD (new int[] {0, 315, 120, 120}, PropType.PLANAR_CONQUEST), //button images IMG_BTN_START_UP (new int[] {480, 200, 160, 80}, PropType.ICON),