main.lua

@@ -31,18 +31,6 @@ 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 = {.8,.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")

obj/Room.lua

@@ -39,7 +39,7 @@ function Room:draw()
     end
     love.graphics.setCanvas()
 
-    love.graphics.setColor(COLORS.default)
+    love.graphics.setColor(255, 255, 255, 255)
     love.graphics.setBlendMode('alpha', 'premultiplied')
     love.graphics.draw(self.main_canvas, 0, 0, 0, sx, sy)
     love.graphics.setBlendMode('alpha')

obj/game/Player.lua

@@ -65,12 +65,12 @@ end
 function Player:draw()
     Player.super.draw(self)
     if DEBUG then
-        love.graphics.setColor(COLORS.collision)
+        love.graphics.setColor(1, 0.4, 0.4)
         self.collider:draw()
-        love.graphics.setColor(COLORS.debug)
+        love.graphics.setColor(0.4, 1, 0.4)
         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(COLORS.default)
+    love.graphics.setColor(1, 1, 1)
     love.graphics.circle('line', self.x, self.y, self.w)
 end
 

obj/game/Projectile.lua

@@ -42,17 +42,11 @@ end
 function Projectile:draw()
     Projectile.super.draw(self)
     if DEBUG then
-        love.graphics.setColor(COLORS.collision)
+        love.graphics.setColor(1, 0, 0)
         self.collider:draw()
     end
-    love.graphics.setColor(COLORS.default)
+    love.graphics.setColor(1, 1, 1)
     love.graphics.circle('fill', self.x, self.y, self.s)
 end
 
----Kills Projectile
-function Projectile:kill()
-    self.area:addGameObject('ProjectileDeathEffect', self.x, self.y, {w = self.s*3})
-    self:destroy()
-end
-
 return Projectile

obj/game/ProjectileDeathEffect.lua

@@ -1,33 +0,0 @@
----@class ProjectileDeathEffect:GameObject
-local ProjectileDeathEffect = GameObject:extend()
-
-function ProjectileDeathEffect:new(area, x, y, opts)
-    ProjectileDeathEffect.super.new(self, area, x, y, opts)
-    -- width
-    self.w = opts.w or 12
-    self.first = true
-    self.timer:after(0.1, function()
-        self.first = false
-        self.second = true
-        self.timer:after(0.15, function()
-            self.second = false
-            self:kill()
-        end)
-    end)
-end
-
----Updates ProjectileDeathEffect
----@param dt number delta time
-function ProjectileDeathEffect:update(dt)
-    ProjectileDeathEffect.super.update(self, dt)
-end
-
----Draws ProjectileDeathEffect
-function ProjectileDeathEffect:draw()
-    ProjectileDeathEffect.super.draw(self)
-    if self.first then love.graphics.setColor(COLORS.default)
-    elseif self.second then love.graphics.setColor(COLORS.hp) end
-    love.graphics.rectangle('fill', self.x - self.w/2, self.y - self.w/2, self.w, self.w)
-end
-
-return ProjectileDeathEffect

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(COLORS.default)
+    love.graphics.setColor(1,1,1)
     love.graphics.rectangle('fill', self.x - self.w/2, self.y - self.w/2, self.w, self.w)
     love.graphics.pop()
 end

rooms/CircleRoom.lua

@@ -40,7 +40,7 @@ end
 
 function CircleRoom:canvasDraw()
     CircleRoom.super.canvasDraw(self)
-    love.graphics.setColor(COLORS.default)
+    love.graphics.setColor(1, 1, 1)
 end
 
 return CircleRoom