diff --git a/art/bg/help.png b/art/bg/help.png index 888bced..567877c 100644 Binary files a/art/bg/help.png and b/art/bg/help.png differ diff --git a/art/bg/help.txt b/art/bg/help.txt new file mode 100644 index 0000000..27ba2bc --- /dev/null +++ b/art/bg/help.txt @@ -0,0 +1 @@ +Literally just a gradient. lol diff --git a/art/bg/sky.png b/art/bg/sky.png index 100ea34..d1459bc 100644 Binary files a/art/bg/sky.png and b/art/bg/sky.png differ diff --git a/art/sfx/cpudash.wav b/art/sfx/cpudash.wav new file mode 100644 index 0000000..0104eca Binary files /dev/null and b/art/sfx/cpudash.wav differ diff --git a/art/sfx/dash.wav b/art/sfx/dash.wav new file mode 100644 index 0000000..7eff2ef Binary files /dev/null and b/art/sfx/dash.wav differ diff --git a/main.lua b/main.lua index 9e77f6e..879137f 100644 --- a/main.lua +++ b/main.lua @@ -27,6 +27,8 @@ function love.load () bgm = nil flapSfx = love.audio.newSource( "art/sfx/flap.wav", "static") cpuFlapSfx = love.audio.newSource( "art/sfx/cpuflap.wav", "static") + dashSfx = love.audio.newSource( "art/sfx/dash.wav", "static") + cpuDashSfx = love.audio.newSource( "art/sfx/cpudash.wav", "static") bounceSfx = love.audio.newSource( "art/sfx/bounce.wav", "static") waveSfx = love.audio.newSource( "art/sfx/wave.wav", "static") @@ -64,7 +66,6 @@ function love.draw () end love.graphics.draw(bg, 0, 0) love.graphics.draw(bg, 512, 0) - love.graphics.draw(bg, 1024, 0) love.graphics.draw(waveText, 200, 340, 0, 2, 2) love.graphics.draw(lifeText, 125, 355, 0, 1.3, 1.3) @@ -318,7 +319,7 @@ end -------------------- function game_load () mode = game - lives = 4 + lives = 6 wave = 0 waveText:set( "Wave " .. wave ) lifeText:set( "Lives " .. lives ) @@ -622,6 +623,14 @@ function Flier:dash () elseif ( isLeft(self.pointing) ) then self.x_vel = max_vel * -2 end + + if ( self.species ) then + cpuDashSfx:stop() + cpuDashSfx:play() + else + dashSfx:stop() + dashSfx:play() + end end -- kill the Flier, show cool particles @@ -943,14 +952,14 @@ end -- assuming a and b are colliding, act accordingly -- aka, bounce-back or kill one function judgeCollision ( a, b ) - if ( a.y < b.y - 9 and ( b.living ) and ( a.living or a.class() == "Bat" ) ) then + if ( a.y < b.y - 12 and ( b.living ) and ( a.living or a.class() == "Bat" ) ) then if ( (maxSpeed( a.x_vel ) or a.dashTime > 0) and b.blocking == true ) then a.x_vel = a.x_vel * -1 b.x_vel = b.x_vel * -1 else b:kill( a ) end - elseif ( a.y > b.y + 9 and ( a.living ) and ( b.living or a.class() == "Bat" ) ) then + elseif ( a.y > b.y + 12 and ( a.living ) and ( b.living or a.class() == "Bat" ) ) then if ( (maxSpeed( b.x_vel ) or b.dashTime > 0) and a.blocking == true ) then a.x_vel = a.x_vel * -1 b.x_vel = b.x_vel * -1