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

Fix so FatPacks load

Browse Source 
Fix references to non-existant quest icon files
This commit is contained in:
drdev
2014-04-10 02:43:51 +00:00
parent 53c090def2
commit 221be3d93d
4 changed files with 109 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
forge-gui-desktop/src/main/java/forge/screens/home/quest/QuestPreferencesHandler.java
View File

@@ -1,5 +1,6 @@
package forge.screens.home.quest;
import forge.assets.FSkinProp;
import forge.model.FModel;
import forge.quest.data.QuestPreferences;
import forge.quest.data.QuestPreferences.QPref;
@@ -59,7 +60,7 @@ public class QuestPreferencesHandler extends SkinnedPanel {
pnlRewards.setLayout(new MigLayout("insets 0, gap 0, wrap 2"));
pnlRewards.add(new FLabel.Builder().text("Rewards")
.icon(new FSkin.UnskinnedIcon("res/images/icons/CoinIcon.png")).build(),
.icon(FSkin.getImage(FSkinProp.ICO_QUEST_COIN)).build(),
"w 100%!, h 30px!, span 2 1");
pnlRewards.add(lblErrRewards, "w 100%!, h 30px!, span 2 1");
@@ -100,7 +101,7 @@ public class QuestPreferencesHandler extends SkinnedPanel {
pnlDifficulty.setOpaque(false);
pnlDifficulty.setLayout(new MigLayout("insets 0, gap 0, wrap 5"));
pnlDifficulty.add(new FLabel.Builder().text("Difficulty Adjustments").icon(new FSkin.UnskinnedIcon("res/images/icons/NotesIcon.png")).build(), "w 100%!, h 30px!, span 5 1");
pnlDifficulty.add(new FLabel.Builder().text("Difficulty Adjustments").icon(FSkin.getImage(FSkinProp.ICO_QUEST_NOTES)).build(), "w 100%!, h 30px!, span 5 1");
pnlDifficulty.add(lblErrDifficulty, "w 100%!, h 30px!, span 5 1");
constraints1 = "w 60px!, h 26px!";
@@ -183,7 +184,7 @@ public class QuestPreferencesHandler extends SkinnedPanel {
pnlBooster.setLayout(new MigLayout("insets 0, gap 0, wrap 2"));
pnlBooster.add(new FLabel.Builder().text("Booster Pack Ratios")
.icon(new FSkin.UnskinnedIcon("res/images/icons/BookIcon.png")).build(),
.icon(FSkin.getImage(FSkinProp.ICO_QUEST_BOOK)).build(),
"w 100%!, h 30px!, span 2 1");
pnlBooster.add(lblErrBooster, "w 100%!, h 30px!, span 2 1");
@@ -203,7 +204,7 @@ public class QuestPreferencesHandler extends SkinnedPanel {
pnlShop.setLayout(new MigLayout("insets 0, gap 0, wrap 2"));
pnlShop.add(new FLabel.Builder().text("Shop Preferences")
.icon(new FSkin.UnskinnedIcon("res/images/icons/CoinIcon.png")).build(), "w 100%!, h 30px!, span 2 1");
.icon(FSkin.getImage(FSkinProp.ICO_QUEST_COIN)).build(), "w 100%!, h 30px!, span 2 1");
pnlShop.add(lblErrShop, "w 100%!, h 30px!, span 2 1");
constraints1 = "w 60px, h 26px!";

2
forge-gui-desktop/src/test/java/forge/gamesimulationtests/util/CardDatabaseHelper.java
View File

@@ -27,7 +27,7 @@ public class CardDatabaseHelper {
private static void initialize() {
final CardStorageReader reader = new CardStorageReader(ForgeConstants.CARD_DATA_DIR, null, null);
staticData = new StaticData(reader, "res/editions", "res/blockdata");
staticData = new StaticData(reader, ForgeConstants.EDITIONS_DIR, ForgeConstants.BLOCK_DATA_DIR);
}
private static boolean hasBeenInitialized() {