Add wrapper for game mode

src/system/game-data.ts

@@ -8,7 +8,7 @@ import PokemonData from "./pokemon-data";
 import PersistentModifierData from "./modifier-data";
 import ArenaData from "./arena-data";
 import { Unlockables } from "./unlockables";
-import { GameMode } from "../game-mode";
+import { GameModes, gameModes } from "../game-mode";
 import { BattleType } from "../battle";
 import TrainerData from "./trainer-data";
 import { trainerConfigs } from "../data/trainer-config";
@@ -76,7 +76,7 @@ interface SystemSaveData {
 interface SessionSaveData {
   seed: string;
   playTime: integer;
-  gameMode: GameMode;
+  gameMode: GameModes;
   party: PokemonData[];
   enemyParty: PokemonData[];
   modifiers: PersistentModifierData[];
@@ -458,7 +458,7 @@ export class GameData {
         const sessionData = {
           seed: scene.seed,
           playTime: scene.sessionPlayTime,
-          gameMode: scene.gameMode,
+          gameMode: scene.gameMode.modeId,
           party: scene.getParty().map(p => new PokemonData(p)),
           enemyParty: scene.getEnemyParty().map(p => new PokemonData(p)),
           modifiers: scene.findModifiers(() => true).map(m => new PersistentModifierData(m, true)),
@@ -508,7 +508,7 @@ export class GameData {
 
           scene.sessionPlayTime = sessionData.playTime || 0;
 
-          scene.gameMode = sessionData.gameMode || GameMode.CLASSIC;
+          scene.gameMode = gameModes[sessionData.gameMode || GameModes.CLASSIC];
 
           const loadPokemonAssets: Promise<void>[] = [];
 

src/system/session-history.ts

@@ -1,4 +1,4 @@
-import { GameMode } from "../game-mode";
+import { GameModes } from "../game-mode";
 import PokemonData from "./pokemon-data";
 import PersistentModifierData from "./modifier-data";
 
@@ -12,7 +12,7 @@ export interface SessionHistory {
   seed: string;
   playTime: integer;
   result: SessionHistoryResult,
-  gameMode: GameMode;
+  gameMode: GameModes;
   party: PokemonData[];
   modifiers: PersistentModifierData[];
   money: integer;

src/system/unlockables.ts

@@ -1,4 +1,4 @@
-import { GameMode, gameModeNames } from "../game-mode";
+import { GameModes, gameModes } from "../game-mode";
 
 export enum Unlockables {
   ENDLESS_MODE,
@@ -9,10 +9,10 @@ export enum Unlockables {
 export function getUnlockableName(unlockable: Unlockables) {
   switch (unlockable) {
     case Unlockables.ENDLESS_MODE:
-      return `${gameModeNames[GameMode.ENDLESS]} Mode`;
+      return `${gameModes[GameModes.ENDLESS].getName()} Mode`;
     case Unlockables.MINI_BLACK_HOLE:
       return 'Mini Black Hole';
     case Unlockables.SPLICED_ENDLESS_MODE:
-      return `${gameModeNames[GameMode.SPLICED_ENDLESS]} Mode`;
+      return `${gameModes[GameModes.SPLICED_ENDLESS].getName()} Mode`;
   }
 }