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

Add image for AEther shards

Browse Source
This commit is contained in:
drdev
2016-01-06 04:37:30 +00:00
parent fc7caa7c8c
commit fe26ca8a5a
7 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -118,6 +118,7 @@ public enum FSkinImage implements FImage {
//Planar Conquest Images //Planar Conquest Images
PLANE_MONITOR (FSkinProp.IMG_PLANE_MONITOR, SourceFile.PLANAR_CONQUEST), PLANE_MONITOR (FSkinProp.IMG_PLANE_MONITOR, SourceFile.PLANAR_CONQUEST),
AETHER_SHARD (FSkinProp.IMG_AETHER_SHARD, SourceFile.PLANAR_CONQUEST),
//Quest Icons //Quest Icons
QUEST_ZEP (FSkinProp.ICO_QUEST_ZEP, SourceFile.ICONS), QUEST_ZEP (FSkinProp.ICO_QUEST_ZEP, SourceFile.ICONS),

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestAEtherScreen.java
View File

@@ -116,7 +116,7 @@ public class ConquestAEtherScreen extends FScreen {
private class PullButton extends FLabel { private class PullButton extends FLabel {
protected PullButton() { protected PullButton() {
super(new FLabel.ButtonBuilder().font(FSkinFont.forHeight(PULL_BTN_HEIGHT * 0.45f)) 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 @Override
public void handleEvent(FEvent e) { public void handleEvent(FEvent e) {
pullFromTheAEther(); pullFromTheAEther();

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestPrefsScreen.java
View File

@@ -49,7 +49,7 @@ public class ConquestPrefsScreen extends FScreen {
public ConquestPrefsScreen() { public ConquestPrefsScreen() {
super("Conquest Preferences", ConquestMenu.getMenu()); 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("Base Card Value", CQPref.AETHER_BASE_VALUE, PrefsGroup.AETHER));
scroller.add(new PrefsOption("Markup Percentage", CQPref.AETHER_MARKUP, 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)); scroller.add(new PrefsOption("Starting Shards", CQPref.AETHER_START_SHARDS, PrefsGroup.AETHER));

2
forge-gui-mobile/src/forge/screens/planarconquest/ConquestRewardDialog.java
View File

@@ -275,7 +275,7 @@ public class ConquestRewardDialog extends FScrollPane {
reward = reward0; reward = reward0;
if (reward.isDuplicate()) { if (reward.isDuplicate()) {
setFont(FSkinFont.get(20)); setFont(FSkinFont.get(20));
setIcon(FSkinImage.QUEST_COIN); setIcon(FSkinImage.AETHER_SHARD);
setAlignment(HAlignment.CENTER); setAlignment(HAlignment.CENTER);
setText(String.valueOf(reward.getReplacementShards())); setText(String.valueOf(reward.getReplacementShards()));
} }

2
forge-gui-mobile/src/forge/screens/planarconquest/LoadConquestScreen.java
View File

@@ -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.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.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.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); g.drawText(shards, font, SettingsScreen.DESC_COLOR, x + w - shardsWidth + iconSize + SettingsScreen.SETTING_PADDING, y, w, h, false, HAlignment.LEFT, false);
} }
}); });

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 18 KiB

1
forge-gui/src/main/java/forge/assets/FSkinProp.java
View File

@@ -244,6 +244,7 @@ public enum FSkinProp {
//planar conquest images //planar conquest images
IMG_PLANE_MONITOR (new int[] {0, 0, 443, 315}, PropType.PLANAR_CONQUEST), 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 //button images
IMG_BTN_START_UP (new int[] {480, 200, 160, 80}, PropType.ICON), IMG_BTN_START_UP (new int[] {480, 200, 160, 80}, PropType.ICON),