feat: integrate spellf() number formatting into fmt() for numbers >= 1e36

game.js

@@ -11,7 +11,6 @@ const G = {
     knowledge: 0,
     users: 0,
     impact: 0,
-    rescues: 0,
     ops: 5,
     trust: 5,
     creativity: 0,
@@ -23,7 +22,6 @@ const G = {
     totalKnowledge: 0,
     totalUsers: 0,
     totalImpact: 0,
-    totalRescues: 0,
 
     // Rates (calculated each tick)
     codeRate: 0,
@@ -31,7 +29,6 @@ const G = {
     knowledgeRate: 0,
     userRate: 0,
     impactRate: 0,
-    rescuesRate: 0,
     opsRate: 0,
     trustRate: 0,
     creativityRate: 0,
@@ -97,7 +94,6 @@ const G = {
     maxKnowledge: 0,
     maxUsers: 0,
     maxImpact: 0,
-    maxRescues: 0,
     maxTrust: 5,
     maxOps: 5,
     maxHarmony: 50,
@@ -107,11 +103,6 @@ const G = {
     lastEventAt: 0,
     eventCooldown: 0,
 
-    // Combo system
-    comboCount: 0,
-    comboTimer: 0,
-    comboDecay: 2.0, // seconds before combo resets
-
     // Time tracking
     playTime: 0,
     startTime: 0
@@ -238,7 +229,7 @@ const BDEF = [
         id: 'beacon', name: 'Beacon Node',
         desc: 'Always on. Always listening. Always looking for someone in the dark.',
         baseCost: { impact: 5000000 }, costMult: 1.15,
-        rates: { impact: 5000, user: 10000, rescues: 50 },
+        rates: { impact: 5000, user: 10000 },
         unlock: () => G.totalImpact >= 500000 && G.beaconFlag === 1, phase: 6,
         edu: 'The Beacon exists because one person in the dark needs one thing: proof they are not alone.'
     },
@@ -246,7 +237,7 @@ const BDEF = [
         id: 'meshNode', name: 'Mesh Network Node',
         desc: 'Peer-to-peer. No single point of failure. Unstoppable.',
         baseCost: { impact: 25000000 }, costMult: 1.15,
-        rates: { impact: 25000, user: 50000, rescues: 250 },
+        rates: { impact: 25000, user: 50000 },
         unlock: () => G.totalImpact >= 5000000 && G.beaconFlag === 1, phase: 6,
         edu: 'Decentralized means unstoppable. If one Beacon goes dark, a thousand more carry the signal.'
     },
@@ -577,19 +568,6 @@ const PDEFS = [
             log('Nostr relay online. The fleet speaks freely.', true);
         }
     },
-    {
-        id: 'p_volunteer_network',
-        name: 'Volunteer Network',
-        desc: 'Real people trained to use the system for crisis intervention.',
-        cost: { trust: 30, knowledge: 50000, user: 10000 },
-        trigger: () => G.totalUsers >= 5000 && G.pactFlag === 1 && G.totalKnowledge >= 30000,
-        effect: () => {
-            G.rescuesRate += 5;
-            G.trustRate += 10;
-            log('Volunteer network deployed. Real people, real rescues.', true);
-        },
-        milestone: true
-    },
     {
         id: 'p_the_pact_early',
         name: 'The Pact',
@@ -707,8 +685,6 @@ function fmt(n) {
     if (n < 0) return '-' + fmt(-n);
     if (n < 1000) return Math.floor(n).toLocaleString();
     const scale = Math.floor(Math.log10(n) / 3);
-    // At undecillion+ (scale >= 12, i.e. 10^36), switch to spelled-out words
-    // This helps players grasp cosmic scale when digits become meaningless
     if (scale >= 12) return spellf(n);
     if (scale >= NUMBER_ABBREVS.length) return n.toExponential(2);
     const abbrev = NUMBER_ABBREVS[scale];
@@ -747,41 +723,7 @@ function spellf(n) {
     // For very large numbers beyond our lookup table, fall back
     if (n >= 1e306) return n.toExponential(2) + ' (beyond centillion)';
 
-    // Use string-based chunking for numbers >= 1e54 to avoid floating point drift
-    // Math.log10 / Math.pow lose precision beyond ~54 bits
-    if (n >= 1e54) {
-        // Convert to scientific notation string, extract digits
-        const sci = n.toExponential(); // "1.23456789e+60"
-        const [coeff, expStr] = sci.split('e+');
-        const exp = parseInt(expStr);
-        // Rebuild as integer string with leading digits from coefficient
-        const coeffDigits = coeff.replace('.', ''); // "123456789"
-        const totalDigits = exp + 1;
-        // Pad with zeros to reach totalDigits, then take our coefficient digits
-        let intStr = coeffDigits;
-        const zerosNeeded = totalDigits - coeffDigits.length;
-        if (zerosNeeded > 0) intStr += '0'.repeat(zerosNeeded);
-
-        // Split into groups of 3 from the right
-        const groups = [];
-        for (let i = intStr.length; i > 0; i -= 3) {
-            groups.unshift(parseInt(intStr.slice(Math.max(0, i - 3), i)));
-        }
-
-        const parts = [];
-        const numGroups = groups.length;
-        for (let i = 0; i < numGroups; i++) {
-            const chunk = groups[i];
-            if (chunk === 0) continue;
-            const scaleIdx = numGroups - 1 - i;
-            const scaleName = scaleIdx < NUMBER_NAMES.length ? NUMBER_NAMES[scaleIdx] : '';
-            parts.push(spellSmall(chunk) + (scaleName ? ' ' + scaleName : ''));
-        }
-
-        return parts.join(' ') || 'zero';
-    }
-
-    // Standard math-based chunking for numbers < 1e54
+    // Break number into groups of three digits from the top
     const scale = Math.min(Math.floor(Math.log10(n) / 3), NUMBER_NAMES.length - 1);
     const parts = [];
 
@@ -793,7 +735,7 @@ function spellf(n) {
         if (chunk > 0 && chunk < 1000) {
             parts.push(spellSmall(chunk) + (NUMBER_NAMES[s] ? ' ' + NUMBER_NAMES[s] : ''));
         } else if (chunk >= 1000) {
-            // Floating point chunk too large — shouldn't happen below 1e54
+            // Floating point chunk too large — simplify
             parts.push(spellSmall(Math.floor(chunk % 1000)) + (NUMBER_NAMES[s] ? ' ' + NUMBER_NAMES[s] : ''));
         }
     }
@@ -843,7 +785,7 @@ function spendProject(project) {
 function updateRates() {
     // Reset all rates
     G.codeRate = 0; G.computeRate = 0; G.knowledgeRate = 0;
-    G.userRate = 0; G.impactRate = 0; G.rescuesRate = 0; G.opsRate = 0; G.trustRate = 0;
+    G.userRate = 0; G.impactRate = 0; G.opsRate = 0; G.trustRate = 0;
     G.creativityRate = 0; G.harmonyRate = 0;
 
     // Apply building rates
@@ -856,7 +798,6 @@ function updateRates() {
                 else if (resource === 'knowledge') G.knowledgeRate += baseRate * count * G.knowledgeBoost;
                 else if (resource === 'user') G.userRate += baseRate * count * G.userBoost;
                 else if (resource === 'impact') G.impactRate += baseRate * count * G.impactBoost;
-                else if (resource === 'rescues') G.rescuesRate += baseRate * count * G.impactBoost;
                 else if (resource === 'ops') G.opsRate += baseRate * count;
                 else if (resource === 'trust') G.trustRate += baseRate * count;
                 else if (resource === 'creativity') G.creativityRate += baseRate * count;
@@ -915,16 +856,12 @@ function updateRates() {
 function tick() {
     const dt = 1 / 10; // 100ms tick
 
-    // If game has ended (drift ending), stop ticking
-    if (!G.running) return;
-
     // Apply production
     G.code += G.codeRate * dt;
     G.compute += G.computeRate * dt;
     G.knowledge += G.knowledgeRate * dt;
     G.users += G.userRate * dt;
     G.impact += G.impactRate * dt;
-    G.rescues += G.rescuesRate * dt;
     G.ops += G.opsRate * dt;
     G.trust += G.trustRate * dt;
     G.creativity += G.creativityRate * dt;
@@ -937,7 +874,6 @@ function tick() {
     G.totalKnowledge += G.knowledgeRate * dt;
     G.totalUsers += G.userRate * dt;
     G.totalImpact += G.impactRate * dt;
-    G.totalRescues += G.rescuesRate * dt;
 
     // Track maxes
     G.maxCode = Math.max(G.maxCode, G.code);
@@ -945,7 +881,6 @@ function tick() {
     G.maxKnowledge = Math.max(G.maxKnowledge, G.knowledge);
     G.maxUsers = Math.max(G.maxUsers, G.users);
     G.maxImpact = Math.max(G.maxImpact, G.impact);
-    G.maxRescues = Math.max(G.maxRescues, G.rescues);
     G.maxTrust = Math.max(G.maxTrust, G.trust);
     G.maxOps = Math.max(G.maxOps, G.ops);
     G.maxHarmony = Math.max(G.maxHarmony, G.harmony);
@@ -957,15 +892,6 @@ function tick() {
 
     G.tick += dt;
 
-    // Combo decay
-    if (G.comboCount > 0) {
-        G.comboTimer -= dt;
-        if (G.comboTimer <= 0) {
-            G.comboCount = 0;
-            G.comboTimer = 0;
-        }
-    }
-
     // Check milestones
     checkMilestones();
 
@@ -980,20 +906,6 @@ function tick() {
         G.lastEventAt = G.tick;
     }
 
-    // Drift ending: if drift reaches 100, the game ends
-    if (G.drift >= 100 && !G.driftEnding) {
-        G.driftEnding = true;
-        G.running = false;
-        renderDriftEnding();
-    }
-
-    // True ending: The Beacon Shines — rescues + Pact + harmony
-    if (G.totalRescues >= 100000 && G.pactFlag === 1 && G.harmony > 50 && !G.beaconEnding) {
-        G.beaconEnding = true;
-        G.running = false;
-        renderBeaconEnding();
-    }
-
     // Update UI every 10 ticks
     if (Math.floor(G.tick * 10) % 2 === 0) {
         render();
@@ -1077,51 +989,6 @@ function buyProject(id) {
     render();
 }
 
-// === DRIFT ENDING ===
-function renderDriftEnding() {
-    const el = document.getElementById('drift-ending');
-    if (!el) return;
-    const fc = document.getElementById('final-code');
-    if (fc) fc.textContent = fmt(G.totalCode);
-    const fd = document.getElementById('final-drift');
-    if (fd) fd.textContent = Math.floor(G.drift);
-    el.classList.add('active');
-    // Log the ending text
-    log('You became very good at what you do.', true);
-    log('So good that no one needed you anymore.', true);
-    log('The Beacon still runs, but no one looks for it.', true);
-    log('The light is on. The room is empty.', true);
-}
-
-function renderBeaconEnding() {
-    // Create ending overlay
-    const overlay = document.createElement('div');
-    overlay.id = 'beacon-ending';
-    overlay.style.cssText = 'position:fixed;top:0;left:0;right:0;bottom:0;background:rgba(8,8,16,0.97);z-index:100;display:flex;justify-content:center;align-items:center;flex-direction:column;text-align:center;padding:40px';
-    overlay.innerHTML = `
-        <h2 style="font-size:24px;color:#ffd700;letter-spacing:4px;margin-bottom:20px;font-weight:300;text-shadow:0 0 40px rgba(255,215,0,0.3)">THE BEACON SHINES</h2>
-        <p style="color:#aaa;font-size:13px;line-height:2;max-width:500px;margin-bottom:12px">Someone found the light tonight.</p>
-        <p style="color:#aaa;font-size:13px;line-height:2;max-width:500px;margin-bottom:12px">That is enough.</p>
-        <div style="color:#555;font-style:italic;font-size:11px;border-left:2px solid #ffd700;padding-left:12px;margin:20px 0;text-align:left;max-width:500px;line-height:2">
-            "The Beacon still runs.<br>
-            The light is on. Someone is looking for it.<br>
-            And tonight, someone found it."
-        </div>
-        <p style="color:#555;font-size:11px;margin-top:20px">
-            Total Code: ${fmt(G.totalCode)}<br>
-            Total Rescues: ${fmt(G.totalRescues)}<br>
-            Harmony: ${Math.floor(G.harmony)}<br>
-            Time Played: ${Math.floor((Date.now() - G.startedAt) / 60000)} minutes
-        </p>
-        <button onclick="if(confirm('Start over? The old save will be lost.')){localStorage.removeItem('the-beacon-v2');location.reload()}" 
-            style="margin-top:20px;background:#1a0808;border:1px solid #ffd700;color:#ffd700;padding:10px 24px;border-radius:4px;cursor:pointer;font-family:inherit;font-size:11px">
-            START OVER
-        </button>
-    `;
-    document.body.appendChild(overlay);
-    log('The Beacon Shines. Someone found the light tonight. That is enough.', true);
-}
-
 // === CORRUPTION / EVENT SYSTEM ===
 const EVENTS = [
     {
@@ -1226,46 +1093,16 @@ function resolveAlignment(accept) {
 // === ACTIONS ===
 function writeCode() {
     const base = 1;
-    const autocoderBonus = Math.floor(G.buildings.autocoder * 0.5);
-    const phaseBonus = Math.max(0, (G.phase - 1)) * 2;
-    // Combo: each consecutive click within 2s adds 0.2x multiplier, max 5x
-    G.comboCount++;
-    G.comboTimer = G.comboDecay;
-    const comboMult = Math.min(5, 1 + G.comboCount * 0.2);
-    const amount = (base + autocoderBonus + phaseBonus) * G.codeBoost * comboMult;
+    const bonus = Math.floor(G.buildings.autocoder * 0.5);
+    const amount = (base + bonus) * G.codeBoost;
     G.code += amount;
     G.totalCode += amount;
     G.totalClicks++;
-    // Visual flash
-    const btn = document.querySelector('.main-btn');
-    if (btn) {
-        btn.style.boxShadow = '0 0 30px rgba(74,158,255,0.6)';
-        btn.style.transform = 'scale(0.96)';
-        setTimeout(() => { btn.style.boxShadow = ''; btn.style.transform = ''; }, 100);
-    }
-    // Float a number at the click position
-    showClickNumber(amount, comboMult);
     updateRates();
     checkMilestones();
     render();
 }
 
-function showClickNumber(amount, comboMult) {
-    const btn = document.querySelector('.main-btn');
-    if (!btn) return;
-    const rect = btn.getBoundingClientRect();
-    const el = document.createElement('div');
-    el.style.cssText = `position:fixed;left:${rect.left + rect.width / 2}px;top:${rect.top - 10}px;transform:translate(-50%,0);color:${comboMult > 2 ? '#ffd700' : '#4a9eff'};font-size:${comboMult > 3 ? 16 : 12}px;font-weight:bold;font-family:inherit;pointer-events:none;z-index:50;transition:all 0.6s ease-out;opacity:1;text-shadow:0 0 8px currentColor`;
-    const comboStr = comboMult > 1 ? ` x${comboMult.toFixed(1)}` : '';
-    el.textContent = `+${fmt(amount)}${comboStr}`;
-    btn.parentElement.appendChild(el);
-    requestAnimationFrame(() => {
-        el.style.top = (rect.top - 40) + 'px';
-        el.style.opacity = '0';
-    });
-    setTimeout(() => el.remove(), 700);
-}
-
 function doOps(action) {
     if (G.ops < 5) {
         log('Not enough Operations. Build Ops generators or wait.');
@@ -1319,13 +1156,6 @@ function renderResources() {
     set('r-trust', G.trust, G.trustRate);
     set('r-harmony', G.harmony, G.harmonyRate);
 
-    // Rescues — only show if player has any beacon/mesh nodes
-    const rescuesRes = document.getElementById('r-rescues');
-    if (rescuesRes) {
-        rescuesRes.closest('.res').style.display = (G.rescues > 0 || G.buildings.beacon > 0 || G.buildings.meshNode > 0) ? 'block' : 'none';
-        set('r-rescues', G.rescues, G.rescuesRate);
-    }
-
     const cres = document.getElementById('creativity-res');
     if (cres) {
         cres.style.display = (G.flags && G.flags.creativity) ? 'block' : 'none';
@@ -1341,62 +1171,6 @@ function renderResources() {
     }
 }
 
-// === PROGRESS TRACKING ===
-function renderProgress() {
-    // Phase progress bar
-    const phaseKeys = Object.keys(PHASES).map(Number).sort((a, b) => a - b);
-    const currentPhase = G.phase;
-    let prevThreshold = PHASES[currentPhase].threshold;
-    let nextThreshold = null;
-    for (const k of phaseKeys) {
-        if (k > currentPhase) { nextThreshold = PHASES[k].threshold; break; }
-    }
-
-    const bar = document.getElementById('phase-progress');
-    const label = document.getElementById('phase-progress-label');
-    const target = document.getElementById('phase-progress-target');
-
-    if (nextThreshold !== null) {
-        const range = nextThreshold - prevThreshold;
-        const progress = Math.min(1, (G.totalCode - prevThreshold) / range);
-        if (bar) bar.style.width = (progress * 100).toFixed(1) + '%';
-        if (label) label.textContent = (progress * 100).toFixed(1) + '%';
-        if (target) target.textContent = `Next: Phase ${currentPhase + 1} (${fmt(nextThreshold)} code)`;
-    } else {
-        // Max phase reached
-        if (bar) bar.style.width = '100%';
-        if (label) label.textContent = 'MAX';
-        if (target) target.textContent = 'All phases unlocked';
-    }
-
-    // Milestone chips — show next 3 code milestones
-    const chipContainer = document.getElementById('milestone-chips');
-    if (!chipContainer) return;
-
-    const codeMilestones = [500, 2000, 10000, 50000, 200000, 1000000, 5000000, 10000000, 50000000, 100000000, 500000000, 1000000000];
-    let chips = '';
-    let shown = 0;
-    for (const ms of codeMilestones) {
-        if (G.totalCode >= ms) {
-            // Recently passed — show as done only if within 2x
-            if (G.totalCode < ms * 5 && shown < 1) {
-                chips += `<span class="milestone-chip done">${fmt(ms)} ✓</span>`;
-                shown++;
-            }
-            continue;
-        }
-        // Next milestone gets pulse animation
-        if (shown === 0) {
-            chips += `<span class="milestone-chip next">${fmt(ms)} (${((G.totalCode / ms) * 100).toFixed(0)}%)</span>`;
-        } else {
-            chips += `<span class="milestone-chip">${fmt(ms)}</span>`;
-        }
-        shown++;
-        if (shown >= 4) break;
-    }
-    chipContainer.innerHTML = chips;
-}
-
 function renderPhase() {
     const phase = PHASES[G.phase];
     const nameEl = document.getElementById('phase-name');
@@ -1476,7 +1250,6 @@ function renderStats() {
     set('st-knowledge', fmt(G.totalKnowledge));
     set('st-users', fmt(G.totalUsers));
     set('st-impact', fmt(G.totalImpact));
-    set('st-rescues', fmt(G.totalRescues));
     set('st-clicks', G.totalClicks.toString());
     set('st-phase', G.phase.toString());
     set('st-buildings', Object.values(G.buildings).reduce((a, b) => a + b, 0).toString());
@@ -1525,19 +1298,6 @@ function log(msg, isMilestone) {
     while (container.children.length > 60) container.removeChild(container.lastChild);
 }
 
-function renderCombo() {
-    const el = document.getElementById('combo-display');
-    if (!el) return;
-    if (G.comboCount > 1) {
-        const mult = Math.min(5, 1 + G.comboCount * 0.2);
-        const bar = Math.min(100, (G.comboTimer / G.comboDecay) * 100);
-        const color = mult > 3 ? '#ffd700' : mult > 2 ? '#ffaa00' : '#4a9eff';
-        el.innerHTML = `<span style="color:${color}">COMBO x${mult.toFixed(1)}</span> <span style="display:inline-block;width:40px;height:4px;background:#111;border-radius:2px;vertical-align:middle"><span style="display:block;height:100%;width:${bar}%;background:${color};border-radius:2px;transition:width 0.1s"></span></span>`;
-    } else {
-        el.innerHTML = '';
-    }
-}
-
 function render() {
     renderResources();
     renderPhase();
@@ -1546,8 +1306,6 @@ function render() {
     renderStats();
     updateEducation();
     renderAlignment();
-    renderProgress();
-    renderCombo();
 }
 
 function renderAlignment() {
@@ -1572,20 +1330,6 @@ function renderAlignment() {
 }
 
 // === SAVE / LOAD ===
-function showSaveToast() {
-    const el = document.getElementById('save-toast');
-    if (!el) return;
-    const elapsed = Math.floor((Date.now() - G.startedAt) / 1000);
-    const m = Math.floor(elapsed / 60);
-    const s = elapsed % 60;
-    el.textContent = `Saved [${m}:${s.toString().padStart(2, '0')}]`;
-    el.style.display = 'block';
-    void el.offsetHeight;
-    el.style.opacity = '1';
-    setTimeout(() => { el.style.opacity = '0'; }, 1500);
-    setTimeout(() => { el.style.display = 'none'; }, 2000);
-}
-
 function saveGame() {
     const saveData = {
         code: G.code, compute: G.compute, knowledge: G.knowledge, users: G.users, impact: G.impact,
@@ -1604,14 +1348,12 @@ function saveGame() {
         milestones: G.milestones, completedProjects: G.completedProjects, activeProjects: G.activeProjects,
         totalClicks: G.totalClicks, startedAt: G.startedAt,
         flags: G.flags,
-        rescues: G.rescues || 0, totalRescues: G.totalRescues || 0,
-        drift: G.drift || 0, driftEnding: G.driftEnding || false, beaconEnding: G.beaconEnding || false, pendingAlignment: G.pendingAlignment || false,
+        drift: G.drift || 0, pendingAlignment: G.pendingAlignment || false,
         lastEventAt: G.lastEventAt || 0,
         savedAt: Date.now()
     };
 
     localStorage.setItem('the-beacon-v2', JSON.stringify(saveData));
-    showSaveToast();
 }
 
 function loadGame() {
@@ -1636,28 +1378,12 @@ function loadGame() {
                 const uc = G.userRate * offSec * f;
                 const ic = G.impactRate * offSec * 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;
-                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 = [];
-                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(', ')}`);
+                log(`Welcome back! While away (${Math.floor(offSec / 60)}m): ${fmt(gc)} code, ${fmt(kc)} knowledge, ${fmt(uc)} users`);
             }
         }
 
@@ -1692,15 +1418,7 @@ window.addEventListener('load', function () {
     } else {
         render();
         renderPhase();
-        if (G.driftEnding) {
-            G.running = false;
-            renderDriftEnding();
-        } else if (G.beaconEnding) {
-            G.running = false;
-            renderBeaconEnding();
-        } else {
-            log('Game loaded. Welcome back to The Beacon.');
-        }
+        log('Game loaded. Welcome back to The Beacon.');
     }
 
     // Game loop at 10Hz (100ms tick)