Merge branch 'sounds'

nthirtyone · Feb 24, 2017 · 5f013c9 · 5f013c9
2 parents 7c37217 + 044313e
commit 5f013c9
Show file tree

Hide file tree

Showing 11 changed files with 10 additions and 4 deletions.
diff --git a/assets/sounds/attack.ogg b/assets/sounds/attack.ogg
diff --git a/assets/sounds/cheer.ogg b/assets/sounds/cheer.ogg
diff --git a/assets/sounds/death.ogg b/assets/sounds/death.ogg
diff --git a/assets/sounds/hit.ogg b/assets/sounds/hit.ogg
diff --git a/assets/sounds/jump.ogg b/assets/sounds/jump.ogg
diff --git a/assets/sounds/land.ogg b/assets/sounds/land.ogg
diff --git a/assets/sounds/spawn.ogg b/assets/sounds/spawn.ogg
diff --git a/assets/sounds/step.ogg b/assets/sounds/step.ogg
diff --git a/player.lua b/player.lua
@@ -205,6 +205,7 @@ function Player:controlpressed(set, action, key)
 		if self.jumpnumber > 0 then
 			-- General jump logics
 			self.jumpactive = true
+			--self:playSound(6)
 			-- Spawn proper effect
 			if not self.inAir then
 				self:createEffect("jump")
@@ -436,11 +437,12 @@ function Player:respawn()
 	self.body:setPosition(self.world:getSpawnPosition())
 	self.body:setActive(true)
 	self:createEffect("respawn")
+	self:playSound(7)
 end
 
 -- Sounds
-function Player:playSound(sfx)
-	if self.alive then
+function Player:playSound(sfx, force)
+	if self.alive or force then
 		local source = love.audio.newSource(self.sfx[sfx])
 		source:play()
 	end

diff --git a/sounds.lua b/sounds.lua
@@ -1,6 +1,9 @@
 return {
 	love.sound.newSoundData("assets/sounds/death.ogg"),
 	love.sound.newSoundData("assets/sounds/hit.ogg"),
-	love.sound.newSoundData("assets/sounds/land.ogg"),
-	love.sound.newSoundData("assets/sounds/attack.ogg")
+	love.sound.newSoundData("assets/sounds/step.ogg"),
+	love.sound.newSoundData("assets/sounds/attack.ogg"),
+	love.sound.newSoundData("assets/sounds/cheer.ogg"),
+	love.sound.newSoundData("assets/sounds/jump.ogg"),
+	love.sound.newSoundData("assets/sounds/spawn.ogg"),
 }
diff --git a/world.lua b/world.lua
@@ -216,6 +216,7 @@ function World:onNautKilled(naut)
 		changeScene(Menu:new())
 	elseif #nauts < 2 then
 		self.lastNaut = true
+		naut:playSound(5, true)
 	end
 end