diff --git a/button.lua b/button.lua deleted file mode 100644 index a79e9f7..0000000 --- a/button.lua +++ /dev/null @@ -1,4 +0,0 @@ -buttons = {} - -function button:new(x, y, w, h) - return \ No newline at end of file diff --git a/main.lua b/main.lua index b508cad..b6b2cae 100644 --- a/main.lua +++ b/main.lua @@ -2,7 +2,7 @@ function love.load() love.graphics.setDefaultFilter("nearest", "nearest") love.window.setMode(0, 0) - --love.window.setMode(1920, 1080) +-- love.window.setMode(1920, 1080) screen_width = love.graphics.getWidth() screen_height = love.graphics.getHeight() love.window.setFullscreen(true, "desktop") @@ -224,6 +224,11 @@ function love.draw() love.graphics.printf("PAUSED", originXCenter - 130, originYCenter - 10, 999, "left", nil, 4, 4) + + + ret1,ret2 = cam:mousePosition() + love.graphics.draw(reticle, ret1, ret2,nil,nil,nil,3,3) + cam:detach() elseif round.gameState == 1 then gameOverScreen() diff --git a/menu.lua b/menu.lua index 9cb7f4c..5690aa3 100644 --- a/menu.lua +++ b/menu.lua @@ -93,6 +93,9 @@ function drawMenuButtons() end --check for click if love.mouse.isDown(1) and not oldmousedown and isHot then + if not soundFX.collectCoin.m1:isPlaying() then love.audio.play(soundFX.collectCoin.m1) else + love.audio.play(soundFX.collectCoin.m5) + end button.fn() end end diff --git a/sounds.lua b/sounds.lua index 290f34f..8e51e00 100644 --- a/sounds.lua +++ b/sounds.lua @@ -63,10 +63,10 @@ function loadSoundFX() soundFX.annihilate:setVolume(.2) soundFX.collectCoin.m1:setVolume(1) - soundFX.collectCoin.m2:setVolume(.2) - soundFX.collectCoin.m3:setVolume(.3) - soundFX.collectCoin.m4:setVolume(.4) - soundFX.collectCoin.m5:setVolume(.5) + soundFX.collectCoin.m2:setVolume(.3) + soundFX.collectCoin.m3:setVolume(.5) + soundFX.collectCoin.m4:setVolume(.7) + soundFX.collectCoin.m5:setVolume(1) end function playMusic() diff --git a/sounds/dash.flp b/sounds/flps/dash.flp similarity index 100% rename from sounds/dash.flp rename to sounds/flps/dash.flp diff --git a/sounds/gameMusic.flp b/sounds/flps/gameMusic.flp similarity index 100% rename from sounds/gameMusic.flp rename to sounds/flps/gameMusic.flp diff --git a/sounds/soundFX.flp b/sounds/flps/soundFX.flp similarity index 100% rename from sounds/soundFX.flp rename to sounds/flps/soundFX.flp diff --git a/sounds/vocalFX.flp b/sounds/flps/vocalFX.flp similarity index 100% rename from sounds/vocalFX.flp rename to sounds/flps/vocalFX.flp diff --git a/sounds/wind.flp b/sounds/flps/wind.flp similarity index 100% rename from sounds/wind.flp rename to sounds/flps/wind.flp