From 6fbef22a91840e75c5c6247d5e53175fec03e50c Mon Sep 17 00:00:00 2001 From: Aki Date: Wed, 22 Jun 2016 03:10:11 +0200 Subject: Hit and death sounds --- player.lua | 18 +++++++++++++++++- sounds/death.wav | Bin 9352 -> 20388 bytes sounds/hit.wav | Bin 8219 -> 25760 bytes sounds/jump.wav | Bin 11696 -> 0 bytes 4 files changed, 17 insertions(+), 1 deletion(-) delete mode 100644 sounds/jump.wav diff --git a/player.lua b/player.lua index 567f908..66872c6 100644 --- a/player.lua +++ b/player.lua @@ -42,7 +42,10 @@ Player = { controller_empty = {isDown = function () return false end}, -- HUD portrait_sprite = nil, - portrait_sheet = require "portraits" + portrait_sheet = require "portraits", + -- Sounds + sfx_death = love.sound.newSoundData("sounds/death.wav"), + sfx_hit = love.sound.newSoundData("sounds/hit.wav") } -- Constructor of `Player` @@ -355,6 +358,7 @@ function Player:damage (horizontal, vertical) self:changeAnimation("damage") self.combo = math.min(20, self.combo + 1) self.punchcd = 0.08 + self:playSoundHit() end -- DIE @@ -365,6 +369,7 @@ function Player:die () self.spawntimer = 1 self.body:setActive(false) self.world:onNautKilled(self) + self:playSoundDeath() end -- And then respawn. Like Jon Snow. @@ -374,4 +379,15 @@ function Player:respawn () self.body:setPosition(self.world:getSpawnPosition()) self.body:setActive(true) self:createEffect("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) + source:play() end \ No newline at end of file diff --git a/sounds/death.wav b/sounds/death.wav index 8ceb430..f37ce03 100644 Binary files a/sounds/death.wav and b/sounds/death.wav differ diff --git a/sounds/hit.wav b/sounds/hit.wav index a5690a8..ca1e7b6 100644 Binary files a/sounds/hit.wav and b/sounds/hit.wav differ diff --git a/sounds/jump.wav b/sounds/jump.wav deleted file mode 100644 index 971870a..0000000 Binary files a/sounds/jump.wav and /dev/null differ -- cgit v1.1