Make cross-tab progress and resets monotonic

Author: gmval-g3

index.html

@@ -172,12 +172,15 @@ <h2 id="journal-title">SIGNAL LOG</h2>
 let progressStorage = null;
 try { progressStorage = window.localStorage; } catch {}
 const savedProgress = LittleAndroidProgress.loadProgress(progressStorage);
+let progressGeneration = savedProgress.generation;
 for (const fragment of signalFragments) {
   fragment.discovered = savedProgress.discoveredFragments.includes(fragment.id);
   fragment.collected = savedProgress.collectedFragments.includes(fragment.id);
 }
 const discoveredNPCs = new Set(savedProgress.discoveredNPCs);
-const quest = { complete: savedProgress.complete };
+const quest = {
+  complete: savedProgress.complete || signalFragments.every(fragment => fragment.collected),
+};
 
 function isWalkable(tx,ty){
   if(tx<0||ty<0||tx>=MW||ty>=MH)return false;
@@ -963,6 +966,7 @@ <h2 id="journal-title">SIGNAL LOG</h2>
 function currentProgress() {
   return {
     version: LittleAndroidProgress.SAVE_VERSION,
+    generation: progressGeneration,
     discoveredFragments: signalFragments.filter(fragment => fragment.discovered).map(fragment => fragment.id),
     collectedFragments: signalFragments.filter(fragment => fragment.collected).map(fragment => fragment.id),
     discoveredNPCs: [...discoveredNPCs],
@@ -972,8 +976,23 @@ <h2 id="journal-title">SIGNAL LOG</h2>
 
 function persistProgress() {
   const latest = LittleAndroidProgress.loadProgress(progressStorage);
-  const merged = LittleAndroidProgress.mergeProgress(latest, currentProgress());
+  const merged = LittleAndroidProgress.mergeProgress(
+    latest,
+    currentProgress(),
+    signalFragments.map(fragment => fragment.id),
+  );
+  progressGeneration = merged.generation;
+  for (const fragment of signalFragments) {
+    fragment.discovered = merged.discoveredFragments.includes(fragment.id);
+    fragment.collected = merged.collectedFragments.includes(fragment.id);
+  }
+  discoveredNPCs.clear();
+  for (const identity of merged.discoveredNPCs) discoveredNPCs.add(identity);
+  quest.complete = merged.complete;
+  document.body.classList.toggle('world-restored', quest.complete);
+  updateQuestUI();
   LittleAndroidProgress.saveProgress(progressStorage, merged);
+  return merged;
 }
 
 function rememberNPC(npc) {
@@ -1028,7 +1047,9 @@ <h2 id="journal-title">SIGNAL LOG</h2>
   discoveredNPCs.clear();
   quest.complete = false;
   document.body.classList.remove('world-restored');
-  LittleAndroidProgress.clearProgress(progressStorage);
+  const storedGeneration = LittleAndroidProgress.loadProgress(progressStorage).generation;
+  progressGeneration = Math.max(progressGeneration, storedGeneration) + 1;
+  LittleAndroidProgress.saveProgress(progressStorage, currentProgress());
   updateQuestUI();
   updateJournal();
   showStatus('SIGNAL SEARCH RESTARTED', 2);
@@ -1041,8 +1062,7 @@ <h2 id="journal-title">SIGNAL LOG</h2>
     confirmReset(message) :
     typeof window.confirm === 'function' && window.confirm(message);
   if (!confirmed) return false;
-  resetQuest();
-  return true;
+  return resetQuest();
 }
 
 function performAction() {

src/progress.js

@@ -11,6 +11,7 @@
   function defaultProgress() {
     return {
       version: SAVE_VERSION,
+      generation: 0,
       discoveredFragments: [],
       collectedFragments: [],
       discoveredNPCs: [],
@@ -30,6 +31,7 @@
       if (!parsed || parsed.version !== SAVE_VERSION) return defaultProgress();
       return {
         version: SAVE_VERSION,
+        generation: Number.isSafeInteger(parsed.generation) && parsed.generation >= 0 ? parsed.generation : 0,
         discoveredFragments: normalizeStringList(parsed.discoveredFragments),
         collectedFragments: normalizeStringList(parsed.collectedFragments),
         discoveredNPCs: normalizeStringList(parsed.discoveredNPCs),
@@ -48,24 +50,32 @@
     }
   }
 
-  function mergeProgress(base, incoming) {
+  function mergeProgress(base, incoming, requiredFragmentIds = []) {
     const current = parseProgress(base);
     const next = parseProgress(incoming);
+    if (current.generation !== next.generation) {
+      return current.generation > next.generation ? current : next;
+    }
+    const collectedFragments = normalizeStringList([
+      ...current.collectedFragments,
+      ...next.collectedFragments,
+    ]);
     return {
       version: SAVE_VERSION,
+      generation: current.generation,
       discoveredFragments: normalizeStringList([
         ...current.discoveredFragments,
         ...next.discoveredFragments,
       ]),
-      collectedFragments: normalizeStringList([
-        ...current.collectedFragments,
-        ...next.collectedFragments,
-      ]),
+      collectedFragments,
       discoveredNPCs: normalizeStringList([
         ...current.discoveredNPCs,
         ...next.discoveredNPCs,
       ]),
-      complete: current.complete || next.complete,
+      complete: current.complete || next.complete || (
+        requiredFragmentIds.length > 0 &&
+        requiredFragmentIds.every(id => collectedFragments.includes(id))
+      ),
     };
   }
 

tests/progress.test.cjs

@@ -37,6 +37,7 @@ test('progress normalizes lists and ignores unknown fields', () => {
   });
   assert.deepEqual(parsed, {
     version: 1,
+    generation: 0,
     discoveredFragments: ['a'],
     collectedFragments: ['a'],
     discoveredNPCs: ['scout'],
@@ -64,10 +65,22 @@ test('progress merges monotonically across stale tabs', () => {
     ...defaultProgress(),
     discoveredNPCs: ['OVERSEER'],
   };
-  assert.deepEqual(mergeProgress(firstTab, staleTab), {
+  assert.deepEqual(mergeProgress(firstTab, staleTab, ['field-coil']), {
     ...defaultProgress(),
     discoveredFragments: ['field-coil'],
     collectedFragments: ['field-coil'],
     discoveredNPCs: ['OVERSEER'],
+    complete: true,
   });
 });
+
+test('a newer reset generation defeats stale tab writes', () => {
+  const reset = { ...defaultProgress(), generation: 2 };
+  const stale = {
+    ...defaultProgress(),
+    generation: 1,
+    collectedFragments: ['field-coil'],
+    complete: true,
+  };
+  assert.deepEqual(mergeProgress(reset, stale, ['field-coil']), reset);
+});