Spaces:

victor
/

orcs-in-the-forest

Running

App Files Files

xet

Community

Codex CLI commited on Aug 24

Commit

a646668

1 Parent(s): 9b606b6

feat(powerups): add infinite ammo powerup mechanics and UI integration

Browse files

Files changed (9) hide show

index.html +28 -0
src/combat.js +11 -3
src/globals.js +10 -0
src/hud.js +69 -3
src/main.js +7 -0
src/pickups.js +133 -0
src/player.js +10 -1
src/waves.js +4 -1
src/weapon.js +27 -5

index.html CHANGED Viewed

@@ -181,6 +181,33 @@
       opacity: 0;
     }
   </style>
 </head>
 <body>
   <div id="hud">
@@ -211,6 +238,7 @@
     <!-- Health Bottom-Left -->
     <div id="ui-health" class="hud-card bl">
       <div id="health-label"><span class="hud-title">HEALTH</span><span id="health-text">100</span></div>
       <div id="health-bar">
         <div id="health-fill" style="width: 100%"></div>

       opacity: 0;
     }
   </style>
+  <style>
+    /* Powerup chips next to health */
+    .powerup-chips { display: flex; gap: 8px; margin-bottom: 8px; flex-wrap: wrap; }
+    .pu-chip {
+      display: inline-block;
+      padding: 2px 8px;
+      font-size: 12px;
+      letter-spacing: 1px;
+      border-radius: 999px;
+      border: 1px solid rgba(255,255,255,0.3);
+      color: #fff;
+      text-shadow: 0 1px 2px rgba(0,0,0,0.5);
+      box-shadow: 0 0 10px rgba(255,255,255,0.05);
+      pointer-events: none;
+      user-select: none;
+      position: relative;
+      overflow: hidden;
+    }
+    .pu-chip .pu-fill { position: absolute; left: 0; top: 0; bottom: 0; width: 0%; border-radius: 999px; filter: saturate(1.1); }
+    .pu-chip .pu-text { position: relative; z-index: 1; }
+    .pu-chip.blink { animation: puBlink 0.6s linear infinite; }
+    @keyframes puBlink {
+      0% { opacity: 1; filter: brightness(1); }
+      50% { opacity: 0.35; filter: brightness(1.4); }
+      100% { opacity: 1; filter: brightness(1); }
+    }
+  </style>
 </head>
 <body>
   <div id="hud">
     <!-- Health Bottom-Left -->
     <div id="ui-health" class="hud-card bl">
+      <div id="powerup-chips" class="powerup-chips"></div>
       <div id="health-label"><span class="hud-title">HEALTH</span><span id="health-text">100</span></div>
       <div id="health-bar">
         <div id="health-fill" style="width: 100%"></div>

src/combat.js CHANGED Viewed

@@ -24,14 +24,17 @@ export function performShooting(delta) {
   if (G.input.shoot && G.shootCooldown <= 0 && G.state === 'playing') {
     if (G.weapon.reloading) return;
-    if (G.weapon.ammo <= 0) {
       G.shootCooldown = 0.2;
       G.weapon.recoil += CFG.gun.recoilKick * 0.25;
       return;
     }
     G.shootCooldown = 1 / (CFG.gun.rof * (G.weapon.rofMult || 1));
-    G.weapon.ammo--;
     G.weapon.recoil += CFG.gun.recoilKick;
     updateHUD();
@@ -182,7 +185,12 @@ export function performShooting(delta) {
     playGunshot();
   }
-  if (!G.weapon.reloading && G.weapon.ammo === 0 && (G.weapon.reserve > 0 || G.weapon.reserve === Infinity)) {
     beginReload();
   }
 }

   if (G.input.shoot && G.shootCooldown <= 0 && G.state === 'playing') {
     if (G.weapon.reloading) return;
+    const infinite = G.weapon.infiniteAmmoTimer > 0;
+    if (!infinite && G.weapon.ammo <= 0) {
       G.shootCooldown = 0.2;
       G.weapon.recoil += CFG.gun.recoilKick * 0.25;
       return;
     }
     G.shootCooldown = 1 / (CFG.gun.rof * (G.weapon.rofMult || 1));
+    if (!infinite) {
+      G.weapon.ammo--;
+    }
     G.weapon.recoil += CFG.gun.recoilKick;
     updateHUD();
     playGunshot();
   }
+  if (
+    !G.weapon.reloading &&
+    G.weapon.infiniteAmmoTimer <= 0 &&
+    G.weapon.ammo === 0 &&
+    (G.weapon.reserve > 0 || G.weapon.reserve === Infinity)
+  ) {
     beginReload();
   }
 }

