Rename Methods & Session Migration Adjustment

xsn34kzx · Sep 27, 2024 · ca004b9 · ca004b9
1 parent 8bea6b7
commit ca004b9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/src/system/version_migration/v1_0_4/session_migrators.ts b/src/system/version_migration/v1_0_4/session_migrators.ts
@@ -47,7 +47,7 @@ export function migrateModifiers(data: SessionSaveData) {
       }
 
       // From [ battlesLeft ] to [ maxBattles, battleCount ]
-      m.args = [ maxBattles, m.args[0] ];
+      m.args = [ maxBattles, Math.min(m.args[0], maxBattles) ];
     }
   });
 

diff --git a/src/system/version_migration/version_converter.ts b/src/system/version_migration/version_converter.ts
@@ -12,7 +12,7 @@ export abstract class VersionConverter {
   constructor(data: any, gameVersion: string) {
     const curVersion = gameVersion.split(".").map(value => parseInt(value));
     if (!curVersion.every((value, index) => value === LATEST_VERSION[index])) {
-      this.applyPatches(data, curVersion);
+      this.applyMigration(data, curVersion);
     }
   }
 
@@ -23,15 +23,15 @@ export abstract class VersionConverter {
     }
   }
 
-    abstract applyPatches(data: any, curVersion: number[]): void;
+  abstract applyMigration(data: any, curVersion: number[]): void;
 }
 
 export class SessionVersionConverter extends VersionConverter {
   constructor(data: SessionSaveData, gameVersion: string) {
     super(data, gameVersion);
   }
 
-  applyPatches(data: SessionSaveData, curVersion: number[]): void {
+  applyMigration(data: SessionSaveData, curVersion: number[]): void {
     const [ curMajor, curMinor, curPatch ] = curVersion;
 
     switch (curMajor) {
@@ -55,7 +55,7 @@ export class SystemVersionConverter extends VersionConverter {
     super(data, gameVersion);
   }
 
-  applyPatches(data: SystemSaveData, curVersion: number[]): void {
+  applyMigration(data: SystemSaveData, curVersion: number[]): void {
     const [ curMajor, curMinor, curPatch ] = curVersion;
 
     switch (curMajor) {
@@ -80,7 +80,7 @@ export class SettingsVersionConverter extends VersionConverter {
     super(data, gameVersion);
   }
 
-  applyPatches(data: Object, curVersion: number[]): void {
+  applyMigration(data: Object, curVersion: number[]): void {
     const [ curMajor, curMinor, curPatch ] = curVersion;
 
     switch (curMajor) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -47,7 +47,7 @@ export function migrateModifiers(data: SessionSaveData) { @@
           }
           // From [ battlesLeft ] to [ maxBattles, battleCount ]
-          m.args = [ maxBattles, m.args[0] ];
+          m.args = [ maxBattles, Math.min(m.args[0], maxBattles) ];
         }
       });
@@ Expand Down @@