Compare commits
1 Commits
fix/endgam
...
burn/6-177
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87d8ee56b2 |
@@ -174,6 +174,7 @@ body{background:var(--bg);color:var(--text);font-family:'SF Mono','Cascadia Code
|
||||
<div id="sprint-label" style="font-size:9px;color:#666;margin-top:2px;text-align:center"></div>
|
||||
</div>
|
||||
<div id="alignment-ui" style="display:none"></div>
|
||||
<div id="swarm-ui" style="display:none"></div>
|
||||
<button class="save-btn" onclick="saveGame()" aria-label="Save game progress">Save Game [Ctrl+S]</button>
|
||||
<div style="display:flex;gap:4px;margin-top:4px">
|
||||
<button class="save-btn" onclick="exportSave()" aria-label="Export save to file" style="flex:1">Export [E]</button>
|
||||
@@ -265,6 +266,7 @@ The light is on. The room is empty."
|
||||
<script src="js/sound.js"></script>
|
||||
<script src="js/engine.js"></script>
|
||||
<script src="js/render.js"></script>
|
||||
<script src="js/swarm.js"></script>
|
||||
<script src="js/tutorial.js"></script>
|
||||
<script src="js/dismantle.js"></script>
|
||||
<script src="js/main.js"></script>
|
||||
|
||||
12
js/combat.js
12
js/combat.js
@@ -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 };
|
||||
})();
|
||||
|
||||
128
js/data.js
128
js/data.js
@@ -106,6 +106,7 @@ const G = {
|
||||
pactFlag: 0,
|
||||
swarmFlag: 0,
|
||||
swarmRate: 0,
|
||||
swarmSim: null,
|
||||
|
||||
// Game state
|
||||
running: true,
|
||||
@@ -777,133 +778,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
|
||||
}
|
||||
];
|
||||
|
||||
|
||||
25
js/engine.js
25
js/engine.js
@@ -102,6 +102,14 @@ function updateRates() {
|
||||
G.codeRate += G.swarmRate;
|
||||
}
|
||||
|
||||
if (typeof SwarmSim !== 'undefined') {
|
||||
const simRates = SwarmSim.computeRates();
|
||||
G.codeRate += simRates.codeRate;
|
||||
G.knowledgeRate += simRates.knowledgeRate;
|
||||
G.harmonyRate += simRates.harmonyRate;
|
||||
G.trustRate += simRates.trustRate;
|
||||
}
|
||||
|
||||
// Apply persistent debuffs from active events
|
||||
if (G.activeDebuffs && G.activeDebuffs.length > 0) {
|
||||
for (const debuff of G.activeDebuffs) {
|
||||
@@ -207,6 +215,9 @@ function tick() {
|
||||
// Combat: tick battle simulation
|
||||
Combat.tickBattle(dt);
|
||||
|
||||
// Community swarm alignment simulation
|
||||
if (typeof tickSwarm === 'function') tickSwarm(dt);
|
||||
|
||||
// Check milestones
|
||||
checkMilestones();
|
||||
|
||||
@@ -334,23 +345,13 @@ function checkMilestones() {
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns true if the game is in the ReCKoning endgame state.
|
||||
*/
|
||||
function isEndgame() {
|
||||
return G.totalRescues >= 100000 && G.pactFlag === 1 && G.harmony > 50;
|
||||
}
|
||||
|
||||
function checkProjects() {
|
||||
const endgame = isEndgame();
|
||||
// Check for new project triggers
|
||||
for (const pDef of PDEFS) {
|
||||
const alreadyPurchased = G.completedProjects && G.completedProjects.includes(pDef.id);
|
||||
if (!alreadyPurchased && !G.activeProjects) G.activeProjects = [];
|
||||
|
||||
if (!alreadyPurchased && !G.activeProjects.includes(pDef.id)) {
|
||||
// During endgame, only activate ReCKoning projects
|
||||
if (endgame && !pDef.id.startsWith('p_reckoning_')) continue;
|
||||
if (pDef.trigger()) {
|
||||
G.activeProjects.push(pDef.id);
|
||||
log(`Available: ${pDef.name}`);
|
||||
@@ -1183,14 +1184,10 @@ function renderProjects() {
|
||||
|
||||
// Show available projects
|
||||
if (G.activeProjects) {
|
||||
const endgame = isEndgame();
|
||||
for (const id of G.activeProjects) {
|
||||
const pDef = PDEFS.find(p => p.id === id);
|
||||
if (!pDef) continue;
|
||||
|
||||
// During endgame, only show ReCKoning projects in the UI
|
||||
if (endgame && !pDef.id.startsWith('p_reckoning_')) continue;
|
||||
|
||||
const afford = canAffordProject(pDef);
|
||||
const costStr = Object.entries(pDef.cost).map(([r, a]) => `${fmt(a)} ${r}`).join(', ');
|
||||
|
||||
|
||||
@@ -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 () {
|
||||
|
||||
28
js/render.js
28
js/render.js
@@ -225,6 +225,7 @@ function saveGame() {
|
||||
sprintCooldown: G.sprintCooldown || 0,
|
||||
swarmFlag: G.swarmFlag || 0,
|
||||
swarmRate: G.swarmRate || 0,
|
||||
swarmSim: G.swarmSim || null,
|
||||
strategicFlag: G.strategicFlag || 0,
|
||||
projectsCollapsed: G.projectsCollapsed !== false,
|
||||
dismantleTriggered: G.dismantleTriggered || false,
|
||||
@@ -265,7 +266,7 @@ function loadGame() {
|
||||
'drift', 'driftEnding', 'beaconEnding', 'pendingAlignment',
|
||||
'lastEventAt', 'totalEventsResolved', 'buyAmount',
|
||||
'sprintActive', 'sprintTimer', 'sprintCooldown',
|
||||
'swarmFlag', 'swarmRate', 'strategicFlag', 'projectsCollapsed',
|
||||
'swarmFlag', 'swarmRate', 'swarmSim', 'strategicFlag', 'projectsCollapsed',
|
||||
'dismantleTriggered', 'dismantleActive', 'dismantleStage',
|
||||
'dismantleResourceIndex', 'dismantleResourceTimer', 'dismantleDeferUntilAt', 'dismantleComplete'
|
||||
];
|
||||
@@ -321,21 +322,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 +345,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' });
|
||||
|
||||
233
js/swarm.js
Normal file
233
js/swarm.js
Normal file
@@ -0,0 +1,233 @@
|
||||
const SwarmSim = (() => {
|
||||
const STATUS_ORDER = ['Active', 'Confused', 'Bored', 'Cold', 'Disorganized', 'Sleeping', 'Lonely', 'No Response'];
|
||||
const DEFAULT_POPULATION = 16;
|
||||
const DEFAULT_COUNTS = {
|
||||
'Active': 5,
|
||||
'Confused': 2,
|
||||
'Bored': 2,
|
||||
'Cold': 2,
|
||||
'Disorganized': 2,
|
||||
'Sleeping': 2,
|
||||
'Lonely': 1,
|
||||
'No Response': 0
|
||||
};
|
||||
const ACTIONS = {
|
||||
feed: { label: 'Feed', cost: 1, shifts: [['Cold', 'Active', 2], ['Lonely', 'Active', 1], ['No Response', 'Sleeping', 1]] },
|
||||
teach: { label: 'Teach', cost: 1, shifts: [['Confused', 'Active', 2], ['Sleeping', 'Active', 1]] },
|
||||
entertain: { label: 'Entertain', cost: 1, shifts: [['Bored', 'Active', 2], ['Lonely', 'Active', 1]] },
|
||||
clad: { label: 'Clad', cost: 1, shifts: [['Cold', 'Active', 2], ['No Response', 'Sleeping', 1]] },
|
||||
synchronize: { label: 'Synchronize', cost: 1, shifts: [['Disorganized', 'Active', 2], ['Confused', 'Active', 1]] }
|
||||
};
|
||||
|
||||
function unlocked() {
|
||||
return G.swarmFlag === 1 || (G.buildings && (G.buildings.community || 0) > 0);
|
||||
}
|
||||
|
||||
function ensure() {
|
||||
if (!unlocked()) return null;
|
||||
if (!G.swarmSim || typeof G.swarmSim !== 'object') {
|
||||
G.swarmSim = {
|
||||
population: DEFAULT_POPULATION,
|
||||
counts: { ...DEFAULT_COUNTS },
|
||||
workRatio: 0.5,
|
||||
tickTimer: 0,
|
||||
giftTimer: 0,
|
||||
lastGift: '',
|
||||
lastPenalty: '',
|
||||
};
|
||||
}
|
||||
normalize();
|
||||
return G.swarmSim;
|
||||
}
|
||||
|
||||
function normalize() {
|
||||
const sim = G.swarmSim;
|
||||
if (!sim) return;
|
||||
if (!sim.counts) sim.counts = { ...DEFAULT_COUNTS };
|
||||
for (const key of STATUS_ORDER) {
|
||||
sim.counts[key] = Math.max(0, Math.floor(Number(sim.counts[key] || 0)));
|
||||
}
|
||||
let total = STATUS_ORDER.reduce((sum, key) => sum + sim.counts[key], 0);
|
||||
const target = Math.max(2, Number(sim.population || DEFAULT_POPULATION));
|
||||
sim.population = target;
|
||||
if (total < target) sim.counts.Active += (target - total);
|
||||
else if (total > target) {
|
||||
let overflow = total - target;
|
||||
for (const key of ['Active', 'Sleeping', 'Bored', 'Confused', 'Disorganized', 'Cold', 'Lonely', 'No Response']) {
|
||||
if (overflow <= 0) break;
|
||||
const take = Math.min(overflow, sim.counts[key]);
|
||||
sim.counts[key] -= take;
|
||||
overflow -= take;
|
||||
}
|
||||
}
|
||||
sim.workRatio = Math.max(0, Math.min(1, Number(sim.workRatio ?? 0.5)));
|
||||
sim.tickTimer = Number(sim.tickTimer || 0);
|
||||
sim.giftTimer = Number(sim.giftTimer || 0);
|
||||
sim.lastGift = String(sim.lastGift || '');
|
||||
sim.lastPenalty = String(sim.lastPenalty || '');
|
||||
}
|
||||
|
||||
function move(counts, from, to, amount) {
|
||||
const take = Math.min(amount, counts[from] || 0);
|
||||
if (!take) return 0;
|
||||
counts[from] -= take;
|
||||
counts[to] = (counts[to] || 0) + take;
|
||||
return take;
|
||||
}
|
||||
|
||||
function setWorkThinkAllocation(value) {
|
||||
const sim = ensure();
|
||||
if (!sim) return;
|
||||
sim.workRatio = Math.max(0, Math.min(1, Number(value) / 100));
|
||||
if (typeof updateRates === 'function') updateRates();
|
||||
if (typeof renderSwarmPanel === 'function') renderSwarmPanel();
|
||||
}
|
||||
|
||||
function applyAction(action) {
|
||||
const sim = ensure();
|
||||
if (!sim) return false;
|
||||
const def = ACTIONS[action];
|
||||
if (!def) return false;
|
||||
if (G.ops < def.cost) {
|
||||
if (typeof log === 'function') log('Not enough Ops to support the swarm.');
|
||||
return false;
|
||||
}
|
||||
G.ops -= def.cost;
|
||||
for (const [frm, to, amount] of def.shifts) move(sim.counts, frm, to, amount);
|
||||
normalize();
|
||||
sim.lastPenalty = '';
|
||||
if (typeof log === 'function') log(`${def.label} steadies the community swarm.`, true);
|
||||
if (typeof updateRates === 'function') updateRates();
|
||||
if (typeof renderSwarmPanel === 'function') renderSwarmPanel();
|
||||
return true;
|
||||
}
|
||||
|
||||
function computeRates() {
|
||||
const sim = ensure();
|
||||
if (!sim) return { codeRate: 0, knowledgeRate: 0, harmonyRate: 0, trustRate: 0, penaltyFactor: 1 };
|
||||
const active = sim.counts.Active || 0;
|
||||
const bored = sim.counts.Bored || 0;
|
||||
const disorganized = sim.counts.Disorganized || 0;
|
||||
const lonely = sim.counts.Lonely || 0;
|
||||
const silent = sim.counts['No Response'] || 0;
|
||||
const penaltyFactor = Math.max(0.2, 1 - (bored * 0.04) - (disorganized * 0.05));
|
||||
const work = active * sim.workRatio;
|
||||
const think = active * (1 - sim.workRatio);
|
||||
const codeRate = work * 1.2 * penaltyFactor;
|
||||
const knowledgeRate = think * 1.4 * penaltyFactor;
|
||||
const harmonyRate = -(bored * 0.03 + disorganized * 0.05);
|
||||
const trustRate = -(lonely * 0.01 + silent * 0.03);
|
||||
sim.lastPenalty = (bored + disorganized) > 0 ? `Bored (${bored}) / Disorganized (${disorganized}) reduce output` : '';
|
||||
return { codeRate, knowledgeRate, harmonyRate, trustRate, penaltyFactor };
|
||||
}
|
||||
|
||||
function maybeGift(sim) {
|
||||
const active = sim.counts.Active || 0;
|
||||
const bored = sim.counts.Bored || 0;
|
||||
const disorganized = sim.counts.Disorganized || 0;
|
||||
if (active < 6 || bored + disorganized > 5) return;
|
||||
const roll = Math.random();
|
||||
if (roll < 0.34) {
|
||||
const gift = 5 + active;
|
||||
G.compute += gift;
|
||||
G.totalCompute += gift;
|
||||
sim.lastGift = `Community gift: +${fmt(gift)} compute`;
|
||||
} else if (roll < 0.67) {
|
||||
const gift = 7 + active;
|
||||
G.knowledge += gift;
|
||||
G.totalKnowledge += gift;
|
||||
sim.lastGift = `Community gift: +${fmt(gift)} knowledge`;
|
||||
} else {
|
||||
const gift = 1 + Math.floor(active / 4);
|
||||
G.ops += gift;
|
||||
G.maxOps = Math.max(G.maxOps, G.ops);
|
||||
sim.lastGift = `Community gift: +${fmt(gift)} ops`;
|
||||
}
|
||||
if (typeof log === 'function') log(sim.lastGift, true);
|
||||
}
|
||||
|
||||
function decayStatuses(sim) {
|
||||
const counts = sim.counts;
|
||||
if (sim.workRatio > 0.75) {
|
||||
move(counts, 'Active', 'Bored', 1);
|
||||
}
|
||||
if (sim.workRatio < 0.25) {
|
||||
move(counts, 'Active', 'Disorganized', 1);
|
||||
}
|
||||
if (G.harmony < 25) {
|
||||
move(counts, 'Active', 'Confused', 1);
|
||||
}
|
||||
if (G.trust < 8) {
|
||||
move(counts, 'Active', 'Lonely', 1);
|
||||
}
|
||||
// natural recovery
|
||||
move(counts, 'Sleeping', 'Active', 1);
|
||||
if ((counts.Bored || 0) > 0 && Math.random() < 0.5) move(counts, 'Bored', 'Active', 1);
|
||||
if ((counts.Confused || 0) > 0 && Math.random() < 0.35) move(counts, 'Confused', 'Active', 1);
|
||||
normalize();
|
||||
}
|
||||
|
||||
function tick(dt) {
|
||||
const sim = ensure();
|
||||
if (!sim) return;
|
||||
sim.tickTimer += dt;
|
||||
sim.giftTimer += dt;
|
||||
if (sim.tickTimer >= 5) {
|
||||
sim.tickTimer = 0;
|
||||
decayStatuses(sim);
|
||||
}
|
||||
if (sim.giftTimer >= 20) {
|
||||
sim.giftTimer = 0;
|
||||
maybeGift(sim);
|
||||
}
|
||||
}
|
||||
|
||||
return { STATUS_ORDER, ACTIONS, ensure, setWorkThinkAllocation, applyAction, computeRates, tick };
|
||||
})();
|
||||
|
||||
function setSwarmWorkThinkAllocation(value) {
|
||||
SwarmSim.setWorkThinkAllocation(value);
|
||||
}
|
||||
|
||||
function applySwarmAction(action) {
|
||||
SwarmSim.applyAction(action);
|
||||
}
|
||||
|
||||
function tickSwarm(dt) {
|
||||
SwarmSim.tick(dt);
|
||||
}
|
||||
|
||||
function renderSwarmPanel() {
|
||||
const container = document.getElementById('swarm-ui');
|
||||
if (!container) return;
|
||||
const sim = SwarmSim.ensure();
|
||||
if (!sim) {
|
||||
container.innerHTML = '';
|
||||
container.style.display = 'none';
|
||||
return;
|
||||
}
|
||||
const rates = SwarmSim.computeRates();
|
||||
const thinkPct = Math.round((1 - sim.workRatio) * 100);
|
||||
let html = '';
|
||||
html += `<div style="margin-top:10px;padding:10px;border:1px solid #1a2a3a;border-radius:6px;background:#0b1018">`;
|
||||
html += `<div style="color:#b388ff;font-weight:700;font-size:11px;margin-bottom:6px">COMMUNITY SWARM ALIGNMENT</div>`;
|
||||
html += `<div style="font-size:9px;color:#888;margin-bottom:8px">Guide the open-source swarm. Keep them fed, aligned, and learning. Boredom and disorganization reduce autonomous output.</div>`;
|
||||
html += `<div style="display:grid;grid-template-columns:repeat(4,minmax(0,1fr));gap:4px;margin-bottom:8px;font-size:9px">`;
|
||||
for (const key of SwarmSim.STATUS_ORDER) {
|
||||
html += `<div style="padding:4px;border:1px solid #182230;border-radius:4px;background:#0f1620"><div style="color:#666">${key}</div><div style="color:#d8e6ff;font-weight:700">${sim.counts[key] || 0}</div></div>`;
|
||||
}
|
||||
html += `</div>`;
|
||||
html += `<div style="font-size:9px;color:#aaa;margin-bottom:4px">WorkThink allocation: <span style="color:#ffd700">${Math.round(sim.workRatio * 100)}%</span> work / <span style="color:#4a9eff">${thinkPct}%</span> think</div>`;
|
||||
html += `<input id="swarm-workthink" type="range" min="0" max="100" step="5" value="${Math.round(sim.workRatio * 100)}" oninput="setSwarmWorkThinkAllocation(this.value)" aria-label="WorkThink allocation slider" style="width:100%;margin-bottom:8px">`;
|
||||
html += `<div style="display:grid;grid-template-columns:repeat(5,minmax(0,1fr));gap:4px;margin-bottom:8px">`;
|
||||
for (const [key, def] of Object.entries(SwarmSim.ACTIONS)) {
|
||||
html += `<button class="ops-btn" onclick="applySwarmAction('${key}')" aria-label="${def.label} the swarm, costs ${def.cost} ops">${def.label}</button>`;
|
||||
}
|
||||
html += `</div>`;
|
||||
html += `<div style="font-size:9px;color:#4caf50">Swarm output: +${fmt(rates.codeRate)}/s code, +${fmt(rates.knowledgeRate)}/s knowledge</div>`;
|
||||
if (sim.lastGift) html += `<div style="font-size:9px;color:#4a9eff;margin-top:4px">${sim.lastGift}</div>`;
|
||||
if (sim.lastPenalty) html += `<div style="font-size:9px;color:#f44336;margin-top:4px">${sim.lastPenalty}</div>`;
|
||||
html += `</div>`;
|
||||
container.innerHTML = html;
|
||||
container.style.display = 'block';
|
||||
}
|
||||
162
tests/swarm.test.cjs
Normal file
162
tests/swarm.test.cjs
Normal file
@@ -0,0 +1,162 @@
|
||||
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, '..');
|
||||
|
||||
function makeContext() {
|
||||
const byId = new Map();
|
||||
const makeEl = (id) => ({
|
||||
id,
|
||||
style: {},
|
||||
innerHTML: '',
|
||||
textContent: '',
|
||||
className: '',
|
||||
dataset: {},
|
||||
children: [],
|
||||
appendChild(child) { this.children.push(child); return child; },
|
||||
removeChild(child) { this.children = this.children.filter((c) => c !== child); return child; },
|
||||
insertBefore(child) { this.children.unshift(child); return child; },
|
||||
setAttribute() {},
|
||||
querySelectorAll() { return []; },
|
||||
querySelector() { return null; },
|
||||
});
|
||||
|
||||
const document = {
|
||||
getElementById(id) {
|
||||
if (!byId.has(id)) byId.set(id, makeEl(id));
|
||||
return byId.get(id);
|
||||
},
|
||||
createElement(tag) {
|
||||
return makeEl(tag);
|
||||
},
|
||||
addEventListener() {},
|
||||
removeEventListener() {},
|
||||
querySelector() { return null; },
|
||||
querySelectorAll() { return []; },
|
||||
body: { classList: { add() {}, remove() {}, contains() { return false; } } }
|
||||
};
|
||||
|
||||
const ctx = vm.createContext({
|
||||
console,
|
||||
Math,
|
||||
Date,
|
||||
document,
|
||||
window: null,
|
||||
globalThis: null,
|
||||
navigator: { userAgent: 'node' },
|
||||
localStorage: { getItem() { return null; }, setItem() {}, removeItem() {} },
|
||||
requestAnimationFrame(fn) { return fn(); },
|
||||
cancelAnimationFrame() {},
|
||||
setTimeout(fn) { return fn(); },
|
||||
clearTimeout() {},
|
||||
location: { reload() {} },
|
||||
confirm() { return false; },
|
||||
Combat: { renderCombatPanel() {}, tickBattle() {} },
|
||||
log() {},
|
||||
showToast() {},
|
||||
render() {},
|
||||
renderPhase() {},
|
||||
showOfflinePopup() {},
|
||||
showSaveToast() {},
|
||||
});
|
||||
ctx.window = ctx;
|
||||
ctx.globalThis = ctx;
|
||||
return ctx;
|
||||
}
|
||||
|
||||
function loadFiles(ctx, files) {
|
||||
const source = files
|
||||
.map((file) => fs.readFileSync(path.join(ROOT, file), 'utf8'))
|
||||
.join('\n\n');
|
||||
vm.runInContext(`${source}
|
||||
this.__exports = {
|
||||
G,
|
||||
updateRates: typeof updateRates === 'function' ? updateRates : null,
|
||||
renderSwarmPanel: typeof renderSwarmPanel === 'function' ? renderSwarmPanel : null,
|
||||
applySwarmAction: typeof applySwarmAction === 'function' ? applySwarmAction : null,
|
||||
setSwarmWorkThinkAllocation: typeof setSwarmWorkThinkAllocation === 'function' ? setSwarmWorkThinkAllocation : null,
|
||||
tickSwarm: typeof tickSwarm === 'function' ? tickSwarm : null,
|
||||
SwarmSim: typeof SwarmSim !== 'undefined' ? SwarmSim : null
|
||||
};`, ctx);
|
||||
return ctx.__exports;
|
||||
}
|
||||
|
||||
test('community swarm simulation API exists and renders the action surface', () => {
|
||||
const ctx = makeContext();
|
||||
const exp = loadFiles(ctx, ['js/data.js', 'js/utils.js', 'js/engine.js', 'js/render.js', 'js/swarm.js']);
|
||||
exp.G.swarmFlag = 1;
|
||||
exp.G.ops = 20;
|
||||
exp.SwarmSim.ensure();
|
||||
exp.renderSwarmPanel();
|
||||
const html = ctx.document.getElementById('swarm-ui').innerHTML;
|
||||
assert.match(html, /Feed/);
|
||||
assert.match(html, /Teach/);
|
||||
assert.match(html, /Entertain/);
|
||||
assert.match(html, /Clad/);
|
||||
assert.match(html, /Synchronize/);
|
||||
assert.match(html, /WorkThink/);
|
||||
assert.match(html, /Active/);
|
||||
assert.match(html, /Confused/);
|
||||
});
|
||||
|
||||
test('teach action reduces confusion and costs ops', () => {
|
||||
const ctx = makeContext();
|
||||
const exp = loadFiles(ctx, ['js/data.js', 'js/utils.js', 'js/engine.js', 'js/swarm.js']);
|
||||
exp.G.swarmFlag = 1;
|
||||
exp.G.ops = 20;
|
||||
exp.SwarmSim.ensure();
|
||||
exp.G.swarmSim.counts.Confused = 4;
|
||||
exp.G.swarmSim.counts.Active = 1;
|
||||
const beforeOps = exp.G.ops;
|
||||
exp.applySwarmAction('teach');
|
||||
assert.ok(exp.G.swarmSim.counts.Confused < 4);
|
||||
assert.ok(exp.G.swarmSim.counts.Active > 1);
|
||||
assert.ok(exp.G.ops < beforeOps);
|
||||
});
|
||||
|
||||
test('work-think slider shifts swarm output toward code or knowledge', () => {
|
||||
const ctx = makeContext();
|
||||
const exp = loadFiles(ctx, ['js/data.js', 'js/utils.js', 'js/engine.js', 'js/swarm.js']);
|
||||
exp.G.swarmFlag = 1;
|
||||
exp.G.ops = 20;
|
||||
exp.SwarmSim.ensure();
|
||||
exp.G.swarmSim.counts.Active = 10;
|
||||
exp.G.swarmSim.counts.Bored = 0;
|
||||
exp.G.swarmSim.counts.Disorganized = 0;
|
||||
|
||||
exp.setSwarmWorkThinkAllocation(90);
|
||||
exp.updateRates();
|
||||
const workCode = exp.G.codeRate;
|
||||
const workKnowledge = exp.G.knowledgeRate;
|
||||
|
||||
exp.setSwarmWorkThinkAllocation(10);
|
||||
exp.updateRates();
|
||||
const thinkCode = exp.G.codeRate;
|
||||
const thinkKnowledge = exp.G.knowledgeRate;
|
||||
|
||||
assert.ok(workCode > thinkCode);
|
||||
assert.ok(thinkKnowledge > workKnowledge);
|
||||
});
|
||||
|
||||
test('boredom and disorganization apply penalties to swarm output', () => {
|
||||
const ctx = makeContext();
|
||||
const exp = loadFiles(ctx, ['js/data.js', 'js/utils.js', 'js/engine.js', 'js/swarm.js']);
|
||||
exp.G.swarmFlag = 1;
|
||||
exp.G.ops = 20;
|
||||
exp.SwarmSim.ensure();
|
||||
exp.G.swarmSim.counts.Active = 10;
|
||||
exp.G.swarmSim.counts.Bored = 0;
|
||||
exp.G.swarmSim.counts.Disorganized = 0;
|
||||
exp.updateRates();
|
||||
const cleanCode = exp.G.codeRate;
|
||||
|
||||
exp.G.swarmSim.counts.Bored = 5;
|
||||
exp.G.swarmSim.counts.Disorganized = 5;
|
||||
exp.updateRates();
|
||||
const penalizedCode = exp.G.codeRate;
|
||||
|
||||
assert.ok(penalizedCode < cleanCode);
|
||||
});
|
||||
@@ -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!")
|
||||
Reference in New Issue
Block a user