From 81d1395e82bbe4baa77c53f3d1313a45cdc0ab88 Mon Sep 17 00:00:00 2001 From: Sol Date: Fri, 25 Mar 2016 22:40:21 +0000 Subject: [PATCH] - Probably need these, even though they arent really used quite yet --- forge-game/src/main/java/forge/game/GameType.java | 1 + forge-gui/src/main/java/forge/model/FModel.java | 6 ++++++ .../src/main/java/forge/properties/ForgeConstants.java | 1 + 3 files changed, 8 insertions(+) diff --git a/forge-game/src/main/java/forge/game/GameType.java b/forge-game/src/main/java/forge/game/GameType.java index 3b78adff2cc..4fc99f1f9d4 100644 --- a/forge-game/src/main/java/forge/game/GameType.java +++ b/forge-game/src/main/java/forge/game/GameType.java @@ -13,6 +13,7 @@ public enum GameType { Draft (DeckFormat.Limited, true, true, true, "Draft", ""), Winston (DeckFormat.Limited, true, true, true, "Winston", ""), Gauntlet (DeckFormat.Constructed, false, true, true, "Gauntlet", ""), + Tournament (DeckFormat.Constructed, false, true, true, "Tournament", ""), Quest (DeckFormat.QuestDeck, true, true, false, "Quest", ""), QuestDraft (DeckFormat.Limited, true, true, true, "Quest Draft", ""), PlanarConquest (DeckFormat.PlanarConquest, true, false, false, "Planar Conquest", ""), diff --git a/forge-gui/src/main/java/forge/model/FModel.java b/forge-gui/src/main/java/forge/model/FModel.java index 4d76d53c1a0..25d519b20e2 100644 --- a/forge-gui/src/main/java/forge/model/FModel.java +++ b/forge-gui/src/main/java/forge/model/FModel.java @@ -45,6 +45,7 @@ import forge.properties.ForgePreferences.FPref; import forge.quest.QuestController; import forge.quest.QuestWorld; import forge.quest.data.QuestPreferences; +import forge.tournament.TournamentData; import forge.util.FileUtil; import forge.util.Localizer; import forge.util.storage.IStorage; @@ -76,6 +77,7 @@ public final class FModel { private static Map achievements; // Someone should take care of 2 gauntlets here + private static TournamentData tournamentData; private static GauntletData gauntletData; private static GauntletMini gauntlet; @@ -321,4 +323,8 @@ public final class FModel { public static IStorage getFantasyBlocks() { return fantasyBlocks; } + + public static TournamentData getTournamentData() { return tournamentData; } + + public static void setTournamentData(TournamentData tournamentData) { FModel.tournamentData = tournamentData; } } diff --git a/forge-gui/src/main/java/forge/properties/ForgeConstants.java b/forge-gui/src/main/java/forge/properties/ForgeConstants.java index c3993c14a95..93b58312a56 100644 --- a/forge-gui/src/main/java/forge/properties/ForgeConstants.java +++ b/forge-gui/src/main/java/forge/properties/ForgeConstants.java @@ -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 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 TOURNAMENT_DIR = new FileLocation(_DEFAULTS_DIR, USER_DIR, "tournament" + PATH_SEPARATOR); // data that is only in the cached dir private static final String PICS_DIR = CACHE_DIR + "pics" + PATH_SEPARATOR;