Spaces:

bbc123321
/

battle-zone-royale

Running

App Files Files Community

bbc123321 commited on Oct 14, 2025

Commit

7da48a4

verified ·

1 Parent(s): c2c84b6

Manual changes saved

Browse files

Files changed (1) hide show

index.html +210 -80

index.html CHANGED Viewed

@@ -3,7 +3,7 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>BattleZone Royale - Fixed</title>
   <script src="https://cdn.tailwindcss.com"></script>
   <script src="https://unpkg.com/feather-icons"></script>
   <style>
@@ -169,37 +169,27 @@
     // Helper: equip slot index (or -1 for pickaxe)
     function equipSlot(index){
-      // index: -1 for pickaxe, 0-4 for inventory
       player.equippedIndex = index;
-      // if equipping a slot that is empty, still equip it (shows nothing but slot is 'equipped')
       updateHUD();
     }
     window.addEventListener('keydown',(e)=>{
       const k = e.key.toLowerCase();
-      // Movement & action keys only processed when game active
       if (gameActive){
         if (k in keys) keys[k] = true;
         if (['1','2','3','4','5'].includes(k)) {
           const idx = parseInt(k)-1;
           player.selectedSlot = idx;
-          // Equip the pressed slot (this ensures weapons swap immediately)
           equipSlot(idx);
           updateHUD();
         }
         if (k === 'f') {
-          // toggle between pickaxe and selected slot
           if (player.equippedIndex === player.selectedSlot) equipSlot(-1);
           else equipSlot(player.selectedSlot);
           updateHUD();
         }
         if (k === 'r') keys.r = true;
       } else {
-        // allow selection on landing screen
         if (['1','2','3','4','5'].includes(k)) {
           player.selectedSlot = parseInt(k)-1;
           updateHUD();
@@ -294,7 +284,14 @@
         enemies.push({
           id:'e'+i, x:ex, y:ey, radius:14, angle:0, speed:110+rand(-20,20),
           health: 80 + randInt(0,40), lastMelee:0, meleeRate:800 + randInt(-200,200),
-          roamTimer: rand(0,3), weaponPickup:null, lastShot:0
         });
       }
       updatePlayerCount();
@@ -312,17 +309,14 @@
         slot.addEventListener('click', ()=> {
           const idx = parseInt(slot.dataset.index);
           player.selectedSlot = idx;
-          // if clicking currently equipped slot -> toggle unequip to pickaxe
           if (player.equippedIndex === idx) equipSlot(-1);
           else equipSlot(idx);
           updateHUD();
         });
         hudGear.appendChild(slot);
       }
-      // pickaxe click toggles equip (explicit: clicking pickaxe equips/unequips it)
       pickaxeSlot.onclick = () => {
         if (player.equippedIndex === -1) {
-          // pickaxe already equipped -> equip selected slot instead
           equipSlot(player.selectedSlot);
         } else {
           equipSlot(-1);
@@ -346,7 +340,6 @@
         else if (it.type === 'materials') s.innerHTML = `<div style="font-size:11px">Mat</div><div class="medkit-count">x${it.amount}</div>`;
         else s.innerHTML = 'Item';
       });
-      // pickaxe highlight when equipped
       pickaxeSlot.classList.toggle('selected', player.equippedIndex === -1);
       pickaxeSlot.title = (player.equippedIndex === -1) ? 'Pickaxe (equipped)' : 'Pickaxe (click or press F to equip)';
       feather.replace();
@@ -367,7 +360,6 @@
       if (!weaponObj || (typeof weaponObj.ammoInMag === 'number' && weaponObj.ammoInMag <= 0)) return false;
       const speed = 1100;
       const angle = Math.atan2(targetY-originY, targetX-originX);
-      // decrement ammo if present
       if (typeof weaponObj.ammoInMag === 'number') weaponObj.ammoInMag -= 1;
       const dmg = weaponObj.weapon && weaponObj.weapon.dmg ? weaponObj.weapon.dmg : (weaponObj.dmg || 10);
       const color = (weaponObj.weapon && weaponObj.weapon.color) || weaponObj.color || '#fff';
@@ -379,16 +371,20 @@
       return true;
     }
-    function reloadEquipped(){
-      let item = null;
-      if (player.equippedIndex >= 0) item = player.inventory[player.equippedIndex];
-      else item = player.inventory[player.selectedSlot];
       if (!item || item.type !== 'weapon') return;
       const need = item.weapon.magSize - item.ammoInMag;
       if (need <= 0 || item.ammoReserve <= 0) return;
       const take = Math.min(need, item.ammoReserve);
       item.ammoInMag += take;
       item.ammoReserve -= take;
       updateHUD();
     }
@@ -396,7 +392,6 @@
       const now = performance.now();
       if (now - player.lastMelee < 350) return;
       player.lastMelee = now;
-      // damage enemies and objects (pickaxe)
       for (const e of enemies){
         if (e.health <= 0) continue;
         const d = Math.hypot(e.x - player.x, e.y - player.y);
@@ -413,9 +408,7 @@
     }
     // Interact: use medkit in selected slot OR loot chests / pickup items.
-    // Builds (objects) are NOT harvested via E anymore; only via pickaxe melee or shooting.
     function interactNearby(){
-      // use medkit in selected slot
       const sel = player.selectedSlot;
       const selItem = player.inventory[sel];
       if (selItem && selItem.type === 'medkit'){
@@ -427,13 +420,11 @@
       }
       const range = 56;
-      // chests
       for (const chest of chests){
         if (chest.opened) continue;
         const d = Math.hypot(chest.x - player.x, chest.y - player.y);
         if (d < range){
           chest.opened = true;
-          // spawn pickup on ground (weapon/medkit/materials/ammo)
           const loot = chest.loot;
           const px = chest.x + rand(-20,20), py = chest.y + rand(-20,20);
           if (loot.type === 'weapon'){
@@ -451,7 +442,6 @@
         }
       }
-      // pick up ground pickups if near
       for (let i=pickups.length-1;i>=0;i--){
         const p = pickups[i];
         const d = Math.hypot(p.x - player.x, p.y - player.y);
@@ -466,7 +456,6 @@
     function pickupCollect(p){
       if (p.type === 'weapon'){
-        // place in first empty or merge ammo
         let merged=false;
         for (let s=0;s<5;s++){
           const it = player.inventory[s];
@@ -488,13 +477,77 @@
       } else if (p.type === 'materials'){
         player.materials += p.amount;
       } else if (p.type === 'ammo'){
-        // add ammo to any weapon or to materials as fallback
         let added=false;
         for (let s=0;s<5;s++){ const it=player.inventory[s]; if (it && it.type==='weapon'){ it.ammoReserve += p.amount; added=true; break; } }
         if (!added) player.materials += p.amount;
       }
     }
     // Build Q
     function tryBuild(){
       if (player.materials < 10) return;
@@ -504,8 +557,17 @@
       objects.push({ x:bx, y:by, type:'wall', hp:160, maxHp:160, dead:false });
       updateHUD();
     }
-    // LOS helper
     function hasLineOfSight(x1,y1,x2,y2){
       const vx = x2 - x1, vy = y2 - y1;
       const vlen2 = vx*vx + vy*vy;
@@ -523,8 +585,26 @@
       }
       return true;
     }
-    // Bullets update: bullets do NOT break wood/stone (only walls)
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
         const b = bullets[i];
@@ -566,7 +646,6 @@
           for (const chest of chests){
             if (!chest.opened && Math.hypot(chest.x - b.x, chest.y - b.y) < 18){
               chest.opened = true;
-              // spawn pickup from chest
               const loot = chest.loot;
               const px = chest.x + rand(-20,20), py = chest.y + rand(-20,20);
               if (loot.type === 'weapon') pickups.push({ x:px, y:py, type:'weapon', weapon: makeWeaponProto(loot.weapon), ammoInMag: loot.weapon.magSize || 12, ammoReserve: loot.weapon.startReserve || (loot.weapon.magSize*2 || 24) });
@@ -581,12 +660,13 @@
       }
     }
-    // Enemies: can loot chests; shooting now can happen from any distance (LOS required).
     function updateEnemies(dt, now){
       for (const e of enemies){
         if (e.health <= 0) continue;
         e.roamTimer -= dt;
-        // choose target (player or nearby enemy)
         let target = player;
         let bestDist = Math.hypot(player.x - e.x, player.y - e.y);
         for (const other of enemies){
@@ -594,7 +674,8 @@
           const d = Math.hypot(other.x - e.x, other.y - e.y);
           if (d < bestDist && Math.random() < 0.6){ bestDist = d; target = other; }
         }
-        // move
         if (bestDist < 900 || e.roamTimer <= 0){
           e.angle = Math.atan2(target.y - e.y, target.x - e.x);
           const avoid = e.health < 20 && Math.random() < 0.6;
@@ -623,22 +704,81 @@
           }
         }
-        // enemies pick up nearby pickups automatically
         for (let i=pickups.length-1;i>=0;i--){
           const p = pickups[i];
           if (Math.hypot(p.x - e.x, p.y - e.y) < 18){
-            if (p.type === 'weapon' && !e.weaponPickup){
-              e.weaponPickup = { weapon:p.weapon, ammoInMag:p.ammoInMag, ammoReserve:p.ammoReserve };
-              pickups.splice(i,1);
-            } else if (p.type === 'medkit'){
-              if (e.health < 60) e.health = Math.min(120, e.health + 50);
-              pickups.splice(i,1);
-            } else pickups.splice(i,1);
           }
         }
-        // attack: melee if close; ranged if they have weapon and LOS (no distance cap)
         const distToTarget = Math.hypot(target.x - e.x, target.y - e.y);
         if (distToTarget < 34 && now - e.lastMelee > e.meleeRate){
           e.lastMelee = now;
           const dmg = 10 + randInt(0,8);
@@ -649,13 +789,16 @@
             target.health -= dmg;
             if (target.health <= 0) target.health = 0;
           }
-        } else if (e.weaponPickup && now - (e.lastShot||0) > (e.weaponPickup.weapon.rate || 300)){
-          // can shoot from any distance as long as LOS and ammo
-          if (hasLineOfSight(e.x, e.y, target.x, target.y) && e.weaponPickup.ammoInMag > 0){
-            e.lastShot = now;
-            e.weaponPickup.ammoInMag -= 1;
-            const angle = Math.atan2(target.y - e.y, target.x - e.x);
-            shootBullet(e.x + Math.cos(angle)*12, e.y + Math.sin(angle)*12, target.x + (Math.random()-0.5)*6, target.y + (Math.random()-0.5)*6, e.weaponPickup, e.id);
           }
         }
       }
@@ -669,7 +812,6 @@
       if (!storm.active) return;
       storm.radius -= storm.closingSpeed * dt * 60;
       if (storm.radius < 120) storm.radius = 120;
-      // damage player
       if (playerInStorm()){
         const prog = 1 - storm.radius / storm.maxRadius;
         const rate = storm.damagePerSecond * (1 + prog*4);
@@ -680,7 +822,6 @@
           if (player.health <= 0){ player.health = 0; playerDeath(); }
         }
       } else stormDamageAccumulator = 0;
-      // damage enemies
       for (const e of enemies){
         if (e.health <= 0) continue;
         const d = Math.hypot(e.x - storm.centerX, e.y - storm.centerY);
@@ -695,17 +836,14 @@
     function updatePlayerCount(){
       const aliveEnemies = enemies.filter(e => e.health > 0).length;
       document.getElementById('playerCount').textContent = `${1 + aliveEnemies}/20`;
-      // Victory check: if all enemies dead and player alive & game active -> show victory
       if (gameActive && aliveEnemies === 0 && player.health > 0){
-        // stop game loop and show victory UI
         gameActive = false;
         victoryScreen.classList.remove('hidden');
         clearInterval(timerInterval);
       }
     }
-    // Drawing (chests no text; glow; pickups visible)
     function drawWorld(){
       const TILE = 600;
       const cols = Math.ceil(WORLD.width / TILE);
@@ -743,6 +881,12 @@
         ctx.fillStyle='rgba(0,0,0,0.18)'; ctx.beginPath(); ctx.ellipse(s.x,s.y+8,18,8,0,0,Math.PI*2); ctx.fill();
         ctx.fillStyle = obj.type==='wood'? '#6b3b1a' : (obj.type==='stone'? '#6b6b6b' : '#8b5a32');
         ctx.fillRect(s.x-12, s.y-h, 24, h);
         ctx.restore();
       }
     }
@@ -796,9 +940,12 @@
         ctx.fillStyle='rgba(0,0,0,0.18)'; ctx.beginPath(); ctx.ellipse(0,12,14,6,0,0,Math.PI*2); ctx.fill();
         ctx.fillStyle='#ff6b6b'; ctx.beginPath(); ctx.moveTo(12,0); ctx.lineTo(-10,-8); ctx.lineTo(-10,8); ctx.closePath(); ctx.fill();
         ctx.fillStyle='rgba(0,0,0,0.6)'; ctx.fillRect(-18,-22,36,6);
-        const hpPct = Math.max(0, e.health/120);
         ctx.fillStyle='#ff6b6b'; ctx.fillRect(-18,-22,36*hpPct,6);
-        if (e.weaponPickup) { ctx.fillStyle = e.weaponPickup.weapon.color || '#fff'; ctx.fillRect(-10,12,8,6); }
         ctx.restore();
       }
     }
