Spaces:

bbc123321
/

battle-zone-royale

Running

App Files Files Community

bbc123321 commited on Oct 14, 2025

Commit

2c0205e

verified ·

1 Parent(s): ebb0af0

Manual changes saved

Browse files

Files changed (1) hide show

index.html +105 -271

index.html CHANGED Viewed

@@ -3,15 +3,13 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>BattleZone Royale - Collisions, AI & Minimap</title>
   <script src="https://cdn.tailwindcss.com"></script>
   <script src="https://unpkg.com/feather-icons"></script>
   <style>
     html,body { height:100%; margin:0; background:#0b1220; color:#fff; font-family:monospace; }
     #canvasContainer { position:relative; flex:1; display:flex; justify-content:center; align-items:center; height:100vh; overflow:hidden; }
     #gameCanvas { display:block; user-select:none; cursor:crosshair; box-shadow:0 0 20px rgba(0,0,0,.5); width:100%; height:100%; }
-    #minimap { position: absolute; top:12px; left:50%; transform:translateX(-50%); width:220px; height:140px; border-radius:8px; background: rgba(0,0,0,0.45); padding:6px; z-index:40; box-shadow: 0 6px 30px rgba(0,0,0,0.6); }
-    #minimapCanvas { width:100%; height:100%; display:block; image-rendering: pixelated; border-radius:6px; background:transparent; }
     /* HUD */
     #hudHealth { position:absolute; left:12px; bottom:12px; background:rgba(0,0,0,0.55); padding:6px 8px; border-radius:8px; font-weight:700; font-size:13px; display:flex; align-items:center; gap:8px; z-index:30; }
     #hudGearWrap { position:absolute; right:12px; bottom:12px; display:flex; gap:8px; align-items:center; z-index:30; }
@@ -93,11 +91,6 @@
       <div id="canvasContainer" class="relative bg-gray-900 border-4 border-gray-700 rounded-xl max-w-full max-h-full">
         <canvas id="gameCanvas"></canvas>
-        <!-- Minimap (top middle) -->
-        <div id="minimap">
-          <canvas id="minimapCanvas" width="220" height="140"></canvas>
-        </div>
         <div id="stormWarning" class="hidden absolute top-6 left-1/2 transform -translate-x-1/2 bg-red-900 bg-opacity-80 text-white px-6 py-3 rounded-lg flex items-center">
           <i data-feather="alert-circle" class="mr-2"></i>
           <span>STORM APPROACHING! MOVE TO SAFE ZONE!</span>
@@ -156,9 +149,6 @@
     const continueBtn = document.getElementById('continueBtn');
     const biomeGrid = document.getElementById('biomeGrid');
-    const minimapCanvas = document.getElementById('minimapCanvas');
-    const miniCtx = minimapCanvas.getContext('2d');
     // World
     const WORLD = { width: 6000, height: 4000 };
     let camera = { x:0, y:0 };
@@ -278,55 +268,6 @@
     const VIEW_RANGE = 1200;          // if player is farther than this, enemies switch target
     const SPAWN_PROTECT_MS = 1200;    // time after spawn they ignore ground pickups to avoid instant pickup
-    // collision helpers
-    function getObjectRadius(obj){
-      if (!obj) return 18;
-      if (obj.type === 'wall') return 28;
-      if (obj.type === 'stone') return 18;
-      if (obj.type === 'wood') return 18;
-      return 16;
-    }
-    function chestRadius(){ return 18; }
-    function circleOverlap(x1,y1,r1,x2,y2,r2){
-      return Math.hypot(x1-x2,y1-y2) < (r1 + r2);
-    }
-    function isCollidingSolid(x,y,r){
-      // objects are solid if not dead
-      for (const o of objects){
-        if (o.dead) continue;
-        const rr = getObjectRadius(o);
-        if (circleOverlap(x,y,r,o.x,o.y,rr)) return true;
-      }
-      // chests solid if not opened
-      for (const c of chests){
-        if (c.opened) continue;
-        if (circleOverlap(x,y,r,c.x,c.y,chestRadius())) return true;
-      }
-      return false;
-    }
-    // move with axis-based collision (allows sliding)
-    function moveEntityWithCollision(entity, dx, dy, radius){
-      // move along x
-      const oldX = entity.x, oldY = entity.y;
-      let nx = entity.x + dx;
-      entity.x = nx;
-      if (entity.x < radius) entity.x = radius;
-      if (entity.x > WORLD.width - radius) entity.x = WORLD.width - radius;
-      if (isCollidingSolid(entity.x, entity.y, radius)){
-        entity.x = oldX; // revert X
-      }
-      // move along y
-      let ny = entity.y + dy;
-      entity.y = ny;
-      if (entity.y < radius) entity.y = radius;
-      if (entity.y > WORLD.height - radius) entity.y = WORLD.height - radius;
-      if (isCollidingSolid(entity.x, entity.y, radius)){
-        entity.y = oldY; // revert Y
-      }
-    }
     // Populate world - spawn many objects and enemies
     function populateWorld(){
       chests.length = 0; objects.length = 0; enemies.length = 0; pickups.length = 0;
@@ -363,7 +304,6 @@
           reloadingUntil: 0,
           reloadPending: false,
           lastAttackedTime: 0,
-          lastAttackerId: null,
           state: 'gather',
           gatherTimeLeft: rand(8,16),
           target: null,
@@ -665,11 +605,6 @@
       return closest;
     }
-    function findEnemyById(id){
-      if (!id) return null;
-      return enemies.find(en => en.id === id) || null;
-    }
     // Bullets update
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
@@ -691,7 +626,6 @@
             if (Math.hypot(e.x - b.x, e.y - b.y) < 14){
               e.health -= b.dmg;
               e.lastAttackedTime = performance.now();
-              e.lastAttackerId = b.shooter; // record who attacked them
               if (e.health <= 0){ e.health = 0; if (b.shooter === 'player'){ player.kills++; player.materials += 2; updatePlayerCount(); } }
               bullets.splice(i,1); break;
             }
@@ -760,11 +694,13 @@
             // move towards safe zone center
             e.state = 'toSafe';
             e.angle = Math.atan2(storm.centerY - e.y, storm.centerX - e.x);
-            const speedMult = 0.95;
-            const dx = Math.cos(e.angle) * e.speed * dt * speedMult;
-            const dy = Math.sin(e.angle) * e.speed * dt * speedMult;
-            moveEntityWithCollision(e, dx, dy, e.radius);
             if (Math.random() < 0.02) e.angle += (Math.random()-0.5)*0.5;
             continue; // priority movement to safe zone
           }
         }
