few tweaks on puddle, water and birds sound

Author: gcclinux

screenshots/first-water-sign.png

@@ -188,7 +188,7 @@ private boolean isInSandPatch(float worldX, float worldY) {
     /**
      * Checks if a position is within a water patch.
      * Uses multi-octave noise to create organic lake shapes.
-     * Target distribution: ~15% water coverage
+     * Target distribution: ~15% water coverage with smaller, more varied shapes
      * 
      * @param worldX The x-coordinate in world space
      * @param worldY The y-coordinate in world space
@@ -205,23 +205,23 @@ private boolean isInWaterPatch(float worldX, float worldY) {
         }
 
         // Use multi-octave noise for organic lake shapes
-        // Using smaller scale values (lower frequency) to create larger, more contiguous lakes
-        float noiseScale1 = 0.00005f;  // Large features (lake locations) - very low frequency for large lakes
-        float noiseScale2 = 0.0002f;   // Medium features (lake shapes) - reduced for more contiguity
-        float noiseScale3 = 0.0008f;   // Small features (shoreline detail) - reduced for smoother edges
+        // Higher frequency values create smaller, more varied water bodies
+        float noiseScale1 = 0.0003f;   // Large features (lake locations) - increased for smaller lakes
+        float noiseScale2 = 0.0012f;   // Medium features (lake shapes) - increased for more variation
+        float noiseScale3 = 0.0025f;   // Small features (shoreline detail) - increased for irregular edges
 
         // Sample noise at different scales
         float noise1 = simplexNoise(worldX * noiseScale1, worldY * noiseScale1);
         float noise2 = simplexNoise(worldX * noiseScale2, worldY * noiseScale2);
         float noise3 = simplexNoise(worldX * noiseScale3, worldY * noiseScale3);
 
-        // Combine noise octaves with heavy weight on large features for maximum contiguity
-        float combinedNoise = noise1 * 0.7f + noise2 * 0.2f + noise3 * 0.1f;
+        // Combine noise octaves with more balanced weights for varied shapes
+        float combinedNoise = noise1 * 0.4f + noise2 * 0.35f + noise3 * 0.25f;
 
         // Normalize to 0-1 range
         float waterProbability = combinedNoise * 0.5f + 0.5f;
 
-        // Threshold for water (0.75 = ~15% coverage)
+        // Threshold for water - adjusted to maintain ~15% coverage with new noise scales
         return waterProbability > BiomeConfig.WATER_NOISE_THRESHOLD;
     }
 

screenshots/fully-loaded.png

@@ -24,15 +24,12 @@ public class BirdFormationManager {
     private Texture birdTexture1;
     private Texture birdTexture2;
     private Sound birdSound;
-    private long birdSoundId = -1;
-    private boolean isFadingOut = false;
-    private float currentVolume = 1.0f;
-    private float fadeOutTimer = 0f;
+    
+    private static final float BIRD_VOLUME = 0.7f; // 70% volume (reduced by 30%)
 
     private static final float MIN_SPAWN_INTERVAL = 60f; // 1 minute
     private static final float MAX_SPAWN_INTERVAL = 180f; // 3 minutes
     private static final float BIRD_SPEED = 100f; // pixels per second
-    private static final float FADE_OUT_DURATION = 1.0f; // 1 second fade out
 
     public BirdFormationManager(OrthographicCamera camera, Viewport viewport) {
         this.camera = camera;
@@ -93,35 +90,6 @@ public void update(float deltaTime, float playerX, float playerY) {
             return; // Bird system disabled if textures failed to load
         }
 
-        // Update fade-out if in progress
-        if (isFadingOut && birdSound != null && birdSoundId != -1) {
-            fadeOutTimer += deltaTime;
-            float fadeProgress = fadeOutTimer / FADE_OUT_DURATION;
-            
-            if (fadeProgress >= 1.0f) {
-                // Fade complete, stop sound
-                try {
-                    birdSound.stop(birdSoundId);
-                    System.out.println("[BIRDS] Bird sound stopped (fade complete)");
-                } catch (Exception e) {
-                    System.err.println("[BIRDS] Error stopping bird sound: " + e.getMessage());
-                } finally {
-                    birdSoundId = -1;
-                    isFadingOut = false;
-                    currentVolume = 1.0f;
-                    fadeOutTimer = 0f;
-                }
-            } else {
-                // Update volume during fade
-                currentVolume = 1.0f - fadeProgress;
-                try {
-                    birdSound.setVolume(birdSoundId, currentVolume);
-                } catch (Exception e) {
-                    System.err.println("[BIRDS] Error setting bird sound volume: " + e.getMessage());
-                }
-            }
-        }
-        
         // Update active formation
         if (activeFormation != null) {
             activeFormation.update(deltaTime);
@@ -137,7 +105,7 @@ public void update(float deltaTime, float playerX, float playerY) {
         }
 
         // Update spawn timer
-        if (activeFormation == null && !isFadingOut) {
+        if (activeFormation == null) {
             spawnTimer -= deltaTime;
 
             if (spawnTimer <= 0) {
@@ -153,17 +121,6 @@ public void render(SpriteBatch batch) {
     }
 
     public void dispose() {
-        // Stop sound if playing
-        if (birdSound != null && birdSoundId != -1) {
-            try {
-                birdSound.stop(birdSoundId);
-            } catch (Exception e) {
-                System.err.println("[BIRDS] Error stopping bird sound during dispose: " + e.getMessage());
-            } finally {
-                birdSoundId = -1;
-            }
-        }
-        
         // Dispose sound resource
         if (birdSound != null) {
             try {
@@ -193,18 +150,13 @@ private void spawnFormation() {
         activeFormation = new BirdFormation(spawnPoint, velocity, birdTexture1, birdTexture2);
         lastSpawnBoundary = spawnPoint.boundary;
 
-        // Start bird sound
-        if (birdSound != null && birdSoundId == -1) {
+        // Play bird sound once
+        if (birdSound != null) {
             try {
-                birdSoundId = birdSound.loop();
-                birdSound.setVolume(birdSoundId, 1.0f);
-                currentVolume = 1.0f;
-                isFadingOut = false;
-                fadeOutTimer = 0f;
-                System.out.println("[BIRDS] Bird sound started");
+                birdSound.play(BIRD_VOLUME);
+                System.out.println("[BIRDS] Bird sound played once");
             } catch (Exception e) {
-                System.err.println("[BIRDS] Error starting bird sound: " + e.getMessage());
-                birdSoundId = -1; // Ensure sound ID remains in stopped state
+                System.err.println("[BIRDS] Error playing bird sound: " + e.getMessage());
             }
         }
 
@@ -226,13 +178,6 @@ private void spawnFormation() {
     }
 
     private void despawnFormation() {
-        // Start fade-out for bird sound
-        if (birdSound != null && birdSoundId != -1 && !isFadingOut) {
-            isFadingOut = true;
-            fadeOutTimer = 0f;
-            System.out.println("[BIRDS] Bird sound fading out");
-        }
-        
         if (activeFormation != null) {
             activeFormation.dispose();
             activeFormation = null;

src/main/java/wagemaker/uk/biome/BiomeManager.java

@@ -312,12 +312,28 @@ public void setBiomeManager(BiomeManager biomeManager) {
      * @return true if the position has adequate spacing, false otherwise
      */
     private boolean hasMinimumSpacing(float x, float y, WaterPuddle excludePuddle) {
-        // Check if location is in water biome
+        // Check if location is in or near water biome (minimum 128px distance)
         if (biomeManager != null && biomeManager.isInitialized()) {
-            BiomeType biomeType = biomeManager.getBiomeAtPosition(x, y);
-            if (biomeType == BiomeType.WATER) {
+            float waterCheckRadius = 128f;
+            int checkPoints = 8; // Check 8 points around the puddle location
+            
+            // Check center point
+            BiomeType centerBiome = biomeManager.getBiomeAtPosition(x, y);
+            if (centerBiome == BiomeType.WATER) {
                 return false; // Don't create puddles in water
             }
+            
+            // Check points in a circle around the puddle location
+            for (int i = 0; i < checkPoints; i++) {
+                float angle = (float) (2 * Math.PI * i / checkPoints);
+                float checkX = x + (float) Math.cos(angle) * waterCheckRadius;
+                float checkY = y + (float) Math.sin(angle) * waterCheckRadius;
+                
+                BiomeType biomeType = biomeManager.getBiomeAtPosition(checkX, checkY);
+                if (biomeType == BiomeType.WATER) {
+                    return false; // Too close to water
+                }
+            }
         }
 
         float minSpacingSquared = PuddleConfig.MIN_PUDDLE_SPACING * PuddleConfig.MIN_PUDDLE_SPACING;