summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-02-10 13:51:45 +0100
committerAki <nthirtyone@gmail.com>2017-02-10 13:51:45 +0100
commit21184b6b9e3441064960ebf5af910afa6c7ffd1e (patch)
tree8f8a7f2681e52b0908ce8b10f76840ab2e9b1f91
parent1a6b183f2b3457b62b7a403209bec6184c6c6106 (diff)
downloadroflnauts-21184b6b9e3441064960ebf5af910afa6c7ffd1e.zip
roflnauts-21184b6b9e3441064960ebf5af910afa6c7ffd1e.tar.gz
roflnauts-21184b6b9e3441064960ebf5af910afa6c7ffd1e.tar.bz2
Added new sounds and modified old ones
-rw-r--r--assets/sounds/attack.oggbin4487 -> 8288 bytes
-rw-r--r--assets/sounds/death.oggbin12111 -> 20380 bytes
-rw-r--r--assets/sounds/hit.oggbin5877 -> 7640 bytes
-rw-r--r--assets/sounds/jump.oggbin0 -> 14436 bytes
-rw-r--r--assets/sounds/land.oggbin4733 -> 0 bytes
-rw-r--r--assets/sounds/spawn.oggbin0 -> 7302 bytes
-rw-r--r--assets/sounds/step.oggbin0 -> 6363 bytes
-rw-r--r--player.lua2
-rw-r--r--sounds.lua6
9 files changed, 6 insertions, 2 deletions
diff --git a/assets/sounds/attack.ogg b/assets/sounds/attack.ogg
index c4e1123..5cae4f3 100644
--- a/assets/sounds/attack.ogg
+++ b/assets/sounds/attack.ogg
Binary files differ
diff --git a/assets/sounds/death.ogg b/assets/sounds/death.ogg
index 64c717f..dd4881d 100644
--- a/assets/sounds/death.ogg
+++ b/assets/sounds/death.ogg
Binary files differ
diff --git a/assets/sounds/hit.ogg b/assets/sounds/hit.ogg
index f44ad06..1e85257 100644
--- a/assets/sounds/hit.ogg
+++ b/assets/sounds/hit.ogg
Binary files differ
diff --git a/assets/sounds/jump.ogg b/assets/sounds/jump.ogg
new file mode 100644
index 0000000..4566031
--- /dev/null
+++ b/assets/sounds/jump.ogg
Binary files differ
diff --git a/assets/sounds/land.ogg b/assets/sounds/land.ogg
deleted file mode 100644
index 2804476..0000000
--- a/assets/sounds/land.ogg
+++ /dev/null
Binary files differ
diff --git a/assets/sounds/spawn.ogg b/assets/sounds/spawn.ogg
new file mode 100644
index 0000000..1becd40
--- /dev/null
+++ b/assets/sounds/spawn.ogg
Binary files differ
diff --git a/assets/sounds/step.ogg b/assets/sounds/step.ogg
new file mode 100644
index 0000000..73ee27f
--- /dev/null
+++ b/assets/sounds/step.ogg
Binary files differ
diff --git a/player.lua b/player.lua
index f08ca19..5e75e68 100644
--- 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,6 +437,7 @@ function Player:respawn()
self.body:setPosition(self.world:getSpawnPosition())
self.body:setActive(true)
self:createEffect("respawn")
+ self:playSound(7)
end
-- Sounds
diff --git a/sounds.lua b/sounds.lua
index 6c888e1..c30af16 100644
--- a/sounds.lua
+++ b/sounds.lua
@@ -1,7 +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/step.ogg"),
love.sound.newSoundData("assets/sounds/attack.ogg"),
- love.sound.newSoundData("assets/sounds/cheer.ogg")
+ love.sound.newSoundData("assets/sounds/cheer.ogg"),
+ love.sound.newSoundData("assets/sounds/jump.ogg"),
+ love.sound.newSoundData("assets/sounds/spawn.ogg"),
} \ No newline at end of file