Spaces:

bbc123321
/

battle-zone-royale

Running

App Files Files Community

bbc123321 commited on Oct 14, 2025

Commit

076379c

verified ·

1 Parent(s): 7da48a4

Manual changes saved

Browse files

Files changed (1) hide show

index.html +194 -123

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 - Enemies Improved</title>
   <script src="https://cdn.tailwindcss.com"></script>
   <script src="https://unpkg.com/feather-icons"></script>
   <style>
@@ -167,11 +167,7 @@
     const keys = { w:false,a:false,s:false,d:false,e:false,q:false,r:false,f:false };
     const mouse = { canvasX:0, canvasY:0, worldX:0, worldY:0, down:false };
-    // Helper: equip slot index (or -1 for pickaxe)
-    function equipSlot(index){
-      player.equippedIndex = index;
-      updateHUD();
-    }
     window.addEventListener('keydown',(e)=>{
       const k = e.key.toLowerCase();
@@ -200,7 +196,7 @@
     window.addEventListener('keyup',(e)=>{
       const k = e.key.toLowerCase();
       if (k in keys) keys[k] = false;
-      if (k === 'e') keys.e = true; // single-use flag
       if (k === 'q') keys.q = true;
     });
@@ -285,19 +281,23 @@
           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();
     }
-    // HUD init (pickaxe left of inventory)
     function initHUD(){
       hudHealth.classList.remove('hidden');
       hudGearWrap.classList.remove('hidden');
@@ -345,7 +345,7 @@
       feather.replace();
     }
-    // Camera
     function cameraUpdate(){
       if (!canvas.width || !canvas.height) return;
       camera.x = player.x - canvas.width/2;
@@ -355,7 +355,7 @@
     }
     function worldToScreen(wx,wy){ return { x: Math.round(wx - camera.x), y: Math.round(wy - camera.y) }; }
-    // Shooting, reload, melee
     function shootBullet(originX, originY, targetX, targetY, weaponObj, shooterId){
       if (!weaponObj || (typeof weaponObj.ammoInMag === 'number' && weaponObj.ammoInMag <= 0)) return false;
       const speed = 1100;
@@ -395,7 +395,7 @@
       for (const e of enemies){
         if (e.health <= 0) continue;
         const d = Math.hypot(e.x - player.x, e.y - player.y);
-        if (d < 36){ e.health -= 18; if (e.health <= 0) { e.health = 0; player.kills++; player.materials += 2; updatePlayerCount(); } }
       }
       for (const obj of objects){
         if (obj.dead) continue;
@@ -407,7 +407,7 @@
       }
     }
-    // Interact: use medkit in selected slot OR loot chests / pickup items.
     function interactNearby(){
       const sel = player.selectedSlot;
       const selItem = player.inventory[sel];
@@ -418,22 +418,18 @@
         updateHUD();
         return;
       }
       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'){
-            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) });
-          } else if (loot.type === 'medkit') {
-            pickups.push({ x:px, y:py, type:'medkit', amount: loot.amount || 1 });
-          } else if (loot.type === 'materials') {
-            pickups.push({ x:px, y:py, type:'materials', amount: loot.amount || 5 });
-          }
           if (Math.random() < 0.25){
             pickups.push({ x:px+8, y:py+8, type:'ammo', forWeapon: null, amount: randInt(6,30) });
           }
@@ -441,7 +437,6 @@
           return;
         }
       }
       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);
@@ -485,7 +480,6 @@
     // 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++){
@@ -500,20 +494,18 @@
     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++){
@@ -521,28 +513,24 @@
           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;
       }
@@ -559,7 +547,6 @@
     }
     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;
@@ -604,7 +591,7 @@
       return closest;
     }
-    // Bullets update
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
         const b = bullets[i];
@@ -626,6 +613,7 @@
             if (b.shooter === e.id) continue;
             if (Math.hypot(e.x - b.x, e.y - b.y) < 14){
               e.health -= b.dmg;
               if (e.health <= 0){ e.health = 0; if (b.shooter === 'player'){ player.kills++; player.materials += 2; updatePlayerCount(); } }
               bullets.splice(i,1); break;
             }
