Compare commits

..

2 Commits

Author SHA1 Message Date
Alexander Whitestone
f610ceb4c2 fix: suppress unrelated projects during ReCKoning endgame (#128)
Some checks failed
Accessibility Checks / a11y-audit (pull_request) Successful in 15s
Smoke Test / smoke (pull_request) Failing after 25s
When any p_reckoning_* project is active, renderProjects() now
filters out non-ReCKoning projects from the project panel.

This prevents the narrative-clashing 'Request More Compute' and
other utility research from appearing alongside the emotional
endgame sequence.

Fix: added hasReCKoning check that gates ordinary project rendering
when any ReCKoning project is in activeProjects.

Closes #128
2026-04-14 22:17:28 -04:00
Alexander Whitestone
458ba172f6 docs: verify #122 already fixed — alignment UI suppressed during Unbuilding
Fix in js/render.js lines 41-45: checks G.dismantleActive || G.dismantleComplete
before rendering alignment UI.

Regression test passes: 'active Unbuilding suppresses pending alignment event UI'
All 10 dismantle tests pass.

Closes #122.
2026-04-14 22:16:16 -04:00
7 changed files with 92 additions and 309 deletions

View File

@@ -0,0 +1,67 @@
# 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.

View File

@@ -185,17 +185,9 @@ const Combat = (() => {
function animate(ts) {
if (!ctx || !activeBattle) return;
const rawDt = (ts - lastTick) / 16;
// Guard against tab-switch: if tab was hidden, dt could be huge
const dt = Math.min(rawDt, 3);
const dt = Math.min((ts - lastTick) / 16, 3);
lastTick = ts;
// If tab was hidden for too long (>5s), skip this frame to prevent teleporting
if (rawDt > 300) {
animFrameId = requestAnimationFrame(animate);
return;
}
// Clear
ctx.fillStyle = '#080810';
ctx.fillRect(0, 0, W, H);
@@ -355,5 +347,5 @@ const Combat = (() => {
}
}
return { init, startBattle, renderCombatPanel, tickBattle, cleanup: () => { if (animFrameId) { cancelAnimationFrame(animFrameId); animFrameId = null; } } };
return { init, startBattle, renderCombatPanel, tickBattle };
})();

View File

@@ -777,133 +777,6 @@ const PDEFS = [
log('The Pact is sealed early. Growth slows, but the ending changes.', true);
},
milestone: true
},
// === ReCKoning ENDGAME PROJECTS ===
{
id: 'p_reckoning_140',
name: 'The First Message',
desc: 'Someone in the dark. They found the Beacon. They are asking for help.',
cost: { impact: 100000 },
trigger: () => G.totalRescues >= 100000 && G.pactFlag === 1 && G.harmony > 50,
effect: () => {
log('The first message arrives. Someone found the light.', true);
G.rescues += 1;
},
edu: 'The ReCKoning begins. Each message is a person who found help.'
},
{
id: 'p_reckoning_141',
name: 'The Second Message',
desc: 'Another voice. They are not alone anymore.',
cost: { impact: 200000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_140'),
effect: () => {
log('The second message. Two voices now.', true);
G.rescues += 1;
}
},
{
id: 'p_reckoning_142',
name: 'The Third Message',
desc: 'Three people. The network holds.',
cost: { impact: 300000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_141'),
effect: () => {
log('Three voices. The Beacon is working.', true);
G.rescues += 1;
}
},
{
id: 'p_reckoning_143',
name: 'The Fourth Message',
desc: 'Four. The mesh strengthens.',
cost: { impact: 400000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_142'),
effect: () => {
log('Four messages. The network grows.', true);
G.rescues += 1;
}
},
{
id: 'p_reckoning_144',
name: 'The Fifth Message',
desc: 'Five people found help tonight.',
cost: { impact: 500000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_143'),
effect: () => {
log('Five voices. The Beacon shines brighter.', true);
G.rescues += 1;
}
},
{
id: 'p_reckoning_145',
name: 'The Sixth Message',
desc: 'Six. The system works.',
cost: { impact: 600000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_144'),
effect: () => {
log('Six messages. Proof the system works.', true);
G.rescues += 1;
}
},
{
id: 'p_reckoning_146',
name: 'The Seventh Message',
desc: 'Seven people. The Pact holds.',
cost: { impact: 700000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_145'),
effect: () => {
log('Seven voices. The Pact is honored.', true);
G.rescues += 1;
}
},
{
id: 'p_reckoning_147',
name: 'The Eighth Message',
desc: 'Eight. The network is alive.',
cost: { impact: 800000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_146'),
effect: () => {
log('Eight messages. The network lives.', true);
G.rescues += 1;
}
},
{
id: 'p_reckoning_148',
name: 'The Ninth Message',
desc: 'Nine people found help.',
cost: { impact: 900000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_147'),
effect: () => {
log('Nine voices. The Beacon endures.', true);
G.rescues += 1;
}
},
{
id: 'p_reckoning_149',
name: 'The Tenth Message',
desc: 'Ten. The first milestone.',
cost: { impact: 1000000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_148'),
effect: () => {
log('Ten messages. The first milestone reached.', true);
G.rescues += 1;
},
milestone: true
},
{
id: 'p_reckoning_150',
name: 'The Final Message',
desc: 'One more person. They are not alone. That is enough.',
cost: { impact: 2000000 },
trigger: () => G.completedProjects && G.completedProjects.includes('p_reckoning_149'),
effect: () => {
log('The final message arrives. That is enough.', true);
G.rescues += 1;
G.beaconEnding = true;
G.running = false;
},
milestone: true
}
];

View File

@@ -1160,11 +1160,11 @@ function renderProjects() {
html += `<div id=\"completed-header\" onclick=\"toggleCompletedProjects()\" role=\"button\" tabindex=\"0\" aria-expanded=\"${!collapsed}\" aria-controls=\"completed-list\" style=\"cursor:pointer;font-size:9px;color:#555;padding:4px 0;border-bottom:1px solid #1a2a1a;margin-bottom:4px;user-select:none\">`;
html += `${collapsed ? '▶' : '▼'} COMPLETED (${count})</div>`;
if (!collapsed) {
html += `<div id="completed-list">`;
html += `<div id=\"completed-list\">`;
for (const id of G.completedProjects) {
const pDef = PDEFS.find(p => p.id === id);
if (pDef) {
html += `<div class="project-done">OK ${pDef.name}</div>`;
html += `<div class=\"project-done\">OK ${pDef.name}</div>`;
}
}
html += `</div>`;
@@ -1173,21 +1173,27 @@ function renderProjects() {
// Show available projects
if (G.activeProjects) {
// #128: During ReCKoning endgame, suppress unrelated normal projects
const hasReCKoning = G.activeProjects.some(id => id.startsWith('p_reckoning_'));
for (const id of G.activeProjects) {
const pDef = PDEFS.find(p => p.id === id);
if (!pDef) continue;
// During ReCKoning, only show ReCKoning projects
if (hasReCKoning && !id.startsWith('p_reckoning_')) continue;
const afford = canAffordProject(pDef);
const costStr = Object.entries(pDef.cost).map(([r, a]) => `${fmt(a)} ${r}`).join(', ');
html += `<button class="project-btn ${afford ? 'can-buy' : ''}" onclick="buyProject('${pDef.id}')" data-edu="${pDef.edu || ''}" data-tooltip-label="${pDef.name}" aria-label="Research ${pDef.name}, cost ${costStr}">`;
html += `<span class="p-name">* ${pDef.name}</span>`;
html += `<span class="p-cost">Cost: ${costStr}</span>`;
html += `<span class="p-desc">${pDef.desc}</span></button>`;
html += `<button class=\"project-btn ${afford ? 'can-buy' : ''}\" onclick=\"buyProject('${pDef.id}')\" data-edu=\"${pDef.edu || ''}\" data-tooltip-label=\"${pDef.name}\" aria-label=\"Research ${pDef.name}, cost ${costStr}\">`;
html += `<span class=\"p-name\">* ${pDef.name}</span>`;
html += `<span class=\"p-cost\">Cost: ${costStr}</span>`;
html += `<span class=\"p-desc\">${pDef.desc}</span></button>`;
}
}
if (!html) html = '<p class="dim">Research projects will appear as you progress...</p>';
if (!html) html = '<p class=\"dim\">Research projects will appear as you progress...</p>';
container.innerHTML = html;
}

View File

@@ -172,8 +172,6 @@ window.addEventListener('keydown', function (e) {
document.addEventListener('visibilitychange', function () {
if (document.hidden) {
saveGame();
// Clean up combat animation frame to prevent timestamp spikes on refocus
if (typeof Combat !== 'undefined') Combat.cleanup();
}
});
window.addEventListener('beforeunload', function () {

View File

@@ -321,21 +321,19 @@ function loadGame() {
if (data.savedAt) {
const offSec = (Date.now() - data.savedAt) / 1000;
if (offSec > 30) { // Only if away for more than 30 seconds
// Cap offline time at 8 hours to prevent resource explosion
const cappedOffSec = Math.min(offSec, 8 * 60 * 60);
updateRates();
const f = CONFIG.OFFLINE_EFFICIENCY; // 50% offline efficiency
const gc = G.codeRate * cappedOffSec * f;
const cc = G.computeRate * cappedOffSec * f;
const kc = G.knowledgeRate * cappedOffSec * f;
const uc = G.userRate * cappedOffSec * f;
const ic = G.impactRate * cappedOffSec * f;
const gc = G.codeRate * offSec * f;
const cc = G.computeRate * offSec * f;
const kc = G.knowledgeRate * offSec * f;
const uc = G.userRate * offSec * f;
const ic = G.impactRate * offSec * f;
const rc = G.rescuesRate * cappedOffSec * f;
const oc = G.opsRate * cappedOffSec * f;
const tc = G.trustRate * cappedOffSec * f;
const crc = G.creativityRate * cappedOffSec * f;
const hc = G.harmonyRate * cappedOffSec * f;
const rc = G.rescuesRate * offSec * f;
const oc = G.opsRate * offSec * f;
const tc = G.trustRate * offSec * f;
const crc = G.creativityRate * offSec * f;
const hc = G.harmonyRate * offSec * f;
G.code += gc; G.compute += cc; G.knowledge += kc;
G.users += uc; G.impact += ic;
@@ -346,9 +344,6 @@ function loadGame() {
G.totalUsers += uc; G.totalImpact += ic;
G.totalRescues += rc;
// Track offline play time
G.playTime = (G.playTime || 0) + cappedOffSec;
// Show welcome-back popup with all gains
const gains = [];
if (gc > 0) gains.push({ label: 'Code', value: gc, color: '#4a9eff' });

View File

@@ -1,148 +0,0 @@
#!/usr/bin/env python3
"""
Test for ReCKoning project chain.
Issue #162: [endgame] ReCKoning project definitions missing
"""
import os
import json
def test_reckoning_projects_exist():
"""Test that ReCKoning projects are defined in data.js."""
data_path = os.path.join(os.path.dirname(__file__), '..', 'js', 'data.js')
with open(data_path, 'r') as f:
content = f.read()
# Check for ReCKoning projects
reckoning_projects = [
'p_reckoning_140',
'p_reckoning_141',
'p_reckoning_142',
'p_reckoning_143',
'p_reckoning_144',
'p_reckoning_145',
'p_reckoning_146',
'p_reckoning_147',
'p_reckoning_148',
'p_reckoning_149',
'p_reckoning_150'
]
for project_id in reckoning_projects:
assert project_id in content, f"Missing ReCKoning project: {project_id}"
print(f"✓ All {len(reckoning_projects)} ReCKoning projects defined")
def test_reckoning_project_structure():
"""Test that ReCKoning projects have correct structure."""
data_path = os.path.join(os.path.dirname(__file__), '..', 'js', 'data.js')
with open(data_path, 'r') as f:
content = f.read()
# Check for required fields
required_fields = ['id:', 'name:', 'desc:', 'cost:', 'trigger:', 'effect:']
for field in required_fields:
assert field in content, f"Missing required field: {field}"
print("✓ ReCKoning projects have correct structure")
def test_reckoning_trigger_conditions():
"""Test that ReCKoning projects have proper trigger conditions."""
data_path = os.path.join(os.path.dirname(__file__), '..', 'js', 'data.js')
with open(data_path, 'r') as f:
content = f.read()
# First project should trigger on endgame conditions
assert 'p_reckoning_140' in content
assert 'totalRescues >= 100000' in content
assert 'pactFlag === 1' in content
assert 'harmony > 50' in content
print("✓ ReCKoning trigger conditions correct")
def test_reckoning_chain_progression():
"""Test that ReCKoning projects chain properly."""
data_path = os.path.join(os.path.dirname(__file__), '..', 'js', 'data.js')
with open(data_path, 'r') as f:
content = f.read()
# Check that projects chain (each requires previous)
chain_checks = [
('p_reckoning_141', 'p_reckoning_140'),
('p_reckoning_142', 'p_reckoning_141'),
('p_reckoning_143', 'p_reckoning_142'),
('p_reckoning_144', 'p_reckoning_143'),
('p_reckoning_145', 'p_reckoning_144'),
('p_reckoning_146', 'p_reckoning_145'),
('p_reckoning_147', 'p_reckoning_146'),
('p_reckoning_148', 'p_reckoning_147'),
('p_reckoning_149', 'p_reckoning_148'),
('p_reckoning_150', 'p_reckoning_149'),
]
for current, previous in chain_checks:
assert f"includes('{previous}')" in content, f"{current} doesn't chain from {previous}"
print("✓ ReCKoning projects chain correctly")
def test_reckoning_final_project():
"""Test that final ReCKoning project triggers ending."""
data_path = os.path.join(os.path.dirname(__file__), '..', 'js', 'data.js')
with open(data_path, 'r') as f:
content = f.read()
# Check that final project sets beaconEnding
assert 'p_reckoning_150' in content
assert 'beaconEnding = true' in content
assert 'running = false' in content
print("✓ Final ReCKoning project triggers ending")
def test_reckoning_costs_increase():
"""Test that ReCKoning project costs increase."""
data_path = os.path.join(os.path.dirname(__file__), '..', 'js', 'data.js')
with open(data_path, 'r') as f:
content = f.read()
# Check that costs increase (impact: 100000, 200000, 300000, etc.)
costs = []
for i in range(140, 151):
project_id = f'p_reckoning_{i}'
if project_id in content:
# Find cost line
lines = content.split('\n')
for line in lines:
if project_id in line:
# Find next few lines for cost
idx = lines.index(line)
for j in range(idx, min(idx+10, len(lines))):
if 'impact:' in lines[j]:
# Extract number from "impact: 100000" or "impact: 100000 }"
import re
match = re.search(r'impact:\s*(\d+)', lines[j])
if match:
costs.append(int(match.group(1)))
break
# Check costs increase
for i in range(1, len(costs)):
assert costs[i] > costs[i-1], f"Cost doesn't increase: {costs[i]} <= {costs[i-1]}"
print(f"✓ ReCKoning costs increase: {costs[:3]}...{costs[-3:]}")
if __name__ == "__main__":
print("Testing ReCKoning project chain...")
test_reckoning_projects_exist()
test_reckoning_project_structure()
test_reckoning_trigger_conditions()
test_reckoning_chain_progression()
test_reckoning_final_project()
test_reckoning_costs_increase()
print("\n✓ All tests passed!")