@@ -803,9 +739,8 @@
             if (p){
               const angle = Math.atan2(p.y - e.y, p.x - e.x);
               e.angle = angle;
-              const dx = Math.cos(e.angle) * e.speed * dt * 0.9;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.9;
-              moveEntityWithCollision(e, dx, dy, e.radius);
               if (Math.hypot(p.x - e.x, p.y - e.y) < 18){
                 enemyPickupCollect(e, p);
                 const idx = pickups.indexOf(p);
@@ -820,9 +755,8 @@
             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);
-              const dx = Math.cos(e.angle) * e.speed * dt * 0.9;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.9;
-              moveEntityWithCollision(e, dx, dy, e.radius);
             } else {
               chestTarget.opened = true;
               const loot = chestTarget.loot;
@@ -838,9 +772,8 @@
             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);
-              const dx = Math.cos(e.angle) * e.speed * dt * 0.8;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.8;
-              moveEntityWithCollision(e, dx, dy, e.radius);
             } else {
               objTarget.hp -= 40 * dt;
               if (objTarget.hp <= 0 && !objTarget.dead){
@@ -858,9 +791,8 @@
           }
           // roam
-          const dx = Math.cos(e.angle) * e.speed * dt * 0.25;
-          const dy = Math.sin(e.angle) * e.speed * dt * 0.25;
-          moveEntityWithCollision(e, dx, dy, e.radius);
           if (Math.random() < 0.01) e.angle += (Math.random()-0.5)*2;
           continue;
         }
@@ -887,63 +819,83 @@
           }
         }