@@ -660,83 +648,142 @@
       }
     }
-    // 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){
-          if (other === e || other.health <= 0) continue;
-          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;
-          const moveDir = avoid ? -1 : 1;
-          e.x += Math.cos(e.angle) * e.speed * dt * moveDir;
-          e.y += Math.sin(e.angle) * e.speed * dt * moveDir;
-        } else {
-          e.x += Math.cos(e.angle) * e.speed * dt * 0.25;
-          e.y += Math.sin(e.angle) * e.speed * dt * 0.25;
-          if (Math.random() < 0.01) e.angle += (Math.random()-0.5)*2;
-        }
-        e.x = Math.max(12, Math.min(WORLD.width-12, e.x));
-        e.y = Math.max(12, Math.min(WORLD.height-12, e.y));
-        // enemy loot chests if close
-        for (const chest of chests){
-          if (chest.opened) continue;
-          const d = Math.hypot(chest.x - e.x, chest.y - e.y);
-          if (d < 24){
-            chest.opened = true;
-            const loot = chest.loot;
-            const px = chest.x + rand(-12,12), py = chest.y + rand(-12,12);
-            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) });
-            else if (loot.type === 'medkit') pickups.push({ x:px, y:py, type:'medkit', amount: loot.amount || 1 });
-            else if (loot.type === 'materials') pickups.push({ x:px, y:py, type:'materials', amount: loot.amount || 5 });
-          }
-        }
-        // 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){
@@ -744,21 +791,32 @@
           }
         }
-        // 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)){
@@ -768,43 +826,58 @@
                   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);
-          if (target === player){
-            player.health -= dmg;
-            if (player.health <= 0) { player.health = 0; playerDeath(); }
-          } else {
-            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);
             }
           }
         }
       }
     }
-    // Storm: slower, damages enemies too
     const storm = { maxRadius: 2400, radius:2400, centerX: WORLD.width/2, centerY: WORLD.height/2, damagePerSecond:1, closingSpeed: 0.6, active:false };
     let stormDamageAccumulator = 0;
     function playerInStorm(){ return Math.hypot(player.x - storm.centerX, player.y - storm.centerY) > storm.radius; }
@@ -881,7 +954,6 @@
         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);
@@ -946,6 +1018,9 @@
           ctx.fillStyle = e.inventory[e.equippedIndex].weapon.color || '#fff';
           ctx.fillRect(-10,12,8,6);
         }
         ctx.restore();
       }
     }
@@ -1018,7 +1093,7 @@
       const dt = Math.min(0.05, (ts - lastTime)/1000);
       lastTime = ts;
-      // movement
       let dx=0, dy=0;
       if (keys.w) dy -= 1; if (keys.s) dy += 1; if (keys.a) dx -= 1; if (keys.d) dx += 1;
       if (dx !== 0 || dy !== 0){
@@ -1043,7 +1118,7 @@
         if (selected && selected.type === 'weapon') activeWeaponItem = selected;
       }
-      // shooting or melee on mouse down
       if (mouse.down){
         if (player.equippedIndex === -1){
           playerMeleeHit();
@@ -1059,20 +1134,16 @@
         }
       }
-      // reload
       if (keys.r) { reloadEquipped(); keys.r = false; }
-      // interact/use
       if (keys.e){ interactNearby(); keys.e = false; }
-      // build
       if (keys.q){ tryBuild(); keys.q = false; }
-      // enemy AI and bullets
       updateEnemies(dt, performance.now());
       bulletsUpdate(dt);
