From 453095b2e0b34cc4bd24671bc8abe6ff9279a318 Mon Sep 17 00:00:00 2001 From: Aki Date: Thu, 21 Sep 2017 16:06:53 +0200 Subject: Flames animations moved to separate config file --- config/animations/flames.lua | 21 +++++++++++++++++++++ not/Trap.lua | 24 +----------------------- 2 files changed, 22 insertions(+), 23 deletions(-) create mode 100644 config/animations/flames.lua diff --git a/config/animations/flames.lua b/config/animations/flames.lua new file mode 100644 index 0000000..62ecbb1 --- /dev/null +++ b/config/animations/flames.lua @@ -0,0 +1,21 @@ +return +{ + default = { + [1] = love.graphics.newQuad(0, 0, 42, 19, 168, 19), + [2] = love.graphics.newQuad(42, 0, 42, 19, 168, 19), + frames = 2, + repeated = true + }, + fadein = { + [1] = love.graphics.newQuad(84, 0, 42, 19, 168, 19), + [2] = love.graphics.newQuad(126, 0, 42, 19, 168, 19), + frames = 2, + repeated = false + }, + fadeout = { + [1] = love.graphics.newQuad(126, 0, 42, 19, 168, 19), + [2] = love.graphics.newQuad(84, 0, 42, 19, 168, 19), + frames = 2, + repeated = false + } +} diff --git a/not/Trap.lua b/not/Trap.lua index 84de5b0..47c3f09 100644 --- a/not/Trap.lua +++ b/not/Trap.lua @@ -1,30 +1,8 @@ Trap = require "not.PhysicalBody":extends() --- TODO: Move flames' animations to config file. -local animations = { - default = { - [1] = love.graphics.newQuad(0, 0, 42, 19, 168, 19), - [2] = love.graphics.newQuad(42, 0, 42, 19, 168, 19), - frames = 2, - repeated = true - }, - fadein = { - [1] = love.graphics.newQuad(84, 0, 42, 19, 168, 19), - [2] = love.graphics.newQuad(126, 0, 42, 19, 168, 19), - frames = 2, - repeated = false - }, - fadeout = { - [1] = love.graphics.newQuad(126, 0, 42, 19, 168, 19), - [2] = love.graphics.newQuad(84, 0, 42, 19, 168, 19), - frames = 2, - repeated = false - } -} - function Trap:new (direction, x, y, world, imagePath) Trap.__super.new(self, x, y, world, imagePath) - self:setAnimationsList(animations) + self:setAnimationsList(require("config.animations.flames")) self:setBodyType("static") local mirror = 1 -- cgit v1.1