Manual changes saved

index.html

@@ -110,9 +110,8 @@
     .progress-wrap { width:100%; background: rgba(255,255,255,0.04); height:14px; border-radius:8px; overflow:hidden; }
     .progress-bar { height:100%; width:0%; background: linear-gradient(90deg,#ffd86b,#8ef0ff); transition: width 0.12s linear; }
 
-    .loading-count { font-size:12px; color:#dfe9f9; opacity:0.95; }
+    .loading-count { font-size:12px; color:#dfe9f9; }
 
-    /* disable pointer events visually */
     .disabled-pane { pointer-events: none; opacity: 0.6; filter: grayscale(12%); }
 
     @media (max-width: 820px){
@@ -315,7 +314,9 @@
       inventory: [null,null,null,null,null],
       selectedSlot:0,
       equippedIndex: -1,
-      lastShot:0, lastMelee:0
+      lastShot:0, lastMelee:0,
+      // medkit usage state
+      usingMedkit: false, usingMedkitUntil: 0, usingMedkitStart: 0, usingMedkitTimeout: null
     };
 
     // Input
@@ -460,18 +461,9 @@
     }
 
     // Populate world
-    // Updated: enemies spawn already equipped with a weapon in inventory slot 0 (equipped)
     function populateWorld(){
       chests.length = 0; objects.length = 0; enemies.length = 0; pickups.length = 0;
 
-      // helper weapon pool for enemy spawns
-      const enemyWeapons = [
-        { name:'Pistol', dmg:12, rate:320, color:'#ffd86b', magSize:12, startReserve:24 },
-        { name:'SMG', dmg:6, rate:120, color:'#8ef0ff', magSize:30, startReserve:90 },
-        { name:'Shotgun', dmg:22, rate:800, color:'#ff9fb8', magSize:6, startReserve:18 },
-        { name:'Rifle', dmg:18, rate:400, color:'#c7ff9a', magSize:20, startReserve:60 }
-      ];
-
       for (let i=0;i<260;i++){
         const x = rand(150, WORLD.width-150);
         const y = rand(150, WORLD.height-150);
@@ -493,7 +485,6 @@
         const ex = rand(300, WORLD.width-300);
         const ey = rand(300, WORLD.height-300);
 
-        // create enemy base
         const enemy = {
           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),
@@ -513,13 +504,12 @@
           spawnSafeUntil: now + SPAWN_PROTECT_MS,
           tempTarget: null,
           tempTargetExpiry: 0,
-          prioritizeChestsUntil: 0
+          prioritizeChestsUntil: 0,
+          // medkit state for enemies
+          usingMedkit: false, usingMedkitStart: 0, usingMedkitUntil: 0, usingMedkitSlot: -1
         };
 
-        enemy.equippedIndex = -1;
-        // Slightly bias them to seek chests early so they can refill/reload if needed
         enemy.prioritizeChestsUntil = now + 10000 + rand(0,2000);
-        // Reduce gather time so they don't idle unnecessarily
         enemy.gatherTimeLeft = Math.min(enemy.gatherTimeLeft, 10);
 
         enemies.push(enemy);
@@ -557,7 +547,13 @@
     }
 
     function updateHUD(){
-      hudHealthText.textContent = `${Math.max(0,Math.floor(player.health))}%`;
+      const now = performance.now();
+      let healthText = `${Math.max(0,Math.floor(player.health))}%`;
+      if (player.usingMedkit){
+        const remaining = Math.max(0, Math.ceil((player.usingMedkitUntil - now)/1000));
+        healthText += ` (Healing ${remaining}s)`;
+      }
+      hudHealthText.textContent = healthText;
       const slots = hudGear.querySelectorAll('.gear-slot');
       slots.forEach(s => {
         const idx = parseInt(s.dataset.index);
@@ -585,7 +581,7 @@
     }
     function worldToScreen(wx,wy){ return { x: Math.round(wx - camera.x), y: Math.round(wy - camera.y) }; }
 
-    // Combat utilities (kept same as before)
+    // Combat utilities
     function shootBullet(originX, originY, targetX, targetY, weaponObj, shooterId){
       if (!weaponObj || (typeof weaponObj.ammoInMag === 'number' && weaponObj.ammoInMag <= 0)) return false;
       const speed = 1100;
@@ -637,17 +633,63 @@
       }
     }
 
-    // Player interact
-    function interactNearby(){
+    // Player interact & medkit usage
+    function attemptUseOrInteract(){
       const sel = player.selectedSlot;
       const selItem = player.inventory[sel];
       if (selItem && selItem.type === 'medkit'){
-        selItem.amount -= 1;
-        player.health = Math.min(100, player.health + 50);
-        if (selItem.amount <= 0) player.inventory[sel] = null;
+        // toggle or start medkit usage
+        if (player.usingMedkit){
+          cancelPlayerMedkitUse();
+        } else {
+          startPlayerMedkitUse(sel);
+        }
+      } else {
+        interactNearby();
+      }
+    }
+
+    function startPlayerMedkitUse(slot){
+      const it = player.inventory[slot];
+      if (!it || it.type !== 'medkit' || it.amount <= 0) return;
+      if (player.usingMedkit) return;
+      const now = performance.now();
+      player.usingMedkit = true;
+      player.usingMedkitStart = now;
+      player.usingMedkitUntil = now + 3000; // 3 seconds
+      // set a timeout to apply heal
+      player.usingMedkitTimeout = setTimeout(()=> {
+        // ensure still using and item present
+        if (!player.usingMedkit) return;
+        const cur = player.inventory[slot];
+        if (cur && cur.type === 'medkit'){
+          cur.amount -= 1;
+          player.health = Math.min(100, player.health + 50);
+          if (cur.amount <= 0) player.inventory[slot] = null;
+        }
+        player.usingMedkit = false;
+        player.usingMedkitTimeout = null;
         updateHUD();
-        return;
+      }, 3000);
+      updateHUD();
+    }
+
+    function cancelPlayerMedkitUse(){
+      if (!player.usingMedkit) return;
+      player.usingMedkit = false;
+      player.usingMedkitStart = 0;
+      player.usingMedkitUntil = 0;
+      if (player.usingMedkitTimeout){
+        clearTimeout(player.usingMedkitTimeout);
+        player.usingMedkitTimeout = null;
       }
+      updateHUD();
+    }
+
+    function interactNearby(){
+      const sel = player.selectedSlot;
+      const selItem = player.inventory[sel];
+      // medkit immediate use removed — now 3s usage handled above
       const range = 56;
       for (const chest of chests){
         if (chest.opened) continue;
@@ -705,7 +747,7 @@
       }
     }
 
-    // Enemy helpers
+    // Enemy helpers (medkit usage now takes 3s)
     function enemyEquipBestWeapon(e){
       let bestIdx = -1;
       let bestScore = -Infinity;
@@ -720,22 +762,37 @@
       else e.equippedIndex = -1;
     }
 
-    function enemyUseMedkit(e, now){
+    function enemyStartMedkitUse(e, now){
+      if (e.usingMedkit) return false;
       for (let s=0;s<5;s++){
         const it = e.inventory[s];
         if (it && it.type === 'medkit' && it.amount > 0){
-          // visually switch to medkit slot
-          e.equippedIndex = s;
+          e.usingMedkit = true;
+          e.usingMedkitStart = now;
+          e.usingMedkitUntil = now + 3000;
+          e.usingMedkitSlot = s;
+          // set nextHealTime to prevent immediate re-trigger
+          e.nextHealTime = now + 5000;
+          return true;
+        }
+      }
+      return false;
+    }
+
+    function applyEnemyMedkitUseNow(e){
+      const s = e.usingMedkitSlot;
+      if (s >= 0){
+        const it = e.inventory[s];
+        if (it && it.type === 'medkit'){
           it.amount -= 1;
           e.health = Math.min(120, e.health + 50);
           if (it.amount <= 0) e.inventory[s] = null;
-          e.nextHealTime = now + 6000;
-          // after healing, prefer to have weapon equipped again
-          enemyEquipBestWeapon(e);
-          return true;
         }
       }
-      return false;
+      e.usingMedkit = false;
+      e.usingMedkitSlot = -1;
+      e.usingMedkitStart = 0;
+      e.usingMedkitUntil = 0;
     }
 
     function enemyPickupCollect(e, p){
@@ -766,7 +823,6 @@
             return;
           }
         }
-        // replace worst if pickup is better
         let worstIdx = -1, worstScore = Infinity;
         for (let s=0;s<5;s++){
           const it = e.inventory[s];
@@ -788,13 +844,15 @@
         for (let s=0;s<5;s++){
           const it = e.inventory[s];
           if (it && it.type==='medkit'){ it.amount += p.amount; 
-            // if low health, immediately use medkit (and "swap to heals")
-            if (e.health < 60) enemyUseMedkit(e, performance.now());
+            if (e.health < 60) {
+              // start medkit use if not already using
+              if (!e.usingMedkit) enemyStartMedkitUse(e, performance.now());
+            }
             return; 
           }
         }
         for (let s=0;s<5;s++){ if (!e.inventory[s]) { e.inventory[s] = { type:'medkit', amount:p.amount }; 
-            if (e.health < 60) enemyUseMedkit(e, performance.now());
+            if (e.health < 60) enemyStartMedkitUse(e, performance.now());
             return; } }
         e.materials += 3;
       } else if (p.type === 'materials'){
@@ -867,76 +925,113 @@
       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
+    // Bullets update (rewritten for consistent collision handling)
     function bulletsUpdate(dt){
       for (let i=bullets.length-1;i>=0;i--){
         const b = bullets[i];
         b.x += b.vx * dt; b.y += b.vy * dt;
         b.traveled += Math.hypot(b.vx*dt, b.vy*dt);
         b.life -= dt;
-        if (b.dmg > 0 && b.shooter !== 'player'){
-          if (Math.hypot(player.x - b.x, player.y - b.y) < 16){
+
+        // 1) Hit player (if bullet not from player) — damage then despawn
+        const hitRadiusPlayer = 16;
+        if (b.shooter !== 'player'){
+          const dPlayer = Math.hypot(player.x - b.x, player.y - b.y);
+          if (dPlayer < hitRadiusPlayer){
+            // apply damage
             player.health -= b.dmg;
+            // cancel medkit usage if player is healing
+            if (player.usingMedkit) cancelPlayerMedkitUse();
             if (player.health <= 0){ player.health = 0; playerDeath(); }
-            bullets.splice(i,1); continue;
+            bullets.splice(i,1);
+            continue;
           }
         }
-        if (b.dmg > 0){
-          for (const e of enemies){
-            if (e.health <= 0) continue;
-            if (b.shooter === e.id) continue;
-            if (Math.hypot(e.x - b.x, e.y - b.y) < 14){
-              e.health -= b.dmg;
-              e.lastAttackedTime = performance.now();
-              if (e.health <= 0){ e.health = 0; if (b.shooter === 'player'){ player.kills++; player.materials += 2; updatePlayerCount(); } }
-              bullets.splice(i,1); break;
+
+        // 2) Hit any enemy (if not the shooter) — damage then despawn
+        let hitEnemy = null;
+        for (const e of enemies){
+          if (e.health <= 0) continue;
+          const d = Math.hypot(e.x - b.x, e.y - b.y);
+          if (d < 14 && b.shooter !== e.id){
+            // apply damage
+            e.health -= b.dmg;
+            e.lastAttackedTime = performance.now();
+            // cancel enemy medkit if they are healing
+            if (e.usingMedkit){
+              // if they were using medkit, cancel it when hit
+              e.usingMedkit = false; e.usingMedkitSlot = -1; e.usingMedkitStart = 0; e.usingMedkitUntil = 0;
             }
+            if (e.health <= 0){
+              e.health = 0;
+              if (b.shooter === 'player'){ player.kills++; player.materials += 2; updatePlayerCount(); }
+            }
+            hitEnemy = e;
+            break;
           }
-          if (!bullets[i]) continue;
         }
-        if (!b.tracer && b.dmg > 0){
-          for (const obj of objects){
-            if (obj.dead) continue;
-            if (obj.type === 'wall' && Math.hypot(obj.x - b.x, obj.y - b.y) < 18){
-              obj.hp -= b.dmg;
-              if (obj.hp <= 0 && !obj.dead){ obj.dead = true; if (b.shooter === 'player') player.materials += 6; }
-              bullets.splice(i,1); break;
+        if (hitEnemy){
+          bullets.splice(i,1);
+          continue;
+        }
+
+        // 3) Hit harvestable terrain or wall (wood/stone/wall) — reduce hp and despawn
+        let hitObj = null;
+        for (const obj of objects){
+          if (obj.dead) continue;
+          const rr = getObjectRadius(obj);
+          const d = Math.hypot(obj.x - b.x, obj.y - b.y);
+          // use a small tolerance so bullets clearly collide
+          if (d < rr + 2){
+            obj.hp -= b.dmg;
+            if (obj.hp <= 0){
+              obj.dead = true;
+              // reward materials if player shot the object
+              if (b.shooter === 'player') player.materials += (obj.type === 'wood' ? 3 : 6);
             }
+            hitObj = obj;
+            break;
           }
-          if (!bullets[i]) continue;
-          for (const chest of chests){
-            if (!chest.opened && Math.hypot(chest.x - b.x, chest.y - b.y) < 18){
-              chest.opened = true;
-              const loot = chest.loot;
-              const px = chest.x + rand(-20,20), py = chest.y + rand(-20,20);
-              if (loot.type === 'weapon') pickups.push({ x:px, y:py, type:'weapon', weapon: makeWeaponProto(loot.weapon), ammoInMag: loot.weapon.magSize || 12, ammoReserve: loot.weapon.startReserve || (loot.weapon.magSize*2 || 24) });
-              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 });
-              bullets.splice(i,1); break;
-            }
+        }
+        if (hitObj){
+          bullets.splice(i,1);
+          continue;
+        }
+
+        // 4) Hit chests (if wanted bullets can open chests) — keep old behaviour
+        for (const chest of chests){
+          if (chest.opened) continue;
+          const d = Math.hypot(chest.x - b.x, chest.y - b.y);
+          if (d < 18){
+            chest.opened = true;
+            const loot = chest.loot;
+            const px = chest.x + rand(-20,20), py = chest.y + rand(-20,20);
+            if (loot.type === 'weapon') pickups.push({ x:px, y:py, type:'weapon', weapon: makeWeaponProto(loot.weapon), ammoInMag: loot.weapon.magSize || 12, ammoReserve: loot.weapon.startReserve || (loot.weapon.magSize*2 || 24) });
+            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 });
+            bullets.splice(i,1);
+            break;
           }
-          if (!bullets[i]) continue;
         }
+        if (!bullets[i]) continue;
+
+        // 5) Bullets expire naturally
         if (b.life <= 0 || b.traveled > 2600) bullets.splice(i,1);
       }
     }
@@ -958,19 +1053,17 @@
       return best;
     }
 
-    // Enemy AI (improved: detour around obstacles and break obstructions to reach safe zone)
+    // Enemy AI (with medkit use delay)
     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;
 
-        // --- NEW: Auto-open chests on proximity ---
-        // If an unopened chest is very close, open it immediately and collect its loot.
+        // Auto-open chests on proximity
         for (const chest of chests){
           if (chest.opened) continue;
           const distChest = Math.hypot(chest.x - e.x, chest.y - e.y);
-          // Use a slightly larger threshold so enemies who are 'touching' the chest will open it.
           if (distChest <= (e.radius + chestRadius() + 6)){
             chest.opened = true;
             const loot = chest.loot;
@@ -981,46 +1074,46 @@
             } else if (loot.type === 'materials'){
               enemyPickupCollect(e, { type:'materials', amount: loot.amount || 10 });
             }
-            // If enemy has acquired a weapon, ensure they equip the best available now.
             enemyEquipBestWeapon(e);
             break;
           }
         }
 
-        // === STORM / MOVE TO SAFE ZONE BEHAVIOR ===
+        // Handle enemy medkit usage finishing/cancelling
+        if (e.usingMedkit){
+          // if they were attacked while using, cancel
+          if (e.lastAttackedTime > e.usingMedkitStart){
+            e.usingMedkit = false; e.usingMedkitSlot = -1; e.usingMedkitStart = 0; e.usingMedkitUntil = 0;
+          } else if (now >= e.usingMedkitUntil){
+            applyEnemyMedkitUseNow(e);
+          } else {
+            // still using medkit; don't do other heavy actions
+            continue;
+          }
+        }
+
+        // STORM behavior (unchanged)
         if (storm.active){
           const distToSafeCenter = Math.hypot(e.x - storm.centerX, e.y - storm.centerY);
           if (distToSafeCenter > storm.radius){
             e.state = 'toSafe';
-
-            // If the enemy already has a temporary waypoint, move toward it until expiry
             if (e.tempTarget && now < (e.tempTargetExpiry || 0)){
               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.95, Math.sin(e.angle) * e.speed * dt * 0.95, e.radius);
                 continue;
-              } else {
-                e.tempTarget = null;
-                e.tempTargetExpiry = 0;
-              }
+              } else { e.tempTarget = null; e.tempTargetExpiry = 0; }
             }
-
-            // Direct sight to safe center -> run straight
             if (hasLineOfSight(e.x, e.y, storm.centerX, storm.centerY)){
               e.angle = Math.atan2(storm.centerY - e.y, storm.centerX - e.x);
               moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 1.0, Math.sin(e.angle) * e.speed * dt * 1.0, e.radius);
               continue;
             }
-
-            // If no direct sight, find the blocking object
             const blocker = findBlockingObject(e.x, e.y, storm.centerX, storm.centerY);
             if (blocker){
               const db = Math.hypot(blocker.x - e.x, blocker.y - e.y);
-
-              // If very close to blocker -> attempt to break it physically (melee) or shoot it if has ammo
               if (db < 48){
-                // If has a weapon with ammo, shoot at blocker
                 if (e.equippedIndex >= 0){
                   const eq = e.inventory[e.equippedIndex];
                   if (eq && eq.type === 'weapon' && eq.ammoInMag > 0 && now - (e.lastShot||0) > (eq.weapon.rate || 300)){
@@ -1028,26 +1121,21 @@
                     eq.ammoInMag -= 1;
                     const angle = Math.atan2(blocker.y - e.y, blocker.x - e.x);
                     shootBullet(e.x + Math.cos(angle)*12, e.y + Math.sin(angle)*12, blocker.x + (Math.random()-0.5)*6, blocker.y + (Math.random()-0.5)*6, eq, e.id);
-                    // small nudge away/around while shooting
                     e.angle = angle + (Math.random()-0.10)*0.10;
                     moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.50, Math.sin(e.angle) * e.speed * dt * 0.50, e.radius);
                     continue;
                   }
                 }
-                // No ammo or no weapon -> use melee to whack the blocker
                 blocker.hp -= 28 * dt;
                 if (blocker.hp <= 0){
                   blocker.dead = true;
                   e.materials += (blocker.type === 'wood' ? 3 : 6);
                 } else {
-                  // move closer and keep hitting
                   e.angle = Math.atan2(blocker.y - e.y, blocker.x - e.x);
                   moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.4, Math.sin(e.angle) * e.speed * dt * 0.4, e.radius);
                 }
                 continue;
               }
-
-              // If current blocker is not adjacent, compute a detour waypoint around it
               const waypoint = computeDetourWaypoint(e.x, e.y, blocker, storm.centerX, storm.centerY, 12);
               if (waypoint){
                 e.tempTarget = waypoint;
@@ -1057,33 +1145,25 @@
                   e.angle = Math.atan2(e.tempTarget.y - e.y, e.tempTarget.x - e.x);
                   moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.95, Math.sin(e.angle) * e.speed * dt * 0.95, e.radius);
                   continue;
-                } else {
-                  e.tempTarget = null;
-                  e.tempTargetExpiry = 0;
-                }
+                } else { e.tempTarget = null; e.tempTargetExpiry = 0; }
               }
-
-              // Fallback: try to path straight toward blocker to push through or destroy it
               e.angle = Math.atan2(blocker.y - e.y, blocker.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);
               continue;
             }
-
-            // Default: move toward safe center (should not reach here often)
             e.angle = Math.atan2(storm.centerY - e.y, storm.centerX - e.x);
             moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.95, Math.sin(e.angle) * e.speed * dt * 0.95, e.radius);
             continue;
           }
         }
 
