Spaces:

bbc123321
/

battle-zone-royale

Running

App Files Files Community

bbc123321 commited on Oct 15, 2025

Commit

492f5c0

verified ·

1 Parent(s): 68e0452

Manual changes saved

Browse files

Files changed (1) hide show

index.html +481 -132

index.html CHANGED Viewed

@@ -3,13 +3,18 @@
 <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; }
@@ -91,6 +96,11 @@
       <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>
@@ -149,6 +159,11 @@
     const continueBtn = document.getElementById('continueBtn');
     const biomeGrid = document.getElementById('biomeGrid');
     // World
     const WORLD = { width: 6000, height: 4000 };
     let camera = { x:0, y:0 };
@@ -157,7 +172,11 @@
       const ctn = document.getElementById('canvasContainer');
       canvas.width = Math.max(900, Math.floor(ctn.clientWidth));
       canvas.height = Math.max(560, Math.floor(ctn.clientHeight));
       cameraUpdate();
     }
     window.addEventListener('resize', resizeCanvas);
@@ -254,7 +273,7 @@
     function generateLootForBiome(b){
       const roll = Math.random();
       if (roll < 0.35) return { type:'medkit', amount:1 };
-      if (roll < 0.7) return { type:'materials', amount: 10 }; // always 10
       const weapons = [
         { name:'Pistol', dmg:12, rate:320, color:'#ffd86b', magSize:12, startReserve:24 },
         { name:'SMG', dmg:6, rate:120, color:'#8ef0ff', magSize:30, startReserve:90 },
@@ -265,17 +284,61 @@
     }
     // Behaviour tuning
-    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;
       for (let i=0;i<260;i++){
         const x = rand(150, WORLD.width-150);
         const y = rand(150, WORLD.height-150);
         const loot = generateLootForBiome(biomeAt(x,y));
-        if (loot.type === 'materials') loot.amount = 10; // ensure 10
         chests.push({ x,y, opened:false, loot });
       }
       for (let i=0;i<700;i++){
@@ -287,7 +350,6 @@
         const hp = type==='wood'?40 : (type==='stone'?80:160);
         objects.push({ x,y, type, hp, maxHp:hp, dead:false });
       }
-      // spawn enemies - ensure they start unarmed and must loot to obtain weapons
       const now = performance.now();
       for (let i=0;i<49;i++){
         const ex = rand(300, WORLD.width-300);
@@ -296,7 +358,7 @@
           id:'e'+i, x:ex, y:ey, radius:14, angle:rand(0,Math.PI*2), speed:110+rand(-20,20),
           health: 80 + randInt(0,40), lastMelee:0, meleeRate:800 + randInt(-200,200),
           roamTimer: rand(0,3),
-          inventory: [null,null,null,null,null], // explicitly no weapons at spawn
           selectedSlot: 0,
           equippedIndex: -1,
           materials: 0,
@@ -308,7 +370,10 @@
           gatherTimeLeft: rand(8,16),
           target: null,
           nextHealTime: 0,
-          spawnSafeUntil: now + SPAWN_PROTECT_MS // cooldown: ignore nearby ground pickups for short time
         });
       }
       updatePlayerCount();
@@ -372,7 +437,7 @@
     }
     function worldToScreen(wx,wy){ return { x: Math.round(wx - camera.x), y: Math.round(wy - camera.y) }; }
-    // Combat utilities
     function shootBullet(originX, originY, targetX, targetY, weaponObj, shooterId){
       if (!weaponObj || (typeof weaponObj.ammoInMag === 'number' && weaponObj.ammoInMag <= 0)) return false;
       const speed = 1100;
@@ -492,37 +557,70 @@
       }
     }
-    // Enemy helpers (equip / collect)
     function enemyEquipBestWeapon(e){
       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;
-      else e.equippedIndex = -1;
     }
     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++){
           const it = e.inventory[s];
           if (it && it.type==='weapon'){
@@ -530,11 +628,14 @@
             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++){
@@ -605,6 +706,34 @@
       return closest;
     }
     // Bullets update
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
@@ -676,41 +805,52 @@
       return best;
     }
-    // Enemy AI with gather-first + separation + reload with delay
     function updateEnemies(dt, now){
-      // basic separation step variables
-      const minSeparation = 20; // minimal distance between enemies
-      // Update each enemy movement and actions
       for (const e of enemies){
         if (e.health <= 0) continue;
-        // ensure spawn protection exists
         if (!e.spawnSafeUntil) e.spawnSafeUntil = performance.now() + SPAWN_PROTECT_MS;
-        // If storm is active and enemy is outside safe zone, move to safe zone first
         if (storm.active){
           const distToSafeCenter = Math.hypot(e.x - storm.centerX, e.y - storm.centerY);
           if (distToSafeCenter > storm.radius){
-            // 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 recently attacked go combat
-        if (now - e.lastAttackedTime < 4000) e.state = 'combat';
-        if (e.state === 'gather') e.gatherTimeLeft -= dt;
-        // Medkit-only heal (consume medkit, with cooldown)
         if (e.health < 60 && now >= (e.nextHealTime || 0)){
           let medIdx = -1;
           for (let s=0;s<5;s++){
@@ -727,53 +867,106 @@
           }
         }
-        // Transition gather->combat only if they actually have weapons/ammo or enough materials or time expired
         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';
         if (e.state === 'gather'){
-          // Prioritize pickup -> chest -> harvest -> roam
-          // Respect spawn protection so they don't instantly pick up something they spawned on
           if (now >= (e.spawnSafeUntil || 0)){
             let p = findNearestPickup(e, 240);
-            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);
                 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 {
-              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 || 10 });
             }
             continue;
           }
           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 {
               objTarget.hp -= 40 * dt;
               if (objTarget.hp <= 0 && !objTarget.dead){
@@ -790,17 +983,15 @@
             continue;
           }
-          // 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;
         }
         // Combat state
         if (e.equippedIndex === -1) enemyEquipBestWeapon(e);
-        // Handle reload pending (delayed reload to simulate player reload)
         if (e.reloadPending){
           if (now >= e.reloadingUntil){
             const eq = e.inventory[e.equippedIndex];
@@ -809,21 +1000,45 @@
             e.reloadingUntil = 0;
           }
         }
-        // If equipped weapon empty and reserve present, start reload (delayed)
         if (e.equippedIndex >= 0){
           const eq = e.inventory[e.equippedIndex];
           if (eq && eq.type === 'weapon' && eq.ammoInMag <= 0 && eq.ammoReserve > 0 && !e.reloadPending && now >= e.reloadingUntil){
             e.reloadPending = true;
-            e.reloadingUntil = now + 600 + rand(-100,100); // ~600ms reload time
           }
         }
-        // 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);
@@ -831,7 +1046,6 @@
           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);
@@ -841,10 +1055,9 @@
             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);