-        // choose a target: respect lastAttackerId first (retaliate), then player if in view range, else nearest meaningful target (including other enemies)
-        let target = null;
-        if (e.lastAttackerId && e.lastAttackerId !== 'player'){
-          const attacker = findEnemyById(e.lastAttackerId);
-          if (attacker && attacker.health > 0){
-            target = attacker;
           } else {
-            e.lastAttackerId = null;
           }
         }
-        if (!target){
-          const distToPlayer = Math.hypot(player.x - e.x, player.y - e.y);
-          if (distToPlayer <= VIEW_RANGE){
-            target = player;
-          } else {
-            // look for pickups/chests/harvestables/nearby enemies to fight
-            const p = findNearestPickup(e, 1200);
-            const c = findNearestChest(e, 1200);
-            const h = findNearestHarvestable(e, 1200);
-            let candidate = null, cd = Infinity;
-            if (p){ const d=Math.hypot(p.x-e.x,p.y-e.y); if (d<cd){ candidate=p; cd=d; } }
-            if (c){ const d=Math.hypot(c.x-e.x,c.y-e.y); if (d<cd){ candidate=c; cd=d; } }
-            if (h){ const d=Math.hypot(h.x-e.x,h.y-e.y); if (d<cd){ candidate=h; cd=d; } }
-            // consider nearby enemy targets (higher aggression probability)
-            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 < cd && d <= 800){
-                // preferentially go after enemies if already in combat or if random chance
-                if (Math.random() < 0.6 || e.state === 'combat'){
-                  candidate = other; cd = d;
-                }
-              }
-            }
-            if (candidate){
-              target = candidate;
-            } else {
-              target = null;
-            }
-          }
         }
-        // If we still have no target, roam
         if (!target){
           e.x += Math.cos(e.angle) * e.speed * dt * 0.7;
           e.y += Math.sin(e.angle) * e.speed * dt * 0.7;
           if (Math.random() < 0.02) e.angle += (Math.random()-0.5)*1.5;
-          // ensure no collisions after roam
-          moveEntityWithCollision(e, 0, 0, e.radius);
           continue;
         }