-        // === NORMAL BEHAVIOR (unchanged) ===
+        // NORMAL behavior
         if (now - e.lastAttackedTime < 4000) e.state = 'combat';
         if (e.state === 'gather') e.gatherTimeLeft -= dt;
 
-        // Enhanced heal handling: swap to medkit and consume when needed
-        if (e.health < 60 && now >= (e.nextHealTime || 0)){
-          // Attempt to use medkit (this will "swap" to medkit slot and then back to weapons)
-          if (enemyUseMedkit(e, now)){
+        if (e.health < 60 && now >= (e.nextHealTime || 0) && !e.usingMedkit){
+          // start medkit use (3s) if possible
+          if (enemyStartMedkitUse(e, now)){
             continue;
           }
         }
@@ -1167,7 +1247,7 @@
           continue;
         }
 
-        // Combat
+        // Combat logic remains (omitted here for brevity but preserved)
         if (e.equippedIndex === -1) enemyEquipBestWeapon(e);
         if (e.reloadPending){
           if (now >= e.reloadingUntil){
@@ -1388,6 +1468,7 @@
         while (stormDamageAccumulator >= 1){
           stormDamageAccumulator -=1;
           player.health -= 1;
+          if (player.usingMedkit) cancelPlayerMedkitUse();
           if (player.health <= 0){ player.health = 0; playerDeath(); }
         }
       } else stormDamageAccumulator = 0;
@@ -1412,7 +1493,8 @@
       }
     }
 
