Nixyri/AntimatterDimensionsSourceCode
1
0
Fork 0
mirror of https://github.com/IvarK/AntimatterDimensionsSourceCode.git synced 2024-09-20 11:01:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix some backup bugs

Browse Source
This commit is contained in:
SpectralFlame 2023-07-10 13:56:53 -05:00 committed by cyip92
parent c56fd9c99d
commit e1c072f77e
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/modals/options/BackupWindowModal.vue
View File

@ -31,7 +31,7 @@ export default {
},
methods: {
update() {
this.nextSave = GameStorage.lastBackupTimes.map(t => t && t.backupTimer).sum();
this.nextSave = Object.values(GameStorage.lastBackupTimes).map(t => t && t.backupTimer).sum();
this.ignoreOffline = player.options.loadBackupWithoutOffline;
},
offlineOptionClass() {

13
src/core/storage/storage.js
View File

@ -238,9 +238,9 @@ export const GameStorage = {
},
// A few things in the current game state can prevent saving, which we want to do for all forms of saving
canSave() {
canSave(ignoreSimulation = false) {
const isSelectingGlyph = GlyphSelection.active;
const isSimulating = ui.$viewModel.modal.progressBar !== undefined;
const isSimulating = ui.$viewModel.modal.progressBar !== undefined && !ignoreSimulation;
const isEnd = (GameEnd.endState >= END_STATE_MARKERS.SAVE_DISABLED && !GameEnd.removeAdditionalEnd) ||
GameEnd.endState >= END_STATE_MARKERS.INTERACTIVITY_DISABLED;
return !isEnd && !(isSelectingGlyph || isSimulating);
@ -259,9 +259,12 @@ export const GameStorage = {
if (!silent) GameUI.notify.info("Game saved");
},
// Saves a backup, updates save timers (this is called before nextBackup is updated), and then saves the timers too
// Saves a backup, updates save timers (this is called before nextBackup is updated), and then saves the timers too.
// When checking offline backups, this call typically resolves during offline progress simulation, so in this case
// we want to ignore that (which saves the game state pre-simulation). This is because it's messier and less useful
// to the player if we instead defer the call until after simulation
saveToBackup(backupSlot, backupTimer) {
if (!this.canSave()) return;
if (!this.canSave(true)) return;
localStorage.setItem(this.backupDataKey(this.currentSlot, backupSlot), GameSaveSerializer.serialize(player));
this.lastBackupTimes[backupSlot] = {
backupTimer,
@ -328,7 +331,7 @@ export const GameStorage = {
// Set the next backup time, but make sure to skip forward an appropriate amount if a load or import happened,
// since these may cause the backup timer to be significantly behind
resetBackupTimer() {
const latestBackupTime = this.lastBackupTimes.map(t => t && t.backupTimer).max();
const latestBackupTime = Object.values(this.lastBackupTimes).map(t => t && t.backupTimer).max();
player.backupTimer = Math.max(this.oldBackupTimer, player.backupTimer, latestBackupTime);
},