diff --git a/main.lua b/main.lua index b320f9a..7f7a951 100644 --- a/main.lua +++ b/main.lua @@ -31,6 +31,18 @@ Area = require 'obj/Area' GameObject = require 'obj/GameObject' function love.load() + -- table of color palette + COLORS = { + default = {1,1,1,1}, + bg = {.05,.05,.05,1}, + ammo = {1,1,1,1}, + boost = {1,1,1,1}, + hp = {1,1,1,1}, + skill_point = {1,1,1,1}, + collision = {1,0.4,0.4,1}, + debug = {0.4,1,0.4,1} + } + -- screen setup love.graphics.setDefaultFilter("nearest") love.graphics.setLineStyle("rough") diff --git a/obj/Room.lua b/obj/Room.lua index e497baa..7c52d5d 100644 --- a/obj/Room.lua +++ b/obj/Room.lua @@ -39,7 +39,7 @@ function Room:draw() end love.graphics.setCanvas() - love.graphics.setColor(255, 255, 255, 255) + love.graphics.setColor(COLORS.default) love.graphics.setBlendMode('alpha', 'premultiplied') love.graphics.draw(self.main_canvas, 0, 0, 0, sx, sy) love.graphics.setBlendMode('alpha') diff --git a/obj/game/Player.lua b/obj/game/Player.lua index afd2ab4..d6dbe8a 100644 --- a/obj/game/Player.lua +++ b/obj/game/Player.lua @@ -65,12 +65,12 @@ end function Player:draw() Player.super.draw(self) if DEBUG then - love.graphics.setColor(1, 0.4, 0.4) + love.graphics.setColor(COLORS.collision) self.collider:draw() - love.graphics.setColor(0.4, 1, 0.4) + love.graphics.setColor(COLORS.debug) love.graphics.line(self.x, self.y, self.x + 2*self.w*math.cos(self.r), self.y + 2*self.w*math.sin(self.r)) end - love.graphics.setColor(1, 1, 1) + love.graphics.setColor(COLORS.default) love.graphics.circle('line', self.x, self.y, self.w) end diff --git a/obj/game/Projectile.lua b/obj/game/Projectile.lua index ac2b4b3..8e583de 100644 --- a/obj/game/Projectile.lua +++ b/obj/game/Projectile.lua @@ -42,10 +42,10 @@ end function Projectile:draw() Projectile.super.draw(self) if DEBUG then - love.graphics.setColor(1, 0, 0) + love.graphics.setColor(COLORS.collision) self.collider:draw() end - love.graphics.setColor(1, 1, 1) + love.graphics.setColor(COLORS.default) love.graphics.circle('fill', self.x, self.y, self.s) end diff --git a/obj/game/ShootEffect.lua b/obj/game/ShootEffect.lua index f426c15..c9005b4 100644 --- a/obj/game/ShootEffect.lua +++ b/obj/game/ShootEffect.lua @@ -23,7 +23,7 @@ end function ShootEffect:draw() ShootEffect.super.draw(self) pushRotateScale(self.x, self.y, self.player.r+math.pi/4) - love.graphics.setColor(1,1,1) + love.graphics.setColor(COLORS.default) love.graphics.rectangle('fill', self.x - self.w/2, self.y - self.w/2, self.w, self.w) love.graphics.pop() end diff --git a/rooms/CircleRoom.lua b/rooms/CircleRoom.lua index 1c4c504..8b1e9a7 100644 --- a/rooms/CircleRoom.lua +++ b/rooms/CircleRoom.lua @@ -40,7 +40,7 @@ end function CircleRoom:canvasDraw() CircleRoom.super.canvasDraw(self) - love.graphics.setColor(1, 1, 1) + love.graphics.setColor(COLORS.default) end return CircleRoom