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

Ensure editions linked to cards properly

Browse Source
This commit is contained in:
drdev
2014-03-02 21:22:06 +00:00
parent 124174a564
commit 859bc49f0d
4 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -90,9 +90,12 @@ forge-gui/target
forge-gui/tools/PerSetTrackingResults forge-gui/tools/PerSetTrackingResults
forge-gui/tools/oracleScript.log forge-gui/tools/oracleScript.log
forge-m-android/bin forge-m-android/bin
forge-m-android/target
forge-m-base/bin forge-m-base/bin
forge-m-base/target
forge-m-desktop/bin forge-m-desktop/bin
forge-m-desktop/res forge-m-desktop/res
forge-m-desktop/target
forge-net/target forge-net/target
/forge.profile.properties /forge.profile.properties
/nbactions.xml /nbactions.xml

2
forge-m-base/src/forge/Forge.java
View File

@@ -86,7 +86,7 @@ public class Forge implements ApplicationListener {
} }
}; };
final CardStorageReader reader = new CardStorageReader(Constants.CARD_DATA_DIR, progressBarBridge, null); final CardStorageReader reader = new CardStorageReader(Constants.CARD_DATA_DIR, progressBarBridge, null);
magicDb = new StaticData(reader, "res/editions", "res/blockdata"); magicDb = new StaticData(reader, Constants.EDITIONS_DIR, Constants.BLOCK_DATA_DIR);
bar.setDescription("Opening main window..."); bar.setDescription("Opening main window...");

4
forge-m-base/src/forge/screens/match/MatchController.java
View File

@@ -40,12 +40,12 @@ public class MatchController {
// It's important to run match in a different thread to allow GUI inputs to be invoked from inside game. // It's important to run match in a different thread to allow GUI inputs to be invoked from inside game.
// Game is set on pause while gui player takes decisions // Game is set on pause while gui player takes decisions
game.getAction().invoke(new Runnable() { /*game.getAction().invoke(new Runnable() {
@Override @Override
public void run() { public void run() {
match.startGame(game); match.startGame(game);
} }
}); });*/
} }
public final void endCurrentGame() { public final void endCurrentGame() {

2
forge-m-base/src/forge/utils/Constants.java
View File

@@ -44,6 +44,8 @@ public final class Constants {
public static final String PRICES_BOOSTER_FILE = _QUEST_DIR + "booster-prices.txt"; public static final String PRICES_BOOSTER_FILE = _QUEST_DIR + "booster-prices.txt";
public static final String BAZAAR_FILE = _QUEST_DIR + "bazaar/index.xml"; public static final String BAZAAR_FILE = _QUEST_DIR + "bazaar/index.xml";
public static final String CARD_DATA_DIR = _ASSETS_ROOT + "cardsfolder/"; public static final String CARD_DATA_DIR = _ASSETS_ROOT + "cardsfolder/";
public static final String EDITIONS_DIR = _ASSETS_ROOT + "editions/";
public static final String BLOCK_DATA_DIR = _ASSETS_ROOT + "blockdata/";
public static final String DECK_CUBE_DIR = _ASSETS_ROOT + "cube"; public static final String DECK_CUBE_DIR = _ASSETS_ROOT + "cube";
public static final String QUEST_WORLD_DIR = _QUEST_DIR + "worlds/"; public static final String QUEST_WORLD_DIR = _QUEST_DIR + "worlds/";
public static final String QUEST_PRECON_DIR = _QUEST_DIR + "precons/"; public static final String QUEST_PRECON_DIR = _QUEST_DIR + "precons/";