src/globals.js CHANGED Viewed

@@ -76,10 +76,20 @@ export const G = {
     // Dynamic fire-rate buff
     rofMult: 1,
     rofBuffTimer: 0,
     materials: [],
     glowT: 0
   },
   fx: { tracers: [], impacts: [], flashes: [], dusts: [], portals: [] },
   // Player grenades and preview helpers
   grenades: [],

     // Dynamic fire-rate buff
     rofMult: 1,
     rofBuffTimer: 0,
+    rofBuffTotal: 0,
+    // Infinite ammo buff
+    infiniteAmmoTimer: 0,
+    infiniteAmmoTotal: 0,
+    ammoBeforeInf: null,
+    reserveBeforeInf: null,
     materials: [],
     glowT: 0
   },
+  // Temporary movement speed buff (used by accelerator)
+  movementMult: 1,
+  movementBuffTimer: 0,
   fx: { tracers: [], impacts: [], flashes: [], dusts: [], portals: [] },
   // Player grenades and preview helpers
   grenades: [],

src/hud.js CHANGED Viewed

@@ -2,7 +2,7 @@ import { G } from './globals.js';
 import { CFG } from './config.js';
 // Cache HUD element refs and last values to minimize DOM churn
-const HUD = {
   waveEl: /** @type {HTMLElement|null} */(document.getElementById('wave')),
   scoreEl: /** @type {HTMLElement|null} */(document.getElementById('score')),
   enemiesEl: /** @type {HTMLElement|null} */(document.getElementById('enemies')),
@@ -10,6 +10,7 @@ const HUD = {
   grenadesEl: /** @type {HTMLElement|null} */(document.getElementById('grenades')),
   healthText: /** @type {HTMLElement|null} */(document.getElementById('health-text')),
   healthFill: /** @type {HTMLElement|null} */(document.getElementById('health-fill')),
   ch: {
     root: /** @type {HTMLElement|null} */(document.getElementById('crosshair')),
     left: /** @type {HTMLElement|null} */(document.getElementById('ch-left')),
@@ -34,6 +35,7 @@ const HUD = {
     enemies: -1,
     ammo: '',
     grenades: -1,
   }
 };
@@ -62,8 +64,13 @@ export function updateHUD() {
     HUD.last.enemies = G.waves.aliveCount;
     if (HUD.enemiesEl) HUD.enemiesEl.textContent = String(G.waves.aliveCount);
   }
-  const reserveText = G.weapon.reserve === Infinity ? '∞' : String(G.weapon.reserve);
-  const ammoText = `${G.weapon.ammo}/${reserveText}`;
   if (ammoText !== HUD.last.ammo) {
     HUD.last.ammo = ammoText;
     if (HUD.ammoEl) HUD.ammoEl.textContent = ammoText;
@@ -72,6 +79,65 @@ export function updateHUD() {
     HUD.last.grenades = G.grenadeCount;
     if (HUD.grenadesEl) HUD.grenadesEl.textContent = String(G.grenadeCount);
   }
 }
 export function showWaveBanner(text) {

 import { CFG } from './config.js';
 // Cache HUD element refs and last values to minimize DOM churn
+  const HUD = {
   waveEl: /** @type {HTMLElement|null} */(document.getElementById('wave')),
   scoreEl: /** @type {HTMLElement|null} */(document.getElementById('score')),
   enemiesEl: /** @type {HTMLElement|null} */(document.getElementById('enemies')),
   grenadesEl: /** @type {HTMLElement|null} */(document.getElementById('grenades')),
   healthText: /** @type {HTMLElement|null} */(document.getElementById('health-text')),
   healthFill: /** @type {HTMLElement|null} */(document.getElementById('health-fill')),
+  powerupsEl: /** @type {HTMLElement|null} */(document.getElementById('powerup-chips')),
   ch: {
     root: /** @type {HTMLElement|null} */(document.getElementById('crosshair')),
     left: /** @type {HTMLElement|null} */(document.getElementById('ch-left')),
     enemies: -1,
     ammo: '',
     grenades: -1,
+    powerupsKey: ''
   }
 };
     HUD.last.enemies = G.waves.aliveCount;
     if (HUD.enemiesEl) HUD.enemiesEl.textContent = String(G.waves.aliveCount);
   }
+  let ammoText;
+  if (G.weapon.infiniteAmmoTimer > 0) {
+    ammoText = '∞/∞';
+  } else {
+    const reserveText = G.weapon.reserve === Infinity ? '∞' : String(G.weapon.reserve);
+    ammoText = `${G.weapon.ammo}/${reserveText}`;
+  }
   if (ammoText !== HUD.last.ammo) {
     HUD.last.ammo = ammoText;
     if (HUD.ammoEl) HUD.ammoEl.textContent = ammoText;
     HUD.last.grenades = G.grenadeCount;
     if (HUD.grenadesEl) HUD.grenadesEl.textContent = String(G.grenadeCount);
   }
+  // Powerup chips next to health
+  const active = [];
+  if (G.weapon.rofBuffTimer > 0) active.push({ id: 'accelerator', name: 'ACCELERATE', color: 0xffd84d, time: G.weapon.rofBuffTimer });
+  if (G.weapon.infiniteAmmoTimer > 0) active.push({ id: 'infinite', name: 'INFINITE AMMO', color: 0x4b0082, time: G.weapon.infiniteAmmoTimer });
+  const key = active.map(a => a.id).join(',');
+  if (key !== HUD.last.powerupsKey) {
+    HUD.last.powerupsKey = key;
+    const el = HUD.powerupsEl;
+    if (el) {
+      // Clear and rebuild chips
+      el.innerHTML = '';
+      for (const p of active) {
+        const chip = document.createElement('div');
+        chip.className = 'pu-chip';
+        chip.dataset.id = p.id;
+        const r = (p.color >> 16) & 255;
+        const g = (p.color >> 8) & 255;
+        const b = p.color & 255;
+        chip.style.borderColor = `rgba(${r},${g},${b},0.75)`;
+        chip.style.boxShadow = `0 0 10px rgba(${r},${g},${b},0.35)`;
+        chip.style.backgroundColor = `rgba(${r},${g},${b},0.12)`;
+        const fill = document.createElement('div');
+        fill.className = 'pu-fill';
+        fill.style.backgroundColor = `rgba(${r},${g},${b},0.35)`;
+        fill.style.width = '100%';
+        const text = document.createElement('span');
+        text.className = 'pu-text';
+        text.textContent = p.name;
+        chip.appendChild(fill);
+        chip.appendChild(text);
+        el.appendChild(chip);
+      }
+    }
+  }
+  // Update blink state even if set didn't change
+  const el = HUD.powerupsEl;
+  if (el) {
+    for (const p of active) {
+      const chip = el.querySelector(`.pu-chip[data-id="${p.id}"]`);
+      if (chip) {
+        const shouldBlink = p.time != null && p.time <= 3;
+        if (shouldBlink) chip.classList.add('blink'); else chip.classList.remove('blink');
+        // Update progress fill width if total known
+        const total = (p.id === 'accelerator') ? (G.weapon.rofBuffTotal || 0) : (p.id === 'infinite' ? (G.weapon.infiniteAmmoTotal || 0) : 0);
+        const fill = chip.querySelector('.pu-fill');
+        if (fill && total > 0 && p.time != null) {
+          const t = Math.max(0, Math.min(1, p.time / total));
+          fill.style.width = (t * 100).toFixed(1) + '%';
+        }
+      }
+    }
+    // Also remove blink from any chips not active
+    const nodes = el.querySelectorAll('.pu-chip');
+    nodes.forEach(node => {
+      const id = node.dataset.id;
+      if (!active.find(a => a.id === id)) node.classList.remove('blink');
+    });
+  }
 }
 export function showWaveBanner(text) {

src/main.js CHANGED Viewed

@@ -191,6 +191,13 @@ function startGame() {
   G.weapon.appliedYaw = 0;
   G.weapon.rofMult = 1;
   G.weapon.rofBuffTimer = 0;
   const overlay = document.getElementById('overlay');
   if (overlay) overlay.classList.add('hidden');

   G.weapon.appliedYaw = 0;
   G.weapon.rofMult = 1;
   G.weapon.rofBuffTimer = 0;
+  G.weapon.rofBuffTotal = 0;
+  G.movementMult = 1;
+  G.movementBuffTimer = 0;
+  G.weapon.infiniteAmmoTimer = 0;
+  G.weapon.infiniteAmmoTotal = 0;
+  G.weapon.ammoBeforeInf = null;
+  G.weapon.reserveBeforeInf = null;
   const overlay = document.getElementById('overlay');
   if (overlay) overlay.classList.add('hidden');

src/pickups.js CHANGED Viewed

@@ -106,6 +106,66 @@ function makeAcceleratorMesh() {
   return g;
 }
 // Spawn N accelerator powerups at random world locations
 // They float near ground and rotate, granting x2 ROF for 20s on pickup
 export function spawnAccelerators(count) {
@@ -166,6 +226,62 @@ export function spawnAccelerators(count) {
   }
 }
 // Spawns N small glowing green health orbs around a position
 export function spawnHealthOrbs(center, count) {
   // Allow larger drops (e.g., golem 15–20); cap to keep it reasonable
@@ -341,6 +457,23 @@ export function updatePickups(delta) {
         // Apply/refresh ROF buff: x2 for 20s
         G.weapon.rofMult = 2;
         G.weapon.rofBuffTimer = 20;
         // Audio cue for powerup pickup
         try { playPowerupPickup(); } catch {}
       }

   return g;
 }
+// Infinite ammo (indigo bullet) shared resources
+const INF_COLOR = 0x4b0082; // indigo
+function makeInfiniteAmmoMesh() {
+  const g = new THREE.Group();
+  // Bullet body: cylinder + conical tip
+  const bodyMat = new THREE.MeshBasicMaterial({ color: INF_COLOR, fog: false });
+  const bodyGeo = new THREE.CylinderGeometry(0.10, 0.10, 0.52, 16, 1);
+  const body = new THREE.Mesh(bodyGeo, bodyMat);
+  body.position.set(0, 0.0, 0);
+  g.add(body);
+  const tipGeo = new THREE.ConeGeometry(0.10, 0.20, 16);
+  const tip = new THREE.Mesh(tipGeo, bodyMat);
+  tip.position.set(0, 0.36, 0);
+  g.add(tip);
+  // Base cap
+  const baseMat = new THREE.MeshBasicMaterial({ color: 0x221133, fog: false });
+  const baseGeo = new THREE.CylinderGeometry(0.11, 0.11, 0.06, 16, 1);
+  const base = new THREE.Mesh(baseGeo, baseMat);
+  base.position.set(0, -0.29, 0);
+  g.add(base);
+  // Glow sprites similar to accelerator
+  const innerMat = new THREE.SpriteMaterial({
+    map: GLOW_TEX,
+    color: INF_COLOR,
+    transparent: true,
+    opacity: 0.45,
+    depthWrite: false,
+    depthTest: true,
+    blending: THREE.NormalBlending,
+    fog: false
+  });
+  const outerMat = new THREE.SpriteMaterial({
+    map: GLOW_TEX,
+    color: INF_COLOR,
+    transparent: true,
+    opacity: 0.45,
+    depthWrite: false,
+    depthTest: true,
+    blending: THREE.AdditiveBlending,
+    fog: false
+  });
+  const inner = new THREE.Sprite(innerMat);
+  const outer = new THREE.Sprite(outerMat);
+  inner.scale.set(0.7, 0.7, 1);
+  outer.scale.set(1.7, 1.7, 1);
+  g.add(outer);
+  g.add(inner);
+  g.castShadow = false;
+  g.receiveShadow = false;
+  g.userData.glowInner = inner;
+  g.userData.glowOuter = outer;
+  return g;
+}
 // Spawn N accelerator powerups at random world locations
 // They float near ground and rotate, granting x2 ROF for 20s on pickup
 export function spawnAccelerators(count) {
   }
 }
+// Spawn N infinite-ammo powerups (indigo bullet) scattered around waves anchor
+export function spawnInfiniteAmmo(count) {
+  const n = Math.max(0, Math.min(3, Math.floor(count)));
+  const half = CFG.forestSize / 2;
+  const margin = 12;
+  function sampleAroundAnchor() {
+    const a = G.waves?.spawnAnchor;
+    if (!a) return null;
+    const Rmin = 8;
+    const Rmax = 26;
+    const u = G.random();
+    const r = Math.sqrt(u * (Rmax * Rmax - Rmin * Rmin) + Rmin * Rmin);
+    const t = G.random() * Math.PI * 2;
+    let x = a.x + Math.cos(t) * r;
+    let z = a.z + Math.sin(t) * r;
+    x = Math.max(-half + margin, Math.min(half - margin, x));
+    z = Math.max(-half + margin, Math.min(half - margin, z));
+    return { x, z };
+  }
+  function sampleGlobal() {
+    const clear = (CFG.clearRadius || 12) + 4;
+    for (let tries = 0; tries < 10; tries++) {
+      const x = (G.random() * 2 - 1) * (half - margin);
+      const z = (G.random() * 2 - 1) * (half - margin);
+      if (Math.hypot(x, z) < clear) continue;
+      return { x, z };
+    }
+    return { x: (G.random() * 2 - 1) * (half - margin), z: (G.random() * 2 - 1) * (half - margin) };
+  }
+  for (let i = 0; i < n; i++) {
+    const pt = sampleAroundAnchor() || sampleGlobal();
+    const gy = getTerrainHeight(pt.x, pt.z);
+    const group = makeInfiniteAmmoMesh();
+    const baseY = gy + 0.60;
+    group.position.set(pt.x, baseY + 0.14, pt.z);
+    group.scale.setScalar(1.5); // match accelerator size
+    G.scene.add(group);
+    const p = {
+      type: 'infiniteAmmo',
+      mesh: group,
+      pos: group.position,
+      baseY,
+      bobT: G.random() * Math.PI * 2,
+      rotSpeed: 2.8 + G.random() * 1.2,
+      glowInner: group.userData.glowInner,
+      glowOuter: group.userData.glowOuter,
+      glowT: G.random() * Math.PI * 2
+    };
+    G.powerups.push(p);
+  }
+}
 // Spawns N small glowing green health orbs around a position
 export function spawnHealthOrbs(center, count) {
   // Allow larger drops (e.g., golem 15–20); cap to keep it reasonable
         // Apply/refresh ROF buff: x2 for 20s
         G.weapon.rofMult = 2;
         G.weapon.rofBuffTimer = 20;
+        G.weapon.rofBuffTotal = 20;
+        // Movement speed buff: +50% for 20s
+        G.movementMult = 1.5;
+        G.movementBuffTimer = 20;
+        // Audio cue for powerup pickup
+        try { playPowerupPickup(); } catch {}
+      } else if (p.type === 'infiniteAmmo') {
+        // Apply/refresh infinite ammo for 12s
+        if (G.weapon.infiniteAmmoTimer <= 0) {
+          G.weapon.ammoBeforeInf = G.weapon.ammo;
+          G.weapon.reserveBeforeInf = G.weapon.reserve;
+        }
+        G.weapon.infiniteAmmoTimer = 12;
+        G.weapon.infiniteAmmoTotal = 12;
+        // Cancel any reload in progress
+        G.weapon.reloading = false;
+        G.weapon.reloadTimer = 0;
         // Audio cue for powerup pickup
         try { playPowerupPickup(); } catch {}
       }

src/player.js CHANGED Viewed

@@ -49,6 +49,15 @@ export function updatePlayer(delta) {
   const P = G.player;
   const M = CFG.player.move;
   // Forward/right in the horizontal plane
   G.camera.getWorldDirection(FWD);
   FWD.y = 0; FWD.normalize();
@@ -64,7 +73,7 @@ export function updatePlayer(delta) {
   if (wishLen > 0.0001) { wishX /= wishLen; wishZ /= wishLen; }
   // Desired speeds
-  let baseSpeed = P.speed * (G.input.sprint ? CFG.player.sprintMult : 1);
   const crouchMult = (CFG.player.crouchMult || 1);
   // If not sliding, crouch reduces speed
   if (G.input.crouch && !P.sliding) baseSpeed *= crouchMult;

   const P = G.player;
   const M = CFG.player.move;
+  // Handle timed movement buff
+  if (G.movementBuffTimer > 0) {
+    G.movementBuffTimer -= delta;
+    if (G.movementBuffTimer <= 0) {
+      G.movementBuffTimer = 0;
+      G.movementMult = 1;
+    }
+  }
   // Forward/right in the horizontal plane
   G.camera.getWorldDirection(FWD);
   FWD.y = 0; FWD.normalize();
   if (wishLen > 0.0001) { wishX /= wishLen; wishZ /= wishLen; }
   // Desired speeds
+  let baseSpeed = P.speed * (G.movementMult || 1) * (G.input.sprint ? CFG.player.sprintMult : 1);
   const crouchMult = (CFG.player.crouchMult || 1);
   // If not sliding, crouch reduces speed
   if (G.input.crouch && !P.sliding) baseSpeed *= crouchMult;

src/waves.js CHANGED Viewed

@@ -4,7 +4,7 @@ import { G } from './globals.js';
 import { getTerrainHeight } from './world.js';
 import { showWaveBanner } from './hud.js';
 import { spawnEnemy } from './enemies.js';
-import { spawnAccelerators } from './pickups.js';
 export function startNextWave() {
   const waveCount = Math.min(
@@ -39,6 +39,9 @@ export function startNextWave() {
   // Spawn 0..2 accelerator powerups at random locations
   const accelCount = Math.floor(G.random() * 3); // 0,1,2
   if (accelCount > 0) spawnAccelerators(accelCount);
 }
 export function updateWaves(delta) {

 import { getTerrainHeight } from './world.js';
 import { showWaveBanner } from './hud.js';
 import { spawnEnemy } from './enemies.js';
+import { spawnAccelerators, spawnInfiniteAmmo } from './pickups.js';
 export function startNextWave() {
   const waveCount = Math.min(
   // Spawn 0..2 accelerator powerups at random locations
   const accelCount = Math.floor(G.random() * 3); // 0,1,2
   if (accelCount > 0) spawnAccelerators(accelCount);
+  // Spawn at least 1 infinite ammo on wave 1 for visibility, then occasionally
+  const infCount = (G.waves.current === 1) ? 1 : Math.floor(G.random() * 2);
+  if (infCount > 0) spawnInfiniteAmmo(infCount);
 }
 export function updateWaves(delta) {

src/weapon.js CHANGED Viewed

@@ -139,6 +139,7 @@ export function setupWeapon() {
 export function beginReload() {
   if (G.weapon.reloading) return;
   if (G.weapon.ammo >= CFG.gun.magSize) return;
   G.weapon.reloading = true;
   G.weapon.reloadTimer = CFG.gun.reloadTime;
@@ -176,7 +177,7 @@ export function updateWeapon(delta) {
   G.weapon.spread += (target - G.weapon.spread) * k;
   let reloadTilt = 0;
-  if (G.weapon.reloading) {
     G.weapon.reloadTimer -= delta;
     reloadTilt = 0.4 * Math.sin(Math.min(1, 1 - G.weapon.reloadTimer / CFG.gun.reloadTime) * Math.PI);
     if (G.weapon.reloadTimer <= 0) {
@@ -238,7 +239,7 @@ export function updateWeapon(delta) {
   G.weapon.appliedPitch = G.weapon.viewPitch;
   G.weapon.appliedYaw = G.weapon.viewYaw;
-  // ----- Temporary fire-rate buff + weapon glow -----
   if (G.weapon.rofBuffTimer > 0) {
     G.weapon.rofBuffTimer -= delta;
     if (G.weapon.rofBuffTimer <= 0) {
@@ -247,8 +248,27 @@ export function updateWeapon(delta) {
     }
   }
-  const active = G.weapon.rofBuffTimer > 0;
-  // Pulse emissive when active (subtle)
   const mats = G.weapon.materials || [];
   if (active) {
     G.weapon.glowT += delta * 3.0;
@@ -256,7 +276,9 @@ export function updateWeapon(delta) {
     for (let i = 0; i < mats.length; i++) {
       const m = mats[i];
       if (!m || !m.isMaterial) continue;
-      if (m.emissive) m.emissive.setHex(0xffd84d);
       if ('emissiveIntensity' in m) m.emissiveIntensity = 0.8 + pulse * 0.6;
     }
   } else {

 export function beginReload() {
   if (G.weapon.reloading) return;
+  if (G.weapon.infiniteAmmoTimer > 0) return;
   if (G.weapon.ammo >= CFG.gun.magSize) return;
   G.weapon.reloading = true;
   G.weapon.reloadTimer = CFG.gun.reloadTime;
   G.weapon.spread += (target - G.weapon.spread) * k;
   let reloadTilt = 0;
+  if (G.weapon.reloading && G.weapon.infiniteAmmoTimer <= 0) {
     G.weapon.reloadTimer -= delta;
     reloadTilt = 0.4 * Math.sin(Math.min(1, 1 - G.weapon.reloadTimer / CFG.gun.reloadTime) * Math.PI);
     if (G.weapon.reloadTimer <= 0) {
   G.weapon.appliedPitch = G.weapon.viewPitch;
   G.weapon.appliedYaw = G.weapon.viewYaw;
+  // ----- Temporary fire-rate buff -----
   if (G.weapon.rofBuffTimer > 0) {
     G.weapon.rofBuffTimer -= delta;
     if (G.weapon.rofBuffTimer <= 0) {
     }
   }
+  // ----- Infinite ammo buff timer and restore -----
+  if (G.weapon.infiniteAmmoTimer > 0) {
+    G.weapon.infiniteAmmoTimer -= delta;
+    if (G.weapon.infiniteAmmoTimer <= 0) {
+      G.weapon.infiniteAmmoTimer = 0;
+      // Restore original ammo/reserve values if saved
+      if (G.weapon.ammoBeforeInf != null) {
+        G.weapon.ammo = G.weapon.ammoBeforeInf;
+        G.weapon.ammoBeforeInf = null;
+      }
+      if (G.weapon.reserveBeforeInf != null) {
+        G.weapon.reserve = G.weapon.reserveBeforeInf;
+        G.weapon.reserveBeforeInf = null;
+      }
+      updateHUD();
+    }
+  }
+  // ----- Weapon glow while buffs are active -----
+  const active = (G.weapon.rofBuffTimer > 0) || (G.weapon.infiniteAmmoTimer > 0);
+  // Pulse emissive when active (subtle), color depends on buff
   const mats = G.weapon.materials || [];
   if (active) {
     G.weapon.glowT += delta * 3.0;
     for (let i = 0; i < mats.length; i++) {
       const m = mats[i];
       if (!m || !m.isMaterial) continue;
+      // Indigo for infinite ammo, yellow for accelerator
+      const color = (G.weapon.infiniteAmmoTimer > 0) ? 0x4b0082 : 0xffd84d;
+      if (m.emissive) m.emissive.setHex(color);
       if ('emissiveIntensity' in m) m.emissiveIntensity = 0.8 + pulse * 0.6;
     }
   } else {