aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Sound Effects Index.txt36
-rw-r--r--bullets.lua4
-rw-r--r--enemies.lua30
-rw-r--r--pickups.lua2
-rw-r--r--pico-bhell.p824
-rw-r--r--players.lua15
-rw-r--r--update.lua1
7 files changed, 73 insertions, 39 deletions
diff --git a/Sound Effects Index.txt b/Sound Effects Index.txt
index 9f7cadf..5b61a4c 100644
--- a/Sound Effects Index.txt
+++ b/Sound Effects Index.txt
@@ -24,9 +24,41 @@
23 Laser Charge (1.5 Seconds)
24 Laser Loop
25 Laser Finished
-26 Laser Death
+26 Laser Killed
27 Light Respawn
28 Respawn
29 Rewind Checkpoint
30 Powerup Get!
-31 \ No newline at end of file
+31
+32
+33
+34
+35
+36
+37
+38
+39
+40
+41
+42
+43
+44
+45
+46
+47
+48
+49
+50
+51
+52
+53
+54
+55
+56
+57
+58
+59
+60
+61
+62
+63 \ No newline at end of file
diff --git a/bullets.lua b/bullets.lua
index 6d4337e..c7a47b0 100644
--- a/bullets.lua
+++ b/bullets.lua
@@ -91,7 +91,7 @@ function addlaser(x, y, r)
--collision detection after the warm up
if laser.timer > 1.5 and laser.timer < 3.6 then
if not laser.playingsound then
- sfx(24,1)
+ sfx(24,3)
laser.playingsound = true
end
shake = rnd(8)/laser.timer
@@ -103,7 +103,7 @@ function addlaser(x, y, r)
if laser.timer > 4 then
del(obj, laser)
sfx(24, -2)
- sfx(25)
+ sfx(25, 3)
for i = 1, 16, 1 do
addcircle(rnd(laser.x), laser.y-laser.r/2+rnd(laser.r), -0.5, -0.5, rnd(3), rnd(2), rnd({11,14,7}), 0)
end
diff --git a/enemies.lua b/enemies.lua
index 9b7b08c..28abc74 100644
--- a/enemies.lua
+++ b/enemies.lua
@@ -33,7 +33,7 @@ function addbasicenemy(x, y, sprite, health, speed)
--and reduce health
enemy.health -= 1
if enemy.health > 0 then
- sfx(16)
+ sfx(16, 2)
end
end
@@ -55,7 +55,7 @@ function addbasicenemy(x, y, sprite, health, speed)
enemy.shootcooldown = 0.5 + rnd(1.5)
if enemy.x < 129 then
addbullet(enemy.x-3, enemy.y, -1, 0, true, 2) -- shoot if on screen
- sfx(15) -- play shoot sound if on screen
+ sfx(15, 2) -- play shoot sound if on screen
end
end
if enemy.x < -8 then
@@ -71,7 +71,7 @@ function addbasicenemy(x, y, sprite, health, speed)
if shake < 3 then
shake = 2.5
end
- sfx(17)
+ sfx(17, 2)
del(enemies, enemy)
end
end
@@ -112,7 +112,7 @@ function addwallshooter(x, shootup, health, speed, offset, bulletspeed)
--and reduce health
enemy.health -= 1
enemy.inv = 0.5
- sfx(16)
+ sfx(16, 2)
end
function enemy.collide(object)
@@ -133,7 +133,7 @@ function addwallshooter(x, shootup, health, speed, offset, bulletspeed)
if not enemy.shoottoggle then --implemented a toggle so that the sound effect for firing gets played only once.
enemy.shoottoggle = true
if enemy.x < 128 then
- sfx(18)
+ sfx(18, 3)
end
end
enemy.shootcooldown = 0.08/enemy.bulletspeed
@@ -157,7 +157,7 @@ function addwallshooter(x, shootup, health, speed, offset, bulletspeed)
if shake < 3 then
shake = 2.5
end
- sfx(17)
+ sfx(17, 2)
del(enemies, enemy)
end
end
@@ -195,7 +195,7 @@ function addballshooter(x, y, health, speed)
--and reduce health
enemy.health -= 1
enemy.inv = 0.5
- sfx(16)
+ sfx(16, 2)
end
function enemy.collide(object)
@@ -219,7 +219,7 @@ function addballshooter(x, y, health, speed)
addbullet(enemy.x+4, enemy.y+4, sin(i/48)/2, cos(i/48)/2, true, 2)
end
end
- sfx(19) -- play shoot sound
+ sfx(19, 3) -- play shoot sound
end
end
if enemy.x < -24 then
@@ -238,7 +238,7 @@ function addballshooter(x, y, health, speed)
if shake < 3 then
shake = 12
end
- sfx(20)
+ sfx(20, 3)
explosion(enemy.x+4, enemy.y+4, 8*4, 8*2)
del(enemies, enemy)
end
@@ -272,7 +272,7 @@ function addtargetingenemy(x, y, health, speed)
--and reduce health
enemy.health -= 1
if enemy.health > 0 then
- sfx(16)
+ sfx(16, 2)
end
end
@@ -298,7 +298,7 @@ function addtargetingenemy(x, y, health, speed)
local velx = (players[p].x - enemy.x)/distance
local vely = (players[p].y - enemy.y)/distance
addbullet(enemy.x-3, enemy.y, velx, vely, true, 2) -- shoot if on screen
- sfx(15) -- play shoot sound if on screen
+ sfx(15, 2) -- play shoot sound if on screen
end
end
if enemy.x < -16 then
@@ -314,7 +314,7 @@ function addtargetingenemy(x, y, health, speed)
if shake < 3 then
shake = 3.5
end
- sfx(17)
+ sfx(17, 2)
explosion(enemy.x, enemy.y, 16, 8)
del(enemies, enemy)
end
@@ -357,7 +357,7 @@ function addlasershooter(x, y, speed, stay)
--and reduce health
enemy.health -= 1
if enemy.health > 0 then
- sfx(16)
+ sfx(16, 2)
end
end
@@ -385,7 +385,7 @@ function addlasershooter(x, y, speed, stay)
if enemy.shootcooldown < 0 then
enemy.shootcooldown = 0.18
addbullet(enemy.x+6, enemy.y+20, -1, rnd(2)-1, true, 2) --shoooot!!!!!
- sfx(15) -- play shoot sound if on screen
+ sfx(15, 2) -- play shoot sound if on screen
end
end
@@ -425,7 +425,7 @@ function addlasershooter(x, y, speed, stay)
if shake < 3 then
shake = 6
end
- sfx(26)
+ sfx(26, 3)
del(enemies, enemy)
end
end
diff --git a/pickups.lua b/pickups.lua
index 9c06ada..97fa2b4 100644
--- a/pickups.lua
+++ b/pickups.lua
@@ -50,7 +50,7 @@ function addpickup(x, y, type)
elseif pickup.type == "3shoot" then
player.shoot3 = true
end
- sfx(30)
+ sfx(30, 2)
end
function pickup.draw(pickup)
diff --git a/pico-bhell.p8 b/pico-bhell.p8
index 6e0e754..a827e63 100644
--- a/pico-bhell.p8
+++ b/pico-bhell.p8
@@ -321,7 +321,7 @@ __sfx__
010100001c0002c5003500030500310002a50024000210001a5001800013500130000e500075000b1000c0000a1000a0000710008000061000700004100070000610001600016000160001600016000160001600
480118001c0262c5463503630536310362a52624026210261a5261802613526130260e526075260b1260c0260a1260a0160712608016061260701604116070160610601606016060160601606016060160601606
48021400296200e07034630150703564010070276400d0000a05005000010500465006660076000866006600056600365000650006500f7000f7000f7000f7000f7000f7000f7000f7000f700000000000000000
-c00217002f0203203134061360613707138031390313a0713b0713b0313b0713b0313b0713a0613a05139041370313602135011330112f0112b015280151a001180011500113001100010e0010b0010c0011f001
+c00217002f0103202034021360313703138031390313a0313b0313b0313b0313b0313b0313a0313a02139021370113601135011330112f0112b015270151a001180011500113001100010e0010b0010c0011f001
50011800190122c5323502230522310222a52224022210221a5221802213522130220e522075220b1220c0220a1220a0220712208022061220701204112070120610201602016020160201602016020160201602
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -333,12 +333,12 @@ c00217002f0203203134061360613707138031390313a0713b0713b0313b0713b0313b0713a0613a
92051d002e6732f673306732c66320553165331c54300673016730807300653060430064307653190330864315043026430f03304023016130101300613000130010300613012030020300613001030010300103
900310001a6321e64220652206521e6521d65218652156421263211632106220e6120e6120e6120e6120f61200002000020000200002000020000200002000020000200002000020000200002000020000200002
9102001f0863007630076400764006640076300664005630076300664003630066400664004640066300664006640076400564005630056300664003630026300764004640066400663007630086400863008630
-9e06000002613076130661106651066110762307651066130665305623066110761307623076330862108613096330a6330a631010230c6330d6330e6310202312633136430204117623020431d6530305123633
-5e011d201937322373104730837310473103730c36308463063530464303353016530244301651014510065100451016510044101651014510065102451026410245101651024510163102421014530262301453
-d70600000303300043104130304310453020130c34301043063330463303323016230242301621014110061100411016010041101601014010061102401026010240101611024010160102411014030260301403
-d01e00090050006500005000850000500055000150006500015000050006500005000850000500055000150006500015000000000000000000000000000000000000000000000000000000000000000000000000
-d5050e0010014107121101214722267121a03226732220322673228032260322c032260122f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002
-a0050e0010054107621106214772267721a07226772220722677228072260622c052260322f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002
+9e06000002613076130661106651066110762307651066130665305623066210763307633076330864108623096430a6430a641010430c6130d6430e6110203312613136530201117653020231d6730304123673
+5e011d201137322373104730837310473103730c36308463063530464303353016530244301651014510065100451016510044101651014510065102451026410245101651024510163102421014530262301453
+d60600000303300043104130304310453020130c34301043063330463303323016230242301621014110061100411016010041101601014010061102401026010240101611024010160102411014030260301403
+d60a00002f6732b67312673030730e673020730966301043063330463303323016230242301621014110061100411026130261306601006110260101613076010161306603016130660107603006130060301611
+a4040e0010014107121101214722267121a03226732220322673228032260322c032260122f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002
+a1050e0010034107421104214752267521a05226752220522675228052260522c042260322f015267022670200002267020000200002000020000200002000020000200002000020000200002000020000200002
9c0e0008100531307013071346051c65513070130711c6003f60320600000000050000500070000050007000100533460510003346051c6550700000500070000050007000130701307100500070000000000000
90040900243363234637066110261f126264262e136374463b0260000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
001000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
@@ -375,9 +375,9 @@ __music__
00 41424344
00 41424344
00 41424344
-00 5b1c4344
-01 1b1c5844
-00 1b1c4044
-00 1a1c4344
-02 1a1c4344
+00 5b5c4344
+01 5b5c5844
+00 5b5c4044
+00 5a5c4344
+02 5a5c4344
diff --git a/players.lua b/players.lua
index d395b83..cd56cb4 100644
--- a/players.lua
+++ b/players.lua
@@ -43,10 +43,10 @@ function addplayer(x, y, sprite, bulletsprite)
player.shootspeed = 0.25
player.shoot3 = false
shake = 9
- sfx(10)
+ sfx(10, 0)
explosion(player.x, player.y)
if isgameover() then --FUCK, GAME OVER YOU DIED!
- sfx(11)
+ sfx(11, 0)
gameover = true -- gameover set to true
respawntimer = 5 --respawns all players in 5 seconds
player.inv = 20
@@ -55,6 +55,8 @@ function addplayer(x, y, sprite, bulletsprite)
end
sfx(29, 1)
elseif player.health <= 0 then
+ --kill sfx for co-op
+ sfx(11, 0)
player.inv = 5
end
end
@@ -65,10 +67,11 @@ function addplayer(x, y, sprite, bulletsprite)
for i = 1, 8, 1 do
addcircle(player.x+4, player.y+4, sin(i/8), cos(i/8), 2, 0.6, 7, 0)
end
+ --normal and light respawn sfx for co-op
if playercount == 1 then
- sfx(27)
+ sfx(27, 1)
else
- sfx(28)
+ sfx(28, 1)
end
end
@@ -121,9 +124,9 @@ function addplayer(x, y, sprite, bulletsprite)
if player.shoot3 then
addbullet(player.x+3, player.y+3, 2, 0.25, false, player.bulletsprite)
addbullet(player.x+3, player.y-3, 2, -0.25, false, player.bulletsprite)
- sfx(12)
+ sfx(12, 2)
else
- sfx(9)
+ sfx(9, 2)
end
player.shootcooldown = player.shootspeed
end
diff --git a/update.lua b/update.lua
index 5ccf5c7..042b7a3 100644
--- a/update.lua
+++ b/update.lua
@@ -7,7 +7,6 @@ if gameover then
foreach(players, function(obj) obj:respawn() end)
setwave(mid(checkpoint,currentwave-2,#wave))
sfx(29, -2)
- -- sfx(24)
end
elseif gamerunning then
updatewaves() -- update the wave function