-        // If target is world object (chest/pickup/harvestable/ally), handle accordingly
         if (target === player){
-          // Attack player
-          const distToPlayer = Math.hypot(player.x - e.x, player.y - e.y);
           if (distToPlayer < 36 && now - e.lastMelee > e.meleeRate){
             e.lastMelee = now;
             const dmg = 10 + randInt(0,8);
@@ -963,36 +915,32 @@
                   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 (with collision)
                   e.angle = Math.atan2(target.y - e.y, target.x - e.x);
-                  const dx = Math.cos(e.angle) * e.speed * dt * 0.6;
-                  const dy = Math.sin(e.angle) * e.speed * dt * 0.6;
-                  moveEntityWithCollision(e, dx, dy, e.radius);
                 }
               }
             } else {
               // unarmed behavior: rush to melee
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
-              const dx = Math.cos(e.angle) * e.speed * dt * 0.9;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.9;
-              moveEntityWithCollision(e, dx, dy, e.radius);
             }
           } else {
             // no weapon: rush in
             e.angle = Math.atan2(target.y - e.y, target.x - e.x);
-            const dx = Math.cos(e.angle) * e.speed * dt * 0.9;
-            const dy = Math.sin(e.angle) * e.speed * dt * 0.9;
-            moveEntityWithCollision(e, dx, dy, e.radius);
           }
         } else {
-          // Non-player target (pickup/chest/harvestable/other enemy)
           const td = Math.hypot(target.x - e.x, target.y - e.y);
           if (target.type === 'weapon' || target.type === 'medkit' || target.type === 'materials' || target.type === 'ammo'){ // a pickup
             if (td > 20){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
-              const dx = Math.cos(e.angle) * e.speed * dt * 0.9;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.9;
-              moveEntityWithCollision(e, dx, dy, e.radius);
             } else {
               enemyPickupCollect(e, target);
               const idx = pickups.indexOf(target);
@@ -1002,9 +950,8 @@
           } else if (target.hasOwnProperty('loot')){ // chest
             if (td > 20){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
-              const dx = Math.cos(e.angle) * e.speed * dt * 0.9;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.9;
-              moveEntityWithCollision(e, dx, dy, e.radius);
             } else {
               target.opened = true;
               const loot = target.loot;
@@ -1016,9 +963,8 @@
           } else if (target.hasOwnProperty('type') && (target.type === 'wood' || target.type === 'stone')){ // harvestable object
             if (td > 26){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
-              const dx = Math.cos(e.angle) * e.speed * dt * 0.8;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.8;
-              moveEntityWithCollision(e, dx, dy, e.radius);
             } else {
               target.hp -= 40 * dt;
               if (target.hp <= 0 && !target.dead){
@@ -1028,27 +974,14 @@
               e.state = 'gather';
             }
           } else {
-            // target is another enemy -> fight them
             if (td > 40){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
-              const dx = Math.cos(e.angle) * e.speed * dt * 0.7;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.7;
-              moveEntityWithCollision(e, dx, dy, e.radius);
             } else {
-              // in melee range, do melee attacks
-              if (now - e.lastMelee > e.meleeRate){
-                e.lastMelee = now;
-                // damage target if it's an enemy
-                if (target && target.health > 0){
-                  target.health -= 8 + randInt(0,6);
-                  target.lastAttackedTime = now;
-                  target.lastAttackerId = e.id;
-                  if (target.health <= 0){
-                    target.health = 0;
-                    // don't credit player
-                  }
-                }
-              }
             }
           }
         }
@@ -1147,25 +1080,13 @@
           ctx.strokeStyle = 'rgba(0,0,0,0.08)'; ctx.strokeRect(s.x,s.y,TILE,TILE);
         }
       }
-      // Storm effect: color outside safe zone (overlay) and leave inside uncolored
       if (storm.active){
-        // fill whole screen with overlay
-        ctx.save();
-        ctx.fillStyle = 'rgba(10,30,80,0.45)';
-        ctx.fillRect(0,0,canvas.width,canvas.height);
-        // Clear the safe circle area by using destination-out
         const sc = worldToScreen(storm.centerX, storm.centerY);
-        ctx.globalCompositeOperation = 'destination-out';
-        ctx.beginPath();
-        ctx.arc(sc.x, sc.y, storm.radius, 0, Math.PI*2);
-        ctx.fill();
-        // restore to draw border
-        ctx.globalCompositeOperation = 'source-over';
-        ctx.strokeStyle = 'rgba(255,200,80,0.9)';
-        ctx.lineWidth = 3;
-        ctx.beginPath();
-        ctx.arc(sc.x, sc.y, storm.radius, 0, Math.PI*2);
-        ctx.stroke();
         ctx.restore();
       }
     }
@@ -1337,74 +1258,6 @@
     function drawCrosshair(){}