@@ -852,20 +1065,20 @@
           }
         }
-        // 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);
@@ -883,19 +1096,34 @@
                   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);
@@ -906,7 +1134,14 @@
             const eq = e.inventory[e.equippedIndex];
             if (eq && eq.type === 'weapon' && !e.reloadPending && now - (e.lastShot||0) > (eq.weapon.rate || 300)){
               if (eq.ammoInMag <= 0){
-                // reload will be handled above
               } else {
                 if (hasLineOfSight(e.x, e.y, target.x, target.y)){
                   e.lastShot = now;
@@ -915,56 +1150,57 @@
                   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);
               if (idx >= 0) pickups.splice(idx,1);
               e.state = 'gather';
             }
-          } 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;
-              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 || 10 });
-              e.state = 'gather';
             }
-          } 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){
@@ -974,20 +1210,25 @@
               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;
             }
           }
         }
       }
-      // Separation pass to avoid clumping (simple repulsion)
       for (let i = 0; i < enemies.length; i++){
         const a = enemies[i];
         if (!a || a.health <= 0) continue;
@@ -1000,14 +1241,12 @@
           if (d < minD){
             const overlap = (minD - d) * 0.5;
             const nx = dx / d, ny = dy / d;
-            // push both away proportional to overlap
             b.x += nx * overlap;
             b.y += ny * overlap;
             a.x -= nx * overlap;
             a.y -= ny * overlap;
           }
         }
-        // also avoid getting on top of player
         const pdx = a.x - player.x, pdy = a.y - player.y;
         const pd = Math.hypot(pdx,pdy) || 0.0001;
         const avoidDist = 24;
@@ -1017,7 +1256,6 @@
           a.x += nx * overlap;
           a.y += ny * overlap;
         }
-        // clamp to world
         a.x = Math.max(12, Math.min(WORLD.width-12, a.x));
         a.y = Math.max(12, Math.min(WORLD.height-12, a.y));
       }
@@ -1062,7 +1300,7 @@
       }
     }
-    // Drawing
     function drawWorld(){
       const TILE = 600;
       const cols = Math.ceil(WORLD.width / TILE);
@@ -1161,7 +1399,6 @@
         const hpPct = Math.max(0, Math.min(1, e.health/120));
         ctx.fillStyle='#ff6b6b'; ctx.fillRect(-18,-22,36*hpPct,6);
-        // visible equipped weapon
         if (e.equippedIndex >= 0 && e.inventory[e.equippedIndex] && e.inventory[e.equippedIndex].type === 'weapon'){
           const we = e.inventory[e.equippedIndex];
           const color = we.weapon.color || '#ddd';
@@ -1191,7 +1428,6 @@
           }
         }
-        // state marker
         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();
@@ -1258,6 +1494,108 @@
     function drawCrosshair(){}
     // Main loop
     let lastTime = 0;
     function gameLoop(ts){
@@ -1266,13 +1604,25 @@
       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));
@@ -1289,7 +1639,6 @@
         if (selected && selected.type === 'weapon') activeWeaponItem = selected;
       }
-      // player attack
       if (mouse.down){
         if (player.equippedIndex === -1) playerMeleeHit();
         else if (activeWeaponItem && activeWeaponItem.type === 'weapon'){
@@ -1308,27 +1657,26 @@
       if (keys.e){ interactNearby(); keys.e = false; }
       if (keys.q){ tryBuild(); keys.q = false; }
-      // update
       updateEnemies(dt, performance.now());
       bulletsUpdate(dt);
-      // player pickup auto-collect
       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(); }
       }
-      // clean dead objects
       for (let i=objects.length-1;i>=0;i--) if (objects[i].dead) objects.splice(i,1);
       updatePlayerCount();
       updateStorm(dt);
-      // render
       ctx.clearRect(0,0,canvas.width,canvas.height);
       drawWorld(); drawObjects(); drawChests(); drawPickups(); drawEnemies(); drawBullets(); drawPlayer(); drawCrosshair();
       updateHUD();
       if (storm.active && playerInStorm()) stormWarning.classList.remove('hidden'); else stormWarning.classList.add('hidden');
       requestAnimationFrame(gameLoop);