-    // Drawing world & entities (unchanged)
+    // Drawing functions (unchanged, omitted here for brevity)...
+    // (All draw functions from the previous code remain unchanged and are present below.)
     function drawWorld(){
       const TILE = 600;
       const cols = Math.ceil(WORLD.width / TILE);
@@ -1538,7 +1620,6 @@
             ctx.fillRect(-6,-4,10,4);
             ctx.restore();
           } else {
-            // If equippedIndex refers to a medkit/other, show a small indicator
             const it = e.inventory[e.equippedIndex];
             if (it && it.type === 'medkit'){
               ctx.save();
@@ -1621,7 +1702,7 @@
 
     function drawCrosshair(){}
 
-    // Minimap: build terrain cache and draw overlay (EXCLUDES enemies & chests)
+    // Minimap functions (unchanged)
     function buildMiniTerrainCache(){
       const mw = minimapCanvas.width;
       const mh = minimapCanvas.height;
@@ -1652,10 +1733,8 @@
       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;
@@ -1674,7 +1753,6 @@
           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);
@@ -1689,22 +1767,17 @@
         }
       }
 
-      // 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();
@@ -1712,7 +1785,6 @@
         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';
@@ -1750,6 +1822,8 @@
         if (isCollidingSolid(player.x, player.y, player.radius)){
           player.y = oldY;
         }