-    // Minimap drawing
-    function drawMinimap(){
-      const mw = minimapCanvas.width;
-      const mh = minimapCanvas.height;
-      const scaleX = WORLD.width / mw;
-      const scaleY = WORLD.height / mh;
-      // draw terrain by per-pixel sampling of biomeAt (cheap for 220x140)
-      const img = miniCtx.createImageData(mw, mh);
-      for (let my=0; my<mh; my++){
-        for (let mx=0; mx<mw; mx++){
-          const wx = Math.floor(mx * scaleX + scaleX/2);
-          const wy = Math.floor(my * scaleY + scaleY/2);
-          const b = biomeAt(wx, wy);
-          let col = [32,58,43]; // default
-          if (b==='desert') col = [203,183,139];
-          else if (b==='forest') col = [22,65,31];
-          else if (b==='oasis') col = [39,75,82];
-          else if (b==='ruins') col = [74,59,59];
-          const idx = (my*mw + mx)*4;
-          img.data[idx] = col[0];
-          img.data[idx+1] = col[1];
-          img.data[idx+2] = col[2];
-          img.data[idx+3] = 255;
-        }
-      }
-      miniCtx.putImageData(img, 0, 0);
-      // draw storm overlay: color outside safe zone, leave inside transparent
-      if (storm.active){
-        miniCtx.save();
-        miniCtx.fillStyle = 'rgba(10,30,80,0.55)';
-        miniCtx.fillRect(0,0,mw,mh);
-        miniCtx.globalCompositeOperation = 'destination-out';
-        const cx = (storm.centerX) / WORLD.width * mw;
-        const cy = (storm.centerY) / WORLD.height * mh;
-        const r = storm.radius / WORLD.width * mw; // approximate scale (keep aspect roughly)
-        miniCtx.beginPath();
-        miniCtx.arc(cx, cy, r, 0, Math.PI*2);
-        miniCtx.fill();
-        miniCtx.globalCompositeOperation = 'source-over';
-        // border
-        miniCtx.strokeStyle = 'rgba(255,200,80,0.9)';
-        miniCtx.lineWidth = 2;
-        miniCtx.beginPath();
-        miniCtx.arc(cx, cy, r, 0, Math.PI*2);
-        miniCtx.stroke();
-        miniCtx.restore();
-      }
-      // draw player dot
-      const px = player.x / WORLD.width * mw;
-      const py = player.y / WORLD.height * mh;
-      miniCtx.fillStyle = '#ffff66';
-      miniCtx.beginPath();
-      miniCtx.arc(px, py, 3, 0, Math.PI*2);
-      miniCtx.fill();
-      // optionally draw safe-zone center dot
-      if (storm.active){
-        const cx = (storm.centerX) / WORLD.width * mw;
-        const cy = (storm.centerY) / WORLD.height * mh;
-        miniCtx.fillStyle = 'rgba(255,200,80,0.9)';
-        miniCtx.beginPath();
-        miniCtx.arc(cx, cy, 2, 0, Math.PI*2);
-        miniCtx.fill();
-      }
-    }
     // Main loop
     let lastTime = 0;
     function gameLoop(ts){
@@ -1413,29 +1266,13 @@
       const dt = Math.min(0.05, (ts - lastTime)/1000);
       lastTime = ts;
-      // player movement - axis separated to allow sliding against solids
       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){
         const len = Math.hypot(dx,dy) || 1;
-        const mvx = (dx/len) * player.speed * dt;
-        const mvy = (dy/len) * player.speed * dt;
-        // axis movement with collision
-        // move x first
-        const oldX = player.x, oldY = player.y;
-        player.x += mvx;
-        if (player.x < player.radius) player.x = player.radius;
-        if (player.x > WORLD.width - player.radius) player.x = WORLD.width - player.radius;
-        if (isCollidingSolid(player.x, player.y, player.radius)){
-          player.x = oldX;
-        }
-        // then y
-        player.y += mvy;
-        if (player.y < player.radius) player.y = player.radius;
-        if (player.y > WORLD.height - player.radius) player.y = WORLD.height - player.radius;
-        if (isCollidingSolid(player.x, player.y, player.radius)){
-          player.y = oldY;
-        }
       }
       player.x = Math.max(16, Math.min(WORLD.width-16, player.x));
       player.y = Math.max(16, Math.min(WORLD.height-16, player.y));
@@ -1492,9 +1329,6 @@
       drawWorld(); drawObjects(); drawChests(); drawPickups(); drawEnemies(); drawBullets(); drawPlayer(); drawCrosshair();
       updateHUD();