@@ -824,12 +971,9 @@
       const s = worldToScreen(player.x,player.y);
       ctx.save();
       ctx.translate(s.x,s.y); ctx.rotate(player.angle);
-      // shadow
       ctx.fillStyle='rgba(0,0,0,0.25)'; ctx.beginPath(); ctx.ellipse(0,14,18,8,0,0,Math.PI*2); ctx.fill();
-      // body
       ctx.fillStyle='yellow'; ctx.beginPath(); ctx.moveTo(18,0); ctx.lineTo(-12,-10); ctx.lineTo(-12,10); ctx.closePath(); ctx.fill();
-      // draw currently held item: pickaxe or weapon
       let activeWeaponItem = null;
       if (player.equippedIndex >= 0) activeWeaponItem = player.inventory[player.equippedIndex];
       else {
@@ -838,27 +982,22 @@
       }
       if (player.equippedIndex === -1){
-        // draw pickaxe in right hand
         ctx.save();
         ctx.translate(12, 6);
         ctx.rotate(-0.2);
-        // handle
         ctx.fillStyle = '#8b6b4a';
         ctx.fillRect(-2,0,4,18);
-        // head
         ctx.fillStyle = '#cfcfcf';
         ctx.fillRect(-8,-6,12,6);
         ctx.restore();
       } else if (activeWeaponItem && activeWeaponItem.type === 'weapon'){
-        // draw weapon (simple shape) in right hand
         ctx.save();
         ctx.translate(12, 2);
         ctx.rotate(-0.05);
         ctx.fillStyle = activeWeaponItem.weapon.color || '#fff';
-        ctx.fillRect(0,-4,26,8); // body
         ctx.fillStyle = '#222';
-        ctx.fillRect(18,-2,8,4); // muzzle or detail
-        // small magazine indicator with ammo fraction
         const magPct = Math.max(0, activeWeaponItem.ammoInMag / activeWeaponItem.weapon.magSize);
         ctx.fillStyle = 'rgba(0,0,0,0.35)';
         ctx.fillRect(4,6,18,4);
@@ -869,10 +1008,7 @@
       ctx.restore();
     }