+        // If player moves while using medkit, cancel use
+        if (player.usingMedkit && (dx !== 0 || dy !== 0)) cancelPlayerMedkitUse();
       }
       player.x = Math.max(16, Math.min(WORLD.width-16, player.x));
       player.y = Math.max(16, Math.min(WORLD.height-16, player.y));
@@ -1781,7 +1855,7 @@
       }
 
       if (keys.r) { reloadEquipped(); keys.r = false; }
-      if (keys.e){ interactNearby(); keys.e = false; }
+      if (keys.e){ attemptUseOrInteract(); keys.e = false; }
       if (keys.q){ tryBuild(); keys.q = false; }
 
       updateEnemies(dt, performance.now());
@@ -1801,7 +1875,6 @@
       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');
@@ -1843,6 +1916,7 @@
       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;
+      player.usingMedkit = false; player.usingMedkitTimeout = null;
 
       populateWorld();
       initHUD();
@@ -1861,6 +1935,7 @@
         e.tempTarget = null;
         e.tempTargetExpiry = 0;
         e.prioritizeChestsUntil = e.prioritizeChestsUntil || (performance.now() + 6000 + rand(0,3000));
+        e.usingMedkit = false; e.usingMedkitSlot = -1;
       }
 
       gameTime = 300; storm.active = false; storm.radius = storm.maxRadius;