@@ -1337,7 +1685,6 @@
     // Landing -> spawn selection
     let selectedBiome = null;
     function getSpawnForBiome(b){
-      // choose a spawn area region for each biome
       if (!b) return { x: WORLD.width/2 + (Math.random()-0.5)*400, y: WORLD.height/2 + (Math.random()-0.5)*400 };
       if (b === 'desert') return { x: rand(200, WORLD.width*0.3), y: rand(200, WORLD.height*0.3) };
       if (b === 'forest') return { x: rand(WORLD.width*0.7, WORLD.width-200), y: rand(200, WORLD.height*0.3) };
@@ -1352,7 +1699,6 @@
     let gameActive = false;
     function startGame(biome){
-      // set current biome & spawn where selected
       selectedBiome = biome || selectedBiome;
       const spawn = getSpawnForBiome(selectedBiome);
       document.getElementById('currentBiome').textContent = selectedBiome ? selectedBiome.toUpperCase() : 'CENTER';
@@ -1375,17 +1721,23 @@
       initHUD();
       cameraUpdate();
-      // small safety: ensure enemies don't spawn right on player
       for (const e of enemies){
         if (Math.hypot(e.x - player.x, e.y - player.y) < 180){
           e.x += (Math.random()<0.5? -1:1) * rand(160,260);
           e.y += (Math.random()<0.5? -1:1) * rand(160,260);
         }
-        // ensure they are unarmed at start
         e.inventory = [null,null,null,null,null];
         e.equippedIndex = -1;
         e.spawnSafeUntil = performance.now() + SPAWN_PROTECT_MS;
         e.state = 'gather';
       }
       gameTime = 300; storm.active = false; storm.radius = storm.maxRadius;
@@ -1418,20 +1770,17 @@
     goHomeBtn.addEventListener('click', ()=>{ victoryScreen.classList.add('hidden'); gameScreen.classList.add('hidden'); landingScreen.classList.remove('hidden'); });
     continueBtn.addEventListener('click', ()=>{ victoryScreen.classList.add('hidden'); startGame(selectedBiome); });
-    // Biome click behavior: select & start spawn there
     document.querySelectorAll('.biome-selector').forEach(el => {
       el.addEventListener('click', (ev)=>{
-        // visual selection feedback
         document.querySelectorAll('.biome-selector').forEach(x=>x.classList.remove('biome-selected'));
         el.classList.add('biome-selected');
         const biome = el.dataset.biome;
         selectedBiome = biome;
-        // start game immediately with the selected biome spawn region
         startGame(biome);
       });
     });
-    // initialisation
     resizeCanvas();
     populateWorld();
     feather.replace();

 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
+  <title>BattleZone Royale - Minimap Added</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 (top-right) */
+    #minimap { position: absolute; top:12px; right:12px; 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); pointer-events: none; }
+    #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; }
       <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-right) -->
+        <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>
     const continueBtn = document.getElementById('continueBtn');
     const biomeGrid = document.getElementById('biomeGrid');
+    // Minimap elements and cache
+    const minimapCanvas = document.getElementById('minimapCanvas');
+    const miniCtx = minimapCanvas.getContext('2d');
+    let miniTerrainCache = null;
     // World
     const WORLD = { width: 6000, height: 4000 };
     let camera = { x:0, y:0 };
       const ctn = document.getElementById('canvasContainer');
       canvas.width = Math.max(900, Math.floor(ctn.clientWidth));
       canvas.height = Math.max(560, Math.floor(ctn.clientHeight));
+      // keep minimap internal pixel buffer consistent
+      minimapCanvas.width = 220;
+      minimapCanvas.height = 140;
       cameraUpdate();
+      miniTerrainCache = null; // rebuild on resize
     }
     window.addEventListener('resize', resizeCanvas);
     function generateLootForBiome(b){
       const roll = Math.random();
       if (roll < 0.35) return { type:'medkit', amount:1 };
+      if (roll < 0.7) return { type:'materials', amount: 10 };
       const weapons = [
         { name:'Pistol', dmg:12, rate:320, color:'#ffd86b', magSize:12, startReserve:24 },
         { name:'SMG', dmg:6, rate:120, color:'#8ef0ff', magSize:30, startReserve:90 },
     }
     // Behaviour tuning
+    const VIEW_RANGE = 1200;
+    const SPAWN_PROTECT_MS = 1200;
+    // 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){
+      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;
+      }
+      for (const c of chests){
+        if (c.opened) continue;
+        if (circleOverlap(x,y,r,c.x,c.y,chestRadius())) return true;
+      }
+      return false;
+    }
+    function moveEntityWithCollision(entity, dx, dy, radius){
+      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;
+      }
+      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;
+      }
+    }
+    // Populate world
     function populateWorld(){
       chests.length = 0; objects.length = 0; enemies.length = 0; pickups.length = 0;
       for (let i=0;i<260;i++){
         const x = rand(150, WORLD.width-150);
         const y = rand(150, WORLD.height-150);
         const loot = generateLootForBiome(biomeAt(x,y));
+        if (loot.type === 'materials') loot.amount = 10;
         chests.push({ x,y, opened:false, loot });
       }
       for (let i=0;i<700;i++){
         const hp = type==='wood'?40 : (type==='stone'?80:160);
         objects.push({ x,y, type, hp, maxHp:hp, dead:false });
       }
       const now = performance.now();
       for (let i=0;i<49;i++){
         const ex = rand(300, WORLD.width-300);
           id:'e'+i, x:ex, y:ey, radius:14, angle:rand(0,Math.PI*2), speed:110+rand(-20,20),
           health: 80 + randInt(0,40), lastMelee:0, meleeRate:800 + randInt(-200,200),
           roamTimer: rand(0,3),
+          inventory: [null,null,null,null,null],
           selectedSlot: 0,
           equippedIndex: -1,
           materials: 0,
           gatherTimeLeft: rand(8,16),
           target: null,
           nextHealTime: 0,
+          spawnSafeUntil: now + SPAWN_PROTECT_MS,
+          tempTarget: null,
+          tempTargetExpiry: 0,
+          prioritizeChestsUntil: 0
         });
       }
       updatePlayerCount();
     }
     function worldToScreen(wx,wy){ return { x: Math.round(wx - camera.x), y: Math.round(wy - camera.y) }; }