-    // Do not draw the yellow crosshair - rely on native cursor (one crosshair only)
-    function drawCrosshair(){
-      // no-op: native cursor is used (black/system crosshair)
-    }
     // Main loop
     let lastTime = 0;
@@ -897,10 +1033,9 @@
       mouse.worldX = mouse.canvasX + camera.x;
       mouse.worldY = mouse.canvasY + camera.y;
-      // Ensure the player angle always faces the current mouse world position (covers camera/player movement)
       player.angle = Math.atan2(mouse.worldY - player.y, mouse.worldX - player.x);
-      // determine active weapon: prefer equipped slot if >=0; else if selectedSlot has weapon allow firing from selected slot; if equippedIndex === -1 it's pickaxe
       let activeWeaponItem = null;
       if (player.equippedIndex >= 0) activeWeaponItem = player.inventory[player.equippedIndex];
       else {
@@ -911,7 +1046,6 @@
       // shooting or melee on mouse down
       if (mouse.down){
         if (player.equippedIndex === -1){
-          // pickaxe melee
           playerMeleeHit();
         } else if (activeWeaponItem && activeWeaponItem.type === 'weapon'){
           const now = performance.now();
@@ -920,8 +1054,6 @@
               player.lastShot = now;
               shootBullet(player.x + Math.cos(player.angle)*18, player.y + Math.sin(player.angle)*18, mouse.worldX, mouse.worldY, activeWeaponItem, 'player');
               updateHUD();
-            } else {
-              // out of mag - do nothing until reload with R
             }
           }
         }
