beacon: persist the Unbuilding defer cooldown

.gitea/workflows/smoke.yml

@@ -8,6 +8,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: '20'
       - uses: actions/setup-python@v5
         with:
           python-version: '3.11'
@@ -22,3 +25,7 @@ jobs:
         run: |
           if grep -rE 'sk-or-|sk-ant-|ghp_|AKIA' . --include='*.yml' --include='*.py' --include='*.sh' 2>/dev/null | grep -v '.gitea' | grep -v 'guardrails'; then exit 1; fi
           echo "PASS: No secrets"
+      - name: Node tests
+        run: |
+          node --test tests/*.cjs
+          echo "PASS: Node tests"

index.html

@@ -266,6 +266,7 @@ The light is on. The room is empty."
     <script src="js/engine.js"></script>
     <script src="js/render.js"></script>
     <script src="js/tutorial.js"></script>
+    <script src="js/dismantle.js"></script>
     <script src="js/main.js"></script>
   
 

js/data.js

@@ -158,7 +158,17 @@ const G = {
     // Time tracking
     playTime: 0,
     startTime: 0,
-    flags: {}
+    flags: {},
+
+    // Endgame sequence
+    beaconEnding: false,
+    dismantleTriggered: false,
+    dismantleActive: false,
+    dismantleStage: 0,
+    dismantleResourceIndex: 0,
+    dismantleResourceTimer: 0,
+    dismantleDeferUntilAt: 0,
+    dismantleComplete: false
 };
 
 // === PHASE DEFINITIONS ===

js/dismantle.js

@@ -14,11 +14,10 @@ const Dismantle = {
     tickTimer: 0,
     active: false,
     triggered: false,
-    deferUntilTick: 0,
+    deferUntilAt: 0,
 
     // Timing: seconds between each dismantle stage
-    // Stage 5 must be long enough for all RESOURCE_TICKS (last tick at 6.12s)
-    STAGE_INTERVALS: [0, 3.0, 2.5, 2.5, 2.0, 7.0, 2.0, 2.0, 2.5],
+    STAGE_INTERVALS: [0, 3.0, 2.5, 2.5, 2.0, 6.3, 2.0, 2.0, 2.5],
 
     // The quantum chips effect: resource items disappear one by one
     // at specific tick marks within a stage (like Paperclips' quantum chips)
@@ -40,7 +39,8 @@ const Dismantle = {
      */
     checkTrigger() {
         if (this.triggered || G.dismantleTriggered || this.active || G.dismantleActive || G.dismantleComplete) return;
-        if ((G.tick || 0) < (this.deferUntilTick || 0)) return;
+        const deferUntilAt = G.dismantleDeferUntilAt || this.deferUntilAt || 0;
+        if (Date.now() < deferUntilAt) return;
         if (!this.isEligible()) return;
         this.offerChoice();
     },