+    // Combat utilities (kept same as before)
     function shootBullet(originX, originY, targetX, targetY, weaponObj, shooterId){
       if (!weaponObj || (typeof weaponObj.ammoInMag === 'number' && weaponObj.ammoInMag <= 0)) return false;
       const speed = 1100;
       }
     }
+    // Enemy helpers
     function enemyEquipBestWeapon(e){
+      // prefer weapons that have ammo loaded or reserve; compute score and prefer loaded ones
       let bestIdx = -1;
       let bestScore = -Infinity;
       for (let i=0;i<5;i++){
         const it = e.inventory[i];
         if (it && it.type === 'weapon'){
+          const dmg = (it.weapon && it.weapon.dmg) ? it.weapon.dmg : 1;
+          const rate = (it.weapon && it.weapon.rate) ? it.weapon.rate : 300;
+          let score = dmg / rate;
+          // bonus if currently has ammo in mag
+          if (typeof it.ammoInMag === 'number' && it.ammoInMag > 0) score += 0.5;
+          if (typeof it.ammoReserve === 'number' && it.ammoReserve > 0) score += 0.2;
           if (score > bestScore){ bestScore = score; bestIdx = i; }
         }
       }
+      if (bestIdx !== -1) {
+        e.equippedIndex = bestIdx;
+      } else {
+        e.equippedIndex = -1;
+      }
+    }
+    function normalizeWeaponPickup(p){
+      // ensure fields exist and are numbers
+      const w = p.weapon ? p.weapon : makeWeaponProto(p);
+      const ammoInMag = (typeof p.ammoInMag === 'number') ? p.ammoInMag : (w.magSize || w.magSize || 12);
+      const ammoReserve = (typeof p.ammoReserve === 'number') ? p.ammoReserve : (w.startReserve || (w.magSize*2) || 24);
+      return { type:'weapon', weapon: w, ammoInMag: Math.max(0, Math.floor(ammoInMag)), ammoReserve: Math.max(0, Math.floor(ammoReserve)) };
     }
     function enemyPickupCollect(e, p){
+      if (!e || !p) return;
       if (p.type === 'weapon'){
+        const normalized = normalizeWeaponPickup(p);
+        // 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 === normalized.weapon.name){
+            it.ammoReserve = (it.ammoReserve || 0) + (normalized.ammoReserve || 0);
+            it.ammoInMag = Math.min(it.weapon.magSize, (it.ammoInMag || 0) + (normalized.ammoInMag || 0));
             enemyEquipBestWeapon(e);
+            // ensure they equip a loaded weapon if present
+            if (it.ammoInMag > 0) e.equippedIndex = s;
+            e.state = 'combat';
+            e.lastAttackedTime = performance.now();
             return;
           }
         }
+        // place into empty slot if available
         for (let s=0;s<5;s++){
+          if (!e.inventory[s]){
+            e.inventory[s] = { type:'weapon', weapon: normalized.weapon, ammoInMag: normalized.ammoInMag, ammoReserve: normalized.ammoReserve };
+            enemyEquipBestWeapon(e);
+            // equip this weapon if it has ammo or if no other better weapon
+            if (e.inventory[s].ammoInMag > 0) e.equippedIndex = s;
+            e.state = 'combat';
+            e.lastAttackedTime = performance.now();
+            return;
+          }
         }
+        // replace worst weapon if pickup is better
         let worstIdx = -1, worstScore = Infinity;
         for (let s=0;s<5;s++){
           const it = e.inventory[s];
           if (it && it.type==='weapon'){
             if (score < worstScore){ worstScore = score; worstIdx = s; }
           }
         }
+        const pickupScore = (normalized.weapon.dmg || 1) / (normalized.weapon.rate || 300);
         if (pickupScore > worstScore && worstIdx !== -1){
+          e.inventory[worstIdx] = { type:'weapon', weapon: normalized.weapon, ammoInMag: normalized.ammoInMag, ammoReserve: normalized.ammoReserve };
           enemyEquipBestWeapon(e);
+          e.state = 'combat';
+          e.lastAttackedTime = performance.now();
         } else {
+          e.materials += Math.floor((normalized.ammoReserve || 0) / 2);
         }
       } else if (p.type === 'medkit'){
         for (let s=0;s<5;s++){
       return closest;
     }
+    // New helper: compute detour waypoint around blocker
+    function computeDetourWaypoint(fromX, fromY, blocker, goalX, goalY, padding = 12){
+      if (!blocker) return null;
+      let br = 0;
+      if (blocker.type === 'wall') br = 28;
+      else if (blocker.type === 'stone') br = 22;
+      else if (blocker.type === 'wood') br = 16;
+      else br = 18;
+      // vector from blocker to from
+      const vx = fromX - blocker.x;
+      const vy = fromY - blocker.y;
+      const len = Math.hypot(vx, vy) || 0.0001;
+      // perp directions
+      const px = -vy / len;
+      const py = vx / len;
+      const radius = br + padding + 8;
+      const cand1 = { x: blocker.x + px * radius, y: blocker.y + py * radius };
+      const cand2 = { x: blocker.x - px * radius, y: blocker.y - py * radius };
+      // choose candidate that's closer to goal and not inside other solids (approx)
+      const d1 = Math.hypot(cand1.x - goalX, cand1.y - goalY);
+      const d2 = Math.hypot(cand2.x - goalX, cand2.y - goalY);
+      const chosen = d1 < d2 ? cand1 : cand2;
+      // clamp to world
+      chosen.x = Math.max(16, Math.min(WORLD.width-16, chosen.x));
+      chosen.y = Math.max(16, Math.min(WORLD.height-16, chosen.y));
+      return chosen;
+    }
     // Bullets update
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
       return best;
     }
