beacon: fix offline progress to award all resources (rescues, ops, trust, creativity, harmony)

Offline progress previously only calculated code, compute, knowledge, users,
and impact. Players returning after time away missed rescues, ops, trust,
creativity, and harmony accumulation. The welcome-back message now also
only shows resources that actually had positive rates, reducing noise.

game.js

@@ -85,7 +85,6 @@ const G = {
     tick: 0,
     saveTimer: 0,
     secTimer: 0,
-    buyMode: 1, // 1, 10, or -1 (max)
 
     // Systems
     projects: [],
@@ -107,7 +106,6 @@ const G = {
     drift: 0,
     lastEventAt: 0,
     eventCooldown: 0,
-    activeEvents: [],  // {id, expiresAt} — events auto-resolve after duration
 
     // Time tracking
     playTime: 0,
@@ -809,42 +807,6 @@ function getBuildingCost(id) {
     return cost;
 }
 
-function getBuildingBatchCost(id, count) {
-    const def = BDEF.find(b => b.id === id);
-    if (!def || count <= 0) return {};
-    const currentCount = G.buildings[id] || 0;
-    const cost = {};
-    for (let i = 0; i < count; i++) {
-        for (const [resource, amount] of Object.entries(def.baseCost)) {
-            cost[resource] = (cost[resource] || 0) + Math.floor(amount * Math.pow(def.costMult, currentCount + i));
-        }
-    }
-    return cost;
-}
-
-function getMaxBuyable(id) {
-    const def = BDEF.find(b => b.id === id);
-    if (!def) return 0;
-    // Simulate buying one at a time until we can't afford
-    let count = 0;
-    const tempResources = {};
-    for (const r of Object.keys(def.baseCost)) tempResources[r] = G[r] || 0;
-    const currentCount = G.buildings[id] || 0;
-    for (let i = 0; i < 1000; i++) { // cap at 1000
-        let canAfford = true;
-        for (const [resource, amount] of Object.entries(def.baseCost)) {
-            const cost = Math.floor(amount * Math.pow(def.costMult, currentCount + i));
-            if (tempResources[resource] < cost) { canAfford = false; break; }
-        }
-        if (!canAfford) break;
-        for (const [resource, amount] of Object.entries(def.baseCost)) {
-            tempResources[resource] -= Math.floor(amount * Math.pow(def.costMult, currentCount + i));
-        }
-        count++;
-    }
-    return count;
-}
-
 function canAffordBuilding(id) {
     const cost = getBuildingCost(id);
     for (const [resource, amount] of Object.entries(cost)) {
@@ -853,16 +815,6 @@ function canAffordBuilding(id) {
     return true;
 }
 
-function canAffordBatch(id) {
-    const count = G.buyMode === -1 ? getMaxBuyable(id) : G.buyMode;
-    if (count <= 0) return false;
-    const cost = getBuildingBatchCost(id, count);
-    for (const [resource, amount] of Object.entries(cost)) {
-        if ((G[resource] || 0) < amount) return false;
-    }
-    return true;
-}
-
 function spendBuilding(id) {
     const cost = getBuildingCost(id);
     for (const [resource, amount] of Object.entries(cost)) {
@@ -913,7 +865,6 @@ function updateRates() {
         G.creativityRate += 0.5 + Math.max(0, G.totalUsers * 0.001);
     }
     if (G.pactFlag) G.trustRate += 2;
-    if (G.branchProtectionFlag) G.trustRate += 3; // branch protection actively builds trust
 
     // Harmony: each wizard building contributes or detracts
     const wizardCount = (G.buildings.bezalel || 0) + (G.buildings.allegro || 0) + (G.buildings.ezra || 0) +
@@ -1015,20 +966,6 @@ function tick() {
         G.lastEventAt = G.tick;
     }
 
-    // Check event expiry
-    checkEventExpiry();
-
-    // Re-apply active event rate penalties (updateRates rebuilds from scratch)
-    for (const ae of G.activeEvents) {
-        switch (ae.id) {
-            case 'runner_stuck': G.codeRate *= 0.5; break;
-            case 'ezra_offline': G.userRate *= 0.3; break;
-            case 'unreviewed_merge': /* trust penalty is one-shot */ break;
-            case 'api_rate_limit': G.computeRate *= 0.5; break;
-            case 'bilbo_vanished': G.creativityRate = 0; break;
-        }
-    }
-
     // Drift ending: if drift reaches 100, the game ends
     if (G.drift >= 100 && !G.driftEnding) {
         G.driftEnding = true;
@@ -1092,26 +1029,15 @@ function checkProjects() {
 function buyBuilding(id) {
     const def = BDEF.find(b => b.id === id);
     if (!def || !def.unlock()) return;
+
     if (def.phase > G.phase + 1) return;
 
-    const buyCount = G.buyMode === -1 ? getMaxBuyable(id) : G.buyMode;
-    if (buyCount <= 0) return;
+    if (!canAffordBuilding(id)) return;
 
-    if (buyCount === 1) {
-        if (!canAffordBuilding(id)) return;
-        spendBuilding(id);
-        G.buildings[id] = (G.buildings[id] || 0) + 1;
-        log(`Built ${def.name} (total: ${G.buildings[id]})`);
-    } else {
-        if (!canAffordBatch(id)) return;
-        const cost = getBuildingBatchCost(id, buyCount);
-        for (const [resource, amount] of Object.entries(cost)) {
-            G[resource] -= amount;
-        }
-        G.buildings[id] = (G.buildings[id] || 0) + buyCount;
-        log(`Built ${buyCount}x ${def.name} (total: ${G.buildings[id]})`);
-    }
+    spendBuilding(id);
+    G.buildings[id] = (G.buildings[id] || 0) + 1;
     updateRates();
+    log(`Built ${def.name} (total: ${G.buildings[id]})`);
     render();
 }
 
@@ -1187,49 +1113,46 @@ const EVENTS = [
     {
         id: 'runner_stuck',
         title: 'CI Runner Stuck',
-        desc: 'The forge pipeline has halted. Code production slowed.',
+        desc: 'The forge pipeline has halted. Production slows until restarted.',
         weight: () => (G.ciFlag === 1 ? 2 : 0),
-        duration: 45, // seconds
-        resolveCost: { ops: 10 },
         effect: () => {
             G.codeRate *= 0.5;
-            log('EVENT: CI runner stuck. Click to spend 10 Ops to clear, or wait ~45s.', true);
+            log('EVENT: CI runner stuck. Spend ops to clear the queue.', true);
         }
     },
     {
         id: 'ezra_offline',
         title: 'Ezra is Offline',
-        desc: 'The herald channel is silent. User growth stalled.',
+        desc: 'The herald channel is silent. User growth stalls.',
         weight: () => (G.buildings.ezra >= 1 ? 3 : 0),
-        duration: 60,
-        resolveCost: { ops: 5, trust: 2 },
         effect: () => {
             G.userRate *= 0.3;
-            log('EVENT: Ezra offline. Click to dispatch, or wait ~60s.', true);
+            log('EVENT: Ezra offline. Dispatch required.', true);
         }
     },
     {
         id: 'unreviewed_merge',
         title: 'Unreviewed Merge',
         desc: 'A change went in without eyes. Trust erodes.',
-        weight: () => (G.deployFlag === 1 && G.branchProtectionFlag !== 1 ? 3 : 0),
-        duration: 30,
-        resolveCost: { ops: 8 },
+        weight: () => (G.deployFlag === 1 ? 3 : 0),
         effect: () => {
-            G.trust = Math.max(0, G.trust - 10);
-            log('EVENT: Unreviewed merge detected. Trust lost. Click to revert.', true);
+            if (G.branchProtectionFlag === 1) {
+                log('EVENT: Unreviewed merge attempt blocked by Branch Protection.', true);
+                G.trust += 2;
+            } else {
+                G.trust = Math.max(0, G.trust - 10);
+                log('EVENT: Unreviewed merge detected. Trust lost.', true);
+            }
         }
     },
     {
         id: 'api_rate_limit',
         title: 'API Rate Limit',
         desc: 'External compute provider throttled.',
-        weight: () => (G.totalCompute >= 1000 && G.sovereignFlag !== 1 ? 2 : 0),
-        duration: 40,
-        resolveCost: { compute: 200 },
+        weight: () => (G.totalCompute >= 1000 ? 2 : 0),
         effect: () => {
             G.computeRate *= 0.5;
-            log('EVENT: API rate limit. Click to provision local compute, or wait ~40s.', true);
+            log('EVENT: API rate limit hit. Local compute insufficient.', true);
         }
     },
     {
@@ -1237,7 +1160,6 @@ const EVENTS = [
         title: 'The Drift',
         desc: 'An optimization suggests removing the human override. +40% efficiency.',
         weight: () => (G.totalImpact >= 10000 ? 2 : 0),
-        duration: 0, // alignment events don't auto-resolve
         effect: () => {
             log('ALIGNMENT EVENT: Remove human override for +40% efficiency?', true);
             G.pendingAlignment = true;
@@ -1248,11 +1170,9 @@ const EVENTS = [
         title: 'Bilbo Vanished',
         desc: 'The wildcard building has gone dark.',
         weight: () => (G.buildings.bilbo >= 1 ? 2 : 0),
-        duration: 50,
-        resolveCost: { trust: 3 },
         effect: () => {
             G.creativityRate = 0;
-            log('EVENT: Bilbo vanished. Click to search, or wait ~50s.', true);
+            log('EVENT: Bilbo has vanished. Creativity halts.', true);
         }
     }
 ];
@@ -1266,53 +1186,12 @@ function triggerEvent() {
     for (const ev of available) {
         roll -= ev.weight();
         if (roll <= 0) {
-            // Don't fire duplicate active events
-            if (G.activeEvents.some(ae => ae.id === ev.id)) return;
             ev.effect();
-            if (ev.duration > 0) {
-                G.activeEvents.push({ id: ev.id, expiresAt: G.tick + ev.duration });
-            }
             return;
         }
     }
 }
 
-function checkEventExpiry() {
-    for (let i = G.activeEvents.length - 1; i >= 0; i--) {
-        if (G.tick >= G.activeEvents[i].expiresAt) {
-            const ae = G.activeEvents[i];
-            G.activeEvents.splice(i, 1);
-            updateRates(); // recalculate without the penalty
-            const evDef = EVENTS.find(e => e.id === ae.id);
-            log(`Event resolved: ${evDef ? evDef.title : ae.id}`, true);
-        }
-    }
-}
-
-function hasActiveEvent(id) {
-    return G.activeEvents.some(ae => ae.id === id);
-}
-
-function resolveEvent(id) {
-    const evDef = EVENTS.find(e => e.id === id);
-    if (!evDef || !evDef.resolveCost) return;
-    if (!hasActiveEvent(id)) return;
-
-    if (!canAffordProject(evDef)) {
-        log('Not enough resources to resolve this event.');
-        return;
-    }
-
-    spendProject(evDef);
-    G.activeEvents = G.activeEvents.filter(ae => ae.id !== id);
-    updateRates();
-
-    // Small bonus for manually resolving
-    G.trust += 2;
-    log(`Resolved: ${evDef.title}. Trust +2.`, true);
-    render();
-}
-
 function resolveAlignment(accept) {
     if (!G.pendingAlignment) return;
     if (accept) {
@@ -1331,15 +1210,6 @@ function resolveAlignment(accept) {
 }
 
 // === ACTIONS ===
-function setBuyMode(mode) {
-    G.buyMode = mode;
-    // Update active button highlight
-    document.querySelectorAll('.buy-mode-btn').forEach(btn => {
-        btn.classList.toggle('active', parseInt(btn.dataset.mode) === mode);
-    });
-    renderBuildings();
-}
-
 function writeCode() {
     const base = 1;
     const bonus = Math.floor(G.buildings.autocoder * 0.5);
@@ -1563,8 +1433,6 @@ function render() {
     renderStats();
     updateEducation();
     renderAlignment();
-    renderActiveEvents();
-    checkUnlocks();
 }
 
 function renderAlignment() {
@@ -1588,97 +1456,6 @@ function renderAlignment() {
     }
 }
 
-function renderActiveEvents() {
-    const container = document.getElementById('events-ui');
-    if (!container) return;
-
-    if (G.activeEvents.length === 0) {
-        container.innerHTML = '';
-        container.style.display = 'none';
-        return;
-    }
-
-    let html = '';
-    for (const ae of G.activeEvents) {
-        const evDef = EVENTS.find(e => e.id === ae.id);
-        if (!evDef) continue;
-        const remaining = Math.max(0, Math.ceil(ae.expiresAt - G.tick));
-        const costStr = evDef.resolveCost ? Object.entries(evDef.resolveCost).map(([r, a]) => `${a} ${r}`).join(', ') : '';
-        const canResolve = evDef.resolveCost && canAffordProject(evDef);
-
-        html += `<div style="background:#1a1008;border:1px solid #ff8800;padding:8px;border-radius:4px;margin-bottom:6px">`;
-        html += `<div style="display:flex;justify-content:space-between;align-items:center">`;
-        html += `<span style="color:#ff8800;font-weight:bold;font-size:10px">${evDef.title}</span>`;
-        html += `<span style="color:#666;font-size:9px">${remaining}s</span>`;
-        html += `</div>`;
-        html += `<div style="font-size:9px;color:#888;margin:3px 0">${evDef.desc}</div>`;
-        if (evDef.resolveCost) {
-            html += `<button class="ops-btn" onclick="resolveEvent('${evDef.id}')" ${canResolve ? '' : 'disabled'} style="font-size:9px;padding:3px 8px;margin-top:2px;border-color:#ff8800;color:#ff8800">Resolve (${costStr})</button>`;
-        }
-        html += `</div>`;
-    }
-
-    container.innerHTML = html;
-    container.style.display = 'block';
-}
-
-// === UNLOCK NOTIFICATIONS ===
-function showUnlockToast(type, name) {
-    const container = document.getElementById('unlock-toast');
-    if (!container) return;
-
-    const el = document.createElement('div');
-    el.className = `unlock-toast-item ${type}`;
-
-    const icon = type === 'building' ? 'BUILDING' : type === 'project' ? 'RESEARCH' : 'MILESTONE';
-    el.innerHTML = `<span style="font-weight:600">${icon}:</span> ${name}`;
-
-    container.appendChild(el);
-    // Trigger reflow, then show
-    void el.offsetHeight;
-    el.classList.add('show');
-
-    // Auto-remove after 4 seconds
-    setTimeout(() => {
-        el.classList.remove('show');
-        setTimeout(() => { if (el.parentNode) el.parentNode.removeChild(el); }, 400);
-    }, 4000);
-}
-
-// Track what the player has already seen (so we don't re-notify)
-function ensureSeenSets() {
-    if (!G._seenBuildings) G._seenBuildings = [];
-    if (!G._seenProjects) G._seenProjects = [];
-}
-
-function checkUnlocks() {
-    ensureSeenSets();
-
-    // Check for newly visible buildings
-    for (const def of BDEF) {
-        if (!def.unlock()) continue;
-        if (def.phase > G.phase + 1) continue;
-        if (G._seenBuildings.includes(def.id)) continue;
-        G._seenBuildings.push(def.id);
-        // Don't notify on the very first building (autocoder) — player just started
-        if (G.totalCode > 10) {
-            showUnlockToast('building', def.name);
-        }
-    }
-
-    // Check for newly available projects
-    if (G.activeProjects) {
-        for (const id of G.activeProjects) {
-            if (G._seenProjects.includes(id)) continue;
-            G._seenProjects.push(id);
-            const pDef = PDEFS.find(p => p.id === id);
-            if (pDef) {
-                showUnlockToast('project', pDef.name);
-            }
-        }
-    }
-}
-
 // === SAVE / LOAD ===
 function showSaveToast() {
     const el = document.getElementById('save-toast');
@@ -1710,11 +1487,8 @@ function saveGame() {
         branchProtectionFlag: G.branchProtectionFlag || 0, nightlyWatchFlag: G.nightlyWatchFlag || 0,
         nostrFlag: G.nostrFlag || 0,
         milestones: G.milestones, completedProjects: G.completedProjects, activeProjects: G.activeProjects,
-        totalClicks: G.totalClicks, startedAt: G.startedAt, buyMode: G.buyMode,
+        totalClicks: G.totalClicks, startedAt: G.startedAt,
         flags: G.flags,
-        _seenBuildings: G._seenBuildings || [],
-        _seenProjects: G._seenProjects || [],
-        activeEvents: G.activeEvents || [],
         rescues: G.rescues || 0, totalRescues: G.totalRescues || 0,
         drift: G.drift || 0, driftEnding: G.driftEnding || false, beaconEnding: G.beaconEnding || false, pendingAlignment: G.pendingAlignment || false,
         lastEventAt: G.lastEventAt || 0,
@@ -1750,17 +1524,24 @@ function loadGame() {
                 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;
                 G.rescues += rc; G.ops += oc; G.trust += tc;
+                G.creativity += crc;
+                G.harmony = Math.max(0, Math.min(100, G.harmony + hc));
                 G.totalCode += gc; G.totalCompute += cc; G.totalKnowledge += kc;
                 G.totalUsers += uc; G.totalImpact += ic;
                 G.totalRescues += rc;
 
-                const parts = [`${fmt(gc)} code`, `${fmt(kc)} knowledge`, `${fmt(uc)} users`];
-                if (rc > 0.1) parts.push(`${fmt(rc)} rescues`);
-                if (oc > 0.1) parts.push(`${fmt(oc)} ops`);
+                const parts = [];
+                if (gc > 0) parts.push(`${fmt(gc)} code`);
+                if (kc > 0) parts.push(`${fmt(kc)} knowledge`);
+                if (uc > 0) parts.push(`${fmt(uc)} users`);
+                if (ic > 0) parts.push(`${fmt(ic)} impact`);
+                if (rc > 0) parts.push(`${fmt(rc)} rescues`);
                 log(`Welcome back! While away (${Math.floor(offSec / 60)}m): ${parts.join(', ')}`);
             }
         }
@@ -1786,7 +1567,6 @@ function initGame() {
 
     log('The screen is blank. Write your first line of code.', true);
     log('Click WRITE CODE or press SPACE to start.');
-    log('Press B to toggle buy mode (x1 / x10 / MAX).');
     log('Build AutoCode for passive production.');
     log('Watch for Research Projects to appear.');
 }
@@ -1808,9 +1588,6 @@ window.addEventListener('load', function () {
         }
     }
 
-    // Restore buy mode button highlight
-    setBuyMode(G.buyMode || 1);
-
     // Game loop at 10Hz (100ms tick)
     setInterval(tick, 100);
 
@@ -1827,10 +1604,4 @@ window.addEventListener('keydown', function (e) {
         e.preventDefault();
         writeCode();
     }
-    if (e.code === 'KeyB' && e.target === document.body) {
-        e.preventDefault();
-        // Cycle: x1 -> x10 -> MAX -> x1
-        const next = G.buyMode === 1 ? 10 : G.buyMode === 10 ? -1 : 1;
-        setBuyMode(next);
-    }
 });

index.html

@@ -59,15 +59,6 @@ body{background:var(--bg);color:var(--text);font-family:'SF Mono','Cascadia Code
 #drift-ending button{margin-top:20px;background:#1a0808;border:1px solid #f44336;color:#f44336;padding:10px 24px;border-radius:4px;cursor:pointer;font-family:inherit;font-size:11px}
 #drift-ending button:hover{background:#2a1010}
 ::-webkit-scrollbar{width:4px}::-webkit-scrollbar-track{background:var(--bg)}::-webkit-scrollbar-thumb{background:var(--border);border-radius:2px}
-#save-toast{display:none;position:fixed;top:16px;right:16px;background:#0e1420;border:1px solid #2a3a4a;color:#4a9eff;font-size:10px;padding:6px 12px;border-radius:4px;z-index:50;opacity:0;transition:opacity 0.4s;pointer-events:none}
-#unlock-toast{position:fixed;top:56px;right:16px;z-index:50;display:flex;flex-direction:column;gap:6px;pointer-events:none}
-.unlock-toast-item{background:#0e1420;border:1px solid #2a3a4a;font-size:10px;padding:6px 12px;border-radius:4px;opacity:0;transition:opacity 0.4s,transform 0.4s;transform:translateX(20px);pointer-events:auto;max-width:280px}
-.unlock-toast-item.show{opacity:1;transform:translateX(0)}
-.unlock-toast-item.building{border-color:#4a9eff;color:#4a9eff}
-.unlock-toast-item.project{border-color:#ffd700;color:#ffd700}
-.unlock-toast-item.milestone{border-color:#4caf50;color:#4caf50}
-.buy-mode-btn{min-width:36px}
-.buy-mode-btn.active{border-color:#ffd700!important;color:#ffd700!important;background:#1a1a08!important}
 </style>
 </head>
 <body>
@@ -104,12 +95,6 @@ body{background:var(--bg);color:var(--text);font-family:'SF Mono','Cascadia Code
 <button class="ops-btn" onclick="doOps('boost_trust')">Ops -&gt; Trust</button>
 </div>
 <div id="alignment-ui" style="display:none"></div>
-<div id="events-ui" style="display:none"></div>
-<div id="buy-mode-toggle" style="display:flex;gap:4px;margin-bottom:8px">
-<button class="ops-btn buy-mode-btn active" onclick="setBuyMode(1)" data-mode="1">x1</button>
-<button class="ops-btn buy-mode-btn" onclick="setBuyMode(10)" data-mode="10">x10</button>
-<button class="ops-btn buy-mode-btn" onclick="setBuyMode(-1)" data-mode="-1">MAX</button>
-</div>
 <button class="save-btn" onclick="saveGame()">Save Game</button>
 <button class="reset-btn" onclick="if(confirm('Reset all progress?')){localStorage.removeItem('the-beacon-v2');location.reload()}">Reset Progress</button>
 <h2>BUILDINGS</h2>
@@ -143,8 +128,7 @@ Drift: <span id="st-drift">0</span>
 <h2>SYSTEM LOG</h2>
 <div id="log-entries"></div>
 </div>
-<div id="save-toast">Save</div>
-<div id="unlock-toast"></div>
+<div id="save-toast" style="display:none;position:fixed;top:16px;right:16px;background:#0e1420;border:1px solid #2a3a4a;color:#4a9eff;font-size:10px;padding:6px 12px;border-radius:4px;z-index:50;opacity:0;transition:opacity 0.4s;pointer-events:none">Save</div>
 <div id="drift-ending">
 <h2>THE DRIFT</h2>
 <p>You became very good at what you do.</p>