-      // pickup auto-collect when standing on them
       for (let i=pickups.length-1;i>=0;i--){
         const p = pickups[i];
         if (Math.hypot(p.x - player.x, p.y - player.y) < 18){ pickupCollect(p); pickups.splice(i,1); updateHUD(); }

 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>BattleZone Royale - Enemies Gather First</title>
   <script src="https://cdn.tailwindcss.com"></script>
   <script src="https://unpkg.com/feather-icons"></script>
   <style>
     const keys = { w:false,a:false,s:false,d:false,e:false,q:false,r:false,f:false };
     const mouse = { canvasX:0, canvasY:0, worldX:0, worldY:0, down:false };
+    function equipSlot(index){ player.equippedIndex = index; updateHUD(); }
     window.addEventListener('keydown',(e)=>{
       const k = e.key.toLowerCase();
     window.addEventListener('keyup',(e)=>{
       const k = e.key.toLowerCase();
       if (k in keys) keys[k] = false;
+      if (k === 'e') keys.e = true;
       if (k === 'q') keys.q = true;
     });
           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),
+          // enemy state machine and inventory
           inventory: [null,null,null,null,null],
           selectedSlot: 0,
+          equippedIndex: -1,
           materials: 0,
+          lastShot: 0,
+          reloadingUntil: 0,
+          lastAttackedTime: 0,
+          state: 'gather',               // 'gather' -> 'combat' -> 'defend' ...
+          gatherTimeLeft: rand(8,16),    // seconds to try gather before switching
+          target: null                   // {type:'chest'|'object'|'pickup'|'player', ref:...}
         });
       }
       updatePlayerCount();
     }
+    // HUD init
     function initHUD(){
       hudHealth.classList.remove('hidden');
       hudGearWrap.classList.remove('hidden');
       feather.replace();
     }
+    // Camera helpers
     function cameraUpdate(){
       if (!canvas.width || !canvas.height) return;
       camera.x = player.x - canvas.width/2;
     }
     function worldToScreen(wx,wy){ return { x: Math.round(wx - camera.x), y: Math.round(wy - camera.y) }; }
+    // Shooting, reload, melee (player)
     function shootBullet(originX, originY, targetX, targetY, weaponObj, shooterId){
       if (!weaponObj || (typeof weaponObj.ammoInMag === 'number' && weaponObj.ammoInMag <= 0)) return false;
       const speed = 1100;
       for (const e of enemies){
         if (e.health <= 0) continue;
         const d = Math.hypot(e.x - player.x, e.y - player.y);
+        if (d < 36){ e.health -= 18; if (e.health <= 0) { e.health = 0; player.kills++; player.materials += 2; updatePlayerCount(); e.lastAttackedTime = performance.now(); } }
       }
       for (const obj of objects){
         if (obj.dead) continue;
       }
     }
+    // Interact (player)
     function interactNearby(){
       const sel = player.selectedSlot;
       const selItem = player.inventory[sel];
         updateHUD();
         return;
       }
       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){
+          // open and spawn pickups (player)
           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) });
+          else if (loot.type === 'medkit') pickups.push({ x:px, y:py, type:'medkit', amount: loot.amount || 1 });
+          else if (loot.type === 'materials') pickups.push({ x:px, y:py, type:'materials', amount: loot.amount || 5 });
           if (Math.random() < 0.25){
             pickups.push({ x:px+8, y:py+8, type:'ammo', forWeapon: null, amount: randInt(6,30) });
           }
           return;
         }
       }
       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);
     // Enemy helpers: equip best weapon, reload, collect pickups
     function enemyEquipBestWeapon(e){
       let bestIdx = -1;
       let bestScore = -Infinity;
       for (let i=0;i<5;i++){
     function enemyPickupCollect(e, p){
       if (p.type === '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);
+            enemyEquipBestWeapon(e);
             return;
           }
         }
         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; }
         }
         let worstIdx = -1, worstScore = Infinity;
         const pickupScore = (p.weapon.dmg || 1) / (p.weapon.rate || 300);
         for (let s=0;s<5;s++){
           if (it && it.type==='weapon'){
             const score = (it.weapon.dmg || 1) / (it.weapon.rate || 300);
             if (score < worstScore){ worstScore = score; worstIdx = s; }
+          }
         }
         if (pickupScore > worstScore && worstIdx !== -1){
           e.inventory[worstIdx] = { type:'weapon', weapon:p.weapon, ammoInMag:p.ammoInMag, ammoReserve:p.ammoReserve };
           enemyEquipBestWeapon(e);
         } else {
           e.materials += Math.floor((p.ammoReserve || 0) / 2);
         }
       } else if (p.type === 'medkit'){
         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; } }
         e.materials += 3;
       } else if (p.type === 'materials'){
         e.materials += p.amount;
       } else if (p.type === 'ammo'){
         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;
       }
     }
     function enemyTryBuild(e){
       if (e.materials < 10) return false;
       e.materials -= 10;
       const bx = e.x + Math.cos(e.angle) * 48;
       const by = e.y + Math.sin(e.angle) * 48;
       return closest;
     }
