From 3a1183cdd771982081ef30e981244760bfd876b1 Mon Sep 17 00:00:00 2001 From: jill Date: Sun, 24 Jan 2021 20:46:52 +0300 Subject: [PATCH] post-refactor fixes --- conf.lua | 18 +++++++++++++++++- scenes/gameplay/main.lua | 10 ++++++---- scenes/gameplay/update/fish.lua | 2 +- 3 files changed, 24 insertions(+), 6 deletions(-) diff --git a/conf.lua b/conf.lua index d63b12e..dee92d3 100644 --- a/conf.lua +++ b/conf.lua @@ -10,4 +10,20 @@ function love.conf(t) t.window.height = 480 -- t.window.msaa = 2 -end \ No newline at end of file + + t.releases = { + title = 'Notsanequarium', + package = 'notsanequarium', + loveVersion = '11.1', + version = '1.0a', + author = 'oatmealine', + email = 'oatmealine@disroot.org', + description = 'A recreation of Insaniquarium by PopCap in Love2D', + homepage = 'https://gitdab.com/oat/notsanequarium', + identifier = 'notsanequarium', + excludeFileList = {}, + compile = false, + projectDirectory = '/home/oatmealine/Git/notsanequarium', + releaseDirectory = '/home/oatmealine/Git/notsanequarium/releases', + } +end diff --git a/scenes/gameplay/main.lua b/scenes/gameplay/main.lua index 0d097cc..d2b043d 100644 --- a/scenes/gameplay/main.lua +++ b/scenes/gameplay/main.lua @@ -16,7 +16,7 @@ local headerbuttons = { cost = 100, sprite = 'guppy', openanim = 1, - open = false, + open = true, closed = false, func = function() playSound('splash', 0.7, 0.8) @@ -28,13 +28,14 @@ local headerbuttons = { sprite = 'food', tier = foodtier, openanim = 1, - open = false, + open = true, closed = false, func = function(self) self.openanim = 0 foodtier = foodtier + 1 if foodtier >= 3 then self.open = false + self.closed = true else self.tier = foodtier end @@ -45,13 +46,14 @@ local headerbuttons = { sprite = 'foodcount', tier = foodcount, openanim = 1, - open = false, + open = true, closed = false, func = function(self) self.openanim = 0 foodcount = foodcount + 1 if foodcount >= 9 then self.open = false + self.closed = true else self.tier = foodcount end @@ -104,7 +106,7 @@ function self.update(dt) bench.stopBenchmark('update_money') bench.startBenchmark('update_fish') - require('scenes.gameplay.update.fish')(feesh, dt, food) + require('scenes.gameplay.update.fish')(feesh, dt, food, headerbuttons, money) bench.stopBenchmark('update_fish') end diff --git a/scenes/gameplay/update/fish.lua b/scenes/gameplay/update/fish.lua index 995327d..86d5ed7 100644 --- a/scenes/gameplay/update/fish.lua +++ b/scenes/gameplay/update/fish.lua @@ -1,4 +1,4 @@ -return function(feesh, dt, food) +return function(feesh, dt, food, headerbuttons, money) for fi, n in ipairs(feesh) do bench.startBenchmark('update_fish_eases') for _, e in ipairs(n.eases) do