summaryrefslogtreecommitdiffhomepage
path: root/not
diff options
context:
space:
mode:
Diffstat (limited to 'not')
-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
15 files changed, 33 insertions, 33 deletions
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()
generated by cgit v1.1 at 2024-11-22 03:14:15 +0000