post-refactor fixes
This commit is contained in:
parent
5fbf569c65
commit
3a1183cdd7
3 changed files with 24 additions and 6 deletions
18
conf.lua
18
conf.lua
|
@ -10,4 +10,20 @@ function love.conf(t)
|
||||||
t.window.height = 480
|
t.window.height = 480
|
||||||
|
|
||||||
-- t.window.msaa = 2
|
-- t.window.msaa = 2
|
||||||
end
|
|
||||||
|
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
|
||||||
|
|
|
@ -16,7 +16,7 @@ local headerbuttons = {
|
||||||
cost = 100,
|
cost = 100,
|
||||||
sprite = 'guppy',
|
sprite = 'guppy',
|
||||||
openanim = 1,
|
openanim = 1,
|
||||||
open = false,
|
open = true,
|
||||||
closed = false,
|
closed = false,
|
||||||
func = function()
|
func = function()
|
||||||
playSound('splash', 0.7, 0.8)
|
playSound('splash', 0.7, 0.8)
|
||||||
|
@ -28,13 +28,14 @@ local headerbuttons = {
|
||||||
sprite = 'food',
|
sprite = 'food',
|
||||||
tier = foodtier,
|
tier = foodtier,
|
||||||
openanim = 1,
|
openanim = 1,
|
||||||
open = false,
|
open = true,
|
||||||
closed = false,
|
closed = false,
|
||||||
func = function(self)
|
func = function(self)
|
||||||
self.openanim = 0
|
self.openanim = 0
|
||||||
foodtier = foodtier + 1
|
foodtier = foodtier + 1
|
||||||
if foodtier >= 3 then
|
if foodtier >= 3 then
|
||||||
self.open = false
|
self.open = false
|
||||||
|
self.closed = true
|
||||||
else
|
else
|
||||||
self.tier = foodtier
|
self.tier = foodtier
|
||||||
end
|
end
|
||||||
|
@ -45,13 +46,14 @@ local headerbuttons = {
|
||||||
sprite = 'foodcount',
|
sprite = 'foodcount',
|
||||||
tier = foodcount,
|
tier = foodcount,
|
||||||
openanim = 1,
|
openanim = 1,
|
||||||
open = false,
|
open = true,
|
||||||
closed = false,
|
closed = false,
|
||||||
func = function(self)
|
func = function(self)
|
||||||
self.openanim = 0
|
self.openanim = 0
|
||||||
foodcount = foodcount + 1
|
foodcount = foodcount + 1
|
||||||
if foodcount >= 9 then
|
if foodcount >= 9 then
|
||||||
self.open = false
|
self.open = false
|
||||||
|
self.closed = true
|
||||||
else
|
else
|
||||||
self.tier = foodcount
|
self.tier = foodcount
|
||||||
end
|
end
|
||||||
|
@ -104,7 +106,7 @@ function self.update(dt)
|
||||||
bench.stopBenchmark('update_money')
|
bench.stopBenchmark('update_money')
|
||||||
|
|
||||||
bench.startBenchmark('update_fish')
|
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')
|
bench.stopBenchmark('update_fish')
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
return function(feesh, dt, food)
|
return function(feesh, dt, food, headerbuttons, money)
|
||||||
for fi, n in ipairs(feesh) do
|
for fi, n in ipairs(feesh) do
|
||||||
bench.startBenchmark('update_fish_eases')
|
bench.startBenchmark('update_fish_eases')
|
||||||
for _, e in ipairs(n.eases) do
|
for _, e in ipairs(n.eases) do
|
||||||
|
|
Loading…
Reference in a new issue