From fee69da24f3f580acbe6682116a9a1636f9736c4 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Fri, 24 Jun 2016 19:18:02 +0200
Subject: More sounds

---
 player.lua        |  18 +++++++-----------
 sounds.lua        |   6 ++++++
 sounds/attack.wav | Bin 0 -> 1229 bytes
 sounds/land.wav   | Bin 0 -> 1725 bytes
 world.lua         |   1 +
 5 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 sounds.lua
 create mode 100644 sounds/attack.wav
 create mode 100644 sounds/land.wav

diff --git a/player.lua b/player.lua
index 66872c6..70446b4 100644
--- a/player.lua
+++ b/player.lua
@@ -44,8 +44,7 @@ Player = {
 	portrait_sprite = nil,
 	portrait_sheet  = require "portraits",
 	-- Sounds
-	sfx_death = love.sound.newSoundData("sounds/death.wav"),
-	sfx_hit   = love.sound.newSoundData("sounds/hit.wav")
+	sfx = require "sounds"
 }
 
 -- Constructor of `Player`
@@ -336,6 +335,8 @@ function Player:hit (ox, oy, sx, sy, vx, vy)
 			end
 		end
 	end
+	-- sound
+	self:playSound(4)
 end
 
 -- Hittest
@@ -358,7 +359,7 @@ function Player:damage (horizontal, vertical)
 	self:changeAnimation("damage")
 	self.combo = math.min(20, self.combo + 1)
 	self.punchcd = 0.08
-	self:playSoundHit()
+	self:playSound(2)
 end
 
 -- DIE
@@ -369,7 +370,7 @@ function Player:die ()
 	self.spawntimer = 1
 	self.body:setActive(false)
 	self.world:onNautKilled(self)
-	self:playSoundDeath()
+	self:playSound(1)
 end
 
 -- And then respawn. Like Jon Snow.
@@ -382,12 +383,7 @@ function Player:respawn ()
 end
 
 -- Sounds
-function Player:playSoundHit()
-	local source = love.audio.newSource(self.sfx_hit)
-	source:play()
-end
-
-function Player:playSoundDeath()
-	local source = love.audio.newSource(self.sfx_death)
+function Player:playSound(sfx)
+	local source = love.audio.newSource(self.sfx[sfx])
 	source:play()
 end
\ No newline at end of file
diff --git a/sounds.lua b/sounds.lua
new file mode 100644
index 0000000..d49b2fe
--- /dev/null
+++ b/sounds.lua
@@ -0,0 +1,6 @@
+return {
+	love.sound.newSoundData("sounds/death.wav"),
+	love.sound.newSoundData("sounds/hit.wav"),
+	love.sound.newSoundData("sounds/land.wav"),
+	love.sound.newSoundData("sounds/attack.wav")
+}
\ No newline at end of file
diff --git a/sounds/attack.wav b/sounds/attack.wav
new file mode 100644
index 0000000..c52a405
Binary files /dev/null and b/sounds/attack.wav differ
diff --git a/sounds/land.wav b/sounds/land.wav
new file mode 100644
index 0000000..bc5015b
Binary files /dev/null and b/sounds/land.wav differ
diff --git a/world.lua b/world.lua
index 3b645e5..6fd5203 100644
--- a/world.lua
+++ b/world.lua
@@ -336,6 +336,7 @@ function World.beginContact(a, b, coll)
 			b:getUserData().jumpdouble = true
 			b:getUserData().salto = false
 			b:getUserData():createEffect("land")
+			b:getUserData():playSound(3)
 		end
 	end
 end
-- 
cgit v1.1