@@ -957,7 +1089,6 @@
       drawWorld(); drawObjects(); drawChests(); drawPickups(); drawEnemies(); drawBullets(); drawPlayer(); drawCrosshair();
       updateHUD();
-      // storm warning
       if (storm.active && playerInStorm()) stormWarning.classList.remove('hidden'); else stormWarning.classList.add('hidden');
       requestAnimationFrame(gameLoop);
@@ -987,7 +1118,6 @@
       initHUD();
       cameraUpdate();
-      // timer & storm: pick random center at activation
       gameTime = 300; storm.active = false; storm.radius = storm.maxRadius;
       document.getElementById('gameTimer').textContent = '5:00';
       timerInterval && clearInterval(timerInterval);

 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>BattleZone Royale - Enemies Improved</title>
   <script src="https://cdn.tailwindcss.com"></script>
   <script src="https://unpkg.com/feather-icons"></script>
   <style>
     // Helper: equip slot index (or -1 for pickaxe)
     function equipSlot(index){
       player.equippedIndex = index;
       updateHUD();
     }
     window.addEventListener('keydown',(e)=>{
       const k = e.key.toLowerCase();
       if (gameActive){
         if (k in keys) keys[k] = true;
         if (['1','2','3','4','5'].includes(k)) {
           const idx = parseInt(k)-1;
           player.selectedSlot = idx;
           equipSlot(idx);
           updateHUD();
         }
         if (k === 'f') {
           if (player.equippedIndex === player.selectedSlot) equipSlot(-1);
           else equipSlot(player.selectedSlot);
           updateHUD();
         }
         if (k === 'r') keys.r = true;
       } else {
         if (['1','2','3','4','5'].includes(k)) {
           player.selectedSlot = parseInt(k)-1;
           updateHUD();
         enemies.push({
           id:'e'+i, x:ex, y:ey, radius:14, angle:0, speed:110+rand(-20,20),
           health: 80 + randInt(0,40), lastMelee:0, meleeRate:800 + randInt(-200,200),
+          roamTimer: rand(0,3),
+          // new enemy-specific fields:
+          inventory: [null,null,null,null,null],
+          selectedSlot: 0,
+          equippedIndex: -1, // -1 = pickaxe
+          materials: 0,
+          lastShot:0,
+          reloadingUntil: 0
         });
       }
       updatePlayerCount();
         slot.addEventListener('click', ()=> {
           const idx = parseInt(slot.dataset.index);
           player.selectedSlot = idx;
           if (player.equippedIndex === idx) equipSlot(-1);
           else equipSlot(idx);
           updateHUD();
         });
         hudGear.appendChild(slot);
       }
       pickaxeSlot.onclick = () => {
         if (player.equippedIndex === -1) {
           equipSlot(player.selectedSlot);
         } else {
           equipSlot(-1);
         else if (it.type === 'materials') s.innerHTML = `<div style="font-size:11px">Mat</div><div class="medkit-count">x${it.amount}</div>`;
         else s.innerHTML = 'Item';
       });
       pickaxeSlot.classList.toggle('selected', player.equippedIndex === -1);
       pickaxeSlot.title = (player.equippedIndex === -1) ? 'Pickaxe (equipped)' : 'Pickaxe (click or press F to equip)';
       feather.replace();
       if (!weaponObj || (typeof weaponObj.ammoInMag === 'number' && weaponObj.ammoInMag <= 0)) return false;
       const speed = 1100;
       const angle = Math.atan2(targetY-originY, targetX-originX);
       if (typeof weaponObj.ammoInMag === 'number') weaponObj.ammoInMag -= 1;
       const dmg = weaponObj.weapon && weaponObj.weapon.dmg ? weaponObj.weapon.dmg : (weaponObj.dmg || 10);
       const color = (weaponObj.weapon && weaponObj.weapon.color) || weaponObj.color || '#fff';
       return true;
     }
+    function reloadItem(item){
       if (!item || item.type !== 'weapon') return;
       const need = item.weapon.magSize - item.ammoInMag;
       if (need <= 0 || item.ammoReserve <= 0) return;
       const take = Math.min(need, item.ammoReserve);
       item.ammoInMag += take;
       item.ammoReserve -= take;
+    }
+    function reloadEquipped(){
+      let item = null;
+      if (player.equippedIndex >= 0) item = player.inventory[player.equippedIndex];
+      else item = player.inventory[player.selectedSlot];
+      reloadItem(item);
       updateHUD();
     }
       const now = performance.now();
       if (now - player.lastMelee < 350) return;
       player.lastMelee = now;
       for (const e of enemies){
         if (e.health <= 0) continue;
         const d = Math.hypot(e.x - player.x, e.y - player.y);
     }
     // Interact: use medkit in selected slot OR loot chests / pickup items.
     function interactNearby(){
       const sel = player.selectedSlot;
       const selItem = player.inventory[sel];
       if (selItem && selItem.type === 'medkit'){
       }
       const range = 56;
       for (const chest of chests){
         if (chest.opened) continue;
         const d = Math.hypot(chest.x - player.x, chest.y - player.y);
         if (d < range){
           chest.opened = true;
           const loot = chest.loot;
           const px = chest.x + rand(-20,20), py = chest.y + rand(-20,20);
           if (loot.type === 'weapon'){
         }
       }
       for (let i=pickups.length-1;i>=0;i--){
         const p = pickups[i];
         const d = Math.hypot(p.x - player.x, p.y - player.y);
     function pickupCollect(p){
       if (p.type === 'weapon'){
         let merged=false;
         for (let s=0;s<5;s++){
           const it = player.inventory[s];
       } else if (p.type === 'materials'){
         player.materials += p.amount;
       } else if (p.type === 'ammo'){
         let added=false;
         for (let s=0;s<5;s++){ const it=player.inventory[s]; if (it && it.type==='weapon'){ it.ammoReserve += p.amount; added=true; break; } }
         if (!added) player.materials += p.amount;
       }
     }
+    // Enemy helpers: equip best weapon, reload, collect pickups
+    function enemyEquipBestWeapon(e){
+      // choose weapon with highest effective DPS (approx = dmg / rate)
+      let bestIdx = -1;
+      let bestScore = -Infinity;
+      for (let i=0;i<5;i++){
+        const it = e.inventory[i];
+        if (it && it.type === 'weapon'){
+          const score = (it.weapon.dmg || 1) / (it.weapon.rate || 300);
+          if (score > bestScore){ bestScore = score; bestIdx = i; }
+        }
+      }
+      if (bestIdx !== -1) e.equippedIndex = bestIdx;
+    }
+    function enemyPickupCollect(e, p){
+      if (p.type === 'weapon'){
+        // try to merge into existing same weapon
+        for (let s=0;s<5;s++){
+          const it = e.inventory[s];
+          if (it && it.type==='weapon' && it.weapon.name === p.weapon.name){
+            it.ammoReserve += p.ammoReserve;
+            it.ammoInMag = Math.min(it.weapon.magSize, it.ammoInMag + p.ammoInMag);
+            return;
+          }
+        }
+        // place in empty slot
+        for (let s=0;s<5;s++){
+          if (!e.inventory[s]) { e.inventory[s] = { type:'weapon', weapon:p.weapon, ammoInMag:p.ammoInMag, ammoReserve:p.ammoReserve }; enemyEquipBestWeapon(e); return; }
+        }
+        // replace worst weapon if pickup is better
+        let worstIdx = -1, worstScore = Infinity;
+        const pickupScore = (p.weapon.dmg || 1) / (p.weapon.rate || 300);
+        for (let s=0;s<5;s++){
+          const it = e.inventory[s];
+          if (it && it.type==='weapon'){
+            const score = (it.weapon.dmg || 1) / (it.weapon.rate || 300);
+            if (score < worstScore){ worstScore = score; worstIdx = s; }
+          } else { worstIdx = s; worstScore = -Infinity; }
+        }
+        if (pickupScore > worstScore && worstIdx !== -1){
+          e.inventory[worstIdx] = { type:'weapon', weapon:p.weapon, ammoInMag:p.ammoInMag, ammoReserve:p.ammoReserve };
+          enemyEquipBestWeapon(e);
+        } else {
+          // otherwise stash as materials/ammo
+          e.materials += Math.floor((p.ammoReserve || 0) / 2);
+        }
+      } else if (p.type === 'medkit'){
+        // stack or place
+        for (let s=0;s<5;s++){
+          const it = e.inventory[s];
+          if (it && it.type==='medkit'){ it.amount += p.amount; return; }
+        }
+        for (let s=0;s<5;s++){ if (!e.inventory[s]) { e.inventory[s] = { type:'medkit', amount:p.amount }; return; } }
+        // stash as materials fallback
+        e.materials += 3;
+      } else if (p.type === 'materials'){
+        e.materials += p.amount;
+      } else if (p.type === 'ammo'){
+        // add to any weapon
+        for (let s=0;s<5;s++){ const it=e.inventory[s]; if (it && it.type==='weapon'){ it.ammoReserve += p.amount; return; } }
+        e.materials += p.amount;
+      }
+    }
     // Build Q
     function tryBuild(){
       if (player.materials < 10) return;
       objects.push({ x:bx, y:by, type:'wall', hp:160, maxHp:160, dead:false });
       updateHUD();
     }
+    function enemyTryBuild(e){
+      if (e.materials < 10) return false;
+      // build with small chance or when under pressure
+      e.materials -= 10;
+      const bx = e.x + Math.cos(e.angle) * 48;
+      const by = e.y + Math.sin(e.angle) * 48;
+      objects.push({ x:bx, y:by, type:'wall', hp:160, maxHp:160, dead:false });
+      return true;
+    }
+    // LOS helper + blocker finder
     function hasLineOfSight(x1,y1,x2,y2){
       const vx = x2 - x1, vy = y2 - y1;
       const vlen2 = vx*vx + vy*vy;
       }
       return true;
     }
+    function findBlockingObject(x1,y1,x2,y2){
+      const vx = x2 - x1, vy = y2 - y1;
+      const vlen2 = vx*vx + vy*vy;
+      let closest = null; let closestT = Infinity;
+      for (const obj of objects){
+        if (obj.dead) continue;
+        let br=0;
+        if (obj.type==='wall') br=28; else if (obj.type==='stone') br=22; else if (obj.type==='wood') br=16; else continue;
+        const wx = obj.x - x1, wy = obj.y - y1;
+        const c1 = vx*wx + vy*wy;
+        const t = vlen2>0 ? c1/vlen2 : 0;
+        if (t < 0 || t > 1) continue;
+        const projx = x1 + vx * t, projy = y1 + vy * t;
+        const dist = Math.hypot(projx - obj.x, projy - obj.y);
+        if (dist < br && t < closestT){ closestT = t; closest = obj; }
+      }
+      return closest;
+    }
+    // Bullets update
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
         const b = bullets[i];
           for (const chest of chests){
             if (!chest.opened && Math.hypot(chest.x - b.x, chest.y - b.y) < 18){
               chest.opened = true;
               const loot = chest.loot;
               const px = chest.x + rand(-20,20), py = chest.y + rand(-20,20);
               if (loot.type === 'weapon') pickups.push({ x:px, y:py, type:'weapon', weapon: makeWeaponProto(loot.weapon), ammoInMag: loot.weapon.magSize || 12, ammoReserve: loot.weapon.startReserve || (loot.weapon.magSize*2 || 24) });
       }
     }
+    // Enemies: can loot chests; improved behaviors added
     function updateEnemies(dt, now){
       for (const e of enemies){
         if (e.health <= 0) continue;
         e.roamTimer -= dt;
+        // pick target (player or nearby enemy) like before
         let target = player;
         let bestDist = Math.hypot(player.x - e.x, player.y - e.y);
         for (const other of enemies){
           const d = Math.hypot(other.x - e.x, other.y - e.y);
           if (d < bestDist && Math.random() < 0.6){ bestDist = d; target = other; }
         }
+        // movement: approach target but avoid if low HP
         if (bestDist < 900 || e.roamTimer <= 0){
           e.angle = Math.atan2(target.y - e.y, target.x - e.x);
           const avoid = e.health < 20 && Math.random() < 0.6;
           }
         }
+        // enemies pick up nearby pickups automatically using enemyPickupCollect
         for (let i=pickups.length-1;i>=0;i--){
           const p = pickups[i];
           if (Math.hypot(p.x - e.x, p.y - e.y) < 18){
+            enemyPickupCollect(e, p);
+            pickups.splice(i,1);
           }
         }
+        // Auto-heal: if medkit in inventory and health low -> use it
+        if (e.health < 60){
+          for (let s=0;s<5;s++){
+            const it = e.inventory[s];
+            if (it && it.type === 'medkit'){
+              it.amount -= 1;
+              e.health = Math.min(120, e.health + 50);
+              if (it.amount <= 0) e.inventory[s] = null;
+              break;
+            }
+          }
+        }
+        // Decide to build: if player nearby and enemy has materials, occasional build to block / protect
+        if (e.materials >= 10 && Math.random() < 0.006 && Math.hypot(player.x - e.x, player.y - e.y) < 400){
+          enemyTryBuild(e);
+        }
+        // If the enemy has weapons, ensure it's equipped
+        if (e.equippedIndex === -1){ // no weapon equipped
+          enemyEquipBestWeapon(e);
+        }
+        // Attempt reload if equipped weapon empty and ammoReserve > 0 and not currently reloading
+        if (e.equippedIndex >= 0){
+          const eq = e.inventory[e.equippedIndex];
+          if (eq && eq.type === 'weapon' && eq.ammoInMag <= 0 && eq.ammoReserve > 0){
+            reloadItem(eq);
+          }
+        }
+        // Determine target for attack
         const distToTarget = Math.hypot(target.x - e.x, target.y - e.y);
+        // If there's a blocking object between enemy and target, consider breaking it
+        const blocked = !hasLineOfSight(e.x, e.y, target.x, target.y);
+        if (blocked){
+          const blocker = findBlockingObject(e.x, e.y, target.x, target.y);
+          if (blocker){
+            const db = Math.hypot(blocker.x - e.x, blocker.y - e.y);
+            // if close, melee to break
+            if (db < 36){
+              blocker.hp -= 18 * dt * 2; // faster breaking via melee while close
+              if (blocker.hp <= 0){ blocker.dead = true; if (e.materials !== undefined) e.materials += (blocker.type === 'wood' ? 3 : 6); }
+            } else {
+              // shoot at blocker if has gun
+              if (e.equippedIndex >= 0){
+                const eq = e.inventory[e.equippedIndex];
+                if (eq && eq.type === 'weapon' && eq.ammoInMag > 0 && now - e.lastShot > (eq.weapon.rate || 300)){
+                  e.lastShot = now;
+                  eq.ammoInMag -= 1;
+                  const angle = Math.atan2(blocker.y - e.y, blocker.x - e.x);
+                  shootBullet(e.x + Math.cos(angle)*12, e.y + Math.sin(angle)*12, blocker.x + (Math.random()-0.5)*6, blocker.y + (Math.random()-0.5)*6, eq, e.id);
+                }
+              } else {
+                // move towards blocker to melee
+                e.angle = Math.atan2(blocker.y - e.y, blocker.x - e.x);
+                e.x += Math.cos(e.angle) * e.speed * dt * 0.8;
+                e.y += Math.sin(e.angle) * e.speed * dt * 0.8;
+              }
+            }
+            continue; // handle blocking before attempting to hit the target
+          }
+        }
+        // Attack: melee if close; ranged if they have equipped weapon & LOS
         if (distToTarget < 34 && now - e.lastMelee > e.meleeRate){
           e.lastMelee = now;
           const dmg = 10 + randInt(0,8);
             target.health -= dmg;
             if (target.health <= 0) target.health = 0;
           }
+        } else if (e.equippedIndex >= 0){
+          const eq = e.inventory[e.equippedIndex];
+          if (eq && eq.type === 'weapon' && now - (e.lastShot||0) > (eq.weapon.rate || 300)){
+            // check LOS; can shoot from any distance if line-of-sight
+            if (hasLineOfSight(e.x, e.y, target.x, target.y) && eq.ammoInMag > 0){
+              e.lastShot = now;
+              eq.ammoInMag -= 1;
+              const angle = Math.atan2(target.y - e.y, target.x - e.x);
+              shootBullet(e.x + Math.cos(angle)*12, e.y + Math.sin(angle)*12, target.x + (Math.random()-0.5)*6, target.y + (Math.random()-0.5)*6, eq, e.id);
+            }
           }
         }
       }
       if (!storm.active) return;
       storm.radius -= storm.closingSpeed * dt * 60;
       if (storm.radius < 120) storm.radius = 120;
       if (playerInStorm()){
         const prog = 1 - storm.radius / storm.maxRadius;
         const rate = storm.damagePerSecond * (1 + prog*4);
           if (player.health <= 0){ player.health = 0; playerDeath(); }
         }
       } else stormDamageAccumulator = 0;
       for (const e of enemies){
         if (e.health <= 0) continue;
         const d = Math.hypot(e.x - storm.centerX, e.y - storm.centerY);
     function updatePlayerCount(){
       const aliveEnemies = enemies.filter(e => e.health > 0).length;
       document.getElementById('playerCount').textContent = `${1 + aliveEnemies}/20`;
       if (gameActive && aliveEnemies === 0 && player.health > 0){
         gameActive = false;
         victoryScreen.classList.remove('hidden');
         clearInterval(timerInterval);
       }
     }
+    // Drawing (unchanged)
     function drawWorld(){
       const TILE = 600;
       const cols = Math.ceil(WORLD.width / TILE);
         ctx.fillStyle='rgba(0,0,0,0.18)'; ctx.beginPath(); ctx.ellipse(s.x,s.y+8,18,8,0,0,Math.PI*2); ctx.fill();
         ctx.fillStyle = obj.type==='wood'? '#6b3b1a' : (obj.type==='stone'? '#6b6b6b' : '#8b5a32');
         ctx.fillRect(s.x-12, s.y-h, 24, h);
+        // HP bar for walls
+        if (obj.type==='wall'){
+          ctx.fillStyle='rgba(0,0,0,0.6)'; ctx.fillRect(s.x-18, s.y-h-10, 36, 6);
+          const hpPct = Math.max(0, obj.hp / obj.maxHp);
+          ctx.fillStyle = '#ffc966'; ctx.fillRect(s.x-18, s.y-h-10, 36*hpPct, 6);
+        }
         ctx.restore();
       }
     }
         ctx.fillStyle='rgba(0,0,0,0.18)'; ctx.beginPath(); ctx.ellipse(0,12,14,6,0,0,Math.PI*2); ctx.fill();
         ctx.fillStyle='#ff6b6b'; ctx.beginPath(); ctx.moveTo(12,0); ctx.lineTo(-10,-8); ctx.lineTo(-10,8); ctx.closePath(); ctx.fill();
         ctx.fillStyle='rgba(0,0,0,0.6)'; ctx.fillRect(-18,-22,36,6);
+        const hpPct = Math.max(0, Math.min(1, e.health/120));
         ctx.fillStyle='#ff6b6b'; ctx.fillRect(-18,-22,36*hpPct,6);
+        if (e.equippedIndex >= 0 && e.inventory[e.equippedIndex] && e.inventory[e.equippedIndex].type === 'weapon') {
+          ctx.fillStyle = e.inventory[e.equippedIndex].weapon.color || '#fff';
+          ctx.fillRect(-10,12,8,6);
+        }
         ctx.restore();
       }
     }
       const s = worldToScreen(player.x,player.y);
       ctx.save();
       ctx.translate(s.x,s.y); ctx.rotate(player.angle);
       ctx.fillStyle='rgba(0,0,0,0.25)'; ctx.beginPath(); ctx.ellipse(0,14,18,8,0,0,Math.PI*2); ctx.fill();
       ctx.fillStyle='yellow'; ctx.beginPath(); ctx.moveTo(18,0); ctx.lineTo(-12,-10); ctx.lineTo(-12,10); ctx.closePath(); ctx.fill();
       let activeWeaponItem = null;
       if (player.equippedIndex >= 0) activeWeaponItem = player.inventory[player.equippedIndex];
       else {
       }
       if (player.equippedIndex === -1){
         ctx.save();
         ctx.translate(12, 6);
         ctx.rotate(-0.2);
         ctx.fillStyle = '#8b6b4a';
         ctx.fillRect(-2,0,4,18);
         ctx.fillStyle = '#cfcfcf';
         ctx.fillRect(-8,-6,12,6);
         ctx.restore();
       } else if (activeWeaponItem && activeWeaponItem.type === 'weapon'){
         ctx.save();
         ctx.translate(12, 2);
         ctx.rotate(-0.05);
         ctx.fillStyle = activeWeaponItem.weapon.color || '#fff';
+        ctx.fillRect(0,-4,26,8);
         ctx.fillStyle = '#222';
+        ctx.fillRect(18,-2,8,4);
         const magPct = Math.max(0, activeWeaponItem.ammoInMag / activeWeaponItem.weapon.magSize);
         ctx.fillStyle = 'rgba(0,0,0,0.35)';
         ctx.fillRect(4,6,18,4);
       ctx.restore();
     }
