Merge 1d53be9c65 into a5bafe5c47

src/account.ts

@@ -14,11 +14,10 @@ export function updateUserInfo(): Promise<[boolean, integer]> {
     if (bypassLogin) {
       loggedInUser = { username: 'Guest', lastSessionSlot: -1 };
       let lastSessionSlot = -1;
-      for (let s = 0; s < 5; s++) {
-        if (localStorage.getItem(`sessionData${s ? s : ''}_${loggedInUser.username}`)) {
-          lastSessionSlot = s;
-          break;
-        }
+      // Get last slot saved and checks if it has data to enable continue
+      const slotId = parseInt(localStorage.getItem('slotId'));
+      if (localStorage.getItem(`sessionData${slotId ? slotId : ''}_${loggedInUser.username}`)) {
+        lastSessionSlot = slotId;
       }
       loggedInUser.lastSessionSlot = lastSessionSlot;
       // Migrate old data from before the username was appended

src/system/game-data.ts

@@ -753,6 +753,7 @@ export class GameData {
     return new Promise<boolean>(resolve => {
       if (bypassLogin) {
         localStorage.removeItem(`sessionData${this.scene.sessionSlotId ? this.scene.sessionSlotId : ''}_${loggedInUser.username}`);
+        updateUserInfo(); // Remove continue on session delete
         return resolve(true);
       }
 
@@ -815,6 +816,7 @@ export class GameData {
     return new Promise<[boolean, boolean]>(resolve => {
       if (bypassLogin) {
         localStorage.removeItem(`sessionData${slotId ? slotId : ''}_${loggedInUser.username}`);
+        updateUserInfo(); // Remove continue on clear
         return resolve([true, true]);
       }
 
@@ -927,6 +929,8 @@ export class GameData {
             });
         } else {
           this.verify().then(success => {
+            // Last slot saved for continue purposes
+            localStorage.setItem('slotId', scene.sessionSlotId.toString());
             this.scene.ui.savingIcon.hide();
             resolve(success);
           });