diff --git a/forge-gui-mobile/src/forge/assets/FSkin.java b/forge-gui-mobile/src/forge/assets/FSkin.java index 768022d22b5..3eea1009c25 100644 --- a/forge-gui-mobile/src/forge/assets/FSkin.java +++ b/forge-gui-mobile/src/forge/assets/FSkin.java @@ -90,6 +90,10 @@ public class FSkin { public static void loadLight(String skinName, final SplashScreen splashScreen) { preferredName = skinName.toLowerCase().replace(' ', '_'); + //reset hd buttons/icons + Forge.hdbuttons = false; + Forge.hdstart = false; + //ensure skins directory exists final FileHandle dir = Gdx.files.absolute(ForgeConstants.SKINS_DIR); if (!dir.exists() || !dir.isDirectory()) { @@ -205,21 +209,21 @@ public class FSkin { textures.put(f6.path(), textures.get(f3.path())); } if (f7.exists()){ - Texture t = new Texture(f7, true); - t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear); + Texture t = new Texture(f7, false); + //t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear); textures.put(f7.path(), t); } //hdbuttons if (f11.exists()) { - Texture tf11 = new Texture(f11, true); - tf11.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear); - textures.put(f11.path(), tf11); + Texture t = new Texture(f11, true); + t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear); + textures.put(f11.path(), t); Forge.hdbuttons = true; } else { Forge.hdbuttons = false; } //how to refresh buttons when a theme don't have hd buttons? if (f12.exists()) { - Texture tf12 = new Texture(f12, true); - tf12.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear); - textures.put(f12.path(), tf12); + Texture t = new Texture(f12, true); + t.setFilter(Texture.TextureFilter.MipMapLinearLinear, Texture.TextureFilter.Linear); + textures.put(f12.path(), t); Forge.hdstart = true; } else { Forge.hdstart = false; } //update colors diff --git a/forge-gui-mobile/src/forge/assets/FSkinImage.java b/forge-gui-mobile/src/forge/assets/FSkinImage.java index 17f7b4dd4c5..5ed5abe8b8f 100644 --- a/forge-gui-mobile/src/forge/assets/FSkinImage.java +++ b/forge-gui-mobile/src/forge/assets/FSkinImage.java @@ -176,6 +176,22 @@ public enum FSkinImage implements FImage { QUEST_MINUS (FSkinProp.ICO_QUEST_MINUS, SourceFile.ICONS), QUEST_PLUS (FSkinProp.ICO_QUEST_PLUS, SourceFile.ICONS), QUEST_PLUSPLUS (FSkinProp.ICO_QUEST_PLUSPLUS, SourceFile.ICONS), + QUEST_BIG_ELIXIR (FSkinProp.ICO_QUEST_BIG_ELIXIR, SourceFile.ICONS), + QUEST_BIG_BREW (FSkinProp.ICO_QUEST_BIG_BREW, SourceFile.ICONS), + QUEST_BIG_BM (FSkinProp.ICO_QUEST_BIG_BM, SourceFile.ICONS), + QUEST_BIG_STAKES (FSkinProp.ICO_QUEST_BIG_STAKES, SourceFile.ICONS), + QUEST_BIG_HOUSE (FSkinProp.ICO_QUEST_BIG_HOUSE, SourceFile.ICONS), + QUEST_BIG_COIN (FSkinProp.ICO_QUEST_BIG_COIN, SourceFile.ICONS), + QUEST_BIG_BOOK (FSkinProp.ICO_QUEST_BIG_BOOK, SourceFile.ICONS), + QUEST_BIG_MAP (FSkinProp.ICO_QUEST_BIG_MAP, SourceFile.ICONS), + QUEST_BIG_ZEP (FSkinProp.ICO_QUEST_BIG_ZEP, SourceFile.ICONS), + QUEST_BIG_CHARM (FSkinProp.ICO_QUEST_BIG_CHARM, SourceFile.ICONS), + QUEST_BIG_BOOTS (FSkinProp.ICO_QUEST_BIG_BOOTS, SourceFile.ICONS), + QUEST_BIG_SHIELD (FSkinProp.ICO_QUEST_BIG_SHIELD, SourceFile.ICONS), + QUEST_BIG_ARMOR (FSkinProp.ICO_QUEST_BIG_ARMOR, SourceFile.ICONS), + QUEST_BIG_AXE (FSkinProp.ICO_QUEST_BIG_AXE, SourceFile.ICONS), + QUEST_BIG_SWORD (FSkinProp.ICO_QUEST_BIG_SWORD, SourceFile.ICONS), + QUEST_BIG_BAG (FSkinProp.ICO_QUEST_BIG_BAG, SourceFile.ICONS), //Interface icons QUESTION (FSkinProp.ICO_QUESTION, SourceFile.ICONS), @@ -249,6 +265,7 @@ public enum FSkinImage implements FImage { ENCHANTMENT (FSkinProp.IMG_ENCHANTMENT, SourceFile.MANAICONS), INSTANT (FSkinProp.IMG_INSTANT, SourceFile.MANAICONS), LAND (FSkinProp.IMG_LAND, SourceFile.MANAICONS), + LANDLOGO (FSkinProp.IMG_LANDLOGO, SourceFile.MANAICONS), MULTI (FSkinProp.IMG_MULTI, SourceFile.ICONS), HDMULTI (FSkinProp.IMG_HDMULTI, SourceFile.MANAICONS), PLANESWALKER (FSkinProp.IMG_PLANESWALKER, SourceFile.MANAICONS), diff --git a/forge-gui-mobile/src/forge/deck/FDeckEditor.java b/forge-gui-mobile/src/forge/deck/FDeckEditor.java index 2605cb97dbe..2f74d266722 100644 --- a/forge-gui-mobile/src/forge/deck/FDeckEditor.java +++ b/forge-gui-mobile/src/forge/deck/FDeckEditor.java @@ -332,7 +332,7 @@ public class FDeckEditor extends TabPageScreen { protected void buildMenu() { final Localizer localizer = Localizer.getInstance(); - addItem(new FMenuItem(localizer.getMessage("lblAddBasicLands"), FSkinImage.LAND, new FEventHandler() { + addItem(new FMenuItem(localizer.getMessage("lblAddBasicLands"), FSkinImage.LANDLOGO, new FEventHandler() { @Override public void handleEvent(FEvent e) { CardEdition defaultLandSet; diff --git a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java index dde1039b0e0..401852ee2e6 100644 --- a/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java +++ b/forge-gui-mobile/src/forge/screens/quest/QuestMenu.java @@ -43,7 +43,7 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats { private static final QuestStatsScreen statsScreen = new QuestStatsScreen(); private static final QuestTournamentsScreen tournamentsScreen = new QuestTournamentsScreen(); - private static final FMenuItem duelsItem = new FMenuItem(Localizer.getInstance().getMessage("lblDuels"), FSkinImage.QUEST_GEAR, new FEventHandler() { + private static final FMenuItem duelsItem = new FMenuItem(Localizer.getInstance().getMessage("lblDuels"), FSkinImage.QUEST_BIG_SWORD, new FEventHandler() { @Override public void handleEvent(FEvent e) { setCurrentScreen(duelsScreen); @@ -55,13 +55,13 @@ public class QuestMenu extends FPopupMenu implements IVQuestStats { setCurrentScreen(challengesScreen); } }); - private static final FMenuItem tournamentsItem = new FMenuItem(Localizer.getInstance().getMessage("lblTournaments"), FSkinImage.PACK, new FEventHandler() { + private static final FMenuItem tournamentsItem = new FMenuItem(Localizer.getInstance().getMessage("lblTournaments"), FSkinImage.QUEST_BIG_SHIELD, new FEventHandler() { @Override public void handleEvent(FEvent e) { setCurrentScreen(tournamentsScreen); } }); - private static final FMenuItem decksItem = new FMenuItem(Localizer.getInstance().getMessage("lblQuestDecks"), FSkinImage.DECKLIST, new FEventHandler() { + private static final FMenuItem decksItem = new FMenuItem(Localizer.getInstance().getMessage("lblQuestDecks"), FSkinImage.QUEST_BIG_BAG, new FEventHandler() { @Override public void handleEvent(FEvent e) { setCurrentScreen(decksScreen); diff --git a/forge-gui/res/quest/bazaar/index.xml b/forge-gui/res/quest/bazaar/index.xml index 64637e66cb1..1eb17455fb1 100644 --- a/forge-gui/res/quest/bazaar/index.xml +++ b/forge-gui/res/quest/bazaar/index.xml @@ -1,7 +1,7 @@ - 80 + 160 @@ -26,7 +26,7 @@ Sleight - + This adventurer's market has a tool for every need ... or so the plaque on the wall claims. Map @@ -53,22 +53,22 @@ - + These volumes explain how to perform the most difficult of sleights. Effect: Your first mulligan is free. - + These ancient charts should facilitate navigation during your travels significantly. Effect: Quest challenges become available more frequently. - + This coin is believed to give good luck to its owner. Effect: Improves the chance of getting a random rare after each match by 15%. - + Land owners have a strong voice in community matters. Effect: Gives a bonus of %d%% to match winnings. @@ -81,37 +81,37 @@ Effect: Quest challenges become available more frequently. Effect: +3 life Effect: Activate once for a new set of challenges (re-fuels after a challenge is attempted). - + The Alchemist welcomes contributions to his famous Elixir. But beware, you may build an immunity to its effects... Effect: Alchemist gives you %d credits. Effect: Reduces maximum life by 1. - + A salty sweet smell rises from the vials bubbling behind the counter. Effect: Gives +1 to maximum life. Fine Print: Loses effectiveness after 15 uses. + itemType="CHARM_VIM" icon="ICO_QUEST_BIG_BOOTS"> A charm fills you with energy, speeding your movements. Effect: You may have each match be best of 1 instead of 3. + itemType="CHARM" icon="ICO_QUEST_BIG_CHARM"> A charm to ward off the fatigue of battle. Effect: You may have each match be best of 5 instead of 3. - + A written agreement with the Spell Shop to acquire cards you lose in an ante match from quest opponents. Effect: Cards lost in an ante match will be available immediately following the match in the Card Shop. - + A token certifying you as a member of the bank, giving you a greater selection of booster packs when you win. Effect: Adds one more booster pack to the pack selection after you win. diff --git a/forge-gui/res/skins/default/sprite_icons.png b/forge-gui/res/skins/default/sprite_icons.png index d00063b2f4e..7cff5a518d1 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/res/skins/default/sprite_manaicons.png b/forge-gui/res/skins/default/sprite_manaicons.png index 70e4907b207..3b8f734e939 100644 Binary files a/forge-gui/res/skins/default/sprite_manaicons.png and b/forge-gui/res/skins/default/sprite_manaicons.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 65dc562727c..5468c1e2914 100644 --- a/forge-gui/src/main/java/forge/assets/FSkinProp.java +++ b/forge-gui/src/main/java/forge/assets/FSkinProp.java @@ -213,6 +213,22 @@ public enum FSkinProp { ICO_QUEST_MINUS (new int[] {560, 640, 80, 80}, PropType.ICON), ICO_QUEST_PLUS (new int[] {480, 640, 80, 80}, PropType.ICON), ICO_QUEST_PLUSPLUS (new int[] {480, 720, 80, 80}, PropType.ICON), + ICO_QUEST_BIG_ELIXIR (new int[] {0, 880, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_BREW (new int[] {160, 880, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_BM (new int[] {320, 880, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_STAKES (new int[] {480, 880, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_HOUSE (new int[] {0, 1040, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_COIN (new int[] {160, 1040, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_BOOK (new int[] {320, 1040, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_MAP (new int[] {480, 1040, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_ZEP (new int[] {0, 1200, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_CHARM (new int[] {160, 1200, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_BOOTS (new int[] {320, 1200, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_SHIELD (new int[] {480, 1200, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_ARMOR (new int[] {0, 1360, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_AXE (new int[] {160, 1360, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_SWORD (new int[] {320, 1360, 160, 160}, PropType.ICON), + ICO_QUEST_BIG_BAG (new int[] {480, 1360, 160, 160}, PropType.ICON), //interface icons ICO_QUESTION (new int[] {560, 800, 32, 32}, PropType.ICON),