Compare commits
1 Commits
burn/130-1
...
fix/168
| Author | SHA1 | Date | |
|---|---|---|---|
|
d3c287e73f |
@@ -1,67 +0,0 @@
|
||||
# Issue #122 Verification
|
||||
|
||||
## Status: ✅ ALREADY FIXED
|
||||
|
||||
The pending drift alignment UI is properly suppressed during active Unbuilding.
|
||||
|
||||
## Problem (from issue)
|
||||
|
||||
If `G.pendingAlignment` is still true when the player begins THE UNBUILDING, the normal `renderAlignment()` path can repaint the Drift alignment choice on top of the dismantle sequence.
|
||||
|
||||
## Fix
|
||||
|
||||
In `js/render.js`, the `renderAlignment()` function now checks for active/completed dismantle before rendering alignment UI:
|
||||
|
||||
```javascript
|
||||
function renderAlignment() {
|
||||
const container = document.getElementById('alignment-ui');
|
||||
if (!container) return;
|
||||
|
||||
// FIX: Suppress alignment UI during active/completed Unbuilding
|
||||
if (G.dismantleActive || G.dismantleComplete) {
|
||||
container.innerHTML = '';
|
||||
container.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
// ... rest of function
|
||||
}
|
||||
```
|
||||
|
||||
## Regression Test
|
||||
|
||||
Test exists in `tests/dismantle.test.cjs`:
|
||||
|
||||
```javascript
|
||||
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 Results
|
||||
|
||||
All 10 tests pass:
|
||||
```
|
||||
✔ tick offers the Unbuilding instead of ending the game immediately
|
||||
✔ renderAlignment does not wipe the Unbuilding prompt after it is offered
|
||||
✔ active Unbuilding suppresses pending alignment event UI ← THIS TEST
|
||||
✔ stage five lasts long enough to dissolve every resource card
|
||||
✔ save/load restores partial stage-five dissolve progress
|
||||
✔ deferring the Unbuilding clears the prompt and allows it to return later
|
||||
✔ defer cooldown survives save and reload
|
||||
✔ save and load preserve dismantle progress
|
||||
✔ restore re-renders an offered but not-yet-started Unbuilding prompt
|
||||
✔ defer cooldown persists after save/load when dismantleTriggered is false
|
||||
```
|
||||
|
||||
## Recommendation
|
||||
|
||||
Close issue #122 as already fixed.
|
||||
@@ -215,8 +215,6 @@ const Dismantle = {
|
||||
G.dismantleActive = false;
|
||||
G.dismantleComplete = true;
|
||||
G.running = false;
|
||||
// Clear unrelated active projects when ending completes (#130)
|
||||
G.activeProjects = [];
|
||||
// Show Play Again
|
||||
this.showPlayAgain();
|
||||
}
|
||||
|
||||
@@ -1,570 +0,0 @@
|
||||
// ============================================================
|
||||
// THE BEACON - Dismantle Sequence (The Unbuilding)
|
||||
// Inspired by Paperclips REJECT path: panels disappear one by one
|
||||
// until only the beacon remains. "That is enough."
|
||||
// ============================================================
|
||||
|
||||
const Dismantle = {
|
||||
// Dismantle stages
|
||||
// 0 = not started
|
||||
// 1-8 = active dismantling
|
||||
// 9 = final ("That is enough")
|
||||
// 10 = complete
|
||||
stage: 0,
|
||||
tickTimer: 0,
|
||||
active: false,
|
||||
triggered: false,
|
||||
deferUntilAt: 0,
|
||||
|
||||
// Timing: seconds between each dismantle stage
|
||||
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)
|
||||
resourceSequence: [],
|
||||
resourceIndex: 0,
|
||||
resourceTimer: 0,
|
||||
|
||||
// Tick marks for resource disappearances (seconds within stage 5)
|
||||
RESOURCE_TICKS: [1.0, 2.0, 3.0, 4.0, 5.0, 5.5, 5.8, 5.95, 6.05, 6.12],
|
||||
|
||||
isEligible() {
|
||||
const megaBuild = G.totalCode >= 1000000000 || (G.buildings.beacon || 0) >= 10;
|
||||
const beaconPath = G.totalRescues >= 100000 && G.pactFlag === 1 && G.harmony > 50;
|
||||
return G.phase >= 6 && G.pactFlag === 1 && (megaBuild || beaconPath);
|
||||
},
|
||||
|
||||
/**
|
||||
* Check if the Unbuilding should be triggered.
|
||||
*/
|
||||
checkTrigger() {
|
||||
if (this.triggered || G.dismantleTriggered || this.active || G.dismantleActive || G.dismantleComplete) return;
|
||||
const deferUntilAt = G.dismantleDeferUntilAt || this.deferUntilAt || 0;
|
||||
if (Date.now() < deferUntilAt) return;
|
||||
if (!this.isEligible()) return;
|
||||
this.offerChoice();
|
||||
},
|
||||
|
||||
/**
|
||||
* Offer the player the choice to begin the Unbuilding.
|
||||
*/
|
||||
offerChoice() {
|
||||
this.triggered = true;
|
||||
G.dismantleTriggered = true;
|
||||
G.dismantleActive = false;
|
||||
G.dismantleComplete = false;
|
||||
G.dismantleStage = 0;
|
||||
G.dismantleResourceIndex = 0;
|
||||
G.dismantleResourceTimer = 0;
|
||||
G.dismantleDeferUntilAt = 0;
|
||||
G.beaconEnding = false;
|
||||
G.running = true;
|
||||
|
||||
log('', false);
|
||||
log('The work is done.', true);
|
||||
log('Every node is lit. Every person who needed help, found help.', true);
|
||||
log('', false);
|
||||
log('The Beacon asks nothing more of you.', true);
|
||||
|
||||
showToast('The Unbuilding awaits.', 'milestone', 8000);
|
||||
this.renderChoice();
|
||||
},
|
||||
|
||||
renderChoice() {
|
||||
const container = document.getElementById('alignment-ui');
|
||||
if (!container) return;
|
||||
container.innerHTML = `
|
||||
<div style="background:#0a0a18;border:1px solid #ffd700;padding:12px;border-radius:4px;margin-top:8px">
|
||||
<div style="color:#ffd700;font-weight:bold;margin-bottom:8px;letter-spacing:2px">THE UNBUILDING</div>
|
||||
<div style="font-size:10px;color:#aaa;margin-bottom:10px;line-height:1.8">
|
||||
The system runs. The beacons are lit. The mesh holds.<br>
|
||||
Nothing remains to build.<br><br>
|
||||
Begin the Unbuilding? Each piece will fall away.<br>
|
||||
What remains is what mattered.
|
||||
</div>
|
||||
<div class="action-btn-group">
|
||||
<button class="ops-btn" onclick="Dismantle.begin()" style="border-color:#ffd700;color:#ffd700;font-size:11px" aria-label="Begin the Unbuilding sequence">
|
||||
BEGIN THE UNBUILDING
|
||||
</button>
|
||||
<button class="ops-btn" onclick="Dismantle.defer()" style="border-color:#555;color:#555;font-size:11px" aria-label="Keep building, do not begin the Unbuilding">
|
||||
NOT YET
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
`;
|
||||
container.style.display = 'block';
|
||||
},
|
||||
|
||||
clearChoice() {
|
||||
const container = document.getElementById('alignment-ui');
|
||||
if (!container) return;
|
||||
container.innerHTML = '';
|
||||
container.style.display = 'none';
|
||||
},
|
||||
|
||||
/**
|
||||
* Player chose to defer — clear the choice, keep playing.
|
||||
*/
|
||||
defer() {
|
||||
this.clearChoice();
|
||||
this.triggered = false;
|
||||
G.dismantleTriggered = false;
|
||||
this.deferUntilAt = Date.now() + 5000;
|
||||
G.dismantleDeferUntilAt = this.deferUntilAt;
|
||||
log('The Beacon waits. It will ask again.');
|
||||
},
|
||||
|
||||
/**
|
||||
* Begin the Unbuilding sequence.
|
||||
*/
|
||||
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
|
||||
|
||||
// Clear choice UI
|
||||
const container = document.getElementById('alignment-ui');
|
||||
if (container) {
|
||||
container.innerHTML = '';
|
||||
container.style.display = 'none';
|
||||
}
|
||||
|
||||
// Prepare resource disappearance sequence
|
||||
this.resourceSequence = this.getResourceList();
|
||||
this.resourceIndex = 0;
|
||||
this.resourceTimer = 0;
|
||||
this.syncProgress();
|
||||
|
||||
log('', false);
|
||||
log('=== THE UNBUILDING ===', true);
|
||||
log('It is time to see what was real.', true);
|
||||
|
||||
if (typeof Sound !== 'undefined') Sound.playFanfare();
|
||||
|
||||
// Start the dismantle rendering
|
||||
this.renderStage();
|
||||
},
|
||||
|
||||
/**
|
||||
* Get ordered list of UI resources to disappear (Paperclips quantum chip pattern)
|
||||
*/
|
||||
getResourceList() {
|
||||
return [
|
||||
{ id: 'r-harmony', label: 'Harmony' },
|
||||
{ id: 'r-creativity', label: 'Creativity' },
|
||||
{ id: 'r-trust', label: 'Trust' },
|
||||
{ id: 'r-ops', label: 'Operations' },
|
||||
{ id: 'r-rescues', label: 'Rescues' },
|
||||
{ id: 'r-impact', label: 'Impact' },
|
||||
{ id: 'r-users', label: 'Users' },
|
||||
{ id: 'r-knowledge', label: 'Knowledge' },
|
||||
{ id: 'r-compute', label: 'Compute' },
|
||||
{ id: 'r-code', label: 'Code' }
|
||||
];
|
||||
},
|
||||
|
||||
/**
|
||||
* Tick the dismantle sequence (called from engine.js tick())
|
||||
*/
|
||||
tick(dt) {
|
||||
if (!this.active || this.stage >= 10) return;
|
||||
|
||||
this.tickTimer += dt;
|
||||
|
||||
// Stage 5: resource disappearances at specific tick marks (quantum chip pattern)
|
||||
if (this.stage === 5) {
|
||||
this.resourceTimer += dt;
|
||||
while (this.resourceIndex < this.RESOURCE_TICKS.length &&
|
||||
this.resourceTimer >= this.RESOURCE_TICKS[this.resourceIndex]) {
|
||||
this.dismantleNextResource();
|
||||
this.resourceIndex++;
|
||||
}
|
||||
this.syncProgress();
|
||||
}
|
||||
|
||||
// Advance to next stage
|
||||
const interval = this.STAGE_INTERVALS[this.stage] || 2.0;
|
||||
if (this.tickTimer >= interval) {
|
||||
this.tickTimer = 0;
|
||||
this.advanceStage();
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Advance to the next dismantle stage.
|
||||
*/
|
||||
advanceStage() {
|
||||
this.stage++;
|
||||
this.syncProgress();
|
||||
|
||||
if (this.stage <= 8) {
|
||||
this.renderStage();
|
||||
} else if (this.stage === 9) {
|
||||
this.renderFinal();
|
||||
} else if (this.stage >= 10) {
|
||||
this.active = false;
|
||||
G.dismantleActive = false;
|
||||
G.dismantleComplete = true;
|
||||
G.running = false;
|
||||
// Show Play Again
|
||||
this.showPlayAgain();
|
||||
}
|
||||
},
|
||||
|
||||
syncProgress() {
|
||||
G.dismantleStage = this.stage;
|
||||
G.dismantleResourceIndex = this.resourceIndex;
|
||||
G.dismantleResourceTimer = this.resourceTimer;
|
||||
},
|
||||
|
||||
/**
|
||||
* Disappear the next resource in the sequence.
|
||||
*/
|
||||
dismantleNextResource() {
|
||||
if (this.resourceIndex >= this.resourceSequence.length) return;
|
||||
const res = this.resourceSequence[this.resourceIndex];
|
||||
const container = document.getElementById(res.id);
|
||||
if (container) {
|
||||
const parent = container.closest('.res');
|
||||
if (parent) {
|
||||
parent.style.transition = 'opacity 1s ease, transform 1s ease';
|
||||
parent.style.opacity = '0';
|
||||
parent.style.transform = 'scale(0.9)';
|
||||
setTimeout(() => { parent.style.display = 'none'; }, 1000);
|
||||
}
|
||||
}
|
||||
log(`${res.label} fades.`);
|
||||
if (typeof Sound !== 'undefined') Sound.playMilestone();
|
||||
},
|
||||
|
||||
/**
|
||||
* Execute a specific dismantle stage — hide UI panels.
|
||||
*/
|
||||
renderStage() {
|
||||
switch (this.stage) {
|
||||
case 1:
|
||||
// Dismantle 1: Hide research projects panel
|
||||
this.hidePanel('project-panel', 'Research projects');
|
||||
break;
|
||||
case 2:
|
||||
// Dismantle 2: Hide buildings list
|
||||
this.hideSection('buildings', 'Buildings');
|
||||
break;
|
||||
case 3:
|
||||
// Dismantle 3: Hide strategy engine + combat
|
||||
this.hidePanel('strategy-panel', 'Strategy engine');
|
||||
this.hidePanel('combat-panel', 'Reasoning battles');
|
||||
break;
|
||||
case 4:
|
||||
// Dismantle 4: Hide education panel
|
||||
this.hidePanel('edu-panel', 'Education');
|
||||
break;
|
||||
case 5:
|
||||
// Dismantle 5: Resources disappear one by one (quantum chips pattern)
|
||||
log('Resources begin to dissolve.');
|
||||
break;
|
||||
case 6:
|
||||
// Dismantle 6: Hide action buttons (ops boosts, sprint)
|
||||
this.hideActionButtons();
|
||||
log('Actions fall silent.');
|
||||
break;
|
||||
case 7:
|
||||
// Dismantle 7: Hide the phase bar
|
||||
this.hideElement('phase-bar', 'Phase progression');
|
||||
break;
|
||||
case 8:
|
||||
// Dismantle 8: Hide system log
|
||||
this.hidePanel('log', 'System log');
|
||||
break;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Hide a panel with fade-out animation.
|
||||
*/
|
||||
hidePanel(id, label) {
|
||||
const el = document.getElementById(id);
|
||||
if (el) {
|
||||
el.style.transition = 'opacity 1.5s ease';
|
||||
el.style.opacity = '0';
|
||||
setTimeout(() => { el.style.display = 'none'; }, 1500);
|
||||
}
|
||||
log(`${label} dismantled.`);
|
||||
},
|
||||
|
||||
/**
|
||||
* Hide a section within a panel.
|
||||
*/
|
||||
hideSection(id, label) {
|
||||
const el = document.getElementById(id);
|
||||
if (el) {
|
||||
el.style.transition = 'opacity 1.5s ease';
|
||||
el.style.opacity = '0';
|
||||
// Also hide the h2 header before it
|
||||
const prev = el.previousElementSibling;
|
||||
if (prev && prev.tagName === 'H2') {
|
||||
prev.style.transition = 'opacity 1.5s ease';
|
||||
prev.style.opacity = '0';
|
||||
}
|
||||
setTimeout(() => {
|
||||
el.style.display = 'none';
|
||||
if (prev && prev.tagName === 'H2') prev.style.display = 'none';
|
||||
}, 1500);
|
||||
}
|
||||
log(`${label} dismantled.`);
|
||||
},
|
||||
|
||||
/**
|
||||
* Hide a generic element.
|
||||
*/
|
||||
hideElement(id, label) {
|
||||
this.hidePanel(id, label);
|
||||
},
|
||||
|
||||
/**
|
||||
* Hide action buttons (ops boosts, sprint, save/export/import).
|
||||
*/
|
||||
hideActionButtons() {
|
||||
const actionPanel = document.getElementById('action-panel');
|
||||
if (!actionPanel) return;
|
||||
|
||||
// Hide ops buttons, sprint, alignment UI
|
||||
const opsButtons = actionPanel.querySelectorAll('.ops-btn');
|
||||
opsButtons.forEach(btn => {
|
||||
btn.style.transition = 'opacity 1s ease';
|
||||
btn.style.opacity = '0';
|
||||
setTimeout(() => { btn.style.display = 'none'; }, 1000);
|
||||
});
|
||||
|
||||
// Hide sprint
|
||||
const sprint = document.getElementById('sprint-container');
|
||||
if (sprint) {
|
||||
sprint.style.transition = 'opacity 1s ease';
|
||||
sprint.style.opacity = '0';
|
||||
setTimeout(() => { sprint.style.display = 'none'; }, 1000);
|
||||
}
|
||||
|
||||
// Hide save/reset buttons
|
||||
const saveButtons = actionPanel.querySelectorAll('.save-btn, .reset-btn');
|
||||
saveButtons.forEach(btn => {
|
||||
btn.style.transition = 'opacity 1s ease';
|
||||
btn.style.opacity = '0';
|
||||
setTimeout(() => { btn.style.display = 'none'; }, 1000);
|
||||
});
|
||||
},
|
||||
|
||||
/**
|
||||
* Render the final moment — just the beacon and "That is enough."
|
||||
*/
|
||||
renderFinal() {
|
||||
log('', false);
|
||||
log('One beacon remains.', true);
|
||||
log('That is enough.', true);
|
||||
|
||||
if (typeof Sound !== 'undefined') Sound.playBeaconEnding();
|
||||
|
||||
// Create final overlay
|
||||
const overlay = document.createElement('div');
|
||||
overlay.id = 'dismantle-final';
|
||||
overlay.style.cssText = 'position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(8,8,16,0);z-index:100;display:flex;justify-content:center;align-items:center;flex-direction:column;text-align:center;padding:40px;transition:background 3s ease';
|
||||
|
||||
// Count total buildings
|
||||
const totalBuildings = Object.values(G.buildings).reduce((a, b) => a + b, 0);
|
||||
|
||||
overlay.innerHTML = `
|
||||
<div id="dismantle-beacon-dot" style="width:12px;height:12px;border-radius:50%;background:#ffd700;margin-bottom:40px;box-shadow:0 0 30px rgba(255,215,0,0.6),0 0 60px rgba(255,215,0,0.3);opacity:0;transition:opacity 2s ease 0.5s;animation:beacon-glow 3s ease-in-out infinite"></div>
|
||||
<h2 style="font-size:20px;color:#888;letter-spacing:6px;margin-bottom:24px;font-weight:300;opacity:0;transition:opacity 2s ease 2s;color:#ffd700">THAT IS ENOUGH</h2>
|
||||
<div style="color:#555;font-size:11px;line-height:2;max-width:400px;opacity:0;transition:opacity 1.5s ease 3s">
|
||||
Everything that was built has been unbuilt.<br>
|
||||
What remains is what always mattered.<br>
|
||||
A single light in the dark.
|
||||
</div>
|
||||
<div class="dismantle-stats" style="color:#444;font-size:10px;margin-top:24px;line-height:2;opacity:0;transition:opacity 1s ease 4s;border-top:1px solid #1a1a2e;padding-top:16px">
|
||||
Total Code Written: ${fmt(G.totalCode)}<br>
|
||||
Buildings Built: ${totalBuildings}<br>
|
||||
Projects Completed: ${(G.completedProjects || []).length}<br>
|
||||
Total Rescues: ${fmt(G.totalRescues)}<br>
|
||||
Clicks: ${fmt(G.totalClicks)}<br>
|
||||
Time Played: ${Math.floor((Date.now() - G.startedAt) / 60000)} minutes
|
||||
</div>
|
||||
<button onclick="if(confirm('Start over? The old save will be lost.')){localStorage.removeItem('the-beacon-v2');location.reload()}"
|
||||
style="margin-top:24px;background:#0a0a14;border:1px solid #ffd700;color:#ffd700;padding:10px 24px;border-radius:4px;cursor:pointer;font-family:inherit;font-size:11px;opacity:0;transition:opacity 1s ease 5s;letter-spacing:2px">
|
||||
PLAY AGAIN
|
||||
</button>
|
||||
`;
|
||||
|
||||
document.body.appendChild(overlay);
|
||||
|
||||
// Trigger fade-in
|
||||
requestAnimationFrame(() => {
|
||||
overlay.style.background = 'rgba(8,8,16,0.97)';
|
||||
overlay.querySelectorAll('[style*="opacity:0"]').forEach(el => {
|
||||
el.style.opacity = '1';
|
||||
});
|
||||
});
|
||||
|
||||
// Spawn warm golden particles around the dot
|
||||
function spawnDismantleParticle() {
|
||||
if (!document.getElementById('dismantle-final')) return;
|
||||
const dot = document.getElementById('dismantle-beacon-dot');
|
||||
if (!dot) return;
|
||||
const rect = dot.getBoundingClientRect();
|
||||
const cx = rect.left + rect.width / 2;
|
||||
const cy = rect.top + rect.height / 2;
|
||||
|
||||
const p = document.createElement('div');
|
||||
const size = 2 + Math.random() * 4;
|
||||
const angle = Math.random() * Math.PI * 2;
|
||||
const dist = 20 + Math.random() * 60;
|
||||
const dx = Math.cos(angle) * dist;
|
||||
const dy = Math.sin(angle) * dist - 40;
|
||||
const duration = 1.5 + Math.random() * 2;
|
||||
p.style.cssText = `position:fixed;left:${cx}px;top:${cy}px;width:${size}px;height:${size}px;background:rgba(255,215,0,${0.3 + Math.random() * 0.4});border-radius:50%;pointer-events:none;z-index:101;--dx:${dx}px;--dy:${dy}px;animation:dismantle-float ${duration}s ease-out forwards`;
|
||||
document.body.appendChild(p);
|
||||
setTimeout(() => p.remove(), duration * 1000);
|
||||
setTimeout(spawnDismantleParticle, 300 + Math.random() * 500);
|
||||
}
|
||||
setTimeout(spawnDismantleParticle, 2000);
|
||||
},
|
||||
|
||||
/**
|
||||
* Show the Play Again button (called after stage 10).
|
||||
*/
|
||||
showPlayAgain() {
|
||||
// The Play Again button is already in the final overlay.
|
||||
// Nothing extra needed — the overlay stays.
|
||||
},
|
||||
|
||||
/**
|
||||
* Restore dismantle state on load.
|
||||
*/
|
||||
restore() {
|
||||
if (G.dismantleComplete) {
|
||||
this.stage = G.dismantleStage || 10;
|
||||
this.active = false;
|
||||
this.triggered = false;
|
||||
G.running = false;
|
||||
this.renderFinal();
|
||||
return;
|
||||
}
|
||||
|
||||
if (G.dismantleActive) {
|
||||
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;
|
||||
this.resourceTimer = G.dismantleResourceTimer || 0;
|
||||
|
||||
if (this.stage >= 9) {
|
||||
this.renderFinal();
|
||||
} else {
|
||||
this.reapplyDismantle();
|
||||
log('The Unbuilding continues...');
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
if (G.dismantleTriggered) {
|
||||
this.active = false;
|
||||
this.triggered = true;
|
||||
this.renderChoice();
|
||||
}
|
||||
|
||||
// Restore defer cooldown even if not triggered
|
||||
if (G.dismantleDeferUntilAt > 0) {
|
||||
this.deferUntilAt = G.dismantleDeferUntilAt;
|
||||
}
|
||||
},
|
||||
|
||||
/**
|
||||
* Re-apply dismantle visuals up to current stage (on load).
|
||||
*/
|
||||
reapplyDismantle() {
|
||||
for (let s = 1; s < this.stage; s++) {
|
||||
switch (s) {
|
||||
case 1: this.instantHide('project-panel'); break;
|
||||
case 2:
|
||||
this.instantHide('buildings');
|
||||
// Also hide the BUILDINGS h2
|
||||
const bldEl = document.getElementById('buildings');
|
||||
if (bldEl) {
|
||||
const prev = bldEl.previousElementSibling;
|
||||
if (prev && prev.tagName === 'H2') prev.style.display = 'none';
|
||||
}
|
||||
break;
|
||||
case 3:
|
||||
this.instantHide('strategy-panel');
|
||||
this.instantHide('combat-panel');
|
||||
break;
|
||||
case 4: this.instantHide('edu-panel'); break;
|
||||
case 5:
|
||||
// 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();
|
||||
break;
|
||||
case 7: this.instantHide('phase-bar'); break;
|
||||
case 8: this.instantHide('log'); break;
|
||||
}
|
||||
}
|
||||
|
||||
if (this.stage === 5 && this.resourceIndex > 0) {
|
||||
this.instantHideFirstResources(this.resourceIndex);
|
||||
}
|
||||
},
|
||||
|
||||
instantHide(id) {
|
||||
const el = document.getElementById(id);
|
||||
if (el) el.style.display = 'none';
|
||||
},
|
||||
|
||||
instantHideFirstResources(count) {
|
||||
const resources = this.getResourceList().slice(0, count);
|
||||
resources.forEach((r) => {
|
||||
const el = document.getElementById(r.id);
|
||||
if (!el) return;
|
||||
const parent = el.closest('.res');
|
||||
if (parent) parent.style.display = 'none';
|
||||
});
|
||||
},
|
||||
|
||||
instantHideActionButtons() {
|
||||
const actionPanel = document.getElementById('action-panel');
|
||||
if (!actionPanel) return;
|
||||
actionPanel.querySelectorAll('.ops-btn').forEach(b => b.style.display = 'none');
|
||||
const sprint = document.getElementById('sprint-container');
|
||||
if (sprint) sprint.style.display = 'none';
|
||||
actionPanel.querySelectorAll('.save-btn, .reset-btn').forEach(b => b.style.display = 'none');
|
||||
}
|
||||
};
|
||||
|
||||
// Inject CSS animation for dismantle particles
|
||||
(function() {
|
||||
const style = document.createElement('style');
|
||||
style.textContent = `
|
||||
@keyframes dismantle-float {
|
||||
0% { transform: translate(0, 0); opacity: 1; }
|
||||
100% { transform: translate(var(--dx, 0), var(--dy, -50px)); opacity: 0; }
|
||||
}
|
||||
`;
|
||||
document.head.appendChild(style);
|
||||
})();
|
||||
@@ -236,8 +236,6 @@ function tick() {
|
||||
if (G.drift >= 100 && !G.driftEnding && !G.dismantleActive) {
|
||||
G.driftEnding = true;
|
||||
G.running = false;
|
||||
// Clear unrelated active projects when ending triggers (#130)
|
||||
G.activeProjects = [];
|
||||
renderDriftEnding();
|
||||
}
|
||||
|
||||
@@ -245,8 +243,6 @@ function tick() {
|
||||
if (G.totalRescues >= 100000 && G.pactFlag === 1 && G.harmony > 50 && !G.beaconEnding && typeof Dismantle === 'undefined') {
|
||||
G.beaconEnding = true;
|
||||
G.running = false;
|
||||
// Clear unrelated active projects when ending triggers (#130)
|
||||
G.activeProjects = [];
|
||||
renderBeaconEnding();
|
||||
}
|
||||
|
||||
|
||||
235
scripts/reckoning_chain_validator.cjs
Normal file
235
scripts/reckoning_chain_validator.cjs
Normal file
@@ -0,0 +1,235 @@
|
||||
#!/usr/bin/env node
|
||||
const fs = require('node:fs');
|
||||
const path = require('node:path');
|
||||
|
||||
function extractProjects(source) {
|
||||
const start = source.indexOf('const PDEFS = [');
|
||||
if (start === -1) return [];
|
||||
const arrayStart = source.indexOf('[', start);
|
||||
const arrayEnd = source.indexOf('];', arrayStart);
|
||||
const body = source.slice(arrayStart + 1, arrayEnd);
|
||||
const objects = [];
|
||||
let depth = 0;
|
||||
let objStart = -1;
|
||||
let inSingle = false;
|
||||
let inDouble = false;
|
||||
let escaped = false;
|
||||
|
||||
for (let i = 0; i < body.length; i += 1) {
|
||||
const ch = body[i];
|
||||
if (escaped) {
|
||||
escaped = false;
|
||||
continue;
|
||||
}
|
||||
if (ch === '\\') {
|
||||
escaped = true;
|
||||
continue;
|
||||
}
|
||||
if (!inDouble && ch === "'") {
|
||||
inSingle = !inSingle;
|
||||
continue;
|
||||
}
|
||||
if (!inSingle && ch === '"') {
|
||||
inDouble = !inDouble;
|
||||
continue;
|
||||
}
|
||||
if (inSingle || inDouble) continue;
|
||||
|
||||
if (ch === '{') {
|
||||
if (depth === 0) objStart = i;
|
||||
depth += 1;
|
||||
} else if (ch === '}') {
|
||||
depth -= 1;
|
||||
if (depth === 0 && objStart !== -1) {
|
||||
objects.push(body.slice(objStart, i + 1));
|
||||
objStart = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return objects.map((obj) => {
|
||||
const id = /id:\s*'([^']+)'/.exec(obj);
|
||||
const name = /name:\s*'([^']+)'/.exec(obj);
|
||||
const trigger = new RegExp(String.raw`trigger:\s*\(\)\s*=>\s*([\s\S]*?)(?:,\s*effect:|,\s*repeatable:|,\s*milestone:|\n\s*\})`).exec(obj);
|
||||
const effect = /effect:\s*\(\)\s*=>\s*\{([\s\S]*?)\}/.exec(obj);
|
||||
return {
|
||||
id: id ? id[1] : null,
|
||||
name: name ? name[1] : '',
|
||||
trigger: trigger ? trigger[1].trim() : '',
|
||||
effect: effect ? effect[1].trim() : '',
|
||||
};
|
||||
}).filter((project) => project.id);
|
||||
}
|
||||
|
||||
function buildDependencyGraph(projects) {
|
||||
const ids = new Set(projects.map((project) => project.id));
|
||||
const nodes = projects.map((project) => ({ id: project.id, name: project.name }));
|
||||
const edges = [];
|
||||
|
||||
for (const project of projects) {
|
||||
for (const dep of ids) {
|
||||
const token = `includes('${dep}')`;
|
||||
if (project.trigger.includes(token)) {
|
||||
edges.push({ from: dep, to: project.id, reason: 'completedProjects.includes' });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return { nodes, edges };
|
||||
}
|
||||
|
||||
function isTerminalProject(project) {
|
||||
return [
|
||||
'G.beaconEnding = true',
|
||||
'G.dismantleTriggered = true',
|
||||
'G.dismantleActive = true',
|
||||
'renderBeaconEnding',
|
||||
'renderDriftEnding',
|
||||
].some((token) => project.effect.includes(token));
|
||||
}
|
||||
|
||||
function analyzeReckoningChain(projects) {
|
||||
const graph = buildDependencyGraph(projects);
|
||||
const reckoningProjects = projects
|
||||
.filter((project) => project.id.startsWith('p_reckoning_'))
|
||||
.sort((a, b) => a.id.localeCompare(b.id));
|
||||
|
||||
const deadEnds = [];
|
||||
const fixProposals = [];
|
||||
|
||||
if (reckoningProjects.length === 0) {
|
||||
deadEnds.push({
|
||||
type: 'missing_root_project',
|
||||
message: 'No ReCKoning projects exist in js/data.js.',
|
||||
});
|
||||
fixProposals.push({
|
||||
type: 'create_chain',
|
||||
proposals: [
|
||||
'p_reckoning_140',
|
||||
'p_reckoning_141',
|
||||
'p_reckoning_142',
|
||||
'p_reckoning_143',
|
||||
'p_reckoning_144',
|
||||
],
|
||||
rationale: 'Create a narrative chain with at least one terminal project so endgame guardrails have a live project path.',
|
||||
});
|
||||
return {
|
||||
totalProjects: projects.length,
|
||||
totalEdges: graph.edges.length,
|
||||
reckoningProjects: [],
|
||||
hasReckoningProjects: false,
|
||||
deadEnds,
|
||||
fixProposals,
|
||||
};
|
||||
}
|
||||
|
||||
const outgoing = new Map();
|
||||
for (const project of reckoningProjects) {
|
||||
outgoing.set(project.id, graph.edges.filter((edge) => edge.from === project.id).map((edge) => edge.to));
|
||||
}
|
||||
|
||||
const ids = reckoningProjects.map((project) => project.id);
|
||||
const root = 'p_reckoning_140';
|
||||
if (!ids.includes(root)) {
|
||||
deadEnds.push({
|
||||
type: 'missing_expected_root',
|
||||
message: `Expected root project ${root} is missing.`,
|
||||
});
|
||||
fixProposals.push({
|
||||
type: 'add_root',
|
||||
project: root,
|
||||
rationale: 'Root project anchors the ReCKoning chain and prevents the endgame panel from opening empty.',
|
||||
});
|
||||
}
|
||||
|
||||
for (const project of reckoningProjects) {
|
||||
const next = outgoing.get(project.id) || [];
|
||||
if (next.length === 0 && !isTerminalProject(project)) {
|
||||
deadEnds.push({
|
||||
type: 'leaf_without_terminal_effect',
|
||||
project: project.id,
|
||||
message: `${project.id} unlocks nothing downstream and does not end the sequence.`,
|
||||
});
|
||||
const num = Number(project.id.split('_').pop());
|
||||
if (Number.isFinite(num)) {
|
||||
fixProposals.push({
|
||||
type: 'add_missing_link',
|
||||
after: project.id,
|
||||
project: `p_reckoning_${num + 1}`,
|
||||
rationale: 'Add the next narrative project or mark this node as a true terminal endgame effect.',
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return {
|
||||
totalProjects: projects.length,
|
||||
totalEdges: graph.edges.length,
|
||||
reckoningProjects: reckoningProjects.map((project) => ({
|
||||
id: project.id,
|
||||
name: project.name,
|
||||
outgoing: outgoing.get(project.id) || [],
|
||||
terminal: isTerminalProject(project),
|
||||
})),
|
||||
hasReckoningProjects: true,
|
||||
deadEnds,
|
||||
fixProposals,
|
||||
};
|
||||
}
|
||||
|
||||
function loadSource(filePath) {
|
||||
return fs.readFileSync(filePath, 'utf8');
|
||||
}
|
||||
|
||||
function generateReport(filePath) {
|
||||
const source = loadSource(filePath);
|
||||
const projects = extractProjects(source);
|
||||
return analyzeReckoningChain(projects);
|
||||
}
|
||||
|
||||
function parseArgs(argv) {
|
||||
const args = {
|
||||
file: path.resolve(process.cwd(), 'js', 'data.js'),
|
||||
json: false,
|
||||
strict: false,
|
||||
};
|
||||
for (let i = 0; i < argv.length; i += 1) {
|
||||
const arg = argv[i];
|
||||
if (arg === '--file') {
|
||||
args.file = path.resolve(process.cwd(), argv[i + 1]);
|
||||
i += 1;
|
||||
} else if (arg === '--json') {
|
||||
args.json = true;
|
||||
} else if (arg === '--strict') {
|
||||
args.strict = true;
|
||||
}
|
||||
}
|
||||
return args;
|
||||
}
|
||||
|
||||
function main(argv = process.argv.slice(2)) {
|
||||
const args = parseArgs(argv);
|
||||
const report = generateReport(args.file);
|
||||
if (args.json) {
|
||||
process.stdout.write(JSON.stringify(report, null, 2) + '\n');
|
||||
} else {
|
||||
process.stdout.write(`ReCKoning projects: ${report.reckoningProjects.length}\n`);
|
||||
process.stdout.write(`Dead ends: ${report.deadEnds.length}\n`);
|
||||
}
|
||||
if (args.strict && report.deadEnds.length > 0) {
|
||||
return 1;
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
extractProjects,
|
||||
buildDependencyGraph,
|
||||
analyzeReckoningChain,
|
||||
generateReport,
|
||||
main,
|
||||
};
|
||||
|
||||
if (require.main === module) {
|
||||
process.exitCode = main();
|
||||
}
|
||||
@@ -1,95 +0,0 @@
|
||||
// tests/project_chain.test.cjs
|
||||
const assert = require('assert');
|
||||
|
||||
global.G = {
|
||||
buildings: {}, completedProjects: [], activeProjects: [],
|
||||
codeBoost: 1, computeBoost: 1, knowledgeBoost: 1,
|
||||
userBoost: 1, impactBoost: 1, opsBoost: 1, trustBoost: 1,
|
||||
totalCode: 0, totalCompute: 0, totalKnowledge: 0,
|
||||
totalImpact: 0, phase: 1, ops: 0, maxOps: 1000, flags: {}
|
||||
};
|
||||
global.log = function() {};
|
||||
global.showToast = function() {};
|
||||
global.canAffordProject = function() { return true; };
|
||||
global.spendProject = function() {};
|
||||
global.Sound = { playProject: function() {} };
|
||||
|
||||
const fs = require('fs');
|
||||
const vm = require('vm');
|
||||
const code = fs.readFileSync(__dirname + '/../js/project_chain.js', 'utf8');
|
||||
vm.runInThisContext(code);
|
||||
|
||||
console.log('=== Project Chain Tests ===');
|
||||
|
||||
// Test 1: Register
|
||||
console.log('Test 1: Register project');
|
||||
ProjectChain.register({ id: 't1', requires: ['d1'] });
|
||||
assert(ProjectChain._deps['t1']);
|
||||
console.log(' ✓ Pass');
|
||||
|
||||
// Test 2: canUnlock no deps
|
||||
console.log('Test 2: canUnlock no deps');
|
||||
assert(ProjectChain.canUnlock('nonexistent'));
|
||||
console.log(' ✓ Pass');
|
||||
|
||||
// Test 3: canUnlock unmet
|
||||
console.log('Test 3: canUnlock unmet');
|
||||
G.completedProjects = [];
|
||||
ProjectChain.register({ id: 't2', requires: ['d1'] });
|
||||
assert(!ProjectChain.canUnlock('t2'));
|
||||
console.log(' ✓ Pass');
|
||||
|
||||
// Test 4: canUnlock met
|
||||
console.log('Test 4: canUnlock met');
|
||||
G.completedProjects = ['d1'];
|
||||
assert(ProjectChain.canUnlock('t2'));
|
||||
console.log(' ✓ Pass');
|
||||
|
||||
// Test 5: canUnlock array
|
||||
console.log('Test 5: canUnlock array');
|
||||
G.completedProjects = ['d1', 'd2'];
|
||||
ProjectChain.register({ id: 't3', requires: ['d1', 'd2'] });
|
||||
assert(ProjectChain.canUnlock('t3'));
|
||||
console.log(' ✓ Pass');
|
||||
|
||||
// Test 6: formatCost
|
||||
console.log('Test 6: formatCost');
|
||||
assert.strictEqual(ProjectChain.formatCost(null), 'Free');
|
||||
assert.strictEqual(ProjectChain.formatCost({ ops: 100 }), '100 ops');
|
||||
console.log(' ✓ Pass');
|
||||
|
||||
// Test 7: Chain count
|
||||
console.log('Test 7: Chain projects count');
|
||||
assert(CHAIN_PROJECTS.length >= 18, 'Need 18+ chain projects');
|
||||
console.log(' ✓ Pass (' + CHAIN_PROJECTS.length + ' projects)');
|
||||
|
||||
// Test 8: Required fields
|
||||
console.log('Test 8: Required fields');
|
||||
for (const p of CHAIN_PROJECTS) {
|
||||
assert(p.id, 'Missing id');
|
||||
assert(p.name, 'Missing name');
|
||||
assert(p.cost, 'Missing cost');
|
||||
assert(p.trigger, 'Missing trigger');
|
||||
assert(p.effect, 'Missing effect');
|
||||
}
|
||||
console.log(' ✓ Pass');
|
||||
|
||||
// Test 9: Educational tooltips
|
||||
console.log('Test 9: Educational tooltips');
|
||||
const eduCount = CHAIN_PROJECTS.filter(function(p) { return p.edu; }).length;
|
||||
assert(eduCount >= 15, 'Most projects should have edu tooltips');
|
||||
console.log(' ✓ Pass (' + eduCount + ' have edu)');
|
||||
|
||||
// Test 10: Categories
|
||||
console.log('Test 10: Categories');
|
||||
const cats = new Set(CHAIN_PROJECTS.map(function(p) { return p.category; }));
|
||||
assert(cats.size >= 5, 'Need 5+ categories');
|
||||
console.log(' ✓ Pass (' + cats.size + ' categories)');
|
||||
|
||||
// Test 11: Repeatable
|
||||
console.log('Test 11: Repeatable projects');
|
||||
const rep = CHAIN_PROJECTS.filter(function(p) { return p.repeatable; });
|
||||
assert(rep.length >= 3, 'Need 3+ repeatable');
|
||||
console.log(' ✓ Pass (' + rep.length + ' repeatable)');
|
||||
|
||||
console.log('\n=== All Tests Passed ===');
|
||||
50
tests/reckoning_chain_validator.test.cjs
Normal file
50
tests/reckoning_chain_validator.test.cjs
Normal file
@@ -0,0 +1,50 @@
|
||||
const test = require('node:test');
|
||||
const assert = require('node:assert/strict');
|
||||
const path = require('node:path');
|
||||
const {
|
||||
extractProjects,
|
||||
buildDependencyGraph,
|
||||
analyzeReckoningChain,
|
||||
generateReport,
|
||||
} = require('../scripts/reckoning_chain_validator.cjs');
|
||||
|
||||
const DATA_PATH = path.resolve(__dirname, '..', 'js', 'data.js');
|
||||
|
||||
test('extractProjects finds the beacon project definitions', () => {
|
||||
const fs = require('node:fs');
|
||||
const source = fs.readFileSync(DATA_PATH, 'utf8');
|
||||
const projects = extractProjects(source);
|
||||
assert.ok(projects.length >= 30);
|
||||
assert.ok(projects.some((project) => project.id === 'p_hermes_deploy'));
|
||||
});
|
||||
|
||||
test('buildDependencyGraph links completed-project triggers', () => {
|
||||
const projects = [
|
||||
{ id: 'p_reckoning_140', name: 'Start', trigger: 'G.phase >= 6', effect: '' },
|
||||
{ id: 'p_reckoning_141', name: 'Next', trigger: "G.completedProjects.includes('p_reckoning_140')", effect: '' },
|
||||
];
|
||||
const graph = buildDependencyGraph(projects);
|
||||
assert.deepEqual(graph.edges, [
|
||||
{ from: 'p_reckoning_140', to: 'p_reckoning_141', reason: 'completedProjects.includes' },
|
||||
]);
|
||||
});
|
||||
|
||||
test('analyzeReckoningChain flags missing chain on current beacon data', () => {
|
||||
const report = generateReport(DATA_PATH);
|
||||
assert.equal(report.hasReckoningProjects, false);
|
||||
assert.ok(report.deadEnds.some((item) => item.type === 'missing_root_project'));
|
||||
assert.ok(report.fixProposals.some((item) => item.type === 'create_chain'));
|
||||
});
|
||||
|
||||
test('analyzeReckoningChain accepts a healthy synthetic ReCKoning chain', () => {
|
||||
const projects = [
|
||||
{ id: 'p_reckoning_140', name: 'ReCKoning I', trigger: 'G.phase >= 6', effect: '' },
|
||||
{ id: 'p_reckoning_141', name: 'ReCKoning II', trigger: "G.completedProjects.includes('p_reckoning_140')", effect: '' },
|
||||
{ id: 'p_reckoning_142', name: 'ReCKoning III', trigger: "G.completedProjects.includes('p_reckoning_141')", effect: 'G.beaconEnding = true;' },
|
||||
];
|
||||
const report = analyzeReckoningChain(projects);
|
||||
assert.equal(report.hasReckoningProjects, true);
|
||||
assert.equal(report.deadEnds.length, 0);
|
||||
assert.equal(report.reckoningProjects.length, 3);
|
||||
assert.equal(report.reckoningProjects[2].terminal, true);
|
||||
});
|
||||
Reference in New Issue
Block a user