-      // minimap draw
-      drawMinimap();
       if (storm.active && playerInStorm()) stormWarning.classList.remove('hidden'); else stormWarning.classList.add('hidden');
       requestAnimationFrame(gameLoop);

 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>BattleZone Royale - Spawn & AI Fixes</title>
   <script src="https://cdn.tailwindcss.com"></script>
   <script src="https://unpkg.com/feather-icons"></script>
   <style>
     html,body { height:100%; margin:0; background:#0b1220; color:#fff; font-family:monospace; }
     #canvasContainer { position:relative; flex:1; display:flex; justify-content:center; align-items:center; height:100vh; overflow:hidden; }
     #gameCanvas { display:block; user-select:none; cursor:crosshair; box-shadow:0 0 20px rgba(0,0,0,.5); width:100%; height:100%; }
     /* HUD */
     #hudHealth { position:absolute; left:12px; bottom:12px; background:rgba(0,0,0,0.55); padding:6px 8px; border-radius:8px; font-weight:700; font-size:13px; display:flex; align-items:center; gap:8px; z-index:30; }
     #hudGearWrap { position:absolute; right:12px; bottom:12px; display:flex; gap:8px; align-items:center; z-index:30; }
       <div id="canvasContainer" class="relative bg-gray-900 border-4 border-gray-700 rounded-xl max-w-full max-h-full">
         <canvas id="gameCanvas"></canvas>
         <div id="stormWarning" class="hidden absolute top-6 left-1/2 transform -translate-x-1/2 bg-red-900 bg-opacity-80 text-white px-6 py-3 rounded-lg flex items-center">
           <i data-feather="alert-circle" class="mr-2"></i>
           <span>STORM APPROACHING! MOVE TO SAFE ZONE!</span>
     const continueBtn = document.getElementById('continueBtn');
     const biomeGrid = document.getElementById('biomeGrid');
     // World
     const WORLD = { width: 6000, height: 4000 };
     let camera = { x:0, y:0 };
     const VIEW_RANGE = 1200;          // if player is farther than this, enemies switch target
     const SPAWN_PROTECT_MS = 1200;    // time after spawn they ignore ground pickups to avoid instant pickup
     // Populate world - spawn many objects and enemies
     function populateWorld(){
       chests.length = 0; objects.length = 0; enemies.length = 0; pickups.length = 0;
           reloadingUntil: 0,
           reloadPending: false,
           lastAttackedTime: 0,
           state: 'gather',
           gatherTimeLeft: rand(8,16),
           target: null,
       return closest;
     }
     // Bullets update
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
             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;
             }
             // move towards safe zone center
             e.state = 'toSafe';
             e.angle = Math.atan2(storm.centerY - e.y, storm.centerX - e.x);
+            e.x += Math.cos(e.angle) * e.speed * dt * 0.95;
+            e.y += Math.sin(e.angle) * e.speed * dt * 0.95;
+            // avoid getting stuck: allow minor wandering
             if (Math.random() < 0.02) e.angle += (Math.random()-0.5)*0.5;
+            // clamp
+            e.x = Math.max(12, Math.min(WORLD.width-12, e.x));
+            e.y = Math.max(12, Math.min(WORLD.height-12, e.y));
             continue; // priority movement to safe zone
           }
         }
             if (p){
               const angle = Math.atan2(p.y - e.y, p.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(p.x - e.x, p.y - e.y) < 18){
                 enemyPickupCollect(e, p);
                 const idx = pickups.indexOf(p);
             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 {
               chestTarget.opened = true;
               const loot = chestTarget.loot;
             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 {
               objTarget.hp -= 40 * dt;
               if (objTarget.hp <= 0 && !objTarget.dead){
           }
           // roam
+          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;
         }
           }
         }
+        // choose a target: prefer player if within view range, otherwise pick something else (pickup/chest/harvest/nearest enemy)
+        let target = player;
+        let bestDist = Math.hypot(player.x - e.x, player.y - e.y);
+        if (bestDist > VIEW_RANGE){
+          // player is too far: find the nearest meaningful target
+          const p = findNearestPickup(e, 1200);
+          const c = findNearestChest(e, 1200);
+          const h = findNearestHarvestable(e, 1200);
+          let candidate = null, cd = Infinity;
+          if (p){ const d=Math.hypot(p.x-e.x,p.y-e.y); if (d<cd){ candidate=p; cd=d; } }
+          if (c){ const d=Math.hypot(c.x-e.x,c.y-e.y); if (d<cd){ candidate=c; cd=d; } }
+          if (h){ const d=Math.hypot(h.x-e.x,h.y-e.y); if (d<cd){ candidate=h; cd=d; } }
+          // try target nearest enemy (tend to form small groups) but don't go after a dead one
+          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 < cd && d <= 800){ candidate = other; cd = d; }
+          }
+          if (candidate){
+            target = candidate;
+            bestDist = cd;
           } else {
+            target = null; bestDist = Infinity; // no specific target - roam
+          }
+        } else {
+          // still consider switching to another close enemy sometimes
+          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; }
           }
         }