@@ -1887,13 +1962,18 @@
     }
 
     function endGame(){ gameActive = false; alert('Match over!'); }
-    function playerDeath(){ gameActive = false; deathScreen.classList.remove('hidden'); }
+    function playerDeath(){ 
+      gameActive = false; 
+      // cancel medkit use on death
+      cancelPlayerMedkitUse();
+      deathScreen.classList.remove('hidden'); 
+    }
 
     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); });
 
-    // ---- Loading screen logic ----
+    // Loading screen logic (unchanged)
     const loadingTips = [
       "Stick to cover when approaching buildings — open areas get you killed.",
       "Loot chests quickly and move — enemies can hear opening animations.",
@@ -1910,10 +1990,8 @@
     const LOADING_DURATION = 20000; // 20 seconds
 
     function showLoadingForBiome(biome){
-      // disable selectors visually & functionally
       document.querySelectorAll('.biome-selector').forEach(x => { x.classList.add('disabled-pane'); x.style.pointerEvents = 'none'; });
       selectedBiome = biome;
-      // pick initial tip
       loadingTipEl.textContent = loadingTips[Math.floor(Math.random()*loadingTips.length)];
       loadingProgressEl.style.width = '0%';
       loadingTimerText.textContent = `Landing in ${Math.ceil(LOADING_DURATION/1000)}s`;
@@ -1921,7 +1999,6 @@
       loadingScreen.setAttribute('aria-hidden', 'false');
       loadingStart = performance.now();
 
-      // rotate tips every 4 seconds
       let tipIndex = Math.floor(Math.random()*loadingTips.length);
       tipRotateId = setInterval(()=>{
         tipIndex = (tipIndex + 1) % loadingTips.length;
@@ -1932,26 +2009,21 @@
         }, 180);
       }, 4000);
 
