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

- Probably need these, even though they arent really used quite yet

Browse Source
This commit is contained in:
Sol
2016-03-25 22:40:21 +00:00
parent aca5777c4e
commit 81d1395e82
3 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
forge-game/src/main/java/forge/game/GameType.java
View File

@@ -13,6 +13,7 @@ public enum GameType {
Draft (DeckFormat.Limited, true, true, true, "Draft", ""), Draft (DeckFormat.Limited, true, true, true, "Draft", ""),
Winston (DeckFormat.Limited, true, true, true, "Winston", ""), Winston (DeckFormat.Limited, true, true, true, "Winston", ""),
Gauntlet (DeckFormat.Constructed, false, true, true, "Gauntlet", ""), Gauntlet (DeckFormat.Constructed, false, true, true, "Gauntlet", ""),
Tournament (DeckFormat.Constructed, false, true, true, "Tournament", ""),
Quest (DeckFormat.QuestDeck, true, true, false, "Quest", ""), Quest (DeckFormat.QuestDeck, true, true, false, "Quest", ""),
QuestDraft (DeckFormat.Limited, true, true, true, "Quest Draft", ""), QuestDraft (DeckFormat.Limited, true, true, true, "Quest Draft", ""),
PlanarConquest (DeckFormat.PlanarConquest, true, false, false, "Planar Conquest", ""), PlanarConquest (DeckFormat.PlanarConquest, true, false, false, "Planar Conquest", ""),

6
forge-gui/src/main/java/forge/model/FModel.java
View File

@@ -45,6 +45,7 @@ import forge.properties.ForgePreferences.FPref;
import forge.quest.QuestController; import forge.quest.QuestController;
import forge.quest.QuestWorld; import forge.quest.QuestWorld;
import forge.quest.data.QuestPreferences; import forge.quest.data.QuestPreferences;
import forge.tournament.TournamentData;
import forge.util.FileUtil; import forge.util.FileUtil;
import forge.util.Localizer; import forge.util.Localizer;
import forge.util.storage.IStorage; import forge.util.storage.IStorage;
@@ -76,6 +77,7 @@ public final class FModel {
private static Map<GameType, AchievementCollection> achievements; private static Map<GameType, AchievementCollection> achievements;
// Someone should take care of 2 gauntlets here // Someone should take care of 2 gauntlets here
private static TournamentData tournamentData;
private static GauntletData gauntletData; private static GauntletData gauntletData;
private static GauntletMini gauntlet; private static GauntletMini gauntlet;
@@ -321,4 +323,8 @@ public final class FModel {
public static IStorage<CardBlock> getFantasyBlocks() { public static IStorage<CardBlock> getFantasyBlocks() {
return fantasyBlocks; return fantasyBlocks;
} }
public static TournamentData getTournamentData() { return tournamentData; }
public static void setTournamentData(TournamentData tournamentData) { FModel.tournamentData = tournamentData; }
} }

1
forge-gui/src/main/java/forge/properties/ForgeConstants.java
View File

@@ -142,6 +142,7 @@ public final class ForgeConstants {
public static final FileLocation WORKSHOP_LAYOUT_FILE = new FileLocation(_DEFAULTS_DIR, USER_PREFS_DIR, "workshop.xml"); public static final FileLocation WORKSHOP_LAYOUT_FILE = new FileLocation(_DEFAULTS_DIR, USER_PREFS_DIR, "workshop.xml");
public static final FileLocation EDITOR_LAYOUT_FILE = new FileLocation(_DEFAULTS_DIR, USER_PREFS_DIR, "editor.xml"); public static final FileLocation EDITOR_LAYOUT_FILE = new FileLocation(_DEFAULTS_DIR, USER_PREFS_DIR, "editor.xml");
public static final FileLocation GAUNTLET_DIR = new FileLocation(_DEFAULTS_DIR, USER_DIR, "gauntlet" + PATH_SEPARATOR); public static final FileLocation GAUNTLET_DIR = new FileLocation(_DEFAULTS_DIR, USER_DIR, "gauntlet" + PATH_SEPARATOR);
public static final FileLocation TOURNAMENT_DIR = new FileLocation(_DEFAULTS_DIR, USER_DIR, "tournament" + PATH_SEPARATOR);
// data that is only in the cached dir // data that is only in the cached dir
private static final String PICS_DIR = CACHE_DIR + "pics" + PATH_SEPARATOR; private static final String PICS_DIR = CACHE_DIR + "pics" + PATH_SEPARATOR;