Spaces:

bbc123321
/

battle-zone-royale

Running

App Files Files Community

bbc123321 commited on Oct 14, 2025

Commit

dd91f72

verified ·

1 Parent(s): 65bb0ca

Manual changes saved

Browse files

Files changed (1) hide show

index.html +144 -83

index.html CHANGED Viewed

@@ -3,16 +3,13 @@
 <head>
   <meta charset="utf-8" />
   <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <title>BattleZone Royale - Enemies Gather First (Improved)</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%; }
-    #stormWarning { z-index:10; }
-    #deathScreen, #victoryScreen { z-index:20; }
     /* 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; }
@@ -21,6 +18,7 @@
     .selected { outline: 2px solid rgba(255,215,0,0.9); box-shadow: 0 0 6px rgba(255,215,0,0.12); }
     .equipped { box-shadow: inset 0 -6px 14px rgba(255,255,255,0.03); border:1px solid rgba(255,255,255,0.04); }
     .medkit-count { position:absolute; right:4px; bottom:2px; font-size:10px; color:#ffd; }
   </style>
 </head>
 <body>
@@ -31,7 +29,7 @@
     </h1>
     <h2 class="text-2xl text-yellow-300 mb-4">Choose Landing Zone</h2>
-    <div class="grid grid-cols-2 gap-6 max-w-xl w-full mb-6">
       <div class="biome-selector bg-gray-700 p-6 rounded-lg cursor-pointer hover:bg-yellow-800 flex flex-col items-center" data-biome="desert">
         <i data-feather="sun" class="text-yellow-300 mb-2"></i>
         <h3 class="font-bold text-lg">Golden Dunes</h3>
@@ -125,7 +123,7 @@
   </div>
   <script>
-    // DOM
     const landingScreen = document.getElementById('landingScreen');
     const gameScreen = document.getElementById('gameScreen');
     const canvas = document.getElementById('gameCanvas');
@@ -140,6 +138,7 @@
     const victoryScreen = document.getElementById('victoryScreen');
     const goHomeBtn = document.getElementById('goHomeBtn');
     const continueBtn = document.getElementById('continueBtn');
     // World
     const WORLD = { width: 6000, height: 4000 };
@@ -246,7 +245,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 per request
       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 },
@@ -263,8 +262,7 @@
         const x = rand(150, WORLD.width-150);
         const y = rand(150, WORLD.height-150);
         const loot = generateLootForBiome(biomeAt(x,y));
-        // ensure materials amount=10 (per request) if type materials
-        if (loot.type === 'materials') loot.amount = 10;
         chests.push({ x,y, opened:false, loot });
       }
       for (let i=0;i<700;i++){
@@ -290,11 +288,12 @@
           materials: 0,
           lastShot: 0,
           reloadingUntil: 0,
           lastAttackedTime: 0,
           state: 'gather',
           gatherTimeLeft: rand(8,16),
           target: null,
-          nextHealTime: 0 // only heal using medkit and with cooldown
         });
       }
       updatePlayerCount();
@@ -432,9 +431,7 @@
           if (loot.type === 'weapon') pickups.push({ x:px, y:py, type:'weapon', weapon: makeWeaponProto(loot.weapon), ammoInMag: loot.weapon.magSize || 12, ammoReserve: loot.weapon.startReserve || (loot.weapon.magSize*2 || 24) });
           else if (loot.type === 'medkit') pickups.push({ x:px, y:py, type:'medkit', amount: loot.amount || 1 });
           else if (loot.type === 'materials') pickups.push({ x:px, y:py, type:'materials', amount: loot.amount || 10 });
-          if (Math.random() < 0.25){
-            pickups.push({ x:px+8, y:py+8, type:'ammo', forWeapon: null, amount: randInt(6,30) });
-          }
           updateHUD();
           return;
         }
@@ -480,7 +477,7 @@
       }
     }
-    // Enemy helpers
     function enemyEquipBestWeapon(e){
       let bestIdx = -1;
       let bestScore = -Infinity;
@@ -646,7 +643,7 @@
       }
     }
-    // Nearest helpers
     function findNearestChest(e, maxDist = 1200){
       let best = null; let bd = Infinity;
       for (const c of chests){ if (c.opened) continue; const d = Math.hypot(c.x - e.x, c.y - e.y); if (d < bd && d <= maxDist){ bd = d; best = c; } }
@@ -663,57 +660,51 @@
       return best;
     }
-    // Enemy AI: gather-first state machine, heal only using medkits, visible weapon drawing logic supported in drawEnemies
     function updateEnemies(dt, now){
       for (const e of enemies){
         if (e.health <= 0) continue;
-        // If recently attacked, go combat
-        if (now - e.lastAttackedTime < 4000){
-          e.state = 'combat';
-        }
-        if (e.state === 'gather'){
-          e.gatherTimeLeft -= dt;
-        }
-        // Only heal using medkit: check cooldown and presence in inventory
         if (e.health < 60 && now >= (e.nextHealTime || 0)){
-          // find medkit in inventory
           let medIdx = -1;
           for (let s=0;s<5;s++){
             const it = e.inventory[s];
             if (it && it.type === 'medkit' && it.amount > 0){ medIdx = s; break; }
           }
           if (medIdx !== -1){
-            // use medkit (consume one), set cooldown so it's not instant recurring
             const kit = e.inventory[medIdx];
             kit.amount -= 1;
             e.health = Math.min(120, e.health + 50);
             if (kit.amount <= 0) e.inventory[medIdx] = null;
-            e.nextHealTime = now + 6000; // 6s cooldown before next possible medkit use
-            // do not switch state to combat just because healing occurred
             continue;
           }
         }
-        // transition gather -> combat if conditions met
         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 nearby pickups, then chests, then harvest objects
-          let targetPickup = findNearestPickup(e, 240);
-          if (targetPickup){
-            const angle = Math.atan2(targetPickup.y - e.y, targetPickup.x - e.x);
             e.angle = angle;
             e.x += Math.cos(e.angle) * e.speed * dt * 0.9;
             e.y += Math.sin(e.angle) * e.speed * dt * 0.9;
-            if (Math.hypot(targetPickup.x - e.x, targetPickup.y - e.y) < 18){
-              enemyPickupCollect(e, targetPickup);
-              const idx = pickups.indexOf(targetPickup);
               if (idx >= 0) pickups.splice(idx,1);
             }
             continue;
@@ -729,13 +720,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;
           }
@@ -751,8 +738,7 @@
               objTarget.hp -= 40 * dt;
               if (objTarget.hp <= 0 && !objTarget.dead){
                 objTarget.dead = true;
-                const matGain = objTarget.type === 'wood' ? 3 : 6;
-                e.materials += matGain;
                 if (Math.random() < 0.08){
                   const lootRoll = Math.random();
                   if (lootRoll < 0.4) enemyPickupCollect(e, { type:'medkit', amount:1 });
@@ -769,18 +755,31 @@
           e.y += Math.sin(e.angle) * e.speed * dt * 0.25;
           if (Math.random() < 0.01) e.angle += (Math.random()-0.5)*2;
           continue;
-        } // end gather
-        // Combat behavior
         if (e.equippedIndex === -1) enemyEquipBestWeapon(e);
         if (e.equippedIndex >= 0){
           const eq = e.inventory[e.equippedIndex];
-          if (eq && eq.type === 'weapon' && eq.ammoInMag <= 0 && eq.ammoReserve > 0){
-            reloadItem(eq);
           }
         }
-        // choose target (player preferred)
         let target = player;
         let bestDist = Math.hypot(player.x - e.x, player.y - e.y);
         for (const other of enemies){
@@ -789,6 +788,7 @@
           if (d < bestDist && Math.random() < 0.6){ bestDist = d; target = other; }
         }
         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);
@@ -805,7 +805,7 @@
             } else {
               if (e.equippedIndex >= 0){
                 const eq = e.inventory[e.equippedIndex];
-                if (eq && eq.type === 'weapon' && eq.ammoInMag > 0 && now - e.lastShot > (eq.weapon.rate || 300)){
                   e.lastShot = now;
                   eq.ammoInMag -= 1;
                   const angle = Math.atan2(blocker.y - e.y, blocker.x - e.x);
@@ -821,7 +821,7 @@
           }
         }
-        // Attack
         if (distToPlayer < 36 && now - e.lastMelee > e.meleeRate){
           e.lastMelee = now;
           const dmg = 10 + randInt(0,8);
@@ -830,9 +830,9 @@
           if (player.health <= 0) { player.health = 0; playerDeath(); }
         } else if (e.equippedIndex >= 0){
           const eq = e.inventory[e.equippedIndex];
-          if (eq && eq.type === 'weapon' && now - (e.lastShot||0) > (eq.weapon.rate || 300)){
             if (eq.ammoInMag <= 0){
-              if (eq.ammoReserve > 0) reloadItem(eq);
             } else {
               if (hasLineOfSight(e.x, e.y, target.x, target.y)){
                 e.lastShot = now;
@@ -841,22 +841,60 @@
                 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);
                 e.x += Math.cos(e.angle) * e.speed * dt * 0.6;
                 e.y += Math.sin(e.angle) * e.speed * dt * 0.6;
               }
             }
           } else {
             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 {
           e.angle = Math.atan2(target.y - e.y, target.x - e.x);
           e.x += Math.cos(e.angle) * e.speed * dt * 0.9;
           e.y += Math.sin(e.angle) * e.speed * dt * 0.9;
         }
       }
     }
     // Storm
@@ -990,31 +1028,23 @@
         const s = worldToScreen(e.x,e.y);
         ctx.save();
         ctx.translate(s.x,s.y); ctx.rotate(e.angle);
-        // shadow & body
         ctx.fillStyle='rgba(0,0,0,0.18)'; ctx.beginPath(); ctx.ellipse(0,12,14,6,0,0,Math.PI*2); ctx.fill();
         ctx.fillStyle='#ff6b6b'; ctx.beginPath(); ctx.moveTo(12,0); ctx.lineTo(-10,-8); ctx.lineTo(-10,8); ctx.closePath(); ctx.fill();
-        // HP bar
         ctx.fillStyle='rgba(0,0,0,0.6)'; ctx.fillRect(-18,-22,36,6);
         const hpPct = Math.max(0, Math.min(1, e.health/120));
         ctx.fillStyle='#ff6b6b'; ctx.fillRect(-18,-22,36*hpPct,6);
-        // If equipped with weapon, draw it in hand visibly
         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.save();
-          // position weapon in right-hand area
           ctx.translate(12, 2);
           ctx.rotate(-0.08);
-          // body of weapon
           ctx.fillStyle = color;
           ctx.fillRect(0, -4, 24, 8);
-          // muzzle detail
           ctx.fillStyle = '#222';
           ctx.fillRect(18, -2, 6, 4);
-          // small magazine indicator
           const magPct = Math.max(0, we.ammoInMag / we.weapon.magSize);
           ctx.fillStyle = 'rgba(0,0,0,0.35)';
           ctx.fillRect(4, 6, 18, 4);
@@ -1022,7 +1052,6 @@
           ctx.fillRect(4, 6, 18 * magPct, 4);
           ctx.restore();
         } else {
-          // draw pickaxe if unarmed (small icon)
           if (e.equippedIndex === -1){
             ctx.save();
             ctx.translate(12, 6);
@@ -1035,10 +1064,9 @@
           }
         }
-        // draw 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();
       }
     }
@@ -1101,9 +1129,9 @@
       ctx.restore();
     }
-    function drawCrosshair(){ }
-    // Game loop
     let lastTime = 0;
     function gameLoop(ts){
       if (!gameActive) return;
@@ -1125,7 +1153,6 @@
       cameraUpdate();
       mouse.worldX = mouse.canvasX + camera.x;
       mouse.worldY = mouse.canvasY + camera.y;
       player.angle = Math.atan2(mouse.worldY - player.y, mouse.worldX - player.x);
       let activeWeaponItem = null;
@@ -1137,9 +1164,8 @@
       // player attack
       if (mouse.down){
-        if (player.equippedIndex === -1){
-          playerMeleeHit();
-        } else if (activeWeaponItem && activeWeaponItem.type === 'weapon'){
           const now = performance.now();
           if (now - player.lastShot > (activeWeaponItem.weapon.rate || 300)){
             if (activeWeaponItem.ammoInMag > 0){
@@ -1151,7 +1177,6 @@
         }
       }
-      // reload/interact/build
       if (keys.r) { reloadEquipped(); keys.r = false; }
       if (keys.e){ interactNearby(); keys.e = false; }
       if (keys.q){ tryBuild(); keys.q = false; }
@@ -1182,12 +1207,29 @@
       requestAnimationFrame(gameLoop);
     }
     // Start/end
     let timerInterval = null;
     let gameTime = 300;
     let gameActive = false;
-    function startGame(){
       victoryScreen.classList.add('hidden');
       deathScreen.classList.add('hidden');
@@ -1196,8 +1238,8 @@
       gameScreen.classList.remove('hidden');
       resizeCanvas();
-      player.x = WORLD.width/2 + (Math.random()-0.5)*400;
-      player.y = WORLD.height/2 + (Math.random()-0.5)*400;
       player.health = 100; player.armor = 0; player.kills = 0; player.materials = 0;
       player.inventory = [null,null,null,null,null];
       player.selectedSlot = 0; player.equippedIndex = -1; player.lastShot = 0; player.lastMelee = 0;
@@ -1206,6 +1248,14 @@
       initHUD();
       cameraUpdate();
       gameTime = 300; storm.active = false; storm.radius = storm.maxRadius;
       document.getElementById('gameTimer').textContent = '5:00';
       timerInterval && clearInterval(timerInterval);
@@ -1234,11 +1284,22 @@
     document.getElementById('respawnBtn').addEventListener('click', ()=>{ deathScreen.classList.add('hidden'); landingScreen.classList.remove('hidden'); });
     goHomeBtn.addEventListener('click', ()=>{ victoryScreen.classList.add('hidden'); gameScreen.classList.add('hidden'); landingScreen.classList.remove('hidden'); });
-    continueBtn.addEventListener('click', ()=>{ victoryScreen.classList.add('hidden'); startGame(); });
-    document.querySelectorAll('.biome-selector').forEach(el => el.addEventListener('click', ()=> startGame()));
-    // init
     resizeCanvas();
     populateWorld();
     feather.replace();

 <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; }
     .selected { outline: 2px solid rgba(255,215,0,0.9); box-shadow: 0 0 6px rgba(255,215,0,0.12); }
     .equipped { box-shadow: inset 0 -6px 14px rgba(255,255,255,0.03); border:1px solid rgba(255,255,255,0.04); }
     .medkit-count { position:absolute; right:4px; bottom:2px; font-size:10px; color:#ffd; }
+    .biome-selected { outline: 3px solid rgba(96,165,250,0.9); }
   </style>
 </head>
 <body>
     </h1>
     <h2 class="text-2xl text-yellow-300 mb-4">Choose Landing Zone</h2>
+    <div id="biomeGrid" class="grid grid-cols-2 gap-6 max-w-xl w-full mb-6">
       <div class="biome-selector bg-gray-700 p-6 rounded-lg cursor-pointer hover:bg-yellow-800 flex flex-col items-center" data-biome="desert">
         <i data-feather="sun" class="text-yellow-300 mb-2"></i>
         <h3 class="font-bold text-lg">Golden Dunes</h3>
   </div>
   <script>
+    // DOM references
     const landingScreen = document.getElementById('landingScreen');
     const gameScreen = document.getElementById('gameScreen');
     const canvas = document.getElementById('gameCanvas');
     const victoryScreen = document.getElementById('victoryScreen');
     const goHomeBtn = document.getElementById('goHomeBtn');
     const continueBtn = document.getElementById('continueBtn');
+    const biomeGrid = document.getElementById('biomeGrid');
     // World
     const WORLD = { width: 6000, height: 4000 };
     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 },
         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++){
           materials: 0,
           lastShot: 0,
           reloadingUntil: 0,
+          reloadPending: false,
           lastAttackedTime: 0,
           state: 'gather',
           gatherTimeLeft: rand(8,16),
           target: null,
+          nextHealTime: 0
         });
       }
       updatePlayerCount();
           if (loot.type === 'weapon') pickups.push({ x:px, y:py, type:'weapon', weapon: makeWeaponProto(loot.weapon), ammoInMag: loot.weapon.magSize || 12, ammoReserve: loot.weapon.startReserve || (loot.weapon.magSize*2 || 24) });
           else if (loot.type === 'medkit') pickups.push({ x:px, y:py, type:'medkit', amount: loot.amount || 1 });
           else if (loot.type === 'materials') pickups.push({ x:px, y:py, type:'materials', amount: loot.amount || 10 });
+          if (Math.random() < 0.25) pickups.push({ x:px+8, y:py+8, type:'ammo', forWeapon: null, amount: randInt(6,30) });
           updateHUD();
           return;
         }
       }
     }
+    // Enemy helpers (equip / collect)
     function enemyEquipBestWeapon(e){
       let bestIdx = -1;
       let bestScore = -Infinity;
       }
     }
+    // Helpers to find nearest
     function findNearestChest(e, maxDist = 1200){
       let best = null; let bd = Infinity;
       for (const c of chests){ if (c.opened) continue; const d = Math.hypot(c.x - e.x, c.y - e.y); if (d < bd && d <= maxDist){ bd = d; best = c; } }
       return best;
     }
+    // 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;
+        // 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++){
             const it = e.inventory[s];
             if (it && it.type === 'medkit' && it.amount > 0){ medIdx = s; break; }
           }
           if (medIdx !== -1){
             const kit = e.inventory[medIdx];
             kit.amount -= 1;
             e.health = Math.min(120, e.health + 50);
             if (kit.amount <= 0) e.inventory[medIdx] = null;
+            e.nextHealTime = now + 6000;
             continue;
           }
         }
+        // Transition gather->combat
         const hasUsefulWeapon = e.inventory.some(it => it && it.type === 'weapon' && (it.ammoInMag > 0 || it.ammoReserve > 0));
+        if ((e.gatherTimeLeft <= 0 || e.materials >= 20 || hasUsefulWeapon) && e.state === 'gather') e.state = 'combat';
         if (e.state === 'gather'){
+          // Prioritize pickup -> chest -> harvest -> roam
+          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;
             } 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;
           }
               objTarget.hp -= 40 * dt;
               if (objTarget.hp <= 0 && !objTarget.dead){
                 objTarget.dead = true;
+                e.materials += (objTarget.type === 'wood' ? 3 : 6);
                 if (Math.random() < 0.08){
                   const lootRoll = Math.random();
                   if (lootRoll < 0.4) enemyPickupCollect(e, { type:'medkit', amount:1 });
           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];
+            if (eq && eq.type === 'weapon') reloadItem(eq);
+            e.reloadPending = false;
+            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 target (player preference)
         let target = player;
         let bestDist = Math.hypot(player.x - e.x, player.y - e.y);
         for (const other of enemies){
           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);
             } 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);
           }
         }
+        // Attack: if melee range
         if (distToPlayer < 36 && now - e.lastMelee > e.meleeRate){
           e.lastMelee = now;
           const dmg = 10 + randInt(0,8);
           if (player.health <= 0) { player.health = 0; playerDeath(); }
         } else if (e.equippedIndex >= 0){
           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;
                 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;
         }
       }
+      // 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;
+        for (let j = i+1; j < enemies.length; j++){
+          const b = enemies[j];
+          if (!b || b.health <= 0) continue;
+          const dx = b.x - a.x, dy = b.y - a.y;
+          const d = Math.hypot(dx,dy) || 0.0001;
+          const minD = minSeparation;
+          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;
+        if (pd < avoidDist){
+          const overlap = (avoidDist - pd);
+          const nx = pdx / pd, ny = pdy / pd;
+          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));
+      }
     }
     // Storm
         const s = worldToScreen(e.x,e.y);
         ctx.save();
         ctx.translate(s.x,s.y); ctx.rotate(e.angle);
         ctx.fillStyle='rgba(0,0,0,0.18)'; ctx.beginPath(); ctx.ellipse(0,12,14,6,0,0,Math.PI*2); ctx.fill();
         ctx.fillStyle='#ff6b6b'; ctx.beginPath(); ctx.moveTo(12,0); ctx.lineTo(-10,-8); ctx.lineTo(-10,8); ctx.closePath(); ctx.fill();
         ctx.fillStyle='rgba(0,0,0,0.6)'; ctx.fillRect(-18,-22,36,6);
         const hpPct = Math.max(0, Math.min(1, e.health/120));
         ctx.fillStyle='#ff6b6b'; ctx.fillRect(-18,-22,36*hpPct,6);
+        // 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';
           ctx.save();
           ctx.translate(12, 2);
           ctx.rotate(-0.08);
           ctx.fillStyle = color;
           ctx.fillRect(0, -4, 24, 8);
           ctx.fillStyle = '#222';
           ctx.fillRect(18, -2, 6, 4);
           const magPct = Math.max(0, we.ammoInMag / we.weapon.magSize);
           ctx.fillStyle = 'rgba(0,0,0,0.35)';
           ctx.fillRect(4, 6, 18, 4);
           ctx.fillRect(4, 6, 18 * magPct, 4);
           ctx.restore();
         } else {
           if (e.equippedIndex === -1){
             ctx.save();
             ctx.translate(12, 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();
       }
     }
       ctx.restore();
     }
+    function drawCrosshair(){}
+    // Main loop
     let lastTime = 0;
     function gameLoop(ts){
       if (!gameActive) return;
       cameraUpdate();
       mouse.worldX = mouse.canvasX + camera.x;
       mouse.worldY = mouse.canvasY + camera.y;
       player.angle = Math.atan2(mouse.worldY - player.y, mouse.worldX - player.x);
       let activeWeaponItem = null;
       // player attack
       if (mouse.down){
+        if (player.equippedIndex === -1) playerMeleeHit();
+        else if (activeWeaponItem && activeWeaponItem.type === 'weapon'){
           const now = performance.now();
           if (now - player.lastShot > (activeWeaponItem.weapon.rate || 300)){
             if (activeWeaponItem.ammoInMag > 0){
         }
       }
       if (keys.r) { reloadEquipped(); keys.r = false; }
       if (keys.e){ interactNearby(); keys.e = false; }
       if (keys.q){ tryBuild(); keys.q = false; }
       requestAnimationFrame(gameLoop);
     }
+    // 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) };
+      if (b === 'oasis') return { x: rand(200, WORLD.width*0.3), y: rand(WORLD.height*0.7, WORLD.height-200) };
+      if (b === 'ruins') return { x: rand(WORLD.width*0.7, WORLD.width-200), y: rand(WORLD.height*0.7, WORLD.height-200) };
+      return { x: WORLD.width/2, y: WORLD.height/2 };
+    }
     // Start/end
     let timerInterval = null;
     let gameTime = 300;
     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';
       victoryScreen.classList.add('hidden');
       deathScreen.classList.add('hidden');
       gameScreen.classList.remove('hidden');
       resizeCanvas();
+      player.x = spawn.x;
+      player.y = spawn.y;
       player.health = 100; player.armor = 0; player.kills = 0; player.materials = 0;
       player.inventory = [null,null,null,null,null];
       player.selectedSlot = 0; player.equippedIndex = -1; player.lastShot = 0; player.lastMelee = 0;
       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);
+        }
+      }
       gameTime = 300; storm.active = false; storm.radius = storm.maxRadius;
       document.getElementById('gameTimer').textContent = '5:00';
       timerInterval && clearInterval(timerInterval);
     document.getElementById('respawnBtn').addEventListener('click', ()=>{ deathScreen.classList.add('hidden'); landingScreen.classList.remove('hidden'); });
     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();