+    // Bullets update: mark enemies as attacked when hit
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
         const b = bullets[i];
             if (b.shooter === e.id) continue;
             if (Math.hypot(e.x - b.x, e.y - b.y) < 14){
               e.health -= b.dmg;
+              e.lastAttackedTime = performance.now();
               if (e.health <= 0){ e.health = 0; if (b.shooter === 'player'){ player.kills++; player.materials += 2; updatePlayerCount(); } }
               bullets.splice(i,1); break;
             }
       }
     }
+    // Find nearest unopened chest or nearest harvestable object
+    function findNearestChest(e, maxDist = 1200){
+      let best = null; let bd = Infinity;
+      for (const c of chests){ if (c.opened) continue; const d = Math.hypot(c.x - e.x, c.y - e.y); if (d < bd && d <= maxDist){ bd = d; best = c; } }
+      return best;
+    }
+    function findNearestHarvestable(e, maxDist = 1000){
+      let best = null; let bd = Infinity;
+      for (const o of objects){ if (o.dead || o.type === 'wall') continue; const d = Math.hypot(o.x - e.x, o.y - e.y); if (d < bd && d <= maxDist){ bd = d; best = o; } }
+      return best;
+    }
+    function findNearestPickup(e, maxDist = 500){
+      let best = null; let bd = Infinity;
+      for (const p of pickups){ const d = Math.hypot(p.x - e.x, p.y - e.y); if (d < bd && d <= maxDist){ bd = d; best = p; } }
+      return best;
+    }
+    // Enemies: improved state machine - gather then combat
     function updateEnemies(dt, now){
       for (const e of enemies){
         if (e.health <= 0) continue;
+        // If recently attacked by player, switch to combat immediately
+        if (now - e.lastAttackedTime < 4000){
+          e.state = 'combat';
         }
+        // Decrease gather timer if still gathering
+        if (e.state === 'gather'){
+          e.gatherTimeLeft -= dt;
         }
+        // If underheal and has medkit, heal immediately (even while gathering)
         if (e.health < 60){
+          let used = false;
           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;
+              used = true;
               break;
             }
           }
+          if (used) continue; // use time to heal this tick
         }
+        // Determine transition from 'gather' to 'combat'
+        const hasUsefulWeapon = e.inventory.some(it => it && it.type === 'weapon' && (it.ammoInMag > 0 || it.ammoReserve > 0));
+        if ((e.gatherTimeLeft <= 0 || e.materials >= 20 || hasUsefulWeapon) && e.state === 'gather'){
+          e.state = 'combat';
         }