+        // retreat/build if low HP and has materials
+        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 no target (roaming), do simple roam
         if (!target){
           e.x += Math.cos(e.angle) * e.speed * dt * 0.7;
           e.y += Math.sin(e.angle) * e.speed * dt * 0.7;
           if (Math.random() < 0.02) e.angle += (Math.random()-0.5)*1.5;
           continue;
         }
+        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 {
+              if (e.equippedIndex >= 0){
+                const eq = e.inventory[e.equippedIndex];
+                if (eq && eq.type === 'weapon' && eq.ammoInMag > 0 && !e.reloadPending && 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 {
+                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;
+          }
+        }
+        // If target is player, perform attack logic; if target is other entity/object, adapt accordingly
         if (target === player){
+          // Attack: if melee range
           if (distToPlayer < 36 && now - e.lastMelee > e.meleeRate){
             e.lastMelee = now;
             const dmg = 10 + randInt(0,8);
                   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 {
               // unarmed behavior: rush 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 {
             // no weapon: rush in
             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 {
+          // Target is a chest/pickup/harvestable/other enemy
           const td = Math.hypot(target.x - e.x, target.y - e.y);
           if (target.type === 'weapon' || target.type === 'medkit' || target.type === 'materials' || target.type === 'ammo'){ // a pickup
             if (td > 20){
               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 {
               enemyPickupCollect(e, target);
               const idx = pickups.indexOf(target);
           } else if (target.hasOwnProperty('loot')){ // chest
             if (td > 20){
               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 {
               target.opened = true;
               const loot = target.loot;
           } else if (target.hasOwnProperty('type') && (target.type === 'wood' || target.type === 'stone')){ // harvestable object
             if (td > 26){
               e.angle = Math.atan2(target.y - e.y, target.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 {
               target.hp -= 40 * dt;
               if (target.hp <= 0 && !target.dead){
               e.state = 'gather';
             }
           } else {
+            // target is another enemy (group up / follow)
             if (td > 40){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+              e.x += Math.cos(e.angle) * e.speed * dt * 0.7;
+              e.y += Math.sin(e.angle) * e.speed * dt * 0.7;
             } else {
+              // stay near ally
+              if (Math.random() < 0.02) e.angle += (Math.random()-0.5)*0.5;
             }
           }
         }
           ctx.strokeStyle = 'rgba(0,0,0,0.08)'; ctx.strokeRect(s.x,s.y,TILE,TILE);
         }
       }
       if (storm.active){
         const sc = worldToScreen(storm.centerX, storm.centerY);
+        ctx.save();
+        const grad = ctx.createRadialGradient(sc.x, sc.y, storm.radius*0.15, sc.x, sc.y, storm.radius);
+        grad.addColorStop(0,'rgba(100,149,237,0.02)'); grad.addColorStop(1,'rgba(100,149,237,0.45)');
+        ctx.fillStyle = grad; ctx.beginPath(); ctx.arc(sc.x, sc.y, storm.radius, 0, Math.PI*2); ctx.fill();
+        ctx.strokeStyle = 'rgba(255,200,80,0.9)'; ctx.lineWidth=4; ctx.beginPath(); ctx.arc(sc.x, sc.y, storm.radius, 0, Math.PI*2); ctx.stroke();
         ctx.restore();
       }
     }
     function drawCrosshair(){}
     // Main loop
     let lastTime = 0;
     function gameLoop(ts){
       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){
         const len = Math.hypot(dx,dy) || 1;
+        player.x += (dx/len) * player.speed * dt;
+        player.y += (dy/len) * player.speed * dt;
       }
       player.x = Math.max(16, Math.min(WORLD.width-16, player.x));
       player.y = Math.max(16, Math.min(WORLD.height-16, player.y));
       drawWorld(); drawObjects(); drawChests(); drawPickups(); drawEnemies(); drawBullets(); drawPlayer(); drawCrosshair();
       updateHUD();
       if (storm.active && playerInStorm()) stormWarning.classList.remove('hidden'); else stormWarning.classList.add('hidden');
       requestAnimationFrame(gameLoop);