+    // Enemy AI (improved: detour around obstacles and prioritize chest looting early, ensure equipping)
     function updateEnemies(dt, now){
+      const minSeparation = 20;
       for (const e of enemies){
         if (e.health <= 0) continue;
         if (!e.spawnSafeUntil) e.spawnSafeUntil = performance.now() + SPAWN_PROTECT_MS;
+        // clear expired tempTarget
+        if (e.tempTarget && now > (e.tempTargetExpiry || 0)) { e.tempTarget = null; e.tempTargetExpiry = 0; }
+        // If in storm move towards safe zone, using detours around blockers
         if (storm.active){
           const distToSafeCenter = Math.hypot(e.x - storm.centerX, e.y - storm.centerY);
           if (distToSafeCenter > storm.radius){
             e.state = 'toSafe';
+            if (e.tempTarget){
+              const td = Math.hypot(e.tempTarget.x - e.x, e.tempTarget.y - e.y);
+              if (td > 8){
+                e.angle = Math.atan2(e.tempTarget.y - e.y, e.tempTarget.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);
+                continue;
+              } else {
+                e.tempTarget = null;
+                e.tempTargetExpiry = 0;
+              }
+            }
+            if (!hasLineOfSight(e.x, e.y, storm.centerX, storm.centerY)){
+              const blocker = findBlockingObject(e.x, e.y, storm.centerX, storm.centerY);
+              if (blocker){
+                e.tempTarget = computeDetourWaypoint(e.x, e.y, blocker, storm.centerX, storm.centerY);
+                e.tempTargetExpiry = now + 2500;
+                if (e.tempTarget) { e.angle = Math.atan2(e.tempTarget.y - e.y, e.tempTarget.x - e.x); const dx = Math.cos(e.angle) * e.speed * dt * 0.95; const dy = Math.sin(e.angle) * e.speed * dt * 0.95; moveEntityWithCollision(e, dx, dy, e.radius); continue; }
+              }
+            }
             e.angle = Math.atan2(storm.centerY - e.y, storm.centerX - e.x);
+            const dx = Math.cos(e.angle) * e.speed * dt * 0.95;
+            const dy = Math.sin(e.angle) * e.speed * dt * 0.95;
+            moveEntityWithCollision(e, dx, dy, e.radius);
             if (Math.random() < 0.02) e.angle += (Math.random()-0.5)*0.5;
+            continue;
           }
         }
+        // Healing logic
         if (e.health < 60 && now >= (e.nextHealTime || 0)){
           let medIdx = -1;
           for (let s=0;s<5;s++){
           }
         }
+        // State transitions
         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';
+        if (e.state === 'gather') e.gatherTimeLeft -= dt;
+        // Early-game chest priority: force chest-seeking for first few seconds to equip weapons quickly
+        const prioritizeChests = (e.prioritizeChestsUntil && now < e.prioritizeChestsUntil);
         if (e.state === 'gather'){
           if (now >= (e.spawnSafeUntil || 0)){
+            // pickups nearby priority (quick ammo/weapon)
             let p = findNearestPickup(e, 240);
+            if (p && !prioritizeChests){
               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);
                 if (idx >= 0) pickups.splice(idx,1);
+                // equip best weapon immediately if any
+                enemyEquipBestWeapon(e);
               }
               continue;
             }
           }
+          // If we don't have a useful weapon yet, prioritize chests strongly (extended radius)
+          let chestSearchRadius = prioritizeChests || !hasUsefulWeapon ? 1400 : 900;
+          let chestTarget = findNearestChest(e, chestSearchRadius);
           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);
+              // navigate with detour logic if blocked
+              if (!hasLineOfSight(e.x, e.y, chestTarget.x, chestTarget.y)){
+                const blocker = findBlockingObject(e.x, e.y, chestTarget.x, chestTarget.y);
+                if (blocker){
+                  if (!e.tempTarget){
+                    e.tempTarget = computeDetourWaypoint(e.x, e.y, blocker, chestTarget.x, chestTarget.y);
+                    e.tempTargetExpiry = now + 2500;
+                  }
+                  if (e.tempTarget){
+                    const td = Math.hypot(e.tempTarget.x - e.x, e.tempTarget.y - e.y);
+                    if (td > 8){
+                      e.angle = Math.atan2(e.tempTarget.y - e.y, e.tempTarget.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);
+                      continue;
+                    } else {
+                      e.tempTarget = null;
+                      e.tempTargetExpiry = 0;
+                    }
+                  }
+                }
+              }
+              // If unobstructed or detour not set/needed, move directly
+              const dx = Math.cos(e.angle) * e.speed * dt * 0.95;
+              const dy = Math.sin(e.angle) * e.speed * dt * 0.95;
+              moveEntityWithCollision(e, dx, dy, e.radius);
             } else {
+              // open chest and collect
+              if (!chestTarget.opened){
+                chestTarget.opened = true;
+                const loot = chestTarget.loot;
+                if (loot.type === 'weapon') {
+                  const wp = { type:'weapon', weapon: makeWeaponProto(loot.weapon), ammoInMag:loot.weapon.magSize||12, ammoReserve:loot.weapon.startReserve||24 };
+                  enemyPickupCollect(e, wp);
+                } 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 || 10 });
+                // ensure equip
+                enemyEquipBestWeapon(e);
+                if (e.equippedIndex !== -1){
+                  const eq = e.inventory[e.equippedIndex];
+                  if (eq && eq.type==='weapon' && eq.ammoInMag <= 0 && eq.ammoReserve > 0){
+                    // immediate reload
+                    reloadItem(eq);
+                  }
+                }
+                // after opening chest, prioritize combat if weapon obtained
+                if (e.inventory.some(it => it && it.type==='weapon')) {
+                  e.state = 'combat';
+                  e.lastAttackedTime = now;
+                }
+              }
             }
             continue;
           }
           let objTarget = findNearestHarvestable(e, 700);
