Merge branch 'main' of https://github.com/chosencharacters/Tankmas2024

chosencharacters · Dec 1, 2024 · 4ee2484 · 4ee2484
2 parents 036c245 + 1e95d8e
commit 4ee2484
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/assets/sounds/present-open.ogg b/assets/sounds/present-open.ogg
diff --git a/assets/sounds/present_open.mp3 b/assets/sounds/present_open.mp3
diff --git a/source/entities/Present.hx b/source/entities/Present.hx
@@ -133,9 +133,9 @@ class Present extends Interactable
 		if (state != "OPENED")
 		{
 			sstate(OPENING);
-			new FlxTimer().start(1, function(tmr:FlxTimer)
+			new FlxTimer().start(0.24, (tmr:FlxTimer) -> SoundPlayer.sound(Paths.get('present-open.ogg')));
+			new FlxTimer().start(1.2, function(tmr:FlxTimer)
 			{
-				// TODO: sound effect
 				sstate(OPENED);
 				thumbnail.sstate("OPEN");
 				PlayState.self.openSubState(comic ? new ComicSubstate(content, true) : new ArtSubstate(content));
@@ -145,7 +145,7 @@ class Present extends Interactable
 		}
 		else
 		{
-			// TODO: sound effect
+			SoundPlayer.sound(Paths.get('present-open.ogg'));
 			PlayState.self.openSubState(comic ? new ComicSubstate(content, false) : new ArtSubstate(content));
 		}
 	}