From 4d2c7c76dfd99dd488edcb162fc6e6bd1f08b7ac Mon Sep 17 00:00:00 2001 From: Aki Date: Tue, 17 May 2016 14:13:35 +0200 Subject: Moved quads to new file --- effect.lua | 38 +--------------------------------- effects.lua | 69 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 70 insertions(+), 37 deletions(-) create mode 100644 effects.lua diff --git a/effect.lua b/effect.lua index 6651916..1a0b3f8 100644 --- a/effect.lua +++ b/effect.lua @@ -11,45 +11,9 @@ Effect = { frame = 1, animation = nil, sprite = love.graphics.newImage("assets/effects.png"), - quads = { - jump = { - [1] = love.graphics.newQuad( 0, 0, 24,24, 168,120), - [2] = love.graphics.newQuad( 24, 0, 24,24, 168,120), - [3] = love.graphics.newQuad( 48, 0, 24,24, 168,120), - [4] = love.graphics.newQuad( 72, 0, 24,24, 168,120), - frames = 4 - }, - doublejump = { - [1] = love.graphics.newQuad( 0, 24, 24,24, 168,120), - [2] = love.graphics.newQuad( 24, 24, 24,24, 168,120), - [3] = love.graphics.newQuad( 48, 24, 24,24, 168,120), - [4] = love.graphics.newQuad( 72, 24, 24,24, 168,120), - frames = 4 - }, - land = { - [1] = love.graphics.newQuad( 0, 48, 24,24, 168,120), - [2] = love.graphics.newQuad( 24, 48, 24,24, 168,120), - [3] = love.graphics.newQuad( 48, 48, 24,24, 168,120), - [4] = love.graphics.newQuad( 72, 48, 24,24, 168,120), - [5] = love.graphics.newQuad( 96, 48, 24,24, 168,120), - frames = 5 - }, - respawn = {}, - clash = {}, - trail = {}, - hit = {} - } + quads = require "effects" } --- NAME :POSITION :SIZE :FRAMES --- jump :x 0 y 0: 24px: 4 --- doublejump:x 0 y 24: 24px: 4 --- land :x 0 y 48: 24px: 5 --- respawn :x 0 y 72: 24px: 7 --- clash :x 0 y 96: 24px: 6 --- trail :x104 y 0: 16px: 4 --- hit :x106 y 18: 16px: 3 - -- Construct of `Effect` function Effect:new(name, x, y) -- Meta diff --git a/effects.lua b/effects.lua new file mode 100644 index 0000000..6946d10 --- /dev/null +++ b/effects.lua @@ -0,0 +1,69 @@ +-- Animations spritesheet array for `Effect` +-- Size of sprie atlas is 168px x 120px + +-- NAME :POSITION :SIZE :FRAMES +-- jump :x 0 y 0: 24px: 4 +-- doublejump:x 0 y 24: 24px: 4 +-- land :x 0 y 48: 24px: 5 +-- respawn :x 0 y 72: 24px: 7 +-- clash :x 0 y 96: 24px: 6 +-- trail :x104 y 0: 16px: 4 +-- hit :x106 y 18: 16px: 3 + +local quads = { + jump = { + [1] = love.graphics.newQuad( 0, 0, 24,24, 168,120), + [2] = love.graphics.newQuad( 24, 0, 24,24, 168,120), + [3] = love.graphics.newQuad( 48, 0, 24,24, 168,120), + [4] = love.graphics.newQuad( 72, 0, 24,24, 168,120), + frames = 4 + }, + doublejump = { + [1] = love.graphics.newQuad( 0, 24, 24,24, 168,120), + [2] = love.graphics.newQuad( 24, 24, 24,24, 168,120), + [3] = love.graphics.newQuad( 48, 24, 24,24, 168,120), + [4] = love.graphics.newQuad( 72, 24, 24,24, 168,120), + frames = 4 + }, + land = { + [1] = love.graphics.newQuad( 0, 48, 24,24, 168,120), + [2] = love.graphics.newQuad( 24, 48, 24,24, 168,120), + [3] = love.graphics.newQuad( 48, 48, 24,24, 168,120), + [4] = love.graphics.newQuad( 72, 48, 24,24, 168,120), + [5] = love.graphics.newQuad( 96, 48, 24,24, 168,120), + frames = 5 + }, + respawn = { + [1] = love.graphics.newQuad( 0, 72, 24,24, 168,120), + [2] = love.graphics.newQuad( 24, 72, 24,24, 168,120), + [3] = love.graphics.newQuad( 48, 72, 24,24, 168,120), + [4] = love.graphics.newQuad( 72, 72, 24,24, 168,120), + [5] = love.graphics.newQuad( 96, 72, 24,24, 168,120), + [6] = love.graphics.newQuad(120, 72, 24,24, 168,120), + [7] = love.graphics.newQuad(144, 72, 24,24, 168,120), + frames = 7 + }, + clash = { + [1] = love.graphics.newQuad( 0, 96, 24,24, 168,120), + [2] = love.graphics.newQuad( 24, 96, 24,24, 168,120), + [3] = love.graphics.newQuad( 48, 96, 24,24, 168,120), + [4] = love.graphics.newQuad( 72, 96, 24,24, 168,120), + [5] = love.graphics.newQuad( 96, 96, 24,24, 168,120), + [6] = love.graphics.newQuad(120, 96, 24,24, 168,120), + frames = 6 + }, + trail = { + [1] = love.graphics.newQuad(104, 0, 16,16, 168,120), + [2] = love.graphics.newQuad(120, 0, 16,16, 168,120), + [3] = love.graphics.newQuad(136, 0, 16,16, 168,120), + [4] = love.graphics.newQuad(152, 0, 16,16, 168,120), + frames = 4 + }, + hit = { + [1] = love.graphics.newQuad(106, 18, 16,16, 168,120), + [2] = love.graphics.newQuad(122, 18, 16,16, 168,120), + [3] = love.graphics.newQuad(138, 18, 16,16, 168,120), + frames = 3 + } +} +return quads \ No newline at end of file -- cgit v1.1