+          if (objTarget && !prioritizeChests){
             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){
             continue;
           }
+          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;
         }
         // Combat state
         if (e.equippedIndex === -1) enemyEquipBestWeapon(e);
         if (e.reloadPending){
           if (now >= e.reloadingUntil){
             const eq = e.inventory[e.equippedIndex];
             e.reloadingUntil = 0;
           }
         }
         if (e.equippedIndex >= 0){
           const eq = e.inventory[e.equippedIndex];
           if (eq && eq.type === 'weapon' && eq.ammoInMag <= 0 && eq.ammoReserve > 0 && !e.reloadPending && now >= e.reloadingUntil){
             e.reloadPending = true;
+            e.reloadingUntil = now + 600 + rand(-100,100);
+          }
+        }
+        // If equipped weapon is empty and no reserve, try to swap to another loaded weapon
+        if (e.equippedIndex >= 0){
+          const eq = e.inventory[e.equippedIndex];
+          if (eq && eq.type === 'weapon' && eq.ammoInMag <= 0 && eq.ammoReserve <= 0){
+            // try to find another weapon with ammo
+            for (let i=0;i<5;i++){
+              const it = e.inventory[i];
+              if (it && it.type === 'weapon' && it.ammoInMag > 0){
+                e.equippedIndex = i;
+                break;
+              }
+            }
+            // if still no mag ammo, pick weapon with reserve
+            if (e.equippedIndex === -1 || (e.inventory[e.equippedIndex] && e.inventory[e.equippedIndex].ammoInMag <= 0)){
+              for (let i=0;i<5;i++){
+                const it = e.inventory[i];
+                if (it && it.type === 'weapon' && it.ammoReserve > 0){
+                  e.equippedIndex = i;
+                  // schedule reload
+                  e.reloadPending = true;
+                  e.reloadingUntil = now + 500 + rand(-80,80);
+                  break;
+                }
+              }
+            }
           }
         }
         let target = player;
         let bestDist = Math.hypot(player.x - e.x, player.y - e.y);
         if (bestDist > VIEW_RANGE){
           const p = findNearestPickup(e, 1200);
           const c = findNearestChest(e, 1200);
           const h = findNearestHarvestable(e, 1200);
           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; } }
           for (const other of enemies){
             if (other === e || other.health <= 0) continue;
             const d = Math.hypot(other.x - e.x, other.y - e.y);
             target = candidate;
             bestDist = cd;
           } else {
+            target = null; bestDist = Infinity;
           }
         } else {
           for (const other of enemies){
             if (other === e || other.health <= 0) continue;
             const d = Math.hypot(other.x - e.x, other.y - e.y);
           }
         }
         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){
           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;
+          moveEntityWithCollision(e, 0, 0, e.radius);
           continue;
         }
+        // If a target exists but blocked, try detour waypoint instead of always breaking/shooting blocker
         const blocked = !hasLineOfSight(e.x, e.y, target.x, target.y);
         if (blocked){
           const blocker = findBlockingObject(e.x, e.y, target.x, target.y);
                   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);
                 }
+              }
+              if (!e.tempTarget){
+                const waypoint = computeDetourWaypoint(e.x, e.y, blocker, target.x, target.y);
+                if (waypoint){
+                  e.tempTarget = waypoint;
+                  e.tempTargetExpiry = now + 3000;
+                }
+              }
+              if (e.tempTarget){
+                const td = Math.hypot(e.tempTarget.x - e.x, e.tempTarget.y - e.y);
+                if (td > 8){
+                  e.angle = Math.atan2(e.tempTarget.y - e.y, e.tempTarget.x - e.x);
+                  moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.8, Math.sin(e.angle) * e.speed * dt * 0.8, e.radius);
+                } else {
+                  e.tempTarget = null;
+                  e.tempTargetExpiry = 0;
+                }
               } else {
                 e.angle = Math.atan2(blocker.y - e.y, blocker.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;
               }
             }
             continue;
           }
         }
         if (target === player){
           if (distToPlayer < 36 && now - e.lastMelee > e.meleeRate){
             e.lastMelee = now;
             const dmg = 10 + randInt(0,8);
             const eq = e.inventory[e.equippedIndex];
             if (eq && eq.type === 'weapon' && !e.reloadPending && now - (e.lastShot||0) > (eq.weapon.rate || 300)){
               if (eq.ammoInMag <= 0){
+                // try reload or swap
+                if (eq.ammoReserve > 0 && !e.reloadPending){
+                  e.reloadPending = true;
+                  e.reloadingUntil = now + 600 + rand(-100,100);
+                } else {
+                  // swap to other weapon
+                  enemyEquipBestWeapon(e);
+                }
               } else {
                 if (hasLineOfSight(e.x, e.y, target.x, target.y)){
                   e.lastShot = now;
                   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 {
                   e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+                  moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.6, Math.sin(e.angle) * e.speed * dt * 0.6, e.radius);
                 }
               }
             } else {
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+              moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.9, Math.sin(e.angle) * e.speed * dt * 0.9, e.radius);
             }
           } else {
             e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+            moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.9, Math.sin(e.angle) * e.speed * dt * 0.9, e.radius);
           }
         } else {
           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'){
             if (td > 20){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+              moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.9, Math.sin(e.angle) * e.speed * dt * 0.9, e.radius);
             } else {
               enemyPickupCollect(e, target);
               const idx = pickups.indexOf(target);
               if (idx >= 0) pickups.splice(idx,1);
               e.state = 'gather';
+              enemyEquipBestWeapon(e);
             }