+        // State behavior:
+        if (e.state === 'gather'){
+          // prefer pickups, then chests, then harvest objects
+          let targetPickup = findNearestPickup(e, 240);
+          if (targetPickup){
+            // move to pickup
+            const angle = Math.atan2(targetPickup.y - e.y, targetPickup.x - e.x);
+            e.angle = angle;
+            e.x += Math.cos(e.angle) * e.speed * dt * 0.9;
+            e.y += Math.sin(e.angle) * e.speed * dt * 0.9;
+            if (Math.hypot(targetPickup.x - e.x, targetPickup.y - e.y) < 18){
+              enemyPickupCollect(e, targetPickup);
+              // remove pickup from global array
+              const idx = pickups.indexOf(targetPickup);
+              if (idx >= 0) pickups.splice(idx,1);
+            }
+            continue;
+          }
+          let chestTarget = findNearestChest(e, 900);
+          if (chestTarget){
+            const d = Math.hypot(chestTarget.x - e.x, chestTarget.y - e.y);
+            if (d > 20){
+              e.angle = Math.atan2(chestTarget.y - e.y, chestTarget.x - e.x);
+              e.x += Math.cos(e.angle) * e.speed * dt * 0.9;
+              e.y += Math.sin(e.angle) * e.speed * dt * 0.9;
+            } else {
+              // open chest and directly give loot to enemy (avoid leaving pickups, faster)
+              chestTarget.opened = true;
+              const loot = chestTarget.loot;
+              if (loot.type === 'weapon'){
+                enemyPickupCollect(e, { type:'weapon', weapon: makeWeaponProto(loot.weapon), ammoInMag:loot.weapon.magSize||12, ammoReserve:loot.weapon.startReserve||24 });
+              } else if (loot.type === 'medkit'){
+                enemyPickupCollect(e, { type:'medkit', amount: loot.amount || 1 });
+              } else if (loot.type === 'materials'){
+                enemyPickupCollect(e, { type:'materials', amount: loot.amount || 5 });
+              }
+            }
+            continue;
+          }
+          // no chest nearby -> try harvest nearest wood/stone
+          let objTarget = findNearestHarvestable(e, 700);
+          if (objTarget){
+            const d = Math.hypot(objTarget.x - e.x, objTarget.y - e.y);
+            if (d > 26){
+              e.angle = Math.atan2(objTarget.y - e.y, objTarget.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;
+            } else {
+              // melee hit slice: reduce object hp over time
+              objTarget.hp -= 40 * dt; // faster than player to let enemies gather
+              if (objTarget.hp <= 0 && !objTarget.dead){
+                objTarget.dead = true;
+                const matGain = objTarget.type === 'wood' ? 3 : 6;
+                e.materials += matGain;
+                // small chance to spawn a weapon or medkit when breaking
+                if (Math.random() < 0.08){
+                  const lootRoll = Math.random();
+                  if (lootRoll < 0.4) enemyPickupCollect(e, { type:'medkit', amount:1 });
+                  else if (lootRoll < 0.9) enemyPickupCollect(e, { type:'materials', amount: randInt(3,8) });
+                  else enemyPickupCollect(e, { type:'weapon', weapon: makeWeaponProto({ name:'Pistol', dmg:12, rate:320, color:'#ffd86b', magSize:12, startReserve:24 }), ammoInMag:12, ammoReserve:24 });
+                }
+              }
+            }
+            continue;
+          }
+          // nothing to gather -> roam slowly
+          e.x += Math.cos(e.angle) * e.speed * dt * 0.25;
+          e.y += Math.sin(e.angle) * e.speed * dt * 0.25;
+          if (Math.random() < 0.01) e.angle += (Math.random()-0.5)*2;
+          continue;
+        } // end gather
+        // Combat or defend state
+        // ensure equipped weapon selected if present
+        if (e.equippedIndex === -1){
           enemyEquipBestWeapon(e);
         }
+        // auto-reload if needed
         if (e.equippedIndex >= 0){
           const eq = e.inventory[e.equippedIndex];
           if (eq && eq.type === 'weapon' && eq.ammoInMag <= 0 && eq.ammoReserve > 0){
           }
         }
+        // pick nearest target (player preferred)
+        let target = player;
+        let bestDist = Math.hypot(player.x - e.x, player.y - e.y);
+        for (const other of enemies){
+          if (other === e || other.health <= 0) continue;
+          const d = Math.hypot(other.x - e.x, other.y - e.y);
+          if (d < bestDist && Math.random() < 0.6){ bestDist = d; target = other; }
+        }
+        // If target is player & player is very close while enemy has low HP: try to heal/build/retreat rather than attack
+        const distToPlayer = Math.hypot(player.x - e.x, player.y - e.y);
+        if (distToPlayer < 160 && e.health < 35 && e.materials >= 10 && Math.random() < 0.5){
+          enemyTryBuild(e);
+        }
+        // If target blocked by structure, try to break it first
         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 (db < 36){
+              blocker.hp -= 18 * dt * 2;
+              if (blocker.hp <= 0){ blocker.dead = true; e.materials += (blocker.type === 'wood' ? 3 : 6); }
             } else {
+              // shoot at blocker if possible
               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)){
                   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 {
                 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;
           }
         }
