From 6a21c5ed526576dd7646b876bed9618ecd407b3d Mon Sep 17 00:00:00 2001 From: Martijn de Boer Date: Sun, 16 Oct 2022 15:31:54 +0200 Subject: [PATCH] fixes --- .drone.yml | 2 +- main.lua | 6 +++++- scene/game.lua | 19 ++++++++++++++++--- 3 files changed, 22 insertions(+), 5 deletions(-) diff --git a/.drone.yml b/.drone.yml index 77d22e6..924164f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -6,4 +6,4 @@ steps: - name: lint image: registry.gitlab.com/pipeline-components/luacheck:latest commands: - - luacheck --std +love +lua54 -g -u -t . + - luacheck --std +love -g -u -t . diff --git a/main.lua b/main.lua index 3a8e4dc..382f77d 100644 --- a/main.lua +++ b/main.lua @@ -22,7 +22,11 @@ function love.load() sfxr = require "vendor.sfxr" moonshine = require "shaders" - effect = moonshine(moonshine.effects.chromasep).chain(moonshine.effects.godsray).chain(moonshine.effects.vignette).chain(moonshine.effects.filmgrain) + effect = moonshine(moonshine.effects.chromasep) + .chain(moonshine.effects.godsray) + .chain(moonshine.effects.vignette) + .chain(moonshine.effects.filmgrain) + effect.chromasep.angle=1 effect.chromasep.radius=1 effect.godsray.weight=0 diff --git a/scene/game.lua b/scene/game.lua index e6a61dd..a9f7729 100644 --- a/scene/game.lua +++ b/scene/game.lua @@ -126,7 +126,14 @@ function GameScene:draw() local logoWidth = gameoverLogo:getWidth() local logoHeight = gameoverLogo:getHeight() love.graphics.setColor(1,1,1,GameScene.logoScale.a) - love.graphics.draw(gameoverLogo, (windowWidth - logoWidth) / 2, (windowHeight-logoHeight) / 2, 0, GameScene.logoScale.x, GameScene.logoScale.y ) + love.graphics.draw( + gameoverLogo, + (windowWidth - logoWidth) / 2, + (windowHeight-logoHeight) / 2, + 0, + GameScene.logoScale.x, + GameScene.logoScale.y + ) end end @@ -318,8 +325,14 @@ function GameScene:generateExplosion(px,py) GameScene.explosionObj = {angle=100, radius=100} GameScene.godsrayObj = {weight=0} - flux.to(GameScene.explosionObj, 0.5, {angle= math.variance(100,90), radius=math.variance(1600, 150)}):ease("quintout"):after( GameScene.explosionObj, 0.5, { angle= 100, radius= 100 }) - flux.to(GameScene.godsrayObj, 0.5, {weight=math.variance(100,50)}):ease("quintout"):after( GameScene.godsrayObj, 0.5, { weight=1 }) + flux.to(GameScene.explosionObj, 0.5, { + angle= math.variance(100,90), + radius=math.variance(1600, 150) + }):ease("quintout"):after( GameScene.explosionObj, 0.5, { angle= 100, radius= 100 }) + + flux.to(GameScene.godsrayObj, 0.5, { + weight=math.variance(100,50) + }):ease("quintout"):after( GameScene.godsrayObj, 0.5, { weight=1 }) eSystem:emit(32) end