+          } else if (target.hasOwnProperty('loot')){
             if (td > 20){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+              moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.9, Math.sin(e.angle) * e.speed * dt * 0.9, e.radius);
             } else {
+              if (!target.opened){
+                target.opened = true;
+                const loot = target.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 || 10 });
+                e.state = 'gather';
+                enemyEquipBestWeapon(e);
+                if (e.equippedIndex !== -1){
+                  const eq = e.inventory[e.equippedIndex];
+                  if (eq && eq.type==='weapon' && eq.ammoInMag <= 0 && eq.ammoReserve > 0){
+                    reloadItem(eq);
+                  }
+                }
+                if (e.inventory.some(it => it && it.type === 'weapon')){ e.state = 'combat'; e.lastAttackedTime = now; }
+              }
             }
+          } else if (target.hasOwnProperty('type') && (target.type === 'wood' || target.type === 'stone')){
             if (td > 26){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+              moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.8, Math.sin(e.angle) * e.speed * dt * 0.8, e.radius);
             } else {
               target.hp -= 40 * dt;
               if (target.hp <= 0 && !target.dead){
               e.state = 'gather';
             }
           } else {
             if (td > 40){
               e.angle = Math.atan2(target.y - e.y, target.x - e.x);
+              moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.7, Math.sin(e.angle) * e.speed * dt * 0.7, e.radius);
             } else {
+              if (now - e.lastMelee > e.meleeRate){
+                e.lastMelee = now;
+                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;
+                }
+              }
             }
           }
         }
       }
+      // Separation
       for (let i = 0; i < enemies.length; i++){
         const a = enemies[i];
         if (!a || a.health <= 0) continue;
           if (d < minD){
             const overlap = (minD - d) * 0.5;
             const nx = dx / d, ny = dy / d;
             b.x += nx * overlap;
             b.y += ny * overlap;
             a.x -= nx * overlap;
             a.y -= ny * overlap;
           }
         }
         const pdx = a.x - player.x, pdy = a.y - player.y;
         const pd = Math.hypot(pdx,pdy) || 0.0001;
         const avoidDist = 24;
           a.x += nx * overlap;
           a.y += ny * overlap;
         }
         a.x = Math.max(12, Math.min(WORLD.width-12, a.x));
         a.y = Math.max(12, Math.min(WORLD.height-12, a.y));
       }
       }
     }
+    // Drawing world & entities
     function drawWorld(){
       const TILE = 600;
       const cols = Math.ceil(WORLD.width / TILE);
         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'){
           const we = e.inventory[e.equippedIndex];
           const color = we.weapon.color || '#ddd';
           }
         }
         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();
     function drawCrosshair(){}
