diff --git a/package-lock.json b/package-lock.json index 2654275..26b4277 100644 --- a/package-lock.json +++ b/package-lock.json @@ -51,7 +51,7 @@ "pako": "^2.1.0", "prettier": "^3.1.1", "prettier-eslint": "^16.1.2", - "pydt-shared": "file:../shared/dist/pydt-shared-lib", + "pydt-shared": "^1.8.12", "rimraf": "^5.0.5", "rollbar": "^2.26.2", "rxjs": "^7.8.1", @@ -69,7 +69,7 @@ "../shared/dist/pydt-shared-lib": { "name": "pydt-shared", "version": "1.8.12", - "dev": true, + "extraneous": true, "dependencies": { "tslib": "^2.3.0" } @@ -15599,8 +15599,13 @@ } }, "node_modules/pydt-shared": { - "resolved": "../shared/dist/pydt-shared-lib", - "link": true + "version": "1.8.12", + "resolved": "https://registry.npmjs.org/pydt-shared/-/pydt-shared-1.8.12.tgz", + "integrity": "sha512-dO5JNg2dTJxah4e2xy5vi//QP1It/XKpnuATw0ts+p5orU2M7xpdcmCKfEa0Kc7BoCCpd07kvr5j2Cf4CN3VIg==", + "dev": true, + "dependencies": { + "tslib": "^2.3.0" + } }, "node_modules/qs": { "version": "6.11.0", @@ -30566,7 +30571,10 @@ "dev": true }, "pydt-shared": { - "version": "file:../shared/dist/pydt-shared-lib", + "version": "1.8.12", + "resolved": "https://registry.npmjs.org/pydt-shared/-/pydt-shared-1.8.12.tgz", + "integrity": "sha512-dO5JNg2dTJxah4e2xy5vi//QP1It/XKpnuATw0ts+p5orU2M7xpdcmCKfEa0Kc7BoCCpd07kvr5j2Cf4CN3VIg==", + "dev": true, "requires": { "tslib": "^2.3.0" } diff --git a/package.json b/package.json index 84828ba..00e33f4 100644 --- a/package.json +++ b/package.json @@ -93,7 +93,7 @@ "pako": "^2.1.0", "prettier": "^3.1.1", "prettier-eslint": "^16.1.2", - "pydt-shared": "file:../shared/dist/pydt-shared-lib", + "pydt-shared": "^1.8.12", "rimraf": "^5.0.5", "rollbar": "^2.26.2", "rxjs": "^7.8.1", diff --git a/ui/shared/pydtSettings.ts b/ui/shared/pydtSettings.ts index bee59fb..86062d8 100644 --- a/ui/shared/pydtSettings.ts +++ b/ui/shared/pydtSettings.ts @@ -61,12 +61,13 @@ export class PydtSettingsData { getDefaultDataPath(civGame: CivGame, gameStore?: GameStore): string { const location: PlatformSaveLocation = civGame.saveLocations[window.pydtApi.platform]; + const finalStore = gameStore || this.getGameStore(civGame); let result = window.pydtApi.path.normalize( window.pydtApi.path.join( this.basePaths[location.basePath], location.prefix, - civGame.dataPaths[gameStore || this.getGameStore(civGame)], + location.dataPathOverrides?.[finalStore] || civGame.dataPaths[finalStore], ), ); @@ -79,7 +80,7 @@ export class PydtSettingsData { window.pydtApi.path.join( this.basePaths[protonLocation.basePath], protonLocation.prefix, - civGame.dataPaths[gameStore || this.getGameStore(civGame)], + protonLocation.dataPathOverrides?.[finalStore] || civGame.dataPaths[finalStore], ), );