Merge branch 'danielyxie:dev' into dev

This commit is contained in:
daanflore
2022-01-02 18:55:27 +01:00
committed by GitHub
5 changed files with 21 additions and 13 deletions

18
dist/vendor.bundle.js vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -112,7 +112,7 @@ export const CONSTANTS: {
LatestUpdate: string;
} = {
VersionString: "1.2.0",
VersionNumber: 7,
VersionNumber: 8,
// Speed (in ms) at which the main loop is updated
_idleSpeed: 200,

View File

@ -21,6 +21,7 @@ import { save } from "./db";
import { v1APIBreak } from "./utils/v1APIBreak";
import { AugmentationNames } from "./Augmentation/data/AugmentationNames";
import { PlayerOwnedAugmentation } from "./Augmentation/PlayerOwnedAugmentation";
import { LocationName } from "./Locations/data/LocationNames";
/* SaveObject.js
* Defines the object used to save/load games
@ -233,6 +234,13 @@ function evaluateVersionCompatibility(ver: string | number): void {
}
}
}
if (ver < 9) {
if (StockMarket.hasOwnProperty("Joes Guns")) {
const s = StockMarket["Joes Guns"];
delete StockMarket["Joes Guns"];
StockMarket[LocationName.Sector12JoesGuns] = s;
}
}
}
}