summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--.gitignore8
-rw-r--r--Makefile17
-rw-r--r--assets/backgrounds/alpha.pngbin3708 -> 18668 bytes
-rw-r--r--assets/dust.pngbin0 -> 570 bytes
-rw-r--r--assets/music/ribbit.oggbin1325581 -> 2022836 bytes
-rw-r--r--conf.lua17
-rw-r--r--config/animations/background-alpha.lua17
-rw-r--r--config/maps/alpha.lua94
-rw-r--r--config/menus/host.lua2
-rw-r--r--config/menus/main.lua2
-rw-r--r--config/menus/pause.lua2
-rw-r--r--config/menus/select.lua4
-rw-r--r--config/menus/settings.lua8
-rw-r--r--config/menus/win.lua2
-rw-r--r--main.lua6
-rw-r--r--not/Button.lua4
-rw-r--r--not/CloudGenerator.lua2
-rw-r--r--not/Effect.lua2
-rw-r--r--not/Header.lua2
-rw-r--r--not/Hero.lua8
-rw-r--r--not/Layer.lua2
-rw-r--r--not/MusicPlayer.lua2
-rw-r--r--not/PhysicalBody.lua12
-rw-r--r--not/Platform.lua2
-rw-r--r--not/Ray.lua2
-rw-r--r--not/Selector.lua6
-rw-r--r--not/Settings.lua2
-rw-r--r--not/Sprite.lua8
-rw-r--r--not/Trap.lua2
-rw-r--r--not/World.lua10
30 files changed, 139 insertions, 106 deletions
diff --git a/.gitignore b/.gitignore
index 268094b..9e67eca 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,4 @@
-*.xcf
-*.sfs
*.swp
*.swo
*~
-*.wav
-.project
-.backup/
-run.bat
-run.sh
+releases/
diff --git a/Makefile b/Makefile
index ad749e8..e1a044a 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,16 @@
-all:
- zip not-nautz lib/object/Object.lua not/*.lua config/maps/*.lua config/menus/*.lua config/*.lua assets/*.png assets/sounds/*.ogg assets/platforms/*.png assets/nauts/*.png assets/music/*.ogg assets/decorations/*.png assets/backgrounds/*.png *.lua gamecontrollerdb.txt settings.default
+TOOL=love-release
+FLAGS=-x Makefile -x .md
+
+windows:
+ $(TOOL) -W 32 $(FLAGS)
+
+love:
+ $(TOOL) $(FLAGS)
+
+mac:
+ $(TOOL) -M $(FLAGS)
+
+all: windows love mac
clean:
- rm ../not-nautz.love \ No newline at end of file
+ rm releases/*
diff --git a/assets/backgrounds/alpha.png b/assets/backgrounds/alpha.png
index d897910..39bc44d 100644
--- a/assets/backgrounds/alpha.png
+++ b/assets/backgrounds/alpha.png
Binary files differ
diff --git a/assets/dust.png b/assets/dust.png
new file mode 100644
index 0000000..4023f1f
--- /dev/null
+++ b/assets/dust.png
Binary files differ
diff --git a/assets/music/ribbit.ogg b/assets/music/ribbit.ogg
index 32262d9..8700c8c 100644
--- a/assets/music/ribbit.ogg
+++ b/assets/music/ribbit.ogg
Binary files differ
diff --git a/conf.lua b/conf.lua
index 032f41b..4d366e1 100644
--- a/conf.lua
+++ b/conf.lua
@@ -1,12 +1,17 @@
--- Game configuration
-function love.conf(t)
+function love.conf (t)
t.title = "Roflnauts 2"
- t.version = "0.10.2"
+ t.version = "11.0"
t.window.width = 320
t.window.height = 180
- -- t.window.borderless = true
t.identity = "not-nautz"
- -- t.window.fullscreentype = "desktop"
- -- t.window.fullscreen = true
t.console = false
+ t.releases = {
+ title = t.title,
+ identifier = t.identity,
+ package = "roflnauts",
+ author = "The Roflnauts 2 Team",
+ email = "nthirtyone@gmail.com",
+ description = "Fan made sequel to Roflnauts.",
+ homepage = "https://github.com/nthirtyone/roflnauts"
+ }
end
diff --git a/config/animations/background-alpha.lua b/config/animations/background-alpha.lua
new file mode 100644
index 0000000..019f661
--- /dev/null
+++ b/config/animations/background-alpha.lua
@@ -0,0 +1,17 @@
+return
+{
+ default = {
+ [1] = love.graphics.newQuad(0, 0, 320, 200, 3200, 200),
+ [2] = love.graphics.newQuad(320, 0, 320, 200, 3200, 200),
+ [3] = love.graphics.newQuad(640, 0, 320, 200, 3200, 200),
+ [4] = love.graphics.newQuad(960, 0, 320, 200, 3200, 200),
+ [5] = love.graphics.newQuad(1280, 0, 320, 200, 3200, 200),
+ [6] = love.graphics.newQuad(1600, 0, 320, 200, 3200, 200),
+ [7] = love.graphics.newQuad(1920, 0, 320, 200, 3200, 200),
+ [8] = love.graphics.newQuad(2240, 0, 320, 200, 3200, 200),
+ [9] = love.graphics.newQuad(2560, 0, 320, 200, 3200, 200),
+ [10] = love.graphics.newQuad(2880, 0, 320, 200, 3200, 200),
+ frames = 10,
+ repeated = true
+ }
+} \ No newline at end of file
diff --git a/config/maps/alpha.lua b/config/maps/alpha.lua
index 43c12ee..b99adf3 100644
--- a/config/maps/alpha.lua
+++ b/config/maps/alpha.lua
@@ -1,44 +1,50 @@
-return
-{
- name = "Alpha Abyss",
- theme = "alpha.ogg",
- portrait = "assets/maps/alpha.png",
- available = true,
- center = {x = 0, y = -80},
- width = 360,
- height = 240,
- respawns = {
- {x = -30, y = 0},
- {x = 30, y = 0},
- {x = 0, y = 0},
- {x = -120, y = -50},
- {x = 120, y = -50},
- {x = 0, y = -75}
- },
- create = {
- {
- ratio = 0,
- background = "assets/backgrounds/alpha.png",
- },
- {
- x = -60,
- y = 0,
- platform = "alpha-big",
- },
- {
- x = -145,
- y = -50,
- platform = "alpha-small",
- },
- {
- x = 85,
- y = -50,
- platform = "alpha-small",
- },
- {
- x = -30,
- y = -80,
- platform = "alpha-small",
- }
- },
-}
+return
+{
+ name = "Alpha Abyss",
+ theme = "alpha.ogg",
+ portrait = "assets/maps/alpha.png",
+ available = true,
+ center = {x = 0, y = -80},
+ width = 360,
+ height = 240,
+ respawns = {
+ {x = -30, y = 0},
+ {x = 30, y = 0},
+ {x = 0, y = 0},
+ {x = -120, y = -50},
+ {x = 120, y = -50},
+ {x = 0, y = -75}
+ },
+ create = {
+ {
+ clouds = "assets/dust.png",
+ animations = "clouds-default",
+ count = 8,
+ },
+ {
+ ratio = 0,
+ background = "assets/backgrounds/alpha.png",
+ animations = "background-alpha"
+ },
+ {
+ x = -60,
+ y = 0,
+ platform = "alpha-big",
+ },
+ {
+ x = -145,
+ y = -50,
+ platform = "alpha-small",
+ },
+ {
+ x = 85,
+ y = -50,
+ platform = "alpha-small",
+ },
+ {
+ x = -30,
+ y = -80,
+ platform = "alpha-small",
+ }
+ },
+}
diff --git a/config/menus/host.lua b/config/menus/host.lua
index 2b5fac5..102c4c3 100644
--- a/config/menus/host.lua
+++ b/config/menus/host.lua
@@ -32,7 +32,7 @@ function loadConfigs (dir, process)
local items, icons = {}, {}
for _,file in pairs(love.filesystem.getDirectoryItems(dir)) do
local path = string.format("%s/%s", dir, file)
- if love.filesystem.isFile(path) and file ~= "readme.md" then
+ if love.filesystem.getInfo(path).type == "file" and file ~= "readme.md" then
local item = love.filesystem.load(path)()
if isAvailable(item) then
if process then
diff --git a/config/menus/main.lua b/config/menus/main.lua
index ae2cef2..87dca94 100644
--- a/config/menus/main.lua
+++ b/config/menus/main.lua
@@ -58,7 +58,7 @@ return {
:setPosition(width/2, 15)
:set("draw", function (self, scale)
local x,y = self:getPosition()
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.setFont(Bold)
love.graphics.draw(awesometwo, x*scale, y*scale, 0, scale, scale, 35)
end)
diff --git a/config/menus/pause.lua b/config/menus/pause.lua
index 60aa2fc..d0b5777 100644
--- a/config/menus/pause.lua
+++ b/config/menus/pause.lua
@@ -9,7 +9,7 @@ local bx = width/2-29
return {
Element(menu)
:set("draw", function (self, scale)
- love.graphics.setColor(0, 0, 0, 110)
+ love.graphics.setColor(0, 0, 0, .45)
local width, height = love.graphics.getWidth(), love.graphics.getHeight()
love.graphics.rectangle("fill", 0, 0, width, height)
end)
diff --git a/config/menus/select.lua b/config/menus/select.lua
index 9f0ed9b..df14ad7 100644
--- a/config/menus/select.lua
+++ b/config/menus/select.lua
@@ -36,7 +36,7 @@ function loadConfigs (dir, process)
local items, icons = {}, {}
for _,file in pairs(love.filesystem.getDirectoryItems(dir)) do
local path = string.format("%s/%s", dir, file)
- if love.filesystem.isFile(path) and file ~= "readme.md" then
+ if love.filesystem.getInfo(path).type == "file" and file ~= "readme.md" then
local item = love.filesystem.load(path)()
if isAvailable(item) then
if process then
@@ -128,7 +128,7 @@ return {
if self.the_final_countdown ~= 9 then
local x,y = self:getPosition()
local countdown = math.max(1, math.ceil(self.the_final_countdown))
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.setFont(Font)
love.graphics.print("Autostart in:", (x-16)*scale, (y+10)*scale, 0, scale, scale)
love.graphics.setFont(Bold)
diff --git a/config/menus/settings.lua b/config/menus/settings.lua
index 7102bea..94b8e7a 100644
--- a/config/menus/settings.lua
+++ b/config/menus/settings.lua
@@ -16,13 +16,13 @@ local dimmer = Element(menu)
:set("previousControl", "") -- it actually means key that was set as this control PREVIOUSLY
:set("draw", function (self, scale)
if self.visible then
- love.graphics.setColor(0, 0, 0, 210)
+ love.graphics.setColor(0, 0, 0, .8)
love.graphics.rectangle("fill",0,0,width*getRealScale(),height*getRealScale())
- love.graphics.setColor(120, 255, 120, 255)
+ love.graphics.setColor(.5, 1, .5, 1)
love.graphics.printf("Press new key for: \n> " .. self.currentControl .. " <", (width/2-110)*scale, (height/2-4)*scale, 220, "center", 0, scale, scale)
- love.graphics.setColor(120, 120, 120, 255)
+ love.graphics.setColor(.5, .5, .5, 1)
love.graphics.printf("Old: " .. self.previousControl .. "", (width/2-110)*scale, (height/2+16)*scale, 220, "center", 0, scale, scale)
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
end
end)
diff --git a/config/menus/win.lua b/config/menus/win.lua
index f7163dd..ee56aeb 100644
--- a/config/menus/win.lua
+++ b/config/menus/win.lua
@@ -10,7 +10,7 @@ return {
:setPosition(width/2, 18)
:set("draw", function (self, scale)
local x,y = self:getPosition()
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.printf("ROFL, NOW KILL YOURSELF", x*scale, y*scale, 160, "center", 0, scale, scale, 80, 3)
end)
:set("focus", function () return true end)
diff --git a/main.lua b/main.lua
index ec56e4c..705a3aa 100644
--- a/main.lua
+++ b/main.lua
@@ -27,7 +27,7 @@ debug = false
-- LÖVE2D callbacks
function love.load ()
- love.graphics.setBackgroundColor(90, 90, 90)
+ love.graphics.setBackgroundColor(.35, .35, .35)
love.graphics.setDefaultFilter("nearest", "nearest")
-- TODO: Move fonts somewhere else out of global scope.
Font = love.graphics.newImageFont("assets/font-normal.png", " 0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz.,:;-_/\\!@#$%^&*?=+~`|'\"()[]{}<>", -1)
@@ -44,10 +44,10 @@ function love.draw ()
if debug then
local scale = getScale()
love.graphics.setFont(Font)
- love.graphics.setColor(255, 0, 0, 255)
+ love.graphics.setColor(1, 0, 0, 1)
love.graphics.print("Debug ON", 10, 10, 0, scale, scale)
if dbg_msg then
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.print(dbg_msg, 10, 10+9*scale, 0, scale, scale)
end
end
diff --git a/not/Button.lua b/not/Button.lua
index 3493a84..72823d6 100644
--- a/not/Button.lua
+++ b/not/Button.lua
@@ -42,9 +42,9 @@ function Button:draw (scale)
local quad = self.quads
local sprite = self.sprite
if self:isEnabled() then
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
else
- love.graphics.setColor(140, 140, 140, 255)
+ love.graphics.setColor(.6, .6, .6, 1)
end
love.graphics.draw(sprite, quad.button.normal, x*scale, y*scale, 0, scale, scale)
if self.focused then
diff --git a/not/CloudGenerator.lua b/not/CloudGenerator.lua
index e72514b..62cac5c 100644
--- a/not/CloudGenerator.lua
+++ b/not/CloudGenerator.lua
@@ -17,7 +17,7 @@ end
-- TODO: This was a bad idea. Move Cloud creation back to World, pass created Cloud here for configuration.
function CloudGenerator:createCloud (x, y, style)
local cloud = Cloud(x, y, self.world, self.atlas)
- cloud:setAnimationsList(self.quads)
+ cloud:setAnimations(self.quads)
cloud:setAnimation(style)
cloud:setVelocity(13, 0)
cloud:setBoundary(340, 320)
diff --git a/not/Effect.lua b/not/Effect.lua
index 6c0dad0..ebbfece 100644
--- a/not/Effect.lua
+++ b/not/Effect.lua
@@ -10,7 +10,7 @@ function Effect:new (name, x, y, world)
end
Effect.__super.new(self, x, y, world, nil)
self.finished = false
- self:setAnimationsList(require("config.animations.effects"))
+ self:setAnimations(require("config.animations.effects"))
self:setAnimation(name)
end
diff --git a/not/Header.lua b/not/Header.lua
index 8b2ec0d..5579774 100644
--- a/not/Header.lua
+++ b/not/Header.lua
@@ -26,7 +26,7 @@ function Header:draw (scale)
local angle = self:getBounce(2)
local dy = self:getBounce()*4
local x,y = self:getPosition()
- love.graphics.setColor(255,255,255,255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.setFont(Bold)
love.graphics.printf(string.upper(self.text),x*scale,(y+dy)*scale,400,"center",(angle*5)*math.pi/180,scale,scale,200,12)
end
diff --git a/not/Hero.lua b/not/Hero.lua
index 21c4e27..7ef7b4e 100644
--- a/not/Hero.lua
+++ b/not/Hero.lua
@@ -47,7 +47,7 @@ function Hero:new (config, x, y, world)
self.punchCooldown = 0
-- TODO: Pass loaded portrait from menu to Hero.
self.portrait = love.graphics.newImage(config.portrait)
- self:setAnimationsList(require("config.animations.hero"))
+ self:setAnimations(require("config.animations.hero"))
-- Post-creation
self:createEffect("respawn")
end
@@ -112,7 +112,7 @@ function Hero:update (dt)
-- Cooldown
self.punchCooldown = self.punchCooldown - dt
if not self.body:isDestroyed() then -- TODO: This is weird
- for _,fixture in pairs(self.body:getFixtureList()) do -- TODO: getFixtures from `PhysicalBody` or similar.
+ for _,fixture in pairs(self.body:getFixtures()) do -- TODO: getFixtures from `PhysicalBody` or similar.
if fixture:getUserData() ~= self then
fixture:setUserData({fixture:getUserData()[1] - dt, fixture:getUserData()[2]})
if fixture:getUserData()[1] < 0 then
@@ -225,7 +225,7 @@ end
function Hero:drawTag ()
local x,y = self:getPosition()
love.graphics.setFont(Font)
- love.graphics.setColor(255, 255, 255)
+ love.graphics.setColor(1, 1, 1)
love.graphics.printf(string.format("Player %d", math.abs(self.group)), math.floor(x), math.floor(y)-26 ,100,'center',0,1,1,50,0)
end
@@ -234,7 +234,7 @@ end
function Hero:drawHUD (x,y,scale,elevation)
-- hud displays only if player is alive
if self.isAlive then
- love.graphics.setColor(255,255,255,255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.draw(self.IMAGE_FRAME, self.QUAD_FRAME, (x)*scale, (y)*scale, 0, scale, scale)
love.graphics.draw(self.portrait, (x+2)*scale, (y+3)*scale, 0, scale, scale)
local dy = 30 * elevation
diff --git a/not/Layer.lua b/not/Layer.lua
index 14dac32..97257ed 100644
--- a/not/Layer.lua
+++ b/not/Layer.lua
@@ -38,7 +38,7 @@ function Layer:clear ()
end
function Layer:draw ()
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
love.graphics.draw(self.canvas, nil, nil, nil, self.drawScale, self.drawScale)
end
diff --git a/not/MusicPlayer.lua b/not/MusicPlayer.lua
index 17beda4..900df68 100644
--- a/not/MusicPlayer.lua
+++ b/not/MusicPlayer.lua
@@ -22,7 +22,7 @@ function MusicPlayer:setTrack (trackName)
if self.tracks[trackName] then
self.source = self.tracks[trackName]
else
- local source = love.audio.newSource("assets/music/" .. trackName)
+ local source = love.audio.newSource("assets/music/" .. trackName, "stream")
source:setLooping(true)
source:setVolume(.7)
self.source = source
diff --git a/not/PhysicalBody.lua b/not/PhysicalBody.lua
index 5081836..0fb969f 100644
--- a/not/PhysicalBody.lua
+++ b/not/PhysicalBody.lua
@@ -65,23 +65,23 @@ end
function PhysicalBody:draw (debug)
PhysicalBody.__super.draw(self, debug)
if debug then
- for _,fixture in pairs(self.body:getFixtureList()) do
+ for _,fixture in pairs(self.body:getFixtures()) do
local category = fixture:getCategory()
-- TODO: Fixture drawing of PhysicalBodies could take activity into account in every case.
if category == 1 then
- love.graphics.setColor(255, 69, 0, 150)
+ love.graphics.setColor(1, .3, 0, .6)
end
if category == 2 then
- love.graphics.setColor(137, 255, 0, 150)
+ love.graphics.setColor(.5, 1, 0, .6)
end
if category == 3 then
- love.graphics.setColor(137, 0, 255, 50)
+ love.graphics.setColor(.5, 0, 1, .2)
end
if category == 4 then
if self.body:isActive() then
- love.graphics.setColor(255, 230, 0, 50)
+ love.graphics.setColor(1, .9, 0, .2)
else
- love.graphics.setColor(255, 230, 0, 10)
+ love.graphics.setColor(1, .9, 0, .04)
end
end
local camera = self.world.camera
diff --git a/not/Platform.lua b/not/Platform.lua
index a4b3a59..29c74cf 100644
--- a/not/Platform.lua
+++ b/not/Platform.lua
@@ -8,7 +8,7 @@ Platform = PhysicalBody:extends()
-- Constructor of `Platform`
function Platform:new (animations, shape, x, y, world, imagePath)
Platform.__super.new(self, x, y, world, imagePath)
- self:setAnimationsList(animations)
+ self:setAnimations(animations)
-- Create table of shapes if single shape is passed.
if type(shape[1]) == "number" then
shape = {shape}
diff --git a/not/Ray.lua b/not/Ray.lua
index 4ae640a..c53199b 100644
--- a/not/Ray.lua
+++ b/not/Ray.lua
@@ -18,7 +18,7 @@ end
-- TODO: Ray should use Camera boundaries just-in-case.
-- TODO: Ray uses magic numbers.
function Ray:draw ()
- love.graphics.setColor(255, 247, 228, 247)
+ love.graphics.setColor(1, .97, .89, .97)
love.graphics.setLineStyle("rough")
love.graphics.setLineWidth(self.delay*160)
diff --git a/not/Selector.lua b/not/Selector.lua
index 5536b44..3a30834 100644
--- a/not/Selector.lua
+++ b/not/Selector.lua
@@ -134,9 +134,9 @@ function Selector:draw (scale)
boxType = "active"
end
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
if not self:isUnique() then
- love.graphics.setColor(120, 120, 120, 255)
+ love.graphics.setColor(.5, .5, .5, 1)
end
love.graphics.draw(self.atlas, self.quads[self:getShapeString()][boxType], x*scale, y*scale, 0, scale, scale)
-- TODO: That is one way to draw icon for selected value. Find better one. See: `config/menus/host`.
@@ -145,7 +145,7 @@ function Selector:draw (scale)
love.graphics.draw(icon, (x+2)*scale, (y+3)*scale, 0, scale, scale)
end
- love.graphics.setColor(255, 255, 255, 255)
+ love.graphics.setColor(1, 1, 1, 1)
if self.focused then
local dy = (h-6)/2
diff --git a/not/Settings.lua b/not/Settings.lua
index ca429eb..f4790b3 100644
--- a/not/Settings.lua
+++ b/not/Settings.lua
@@ -10,7 +10,7 @@ local function convertToNew (old)
end
local function filePrepare ()
- if not love.filesystem.exists("settings") then
+ if not love.filesystem.getInfo("settings") then
local def = love.filesystem.newFile("settings.default")
local new = love.filesystem.newFile("settings")
new:open("w") def:open("r")
diff --git a/not/Sprite.lua b/not/Sprite.lua
index ec23eac..a4bd6b8 100644
--- a/not/Sprite.lua
+++ b/not/Sprite.lua
@@ -27,8 +27,8 @@ end
function Sprite.newImage (path)
local imagedata = love.image.newImageData(path)
local transparency = function(x, y, r, g, b, a)
- if (r == 0 and g == 128 and b == 64) or
- (r == 0 and g == 240 and b == 6) then
+ if (r == 0 and g == 128/255 and b == 64/255) or
+ (r == 0 and g == 240/255 and b == 6/255) then
a = 0
end
return r, g, b, a
@@ -48,7 +48,7 @@ function Sprite:getImage ()
end
-- Sets new animations list.
-function Sprite:setAnimationsList (t)
+function Sprite:setAnimations (t)
if t then
self.animations = t
self:setAnimation("default")
@@ -103,7 +103,7 @@ function Sprite:draw (debug)
local draw_x = math.floor(x)
if i and not self.hidden then
- love.graphics.setColor(255,255,255,255)
+ love.graphics.setColor(1, 1, 1, 1)
if q then
love.graphics.draw(i, q, draw_x, draw_y, angle, scaleX, scaleY, self:getOffset())
else
diff --git a/not/Trap.lua b/not/Trap.lua
index 0867a36..ec208bc 100644
--- a/not/Trap.lua
+++ b/not/Trap.lua
@@ -2,7 +2,7 @@ Trap = require "not.PhysicalBody":extends()
function Trap:new (direction, x, y, world, imagePath)
Trap.__super.new(self, x, y, world, imagePath)
- self:setAnimationsList(require("config.animations.flames"))
+ self:setAnimations(require("config.animations.flames"))
self:setBodyType("static")
local mirror = 1
diff --git a/not/World.lua b/not/World.lua
index 6bc5e18..b01a94e 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -132,9 +132,9 @@ function World:buildMap ()
x = op.x
y = op.y
elseif op.animations then
- entity:setAnimationsList(getAnimations(op.animations))
- _,_,x,y = bg:getAnimation()[1]:getViewport()
- bg:setPosition(x / -2, y / -2)
+ entity:setAnimations(getAnimations(op.animations))
+ _,_,x,y = entity:getAnimation()[1]:getViewport()
+ x, y = x / -2, y / -2
else
local image = love.graphics.newImage(imagePath)
x = image:getWidth() / -2
@@ -369,11 +369,11 @@ function World:draw ()
self.camera:push()
self.camera:transform(getScale(), 1, love.graphics.getDimensions())
- love.graphics.setColor(130,130,130)
+ love.graphics.setColor(.5, .5, .5)
love.graphics.line(ax,center.y,bx,center.y)
love.graphics.line(center.x,ay,center.x,by)
- love.graphics.setColor(200,200,200)
+ love.graphics.setColor(.78, .78, .78)
love.graphics.line(ax,0,bx,0)
love.graphics.line(0,ay,0,by)
self.camera:pop()