diff --git a/assets/sprites/bg/1.png b/assets/sprites/bg/1.png index 94c1775..7dacc53 100644 Binary files a/assets/sprites/bg/1.png and b/assets/sprites/bg/1.png differ diff --git a/assets/sprites/fish/big_die.png b/assets/sprites/fish/big_die.png index 5d9f51f..319e6e2 100644 Binary files a/assets/sprites/fish/big_die.png and b/assets/sprites/fish/big_die.png differ diff --git a/assets/sprites/fish/big_eat.png b/assets/sprites/fish/big_eat.png index e9d6b65..6b03fbb 100644 Binary files a/assets/sprites/fish/big_eat.png and b/assets/sprites/fish/big_eat.png differ diff --git a/assets/sprites/fish/big_hungry_eat.png b/assets/sprites/fish/big_hungry_eat.png index 206e0d6..e6df545 100644 Binary files a/assets/sprites/fish/big_hungry_eat.png and b/assets/sprites/fish/big_hungry_eat.png differ diff --git a/assets/sprites/fish/big_hungry_swim.png b/assets/sprites/fish/big_hungry_swim.png index e445ee2..f0c2449 100644 Binary files a/assets/sprites/fish/big_hungry_swim.png and b/assets/sprites/fish/big_hungry_swim.png differ diff --git a/assets/sprites/fish/big_hungry_turn.png b/assets/sprites/fish/big_hungry_turn.png index 903102c..8277bfb 100644 Binary files a/assets/sprites/fish/big_hungry_turn.png and b/assets/sprites/fish/big_hungry_turn.png differ diff --git a/assets/sprites/fish/big_swim.png b/assets/sprites/fish/big_swim.png index 4365b17..fcba8da 100644 Binary files a/assets/sprites/fish/big_swim.png and b/assets/sprites/fish/big_swim.png differ diff --git a/assets/sprites/fish/big_turn.png b/assets/sprites/fish/big_turn.png index a7d2c07..4c00f91 100644 Binary files a/assets/sprites/fish/big_turn.png and b/assets/sprites/fish/big_turn.png differ diff --git a/assets/sprites/fish/carnivore_die.png b/assets/sprites/fish/carnivore_die.png index a118988..c0b6da5 100644 Binary files a/assets/sprites/fish/carnivore_die.png and b/assets/sprites/fish/carnivore_die.png differ diff --git a/assets/sprites/fish/carnivore_eat.png b/assets/sprites/fish/carnivore_eat.png index 351095c..876f5e1 100644 Binary files a/assets/sprites/fish/carnivore_eat.png and b/assets/sprites/fish/carnivore_eat.png differ diff --git a/assets/sprites/fish/carnivore_hungry_eat.png b/assets/sprites/fish/carnivore_hungry_eat.png index e1e96d1..f702e6e 100644 Binary files a/assets/sprites/fish/carnivore_hungry_eat.png and b/assets/sprites/fish/carnivore_hungry_eat.png differ diff --git a/assets/sprites/fish/carnivore_hungry_swim.png b/assets/sprites/fish/carnivore_hungry_swim.png index fece5fe..e63e329 100644 Binary files a/assets/sprites/fish/carnivore_hungry_swim.png and b/assets/sprites/fish/carnivore_hungry_swim.png differ diff --git a/assets/sprites/fish/carnivore_hungry_turn.png b/assets/sprites/fish/carnivore_hungry_turn.png index 909aa7b..dddcf14 100644 Binary files a/assets/sprites/fish/carnivore_hungry_turn.png and b/assets/sprites/fish/carnivore_hungry_turn.png differ diff --git a/assets/sprites/fish/carnivore_swim.png b/assets/sprites/fish/carnivore_swim.png index 6e21849..ba19717 100644 Binary files a/assets/sprites/fish/carnivore_swim.png and b/assets/sprites/fish/carnivore_swim.png differ diff --git a/assets/sprites/fish/carnivore_turn.png b/assets/sprites/fish/carnivore_turn.png index af208b6..861e833 100644 Binary files a/assets/sprites/fish/carnivore_turn.png and b/assets/sprites/fish/carnivore_turn.png differ diff --git a/assets/sprites/fish/king_die.png b/assets/sprites/fish/king_die.png index aa11eaa..689e8a3 100644 Binary files a/assets/sprites/fish/king_die.png and b/assets/sprites/fish/king_die.png differ diff --git a/assets/sprites/fish/king_eat.png b/assets/sprites/fish/king_eat.png index c285b4c..27676d6 100644 Binary files a/assets/sprites/fish/king_eat.png and b/assets/sprites/fish/king_eat.png differ diff --git a/assets/sprites/fish/king_hungry_eat.png b/assets/sprites/fish/king_hungry_eat.png index 36b1e73..cf87fe1 100644 Binary files a/assets/sprites/fish/king_hungry_eat.png and b/assets/sprites/fish/king_hungry_eat.png differ diff --git a/assets/sprites/fish/king_hungry_swim.png b/assets/sprites/fish/king_hungry_swim.png index 005b5a4..a026912 100644 Binary files a/assets/sprites/fish/king_hungry_swim.png and b/assets/sprites/fish/king_hungry_swim.png differ diff --git a/assets/sprites/fish/king_hungry_turn.png b/assets/sprites/fish/king_hungry_turn.png index 2a1df8e..16062a6 100644 Binary files a/assets/sprites/fish/king_hungry_turn.png and b/assets/sprites/fish/king_hungry_turn.png differ diff --git a/assets/sprites/fish/king_swim.png b/assets/sprites/fish/king_swim.png index 6a1c151..d4e71ba 100644 Binary files a/assets/sprites/fish/king_swim.png and b/assets/sprites/fish/king_swim.png differ diff --git a/assets/sprites/fish/king_turn.png b/assets/sprites/fish/king_turn.png index db4f62e..173cf48 100644 Binary files a/assets/sprites/fish/king_turn.png and b/assets/sprites/fish/king_turn.png differ diff --git a/assets/sprites/fish/medium_die.png b/assets/sprites/fish/medium_die.png index afa24b8..efeedba 100644 Binary files a/assets/sprites/fish/medium_die.png and b/assets/sprites/fish/medium_die.png differ diff --git a/assets/sprites/fish/medium_eat.png b/assets/sprites/fish/medium_eat.png index 383bb13..b35adf2 100644 Binary files a/assets/sprites/fish/medium_eat.png and b/assets/sprites/fish/medium_eat.png differ diff --git a/assets/sprites/fish/medium_hungry_eat.png b/assets/sprites/fish/medium_hungry_eat.png index 51ef126..6e1a0ef 100644 Binary files a/assets/sprites/fish/medium_hungry_eat.png and b/assets/sprites/fish/medium_hungry_eat.png differ diff --git a/assets/sprites/fish/medium_hungry_swim.png b/assets/sprites/fish/medium_hungry_swim.png index f432f67..7ac8f89 100644 Binary files a/assets/sprites/fish/medium_hungry_swim.png and b/assets/sprites/fish/medium_hungry_swim.png differ diff --git a/assets/sprites/fish/medium_hungry_turn.png b/assets/sprites/fish/medium_hungry_turn.png index 7293954..a30c368 100644 Binary files a/assets/sprites/fish/medium_hungry_turn.png and b/assets/sprites/fish/medium_hungry_turn.png differ diff --git a/assets/sprites/fish/medium_swim.png b/assets/sprites/fish/medium_swim.png index 56dbee9..c461eae 100644 Binary files a/assets/sprites/fish/medium_swim.png and b/assets/sprites/fish/medium_swim.png differ diff --git a/assets/sprites/fish/medium_turn.png b/assets/sprites/fish/medium_turn.png index 3562c78..3deda5c 100644 Binary files a/assets/sprites/fish/medium_turn.png and b/assets/sprites/fish/medium_turn.png differ diff --git a/assets/sprites/fish/small_die.png b/assets/sprites/fish/small_die.png index bff5a83..1e4a341 100644 Binary files a/assets/sprites/fish/small_die.png and b/assets/sprites/fish/small_die.png differ diff --git a/assets/sprites/fish/small_eat.png b/assets/sprites/fish/small_eat.png index ca2260b..a35769b 100644 Binary files a/assets/sprites/fish/small_eat.png and b/assets/sprites/fish/small_eat.png differ diff --git a/assets/sprites/fish/small_hungry_eat.png b/assets/sprites/fish/small_hungry_eat.png index 844ba68..2d55934 100644 Binary files a/assets/sprites/fish/small_hungry_eat.png and b/assets/sprites/fish/small_hungry_eat.png differ diff --git a/assets/sprites/fish/small_hungry_swim.png b/assets/sprites/fish/small_hungry_swim.png index 548ca80..1bc2754 100644 Binary files a/assets/sprites/fish/small_hungry_swim.png and b/assets/sprites/fish/small_hungry_swim.png differ diff --git a/assets/sprites/fish/small_hungry_turn.png b/assets/sprites/fish/small_hungry_turn.png index 618887b..82ccaf0 100644 Binary files a/assets/sprites/fish/small_hungry_turn.png and b/assets/sprites/fish/small_hungry_turn.png differ diff --git a/assets/sprites/fish/small_swim.png b/assets/sprites/fish/small_swim.png index 22afa7d..eeff01e 100644 Binary files a/assets/sprites/fish/small_swim.png and b/assets/sprites/fish/small_swim.png differ diff --git a/assets/sprites/fish/small_turn.png b/assets/sprites/fish/small_turn.png index e172f2a..38659cb 100644 Binary files a/assets/sprites/fish/small_turn.png and b/assets/sprites/fish/small_turn.png differ diff --git a/assets/sprites/food/1.png b/assets/sprites/food/1.png index 9c93bca..8e1be5d 100644 Binary files a/assets/sprites/food/1.png and b/assets/sprites/food/1.png differ diff --git a/assets/sprites/food/2.png b/assets/sprites/food/2.png index 0fc923c..7dc9b1a 100644 Binary files a/assets/sprites/food/2.png and b/assets/sprites/food/2.png differ diff --git a/assets/sprites/food/3.png b/assets/sprites/food/3.png index d486855..c6439a8 100644 Binary files a/assets/sprites/food/3.png and b/assets/sprites/food/3.png differ diff --git a/assets/sprites/food/potion.png b/assets/sprites/food/potion.png index e407c8c..5b49400 100644 Binary files a/assets/sprites/food/potion.png and b/assets/sprites/food/potion.png differ diff --git a/assets/sprites/food/what.png b/assets/sprites/food/what.png index af33766..90b8439 100644 Binary files a/assets/sprites/food/what.png and b/assets/sprites/food/what.png differ diff --git a/assets/sprites/money/beetle.png b/assets/sprites/money/beetle.png index bbeeef6..b86936c 100644 Binary files a/assets/sprites/money/beetle.png and b/assets/sprites/money/beetle.png differ diff --git a/assets/sprites/money/chest.png b/assets/sprites/money/chest.png index 81ffca9..cb1d5aa 100644 Binary files a/assets/sprites/money/chest.png and b/assets/sprites/money/chest.png differ diff --git a/assets/sprites/money/coin1.png b/assets/sprites/money/coin1.png index 224b47f..d07f74c 100644 Binary files a/assets/sprites/money/coin1.png and b/assets/sprites/money/coin1.png differ diff --git a/assets/sprites/money/coin2.png b/assets/sprites/money/coin2.png index 0f32937..8165279 100644 Binary files a/assets/sprites/money/coin2.png and b/assets/sprites/money/coin2.png differ diff --git a/assets/sprites/money/diamond.png b/assets/sprites/money/diamond.png index 100d925..4453d7a 100644 Binary files a/assets/sprites/money/diamond.png and b/assets/sprites/money/diamond.png differ diff --git a/assets/sprites/money/star.png b/assets/sprites/money/star.png index dc0e651..9f3c60b 100644 Binary files a/assets/sprites/money/star.png and b/assets/sprites/money/star.png differ diff --git a/assets/sprites/wave/wavecenter.png b/assets/sprites/wave/wavecenter.png index 5b0de01..51e8125 100644 Binary files a/assets/sprites/wave/wavecenter.png and b/assets/sprites/wave/wavecenter.png differ diff --git a/assets/sprites/wave/waveside.png b/assets/sprites/wave/waveside.png index 7b82cb3..689f7a1 100644 Binary files a/assets/sprites/wave/waveside.png and b/assets/sprites/wave/waveside.png differ diff --git a/main.lua b/main.lua index e6e6d05..1a54c82 100644 --- a/main.lua +++ b/main.lua @@ -72,6 +72,7 @@ function love.load() end local cursor +local lastcursor = nil function setCursor(mouse) cursor = mouse end @@ -88,13 +89,11 @@ function love.update(dt) if scene.update then scene.update(dt) end bench.stopBenchmark('update') - if not is_mobile then - if cursor then - love.mouse.setCursor(cursor) - else - love.mouse.setCursor(cursors.default) - end + if not cursor then cursor = 'default' end + if (not is_mobile) and (cursor ~= lastcursor) then + love.mouse.setCursor(cursors[cursor]) end + lastcursor = cursor end function love.draw() @@ -170,4 +169,4 @@ function love.focus(f) if not f and options.pause_on_unfocus then paused = true end -end \ No newline at end of file +end diff --git a/scenes/gameplay/main.lua b/scenes/gameplay/main.lua index b769018..3dcd7c1 100644 --- a/scenes/gameplay/main.lua +++ b/scenes/gameplay/main.lua @@ -139,7 +139,7 @@ function self.update(dt) local hovered = mouseOverBox(x * size, y * size, sprites['header/buttonbg']:getWidth() * size, sprites['header/buttonbg']:getHeight() * size) if btn.open and hovered and not paused then - setCursor(cursors.hover) + setCursor('hover') end local incr = 69 -- its like button positions but forcefully shoved into a recursive function :D @@ -152,7 +152,7 @@ function self.update(dt) local size = love.graphics.getWidth() / 640 local hovered = mouseOverBox(love.graphics.getWidth() - 115 * size, size * (HEADER_HEIGHT - 65), s:getWidth() * size, s:getHeight() * size) if hovered and not paused then - setCursor(cursors.hover) + setCursor('hover') end bench.stopBenchmark('update_buttons') diff --git a/scenes/gameplay/update/money.lua b/scenes/gameplay/update/money.lua index 5fc4fba..d68046d 100644 --- a/scenes/gameplay/update/money.lua +++ b/scenes/gameplay/update/money.lua @@ -19,7 +19,7 @@ return function(money, dt, sheets) local dist = math.abs(love.mouse.getX() - f.x * love.graphics.getWidth()) + math.abs(love.mouse.getY() - f.y * love.graphics.getHeight()) if dist < sheets.coin1.width/2 and not f.collected then - setCursor(cursors.hover) + setCursor('hover') end end end \ No newline at end of file