+    // Minimap: build terrain cache and draw overlay (EXCLUDES enemies & chests)
+    function buildMiniTerrainCache(){
+      const mw = minimapCanvas.width;
+      const mh = minimapCanvas.height;
+      const scaleX = WORLD.width / mw;
+      const scaleY = WORLD.height / mh;
+      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];
+          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;
+        }
+      }
+      miniTerrainCache = img;
+    }
+    function drawMinimap(){
+      const mw = minimapCanvas.width;
+      const mh = minimapCanvas.height;
+      if (!miniTerrainCache) buildMiniTerrainCache();
+      // draw base terrain
+      miniCtx.putImageData(miniTerrainCache, 0, 0);
+      // draw world objects (trees/stones/walls) as tiny marks - chests excluded per request
+      miniCtx.save();
+      const scaleX = mw / WORLD.width;
+      const scaleY = mh / WORLD.height;
+      for (const obj of objects){
+        if (obj.dead) continue;
+        const px = Math.round(obj.x * scaleX);
+        const py = Math.round(obj.y * scaleY);
+        if (obj.type === 'wood'){
+          miniCtx.fillStyle = '#3f210f';
+          miniCtx.fillRect(px-1, py-1, 2, 2);
+        } else if (obj.type === 'stone'){
+          miniCtx.fillStyle = '#666';
+          miniCtx.fillRect(px-1, py-1, 2, 2);
+        } else if (obj.type === 'wall'){
+          miniCtx.fillStyle = '#8b5a32';
+          miniCtx.fillRect(px-2, py-2, 4, 4);
+        }
+      }
+      // optionally show pickups (not enemies/chests) - small blue/green dots
+      for (const p of pickups){
+        const px = Math.round(p.x * scaleX);
+        const py = Math.round(p.y * scaleY);
+        if (p.type === 'weapon'){
+          miniCtx.fillStyle = '#ffd86b'; miniCtx.fillRect(px-1, py-1, 2, 2);
+        } else if (p.type === 'medkit'){
+          miniCtx.fillStyle = '#ff6b6b'; miniCtx.fillRect(px-1, py-1, 2, 2);
+        } else if (p.type === 'materials'){
+          miniCtx.fillStyle = '#cfe0a6'; miniCtx.fillRect(px-1, py-1, 2, 2);
+        } else if (p.type === 'ammo'){
+          miniCtx.fillStyle = '#e6e6e6'; miniCtx.fillRect(px-1, py-1, 2, 2);
+        }
+      }
+      // Storm safe zone: draw overlay darkening outside safe zone and stroke the safe circle
+      if (storm.active){
+        // darken everything
+        miniCtx.fillStyle = 'rgba(0,0,0,0.35)';
+        miniCtx.fillRect(0,0,mw,mh);
+        // carve out safe zone
+        miniCtx.globalCompositeOperation = 'destination-out';
+        const cx = storm.centerX * scaleX;
+        const cy = storm.centerY * scaleY;
+        // radius scaled by average axis to keep circle shape close
+        const r = storm.radius * ((scaleX + scaleY) / 2);
+        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.95)';
+        miniCtx.lineWidth = 2;
+        miniCtx.beginPath();
+        miniCtx.arc(cx, cy, r, 0, Math.PI*2);
+        miniCtx.stroke();
+      }
+      // draw player dot (always visible)
+      const ppx = Math.round(player.x * (mw / WORLD.width));
+      const ppy = Math.round(player.y * (mh / WORLD.height));
+      miniCtx.fillStyle = '#ffff66';
+      miniCtx.beginPath();
+      miniCtx.arc(ppx, ppy, 3, 0, Math.PI*2);
+      miniCtx.fill();
+      miniCtx.restore();
+    }
     // Main loop
     let lastTime = 0;
     function gameLoop(ts){
       const dt = Math.min(0.05, (ts - lastTime)/1000);
       lastTime = ts;
       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;
+        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;
+        }
+        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));
         if (selected && selected.type === 'weapon') activeWeaponItem = selected;
       }
       if (mouse.down){
         if (player.equippedIndex === -1) playerMeleeHit();
         else if (activeWeaponItem && activeWeaponItem.type === 'weapon'){
       if (keys.e){ interactNearby(); keys.e = false; }
       if (keys.q){ tryBuild(); keys.q = false; }
       updateEnemies(dt, performance.now());
       bulletsUpdate(dt);
       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(); }
       }
       for (let i=objects.length-1;i>=0;i--) if (objects[i].dead) objects.splice(i,1);
       updatePlayerCount();
       updateStorm(dt);
       ctx.clearRect(0,0,canvas.width,canvas.height);
       drawWorld(); drawObjects(); drawChests(); drawPickups(); drawEnemies(); drawBullets(); drawPlayer(); drawCrosshair();
       updateHUD();
+      // Draw the minimap last so it reflects the latest world state
+      drawMinimap();
       if (storm.active && playerInStorm()) stormWarning.classList.remove('hidden'); else stormWarning.classList.add('hidden');
       requestAnimationFrame(gameLoop);
     // Landing -> spawn selection
     let selectedBiome = null;
     function getSpawnForBiome(b){
       if (!b) return { x: WORLD.width/2 + (Math.random()-0.5)*400, y: WORLD.height/2 + (Math.random()-0.5)*400 };
       if (b === 'desert') return { x: rand(200, WORLD.width*0.3), y: rand(200, WORLD.height*0.3) };
       if (b === 'forest') return { x: rand(WORLD.width*0.7, WORLD.width-200), y: rand(200, WORLD.height*0.3) };
     let gameActive = false;
     function startGame(biome){
       selectedBiome = biome || selectedBiome;
       const spawn = getSpawnForBiome(selectedBiome);
       document.getElementById('currentBiome').textContent = selectedBiome ? selectedBiome.toUpperCase() : 'CENTER';
       initHUD();
       cameraUpdate();
+      // Set each enemy to prioritize chests for a short time so they grab weapons early, and reposition away from player spawn
       for (const e of enemies){
         if (Math.hypot(e.x - player.x, e.y - player.y) < 180){
           e.x += (Math.random()<0.5? -1:1) * rand(160,260);
           e.y += (Math.random()<0.5? -1:1) * rand(160,260);
         }
         e.inventory = [null,null,null,null,null];
         e.equippedIndex = -1;
         e.spawnSafeUntil = performance.now() + SPAWN_PROTECT_MS;
         e.state = 'gather';
+        e.nextHealTime = 0;
+        e.tempTarget = null;
+        e.tempTargetExpiry = 0;
+        // this flag makes them aggressively seek chests in the first few seconds
+        e.prioritizeChestsUntil = performance.now() + 6000 + rand(0,3000);
+        // also slightly reduce gatherTimeLeft so they don't linger on harvesting
+        e.gatherTimeLeft = Math.min(e.gatherTimeLeft, 6);
       }
       gameTime = 300; storm.active = false; storm.radius = storm.maxRadius;
     goHomeBtn.addEventListener('click', ()=>{ victoryScreen.classList.add('hidden'); gameScreen.classList.add('hidden'); landingScreen.classList.remove('hidden'); });
     continueBtn.addEventListener('click', ()=>{ victoryScreen.classList.add('hidden'); startGame(selectedBiome); });
     document.querySelectorAll('.biome-selector').forEach(el => {
       el.addEventListener('click', (ev)=>{
         document.querySelectorAll('.biome-selector').forEach(x=>x.classList.remove('biome-selected'));
         el.classList.add('biome-selected');
         const biome = el.dataset.biome;
         selectedBiome = biome;
         startGame(biome);
       });
     });
+    // initialization
     resizeCanvas();
     populateWorld();
     feather.replace();