Upload index.html

index.html

@@ -22,7 +22,7 @@
 <script>
 (() => {
 "use strict";
-// ============ Aquarium v7 — grass sleeping + overhead light streak + iridescent scales ==============
+// ============ Aquarium v9 — night buffers: spaced sleepers, calmer seaweed ==============
 const canvas = document.getElementById("tank");
 const ctx = canvas.getContext("2d");
 let W = 0, H = 0;
@@ -52,8 +52,10 @@ class Fish {
     this.angle = Math.random() < 0.5 ? rand(-0.4, 0.4) : Math.PI + rand(-0.4, 0.4);
     this.hue = pick(HUES);
     this.phase = rand(0, Math.PI * 2);
-    // v7: most fish bed down in the grass after dark; a few still hover by the seaweed
-    this.grassSleeper = Math.random() < 0.72;
+    // v9: after dark, most fish bed down low in the grass — only a small share still
+    // hovers by the seaweed, and each of those keeps to its own stalk (no pile-ups)
+    this.grassSleeper = Math.random() < 0.85;
+    this.seaweedPref = -1; // chosen lazily on the first night (needs built scenery)
 
     // Wander steering (Reynolds-style): a circle ahead of the fish whose target point jitters
     this.wanderTheta = rand(0, Math.PI * 2);
@@ -131,14 +133,14 @@ class Fish {
         const groundY = sandAt(this.x + Math.cos(this.angle) * this.wanderDist) - this.size * 0.5;
         wy += (groundY - wy) * night * 0.85;
       } else if (seaweeds.length) {
-        let bx = 0, by = 0, bd = Infinity;
-        for (const w of seaweeds) {
-          const d2 = (w.x - this.x) * (w.x - this.x) + (w.yMid - this.y) * (w.yMid - this.y);
-          if (d2 < bd) { bd = d2; bx = w.x; by = w.yMid; }
+        // v9: each seaweed-hungry fish keeps to its own stalk instead of all crowding the nearest one
+        if (this.seaweedPref < 0 || this.seaweedPref >= seaweeds.length) {
+          this.seaweedPref = (Math.random() * seaweeds.length) | 0;
         }
+        const w = seaweeds[this.seaweedPref];
         const k = night * 0.8;
-        wx += (bx - wx) * k;
-        wy += (by - wy) * k;
+        wx += (w.x - wx) * k;
+        wy += (w.yMid - wy) * k;
       }
     }
 
@@ -168,8 +170,7 @@ class Fish {
     }
 
     // v7: separation steering — bend around nearby fish instead of ploughing into them.
-    // Only kicks in while actually swimming, so resting fish don't twitch at each other;
-    // the faster we swim, the earlier and harder we steer away.
+    // The faster we swim, the earlier and harder we steer away.
     const mySpeed = this.speed * this.speedFactor;
     if (mySpeed > 0.3) {
       let ax = 0, ay = 0, wsum = 0;
@@ -189,6 +190,26 @@ class Fish {
       if (wsum > 0) {
         desired = lerpAngle(desired, Math.atan2(ay, ax), Math.min(0.85, wsum * 0.45));
       }
+    } else if (night > 0.2) {
+      // v9: at rest after dark — keep a small personal buffer so sleeping fish
+      // slowly drift apart instead of piling on top of each other
+      let ax = 0, ay = 0, wsum = 0;
+      for (const o of fishes) {
+        if (o === this) continue;
+        const dx = o.x - this.x, dy = o.y - this.y;
+        const d2 = dx * dx + dy * dy;
+        const zone = (this.size + o.size) * 1.3; // tighter buffer than the swim radius
+        if (d2 < zone * zone && d2 > 0.01) {
+          const dd = Math.sqrt(d2);
+          const w = 1 - dd / zone;
+          ax -= (dx / dd) * w;
+          ay -= (dy / dd) * w;
+          wsum += w;
+        }
+      }
+      if (wsum > 0) {
+        desired = lerpAngle(desired, Math.atan2(ay, ax), Math.min(0.5, wsum * 0.3));
+      }
     }
 
     // Limit turn rate so direction changes are smooth and fish-like
@@ -703,7 +724,9 @@ function updatePlants(t, dt) {
     // ---- fish push leaves aside: fish overpower the flora ----
     for (const f of fishes) {
       const R = 80, R2 = R * R;                       // influence radius around fish
-      const fx = Math.cos(f.angle) * f.speed * 60;    // fish velocity x (px/s)
+      const fSpd = f.speed * f.cruiseSpeed * f.speedFactor; // actual current speed
+      const fx = Math.cos(f.angle) * fSpd * 60;       // fish velocity x (px/s)
+      const moveF = Math.min(1, fSpd / 1.2);          // v9: how actively this fish is swimming
       for (let i = 1; i <= w.segs; i++) {
         const fl = i / w.segs;
         const px = w.x + w.off[i] + Math.sin(t * w.speed + w.phase + fl * 2.6) * fl * fl * 24;
@@ -713,9 +736,10 @@ function updatePlants(t, dt) {
         if (d2 < R2 && d2 > 0.01) {
           const d = Math.sqrt(d2);
           const weight = (R - d) / R * (0.35 + 0.65 * fl); // upper segments yield more
-          // shove radially away from the fish + drag along its swim direction
-          w.offV[i] += ((dx / d) * 1500 + fx * 9) * weight * dt;
-          if (weight > 0.25) w.touch = Math.min(1, w.touch + dt * 5);
+          // shove radially away from the fish + drag along its swim direction.
+          // v9: a nearly-still fish only gently parts leaves — no shoving, no flinch wobble
+          w.offV[i] += ((dx / d) * 1500 * (0.25 + 0.75 * moveF) + fx * 9) * weight * dt;
+          if (weight > 0.25 && moveF > 0.35) w.touch = Math.min(1, w.touch + dt * 5);
         }
       }
     }