Merge branch 'codex/signal-quest' into codex/narrative-progress

Author: gmval-g3

index.html

@@ -244,12 +244,13 @@ <h2 id="journal-title">SIGNAL LOG</h2>
 
   // Interaction targets reserve their tile so the player stops facing them.
   const npcOnTile = isTileOccupiedByNPC(tx, ty, null);
-  const fragmentOnTile = getUncollectedFragmentAt(tx, ty);
+  const fragmentOnTile = getActiveFragmentAt(tx, ty);
   if (npcOnTile || fragmentOnTile || !isWalkable(tx, ty)) {
     // BLOCKED
     player.state = 'BLOCKED';
     player.bumpDir = dir;
     player.bumpProgress = 0;
+    if (fragmentOnTile && !fragmentOnTile.discovered) showStatus('SIGNAL INTERFERENCE · SCAN');
     return;
   }
 
@@ -839,7 +840,7 @@ <h2 id="journal-title">SIGNAL LOG</h2>
 // PATHFINDING
 // ══════════════════════════════════════════════════════
 function findPath(sx,sy,ex,ey){
-  const isPlayerWalkable = (x, y) => isWalkable(x, y) && !getUncollectedFragmentAt(x, y);
+  const isPlayerWalkable = (x, y) => isWalkable(x, y) && !getActiveFragmentAt(x, y);
   return findWorldPath(sx, sy, ex, ey, isPlayerWalkable, { allowNearest: false });
 }
 
@@ -1009,6 +1010,14 @@ <h2 id="journal-title">SIGNAL LOG</h2>
 }
 
 function resetQuest() {
+  const occupiedSignalSite = signalFragments.some(fragment => (
+    entityOccupiesTile(player, fragment.x, fragment.y) ||
+    isTileReserved(npcs, fragment.x, fragment.y, null)
+  ));
+  if (occupiedSignalSite) {
+    showStatus('CLEAR SIGNAL SITES BEFORE RESTART', 2.5);
+    return false;
+  }
   for (const fragment of signalFragments) {
     fragment.discovered = false;
     fragment.collected = false;
@@ -1020,6 +1029,7 @@ <h2 id="journal-title">SIGNAL LOG</h2>
   updateQuestUI();
   updateJournal();
   showStatus('SIGNAL SEARCH RESTARTED', 2);
+  return true;
 }
 
 function requestQuestReset(confirmReset) {

tests/runtime-smoke.test.cjs

@@ -102,17 +102,20 @@ test('runtime initializes and renders a frame', () => {
     player.tileY = fragment.y - 1;
     player.renderX = player.tileX;
     player.renderY = player.tileY;
+    playerStartMove('south');
+    const hiddenBlocked = player.state;
+    player.state = 'IDLE';
     triggerScanPulse();
     updateScanPulse(1);
     playerStartMove('south');
     const blocked = player.state;
     player.state = 'IDLE';
     performAction();
-    ({ discovered: fragment.discovered, blocked, collected: fragment.collected });
+    ({ discovered: fragment.discovered, hiddenBlocked, blocked, collected: fragment.collected });
   `, sandbox);
   assert.deepEqual(
     { ...retrieval },
-    { discovered: true, blocked: 'BLOCKED', collected: true },
+    { discovered: true, hiddenBlocked: 'BLOCKED', blocked: 'BLOCKED', collected: true },
   );
 
   const resetBehavior = vm.runInContext(`
@@ -136,6 +139,17 @@ test('runtime initializes and renders a frame', () => {
   `, sandbox);
   assert.deepEqual({ ...completion }, { complete: true, collected: 3 });
   assert.equal(elements.quest.textContent, 'FACTORY ONLINE');
+
+  const replay = vm.runInContext(`
+    player.tileX = signalFragments[0].x;
+    player.tileY = signalFragments[0].y;
+    const refused = resetQuest();
+    player.tileX = 4;
+    player.tileY = 6;
+    const accepted = resetQuest();
+    ({ refused, accepted, collected: signalFragments.filter(fragment => fragment.collected).length });
+  `, sandbox);
+  assert.deepEqual({ ...replay }, { refused: false, accepted: true, collected: 0 });
 });
 
 test('NPC movement rejects a destination reserved earlier in the frame', () => {