+    function drawCrosshair(){ }
     // Main loop
     let lastTime = 0;
       mouse.worldX = mouse.canvasX + camera.x;
       mouse.worldY = mouse.canvasY + camera.y;
       player.angle = Math.atan2(mouse.worldY - player.y, mouse.worldX - player.x);
+      // determine active weapon for player
       let activeWeaponItem = null;
       if (player.equippedIndex >= 0) activeWeaponItem = player.inventory[player.equippedIndex];
       else {
       // shooting or melee on mouse down
       if (mouse.down){
         if (player.equippedIndex === -1){
           playerMeleeHit();
         } else if (activeWeaponItem && activeWeaponItem.type === 'weapon'){
           const now = performance.now();
               player.lastShot = now;
               shootBullet(player.x + Math.cos(player.angle)*18, player.y + Math.sin(player.angle)*18, mouse.worldX, mouse.worldY, activeWeaponItem, 'player');
               updateHUD();
             }
           }
         }
       drawWorld(); drawObjects(); drawChests(); drawPickups(); drawEnemies(); drawBullets(); drawPlayer(); drawCrosshair();
       updateHUD();
       if (storm.active && playerInStorm()) stormWarning.classList.remove('hidden'); else stormWarning.classList.add('hidden');
       requestAnimationFrame(gameLoop);
       initHUD();
       cameraUpdate();
       gameTime = 300; storm.active = false; storm.radius = storm.maxRadius;
       document.getElementById('gameTimer').textContent = '5:00';
       timerInterval && clearInterval(timerInterval);