-      // progress updater
       loadingTimerId = setInterval(() => {
         const elapsed = performance.now() - loadingStart;
         const pct = Math.min(1, elapsed / LOADING_DURATION);
         loadingProgressEl.style.width = `${Math.floor(pct*100)}%`;
         const remaining = Math.max(0, Math.ceil((LOADING_DURATION - elapsed)/1000));
         loadingTimerText.textContent = `Landing in ${remaining}s`;
-        // subtle pulse to spinner ring speed based on pct (cosmetic)
         if (pct >= 1){
           clearInterval(loadingTimerId);
           clearInterval(tipRotateId);
-          // hide overlay and begin game
           setTimeout(()=> {
             loadingScreen.style.display = 'none';
             loadingScreen.setAttribute('aria-hidden', 'true');
-            // re-enable selectors
             document.querySelectorAll('.biome-selector').forEach(x => { x.classList.remove('disabled-pane'); x.style.pointerEvents = ''; });
-            // actually start the game
             startGame(biome);
-          }, 220); // brief fade window
+          }, 220);
         }
       }, 100);
     }
@@ -1963,7 +2035,6 @@
         el.classList.add('biome-selected');
         const biome = el.dataset.biome;
         selectedBiome = biome;
-        // Show the loading screen for 20s then start
         showLoadingForBiome(biome);
       });
     });