+        // Attack logic: melee if close, otherwise ranged if has weapon and LOS
+        if (distToPlayer < 36 && now - e.lastMelee > e.meleeRate){
           e.lastMelee = now;
           const dmg = 10 + randInt(0,8);
+          player.health -= dmg;
+          e.lastAttackedTime = now;
+          if (player.health <= 0) { player.health = 0; playerDeath(); }
         } else if (e.equippedIndex >= 0){
           const eq = e.inventory[e.equippedIndex];
           if (eq && eq.type === 'weapon' && now - (e.lastShot||0) > (eq.weapon.rate || 300)){
+            if (eq.ammoInMag <= 0){
+              // reload if ammoReserve available
+              if (eq.ammoReserve > 0) reloadItem(eq);
+            } else {
+              if (hasLineOfSight(e.x, e.y, target.x, target.y)){
+                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);
+                e.lastAttackedTime = now;
+              } else {
+                // move to get LOS
+                e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+                e.x += Math.cos(e.angle) * e.speed * dt * 0.6;
+                e.y += Math.sin(e.angle) * e.speed * dt * 0.6;
+              }
             }
+          } else {
+            // no weapon -> move toward target to melee
+            e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+            e.x += Math.cos(e.angle) * e.speed * dt * 0.9;
+            e.y += Math.sin(e.angle) * e.speed * dt * 0.9;
           }
+        } else {
+          // unarmed: move in and melee
+          e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+          e.x += Math.cos(e.angle) * e.speed * dt * 0.9;
+          e.y += Math.sin(e.angle) * e.speed * dt * 0.9;
         }
       }
     }
+    // Storm (unchanged)
     const storm = { maxRadius: 2400, radius:2400, centerX: WORLD.width/2, centerY: WORLD.height/2, damagePerSecond:1, closingSpeed: 0.6, active:false };
     let stormDamageAccumulator = 0;
     function playerInStorm(){ return Math.hypot(player.x - storm.centerX, player.y - storm.centerY) > storm.radius; }
         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);
         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 = e.inventory[e.equippedIndex].weapon.color || '#fff';
           ctx.fillRect(-10,12,8,6);
         }
+        // draw state marker small
+        ctx.fillStyle = e.state === 'gather' ? 'rgba(0,200,200,0.9)' : (e.state === 'combat' ? 'rgba(255,80,80,0.95)' : 'rgba(255,200,80,0.9)');
+        ctx.beginPath(); ctx.arc(18, -18, 5, 0, Math.PI*2); ctx.fill();
         ctx.restore();
       }
     }
       const dt = Math.min(0.05, (ts - lastTime)/1000);
       lastTime = ts;
+      // player movement
       let dx=0, dy=0;
       if (keys.w) dy -= 1; if (keys.s) dy += 1; if (keys.a) dx -= 1; if (keys.d) dx += 1;
       if (dx !== 0 || dy !== 0){
         if (selected && selected.type === 'weapon') activeWeaponItem = selected;
       }
+      // player attack
       if (mouse.down){
         if (player.equippedIndex === -1){
           playerMeleeHit();
         }
       }
+      // reload/interact/build
       if (keys.r) { reloadEquipped(); keys.r = false; }
       if (keys.e){ interactNearby(); keys.e = false; }
       if (keys.q){ tryBuild(); keys.q = false; }
+      // update
       updateEnemies(dt, performance.now());
       bulletsUpdate(dt);
+      // pickups auto-collect for player
       for (let i=pickups.length-1;i>=0;i--){
         const p = pickups[i];
         if (Math.hypot(p.x - player.x, p.y - player.y) < 18){ pickupCollect(p); pickups.splice(i,1); updateHUD(); }