Manual changes saved

index.html

@@ -559,39 +559,68 @@
 
     // 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 score = (it.weapon.dmg || 1) / (it.weapon.rate || 300);
+          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;
+      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){
-      // p is a pickup-like object
-      if (!e) return;
+      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 === p.weapon.name){
-            it.ammoReserve += p.ammoReserve;
-            it.ammoInMag = Math.min(it.weapon.magSize, it.ammoInMag + p.ammoInMag);
+          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);
-            e.state = 'combat'; // become aggressive when stocked
+            // 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:p.weapon, ammoInMag:p.ammoInMag, ammoReserve:p.ammoReserve }; enemyEquipBestWeapon(e); e.state = 'combat'; e.lastAttackedTime = performance.now(); return; }
+          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;
-        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'){
@@ -599,13 +628,14 @@
             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:p.weapon, ammoInMag:p.ammoInMag, ammoReserve:p.ammoReserve };
+          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((p.ammoReserve || 0) / 2);
+          e.materials += Math.floor((normalized.ammoReserve || 0) / 2);
         }
       } else if (p.type === 'medkit'){
         for (let s=0;s<5;s++){
@@ -775,7 +805,7 @@
       return best;
     }
 
-    // Enemy AI (improved: detour around obstacles and prioritize chest looting early)
+    // 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){
@@ -790,7 +820,6 @@
           const distToSafeCenter = Math.hypot(e.x - storm.centerX, e.y - storm.centerY);
           if (distToSafeCenter > storm.radius){
             e.state = 'toSafe';
-            // If we have a tempTarget navigate to it until it's reached or LOS to center is available
             if (e.tempTarget){
               const td = Math.hypot(e.tempTarget.x - e.x, e.tempTarget.y - e.y);
               if (td > 8){
@@ -800,36 +829,18 @@
                 moveEntityWithCollision(e, dx, dy, e.radius);
                 continue;
               } else {
-                // reached temp target - clear it if LOS to center exists
                 e.tempTarget = null;
                 e.tempTargetExpiry = 0;
-                if (hasLineOfSight(e.x, e.y, storm.centerX, storm.centerY) === false){
-                  // set another detour if still blocked
-                  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.9; const dy = Math.sin(e.angle) * e.speed * dt * 0.9; moveEntityWithCollision(e, dx, dy, e.radius); continue; }
-                  }
-                }
               }
             }
-            // No temp target or cleared: try to go directly to center, if blocked compute detour
             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;
-                }
+                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; }
               }
             }
-            // If unobstructed or unable to create temp target, head straight to safe center
             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;
@@ -878,6 +889,8 @@
                 enemyPickupCollect(e, p);
                 const idx = pickups.indexOf(p);
                 if (idx >= 0) pickups.splice(idx,1);
+                // equip best weapon immediately if any
+                enemyEquipBestWeapon(e);
               }
               continue;
             }
@@ -894,7 +907,6 @@
               if (!hasLineOfSight(e.x, e.y, chestTarget.x, chestTarget.y)){
                 const blocker = findBlockingObject(e.x, e.y, chestTarget.x, chestTarget.y);
                 if (blocker){
-                  // set a tempTarget detour
                   if (!e.tempTarget){
                     e.tempTarget = computeDetourWaypoint(e.x, e.y, blocker, chestTarget.x, chestTarget.y);
                     e.tempTargetExpiry = now + 2500;
@@ -923,9 +935,20 @@
               if (!chestTarget.opened){
                 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 });
+                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';
@@ -936,9 +959,8 @@
             continue;
           }
 
-          // Harvest nodes (lower priority than chests/pickups)
           let objTarget = findNearestHarvestable(e, 700);
-          if (objTarget && !prioritizeChests && hasLineOfSight(e.x, e.y, objTarget.x, objTarget.y)){
+          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);
@@ -961,18 +983,6 @@
             continue;
           }
 
-          // Roam
-          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.5;
-              const dy = Math.sin(e.angle) * e.speed * dt * 0.5;
-              moveEntityWithCollision(e, dx, dy, e.radius);
-              continue;
-            } else { e.tempTarget = null; e.tempTargetExpiry = 0; }
-          }
-
           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);
@@ -998,7 +1008,34 @@
           }
         }
 
-        // Target selection: prefer player if in range; otherwise prefer nearest visible enemy or pickup/chest when not armed
+        // 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){
@@ -1047,24 +1084,19 @@
           const blocker = findBlockingObject(e.x, e.y, target.x, target.y);
           if (blocker){
             const db = Math.hypot(blocker.x - e.x, blocker.y - e.y);
-            // if close to blocker, try to break it quickly
             if (db < 36){
               blocker.hp -= 18 * dt * 2;
               if (blocker.hp <= 0){ blocker.dead = true; e.materials += (blocker.type === 'wood' ? 3 : 6); }
-              continue;
             } else {
-              // if ranged weapon and can shoot through, do so; otherwise compute detour
               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)){
-                  // attempt to shoot at blocker to create opening, but also compute detour as fallback
                   e.lastShot = now;
                   eq.ammoInMag -= 1;
                   const angle = Math.atan2(blocker.y - e.y, blocker.x - e.x);
                   shootBullet(e.x + Math.cos(angle)*12, e.y + Math.sin(angle)*12, blocker.x + (Math.random()-0.5)*6, blocker.y + (Math.random()-0.5)*6, eq, e.id);
                 }
               }
-              // Compute or reuse a detour waypoint
               if (!e.tempTarget){
                 const waypoint = computeDetourWaypoint(e.x, e.y, blocker, target.x, target.y);
                 if (waypoint){
@@ -1082,16 +1114,15 @@
                   e.tempTargetExpiry = 0;
                 }
               } else {
-                // fallback: nudge towards blocker to try to clear
                 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);
+                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 is player, handle combat vs player
         if (target === player){
           if (distToPlayer < 36 && now - e.lastMelee > e.meleeRate){
             e.lastMelee = now;
@@ -1103,6 +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){
+                // 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;
@@ -1124,7 +1163,6 @@
             moveEntityWithCollision(e, Math.cos(e.angle) * e.speed * dt * 0.9, Math.sin(e.angle) * e.speed * dt * 0.9, e.radius);
           }
         } else {
-          // Target is an item, chest, harvestable, or another 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'){
             if (td > 20){
@@ -1135,6 +1173,7 @@
               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){
@@ -1148,7 +1187,13 @@
                 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';
-                // immediately go to combat if they got a weapon
+                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; }
               }
             }
@@ -1165,7 +1210,6 @@
               e.state = 'gather';
             }
           } else {
-            // target is another enemy (melee)
             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);