Sounds + music

EmperorPenguin18 · Oct 1, 2023 · eb4dd4c · eb4dd4c
1 parent c9df871
commit eb4dd4c
Show file tree

Hide file tree

Showing 17 changed files with 23 additions and 2 deletions.
diff --git a/assets/death.sfx b/assets/death.sfx
diff --git a/assets/kill.sfx b/assets/kill.sfx
diff --git a/assets/music.mmpz b/assets/music.mmpz
diff --git a/assets/shoot.sfx b/assets/shoot.sfx
diff --git a/assets/spawn.sfx b/assets/spawn.sfx
diff --git a/game/death.wav b/game/death.wav
diff --git a/game/enemy.json b/game/enemy.json
@@ -45,6 +45,10 @@
 			}
 		],
 		"collision_1": [
+			{
+				"type": "sound",
+				"file": "kill.wav"
+			},
 			{
 				"type": "destroy"
 			}

diff --git a/game/kill.wav b/game/kill.wav
diff --git a/game/music.ogg b/game/music.ogg
diff --git a/game/player.json b/game/player.json
@@ -7,11 +7,19 @@
 	"collision_type": 0,
 	"events": {
 		"collision_3": [
+			{
+				"type": "sound",
+				"file": "death.wav"
+			},
 			{
 				"type": "destroy"
 			}
 		],
 		"collision_4": [
+			{
+				"type": "sound",
+				"file": "death.wav"
+			},
 			{
 				"type": "destroy"
 			}

diff --git a/game/player.lua b/game/player.lua
@@ -81,6 +81,7 @@ end
 function shoot_up(e, instance)
 	if (can_shoot == true)
 	then
+		action(e, instance, '"type": "sound", "file": "shoot.wav"')
 		local bullet = spawn(e, instance, "bullet_up.json", 0, -25, true)
 		can_shoot = false
 		action(e, instance, '"type": "timer", "num": 2, "time": 0.25')
@@ -92,6 +93,7 @@ end
 function shoot_right(e, instance)
 	if (can_shoot == true)
 	then
+		action(e, instance, '"type": "sound", "file": "shoot.wav"')
 		local bullet = spawn(e, instance, "bullet_right.json", 25, 0, true)
 		can_shoot = false
 		action(e, instance, '"type": "timer", "num": 2, "time": 0.25')
@@ -103,6 +105,7 @@ end
 function shoot_down(e, instance)
 	if (can_shoot == true)
 	then
+		action(e, instance, '"type": "sound", "file": "shoot.wav"')
 		local bullet = spawn(e, instance, "bullet_down.json", 0, 25, true)
 		can_shoot = false
 		action(e, instance, '"type": "timer", "num": 2, "time": 0.25')
@@ -114,6 +117,7 @@ end
 function shoot_left(e, instance)
 	if (can_shoot == true)
 	then
+		action(e, instance, '"type": "sound", "file": "shoot.wav"')
 		local bullet = spawn(e, instance, "bullet_left.json", -25, 0, true)
 		can_shoot = false
 		action(e, instance, '"type": "timer", "num": 2, "time": 0.25')

diff --git a/game/room.json b/game/room.json
@@ -11,6 +11,10 @@
 			}
 		],
 		"timer_0": [
+			{
+				"type": "sound",
+				"file": "spawn.wav"
+			},
 			{
 				"type": "spawn",
 				"object": "enemy.json",

diff --git a/game/room.lua b/game/room.lua
@@ -1,6 +1,7 @@
 function create_room(e, instance)
 	math.randomseed(os.time())
 	action(e, instance, '"type": "window", "w": 768, "h": 768')
+	action(e, instance, '"type": "music", "file": "music.ogg"')
 	local player = spawn(e, instance, "player.json", 384, 384, false)
 	local corner_tl = spawn(e, instance, "corner.json", 32, 32, false)
 	action(e, corner_tl, '"type": "rotation", "angle": 0')

diff --git a/game/shoot.wav b/game/shoot.wav
diff --git a/game/spawn.wav b/game/spawn.wav
diff --git a/to-do.txt b/to-do.txt
@@ -16,6 +16,5 @@ Sunday:
 - Player bullet cooldown
 - Sprites
 - Sound effects + Music
-- Score / timer
 - Balancing / polishing
 - Submission!
diff --git a/tools-used.txt b/tools-used.txt
@@ -1,4 +1,5 @@
 Font: https://fontlibrary.org/en/font/cave-story
 Art: Aseprite
 Engine: Custom
-
+Sound effects: Sfxr
+Music: LMMS