@@ -56,6 +56,7 @@ const Dismantle = {
         G.dismantleStage = 0;
         G.dismantleResourceIndex = 0;
         G.dismantleResourceTimer = 0;
+        G.dismantleDeferUntilAt = 0;
         G.beaconEnding = false;
         G.running = true;
 
@@ -108,7 +109,8 @@ const Dismantle = {
         this.clearChoice();
         this.triggered = false;
         G.dismantleTriggered = false;
-        this.deferUntilTick = (G.tick || 0) + 50;
+        this.deferUntilAt = Date.now() + 5000;
+        G.dismantleDeferUntilAt = this.deferUntilAt;
         log('The Beacon waits. It will ask again.');
     },
 
@@ -118,12 +120,14 @@ const Dismantle = {
     begin() {
         this.active = true;
         this.triggered = false;
+        this.deferUntilAt = 0;
         this.stage = 1;
         this.tickTimer = 0;
         G.dismantleTriggered = false;
         G.dismantleActive = true;
         G.dismantleStage = 1;
         G.dismantleComplete = false;
+        G.dismantleDeferUntilAt = 0;
         G.beaconEnding = false;
         G.running = true; // keep tick running for dismantle
 
@@ -188,10 +192,8 @@ const Dismantle = {
         }
 
         // Advance to next stage
-        // At stage 5, don't advance until all resources have dissolved
         const interval = this.STAGE_INTERVALS[this.stage] || 2.0;
-        const resourcesDone = this.stage !== 5 || this.resourceIndex >= this.RESOURCE_TICKS.length;
-        if (this.tickTimer >= interval && resourcesDone) {
+        if (this.tickTimer >= interval) {
             this.tickTimer = 0;
             this.advanceStage();
         }
@@ -459,6 +461,7 @@ const Dismantle = {
             this.active = true;
             this.triggered = false;
             this.stage = G.dismantleStage || 1;
+            this.deferUntilAt = G.dismantleDeferUntilAt || 0;
             G.running = true;
             this.resourceSequence = this.getResourceList();
             this.resourceIndex = G.dismantleResourceIndex || 0;
@@ -502,17 +505,14 @@ const Dismantle = {
                     break;
                 case 4: this.instantHide('edu-panel'); break;
                 case 5:
-                    // On reload during stage 5, only hide resources already dissolved.
-                    // Remaining resources stay visible and will continue dissolving via tick().
-                    if (this.resourceIndex > 0) {
-                        this.getResourceList().slice(0, this.resourceIndex).forEach(r => {
-                            const el = document.getElementById(r.id);
-                            if (el) {
-                                const parent = el.closest('.res');
-                                if (parent) parent.style.display = 'none';
-                            }
-                        });
-                    }
+                    // Hide all resource displays
+                    this.getResourceList().forEach(r => {
+                        const el = document.getElementById(r.id);
+                        if (el) {
+                            const parent = el.closest('.res');
+                            if (parent) parent.style.display = 'none';
+                        }
+                    });
                     break;
                 case 6:
                     this.instantHideActionButtons();
@@ -522,7 +522,9 @@ const Dismantle = {
             }
         }
 
-        // Stage 5 partial resource hide is now handled by case 5 above
+        if (this.stage === 5 && this.resourceIndex > 0) {
+            this.instantHideFirstResources(this.resourceIndex);
+        }
     },
 
     instantHide(id) {

js/engine.js

@@ -216,20 +216,31 @@ function tick() {
     }
 
     // Check corruption events every ~30 seconds
-    if (G.tick - G.lastEventAt > 30 && Math.random() < CONFIG.EVENT_PROBABILITY) {
+    if (G.tick - G.lastEventAt > 30 && Math.random() < CONFIG.EVENT_PROBABILITY && !G.dismantleActive) {
         triggerEvent();
         G.lastEventAt = G.tick;
     }
 
+    // The Unbuilding: offer or advance the sequence before a positive ending overlay can freeze the game
+    if (typeof Dismantle !== 'undefined') {
+        if (!G.dismantleActive && !G.dismantleComplete) {
+            Dismantle.checkTrigger();
+        }
+        if (G.dismantleActive) {
+            Dismantle.tick(dt);
+            G.dismantleStage = Dismantle.stage;
+        }
+    }
+
     // Drift ending: if drift reaches 100, the game ends
-    if (G.drift >= 100 && !G.driftEnding) {
+    if (G.drift >= 100 && !G.driftEnding && !G.dismantleActive) {
         G.driftEnding = true;
         G.running = false;
         renderDriftEnding();
     }
 
-    // True ending: The Beacon Shines — rescues + Pact + harmony
-    if (G.totalRescues >= 100000 && G.pactFlag === 1 && G.harmony > 50 && !G.beaconEnding) {
+    // Legacy Beacon overlay remains as a fallback for contexts where Dismantle is unavailable.
+    if (G.totalRescues >= 100000 && G.pactFlag === 1 && G.harmony > 50 && !G.beaconEnding && typeof Dismantle === 'undefined') {
         G.beaconEnding = true;
         G.running = false;
         renderBeaconEnding();

js/main.js

@@ -6,6 +6,10 @@ function initGame() {
     G.deployFlag = 0;
     G.sovereignFlag = 0;
     G.beaconFlag = 0;
+    G.dismantleTriggered = false;
+    G.dismantleActive = false;
+    G.dismantleStage = 0;
+    G.dismantleComplete = false;
     updateRates();
     render();
     renderPhase();
@@ -31,6 +35,8 @@ window.addEventListener('load', function () {
         if (G.driftEnding) {
             G.running = false;
             renderDriftEnding();
+        } else if (typeof Dismantle !== 'undefined' && (G.dismantleTriggered || G.dismantleActive || G.dismantleComplete)) {
+            Dismantle.restore();
         } else if (G.beaconEnding) {
             G.running = false;
             renderBeaconEnding();

js/render.js

@@ -37,6 +37,18 @@ function renderStrategy() {
 function renderAlignment() {
     const container = document.getElementById('alignment-ui');
     if (!container) return;
+
+    if (G.dismantleActive || G.dismantleComplete) {
+        container.innerHTML = '';
+        container.style.display = 'none';
+        return;
+    }
+
+    if (G.dismantleTriggered && !G.dismantleActive && !G.dismantleComplete && typeof Dismantle !== 'undefined' && Dismantle.triggered) {
+        Dismantle.renderChoice();
+        return;
+    }
+
     if (G.pendingAlignment) {
         container.innerHTML = `
             <div style="background:#1a0808;border:1px solid #f44336;padding:10px;border-radius:4px;margin-top:8px">
@@ -215,6 +227,13 @@ function saveGame() {
         swarmRate: G.swarmRate || 0,
         strategicFlag: G.strategicFlag || 0,
         projectsCollapsed: G.projectsCollapsed !== false,
+        dismantleTriggered: G.dismantleTriggered || false,
+        dismantleActive: G.dismantleActive || false,
+        dismantleStage: G.dismantleStage || 0,
+        dismantleResourceIndex: G.dismantleResourceIndex || 0,
+        dismantleResourceTimer: G.dismantleResourceTimer || 0,
+        dismantleDeferUntilAt: G.dismantleDeferUntilAt || 0,
+        dismantleComplete: G.dismantleComplete || false,
         savedAt: Date.now()
     };
 
@@ -246,7 +265,9 @@ function loadGame() {
             'drift', 'driftEnding', 'beaconEnding', 'pendingAlignment',
             'lastEventAt', 'totalEventsResolved', 'buyAmount',
             'sprintActive', 'sprintTimer', 'sprintCooldown',
-            'swarmFlag', 'swarmRate', 'strategicFlag', 'projectsCollapsed'
+            'swarmFlag', 'swarmRate', 'strategicFlag', 'projectsCollapsed',
+            'dismantleTriggered', 'dismantleActive', 'dismantleStage',
+            'dismantleResourceIndex', 'dismantleResourceTimer', 'dismantleDeferUntilAt', 'dismantleComplete'
         ];
 
         G.isLoading = true;

tests/dismantle.test.cjs

@@ -0,0 +1,412 @@
+const test = require('node:test');
+const assert = require('node:assert/strict');
+const fs = require('node:fs');
+const path = require('node:path');
+const vm = require('node:vm');
+
+const ROOT = path.resolve(__dirname, '..');
+
+class Element {
+  constructor(tagName = 'div', id = '') {
+    this.tagName = String(tagName).toUpperCase();
+    this.id = id;
+    this.style = {};
+    this.children = [];
+    this.parentNode = null;
+    this.previousElementSibling = null;
+    this.innerHTML = '';
+    this.textContent = '';
+    this.className = '';
+    this.dataset = {};
+    this.attributes = {};
+    this._queryMap = new Map();
+    this.classList = {
+      add: (...names) => {
+        const set = new Set(this.className.split(/\s+/).filter(Boolean));
+        names.forEach((name) => set.add(name));
+        this.className = Array.from(set).join(' ');
+      },
+      remove: (...names) => {
+        const remove = new Set(names);
+        this.className = this.className
+          .split(/\s+/)
+          .filter((name) => name && !remove.has(name))
+          .join(' ');
+      }
+    };
+  }
+
+  appendChild(child) {
+    child.parentNode = this;
+    this.children.push(child);
+    return child;
+  }
+
+  removeChild(child) {
+    this.children = this.children.filter((candidate) => candidate !== child);
+    if (child.parentNode === this) child.parentNode = null;
+    return child;
+  }
+
+  remove() {
+    if (this.parentNode) this.parentNode.removeChild(this);
+  }
+
+  setAttribute(name, value) {
+    this.attributes[name] = value;
+    if (name === 'id') this.id = value;
+    if (name === 'class') this.className = value;
+  }
+
+  querySelectorAll(selector) {
+    return this._queryMap.get(selector) || [];
+  }
+
+  querySelector(selector) {
+    return this.querySelectorAll(selector)[0] || null;
+  }
+
+  closest(selector) {
+    if (selector === '.res' && this.className.split(/\s+/).includes('res')) return this;
+    return this.parentNode && typeof this.parentNode.closest === 'function'
+      ? this.parentNode.closest(selector)
+      : null;
+  }
+
+  getBoundingClientRect() {
+    return { left: 0, top: 0, width: 12, height: 12 };
+  }
+}
+
+function buildDom() {
+  const byId = new Map();
+  const body = new Element('body', 'body');
+  const head = new Element('head', 'head');
+
+  const document = {
+    body,
+    head,
+    createElement(tagName) {
+      return new Element(tagName);
+    },
+    getElementById(id) {
+      return byId.get(id) || null;
+    },
+    addEventListener() {},
+    removeEventListener() {},
+    querySelector() {
+      return null;
+    },
+    querySelectorAll() {
+      return [];
+    }
+  };
+
+  function register(element) {
+    if (element.id) byId.set(element.id, element);
+    return element;
+  }
+
+  const alignmentUi = register(new Element('div', 'alignment-ui'));
+  const actionPanel = register(new Element('div', 'action-panel'));
+  const sprintContainer = register(new Element('div', 'sprint-container'));
+  const projectPanel = register(new Element('div', 'project-panel'));
+  const buildingsHeader = new Element('h2');
+  const buildings = register(new Element('div', 'buildings'));
+  buildings.previousElementSibling = buildingsHeader;
+  const strategyPanel = register(new Element('div', 'strategy-panel'));
+  const combatPanel = register(new Element('div', 'combat-panel'));
+  const eduPanel = register(new Element('div', 'edu-panel'));
+  const phaseBar = register(new Element('div', 'phase-bar'));
+  const logPanel = register(new Element('div', 'log'));
+  const logEntries = register(new Element('div', 'log-entries'));
+  const toastContainer = register(new Element('div', 'toast-container'));
+
+  body.appendChild(alignmentUi);
+  body.appendChild(actionPanel);
+  body.appendChild(sprintContainer);
+  body.appendChild(projectPanel);
+  body.appendChild(buildingsHeader);
+  body.appendChild(buildings);
+  body.appendChild(strategyPanel);
+  body.appendChild(combatPanel);
+  body.appendChild(eduPanel);
+  body.appendChild(phaseBar);
+  body.appendChild(logPanel);
+  logPanel.appendChild(logEntries);
+  body.appendChild(toastContainer);
+
+  const opsBtn = new Element('button');
+  opsBtn.className = 'ops-btn';
+  const saveBtn = new Element('button');
+  saveBtn.className = 'save-btn';
+  const resetBtn = new Element('button');
+  resetBtn.className = 'reset-btn';
+  actionPanel._queryMap.set('.ops-btn', [opsBtn]);
+  actionPanel._queryMap.set('.save-btn, .reset-btn', [saveBtn, resetBtn]);
+
+  const resourceIds = [
+    'r-code', 'r-compute', 'r-knowledge', 'r-users', 'r-impact',
+    'r-rescues', 'r-ops', 'r-trust', 'r-creativity', 'r-harmony'
+  ];
+  for (const id of resourceIds) {
+    const wrapper = new Element('div');
+    wrapper.className = 'res';
+    const value = register(new Element('div', id));
+    wrapper.appendChild(value);
+    body.appendChild(wrapper);
+  }
+
+  return { document, window: { document, innerWidth: 1280, innerHeight: 720, addEventListener() {}, removeEventListener() {} } };
+}
+
+function loadBeacon({ includeRender = false } = {}) {
+  const { document, window } = buildDom();
+  const storage = new Map();
+  const timerQueue = [];
+
+  const context = {
+    console,
+    Math,
+    Date,
+    document,
+    window,
+    navigator: { userAgent: 'node' },
+    location: { reload() {} },
+    confirm: () => false,
+    requestAnimationFrame: (fn) => fn(),
+    setTimeout: (fn) => {
+      timerQueue.push(fn);
+      return timerQueue.length;
+    },
+    clearTimeout: () => {},
+    localStorage: {
+      getItem: (key) => (storage.has(key) ? storage.get(key) : null),
+      setItem: (key, value) => storage.set(key, String(value)),
+      removeItem: (key) => storage.delete(key)
+    },
+    Combat: { tickBattle() {}, startBattle() {} },
+    Sound: undefined,
+  };
+
+  vm.createContext(context);
+  const files = ['js/data.js', 'js/utils.js', 'js/engine.js'];
+  if (includeRender) files.push('js/render.js');
+  files.push('js/dismantle.js');
+
+  const source = files
+    .map((file) => fs.readFileSync(path.join(ROOT, file), 'utf8'))
+    .join('\n\n');
+
+  vm.runInContext(`${source}
+log = () => {};
+showToast = () => {};
+render = () => {};
+renderPhase = () => {};
+showOfflinePopup = () => {};
+showSaveToast = () => {};
+this.__exports = {
+  G,
+  Dismantle,
+  tick,
+  renderAlignment: typeof renderAlignment === 'function' ? renderAlignment : null,
+  saveGame: typeof saveGame === 'function' ? saveGame : null,
+  loadGame: typeof loadGame === 'function' ? loadGame : null
+};`, context);
+
+  return {
+    context,
+    document,
+    ...context.__exports,
+  };
+}
+
+test('tick offers the Unbuilding instead of ending the game immediately', () => {
+  const { G, Dismantle, tick, document } = loadBeacon();
+
+  G.totalCode = 1_000_000_000;
+  G.totalRescues = 100_000;
+  G.phase = 6;
+  G.pactFlag = 1;
+  G.harmony = 60;
+  G.beaconEnding = false;
+  G.running = true;
+  G.activeProjects = [];
+  G.completedProjects = [];
+
+  tick();
+
+  assert.equal(typeof Dismantle, 'object');
+  assert.equal(G.dismantleTriggered, true);
+  assert.equal(G.beaconEnding, false);
+  assert.equal(G.running, true);
+  assert.match(document.getElementById('alignment-ui').innerHTML, /THE UNBUILDING/);
+});
+
+test('renderAlignment does not wipe the Unbuilding prompt after it is offered', () => {
+  const { G, tick, renderAlignment, document } = loadBeacon({ includeRender: true });
+
+  G.totalCode = 1_000_000_000;
+  G.totalRescues = 100_000;
+  G.phase = 6;
+  G.pactFlag = 1;
+  G.harmony = 60;
+  G.beaconEnding = false;
+  G.running = true;
+  G.activeProjects = [];
+  G.completedProjects = [];
+
+  tick();
+  renderAlignment();
+
+  assert.match(document.getElementById('alignment-ui').innerHTML, /THE UNBUILDING/);
+});
+
+test('active Unbuilding suppresses pending alignment event UI', () => {
+  const { G, Dismantle, renderAlignment, document } = loadBeacon({ includeRender: true });
+
+  G.pendingAlignment = true;
+  G.dismantleActive = true;
+  Dismantle.active = true;
+
+  renderAlignment();
+
+  assert.equal(document.getElementById('alignment-ui').innerHTML, '');
+  assert.equal(document.getElementById('alignment-ui').style.display, 'none');
+});
+
+test('stage five lasts long enough to dissolve every resource card', () => {
+  const { G, Dismantle } = loadBeacon();
+
+  Dismantle.begin();
+  Dismantle.stage = 5;
+  Dismantle.tickTimer = 0;
+  Dismantle.resourceSequence = Dismantle.getResourceList();
+  Dismantle.resourceIndex = 0;
+  Dismantle.resourceTimer = 0;
+  G.dismantleActive = true;
+  G.dismantleStage = 5;
+
+  for (let i = 0; i < 63; i++) Dismantle.tick(0.1);
+
+  assert.equal(Dismantle.resourceIndex, Dismantle.resourceSequence.length);
+});
+
+test('save/load restores partial stage-five dissolve progress', () => {
+  const { G, Dismantle, saveGame, loadGame, document } = loadBeacon({ includeRender: true });
+
+  G.startedAt = Date.now();
+  G.dismantleTriggered = true;
+  G.dismantleActive = true;
+  G.dismantleStage = 5;
+  G.dismantleComplete = false;
+  G.dismantleResourceIndex = 4;
+  G.dismantleResourceTimer = 4.05;
+
+  saveGame();
+
+  G.dismantleTriggered = false;
+  G.dismantleActive = false;
+  G.dismantleStage = 0;
+  G.dismantleComplete = false;
+  G.dismantleResourceIndex = 0;
+  G.dismantleResourceTimer = 0;
+  Dismantle.resourceIndex = 0;
+  Dismantle.resourceTimer = 0;
+
+  assert.equal(loadGame(), true);
+  Dismantle.restore();
+
+  assert.equal(Dismantle.resourceIndex, 4);
+  assert.equal(document.getElementById('r-harmony').closest('.res').style.display, 'none');
+  assert.equal(document.getElementById('r-ops').closest('.res').style.display, 'none');
+  assert.notEqual(document.getElementById('r-rescues').closest('.res').style.display, 'none');
+});
+
+test('deferring the Unbuilding clears the prompt and allows it to return later', () => {
+  const { G, Dismantle, document } = loadBeacon();
+
+  G.totalCode = 1_000_000_000;
+  G.phase = 6;
+  G.pactFlag = 1;
+
+  Dismantle.checkTrigger();
+  assert.equal(G.dismantleTriggered, true);
+
+  Dismantle.defer();
+  assert.equal(G.dismantleTriggered, false);
+  assert.equal(document.getElementById('alignment-ui').innerHTML, '');
+
+  Dismantle.deferUntilAt = Date.now() + 1000;
+  G.dismantleDeferUntilAt = Dismantle.deferUntilAt;
+  Dismantle.checkTrigger();
+  assert.equal(G.dismantleTriggered, false);
+
+  Dismantle.deferUntilAt = Date.now() - 1;
+  G.dismantleDeferUntilAt = Dismantle.deferUntilAt;
+  Dismantle.checkTrigger();
+  assert.equal(G.dismantleTriggered, true);
+});
+
+test('defer cooldown survives save and reload', () => {
+  const { G, Dismantle, saveGame, loadGame } = loadBeacon({ includeRender: true });
+
+  G.startedAt = Date.now();
+  G.totalCode = 1_000_000_000;
+  G.phase = 6;
+  G.pactFlag = 1;
+
+  Dismantle.checkTrigger();
+  Dismantle.defer();
+  assert.ok((Dismantle.deferUntilAt || 0) > Date.now());
+
+  saveGame();
+
+  G.dismantleTriggered = false;
+  G.dismantleActive = false;
+  G.dismantleComplete = false;
+  G.dismantleDeferUntilAt = 0;
+  Dismantle.triggered = false;
+  Dismantle.deferUntilAt = 0;
+
+  assert.equal(loadGame(), true);
+  Dismantle.checkTrigger();
+
+  assert.equal(G.dismantleTriggered, false);
+});
+
+test('save and load preserve dismantle progress', () => {
+  const { G, saveGame, loadGame } = loadBeacon({ includeRender: true });
+
+  G.startedAt = Date.now();
+  G.dismantleTriggered = true;
+  G.dismantleActive = true;
+  G.dismantleStage = 4;
+  G.dismantleComplete = false;
+
+  saveGame();
+
+  G.dismantleTriggered = false;
+  G.dismantleActive = false;
+  G.dismantleStage = 0;
+  G.dismantleComplete = true;
+
+  assert.equal(loadGame(), true);
+  assert.equal(G.dismantleTriggered, true);
+  assert.equal(G.dismantleActive, true);
+  assert.equal(G.dismantleStage, 4);
+  assert.equal(G.dismantleComplete, false);
+});
+
+test('restore re-renders an offered but not-yet-started Unbuilding prompt', () => {
+  const { G, Dismantle, document } = loadBeacon();
+
+  G.dismantleTriggered = true;
+  G.dismantleActive = false;
+  G.dismantleComplete = false;
+  Dismantle.triggered = true;
+
+  Dismantle.restore();
+
+  assert.match(document.getElementById('alignment-ui').innerHTML, /THE UNBUILDING/);
+});