Add waves (The most important commit!).

haydn-smith · haydn-smith · commit 7889f05d7dd8 · 2025-11-27T18:33:52.000+10:30
diff --git a/files/waves.tiled-session b/files/waves.tiled-session
@@ -119,8 +119,8 @@
             "scale": 8,
             "selectedLayer": 1,
             "viewCenter": {
-                "x": 256,
-                "y": 256
+                "x": 397.875,
+                "y": 268.75
             }
         },
         "spring_again_jetty_area.tmx#snow": {
diff --git a/public/assets/audio/waves.mp3 b/public/assets/audio/waves.mp3
diff --git a/src/common/objects/jetty.ts b/src/common/objects/jetty.ts
@@ -1,5 +1,6 @@
-import { rect } from 'common/factories/phaser';
-import { Animation, Depth, Sprite } from 'constants';
+import { rect, vec2 } from 'common/factories/phaser';
+import { Animation, Depth, Sound, Sprite } from 'constants';
+import { spatialAudio, SpatialAudio } from 'systems/audio';
 import { Collision, collision } from 'systems/collision';
 
 export class Jetty extends Phaser.GameObjects.Container {
@@ -11,11 +12,28 @@ export class Jetty extends Phaser.GameObjects.Container {
 
   private collisions: Collision[];
 
+  private wavesAudio: SpatialAudio;
+
   constructor(scene: Phaser.Scene) {
     const tiledSprite = scene.add.tileSprite(120, 0, 320, 480, Sprite.Waves).setDepth(Depth.Background - 1);
 
     super(scene);
 
+    this.wavesAudio = spatialAudio(scene, Sound.Waves).setDistance(200).setPosition(vec2(32, 0)).loop().play();
+
+    scene.tweens
+      .add({
+        targets: this.wavesAudio,
+        props: {
+          volume: { from: 0, to: 1 },
+        },
+        duration: 3000,
+        onUpdate: (_tween, _target, _key, current) => {
+          this.wavesAudio.setVolume(current);
+        },
+      })
+      .play();
+
     this.sprite = scene.add.sprite(-2, 0, Sprite.Jetty);
 
     this.sprite.anims.play(Animation.Jetty);
@@ -47,6 +65,7 @@ export class Jetty extends Phaser.GameObjects.Container {
       c4.toGameObject(),
       c5.toGameObject(),
       this.waves,
+      this.wavesAudio.toGameObject(),
     ]).setDepth(Depth.Main - 1);
 
     this.addToUpdateList();
diff --git a/src/constants.ts b/src/constants.ts
@@ -311,6 +311,7 @@ export const Sound = {
   IceCrack: 'audio/ice_crack.mp3',
   Watering: 'audio/watering.mp3',
   Splash: 'audio/splash.mp3',
+  Waves: 'audio/waves.mp3',
 } as const;
 export type KeyOfSound = keyof typeof Sound;
 export type TypeOfSound = (typeof Sound)[KeyOfSound];
diff --git a/src/scenes/preloader.ts b/src/scenes/preloader.ts
@@ -287,6 +287,7 @@ export class Preloader extends Phaser.Scene {
     this.load.audio(Sound.IceCrack, Sound.IceCrack);
     this.load.audio(Sound.Watering, Sound.Watering);
     this.load.audio(Sound.Splash, Sound.Splash);
+    this.load.audio(Sound.Waves, Sound.Waves);
   }
 
   create() {
diff --git a/src/systems/audio/decorators/spatial_audio.ts b/src/systems/audio/decorators/spatial_audio.ts
@@ -72,4 +72,12 @@ export class SpatialAudio {
 
     return this;
   }
+
+  public toGameObject() {
+    return this.audio;
+  }
+
+  public toSound() {
+    return this.audio.sound;
+  }
 }
diff --git a/src/systems/audio/objects/spatial_audio.ts b/src/systems/audio/objects/spatial_audio.ts
@@ -2,7 +2,7 @@ import { clamp, normalize } from 'common/utils/math';
 import { debugDepth, isDebug } from 'systems/flags';
 
 export class SpatialAudio extends Phaser.GameObjects.Container {
-  private sound: Phaser.Sound.WebAudioSound | Phaser.Sound.HTML5AudioSound | Phaser.Sound.NoAudioSound;
+  public sound: Phaser.Sound.WebAudioSound | Phaser.Sound.HTML5AudioSound | Phaser.Sound.NoAudioSound;
 
   private graphics: Phaser.GameObjects.Graphics;
 

Original file line number	Diff line number	Diff line change
`@@ -287,6 +287,7 @@ export class Preloader extends Phaser.Scene {`
`287`	`287`	`this.load.audio(Sound.IceCrack, Sound.IceCrack);`
`288`	`288`	`this.load.audio(Sound.Watering, Sound.Watering);`
`289`	`289`	`this.load.audio(Sound.Splash, Sound.Splash);`
	`290`	`+ this.load.audio(Sound.Waves, Sound.Waves);`
`290`	`291`	`}`
`291`	`292`
`292`	`293`	`create() {`
Original file line number	Diff line number	Diff line change
`@@ -72,4 +72,12 @@ export class SpatialAudio {`
`72`	`72`
`73`	`73`	`return this;`
`74`	`74`	`}`
	`75`	`+`
	`76`	`+ public toGameObject() {`
	`77`	`+ return this.audio;`
	`78`	`+ }`
	`79`	`+`
	`80`	`+ public toSound() {`
	`81`	`+ return this.audio.sound;`
	`82`	`+ }`
`75`	`83`	`}`