Merge pull request #49 from largato/properties

Change projectile color according to loyalty
largato · Oct 20, 2018 · df764b3 · df764b3
2 parents 5e40c9c + b374f16
commit df764b3
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 4 deletions.
diff --git a/gunner.lua b/gunner.lua
@@ -138,7 +138,8 @@ function Gunner:shoot()
                            self.position.y,
                            self.target.position.x,
                            self.target.position.y,
-                           0.2))
+                           0.2,
+                           self.loyalty))
 end
 
 function Gunner:seek_target()

diff --git a/projectile.lua b/projectile.lua
@@ -1,8 +1,10 @@
 local Timer = require "libs/hump/timer"
+local Character = require "character"
 
 Projectile = Object:extend()
 
-function Projectile:new(size, ox, oy, dx, dy, duration)
+function Projectile:new(size, ox, oy, dx, dy, duration, loyalty)
+   self.loyalty = loyalty
    self.size = size
    self.pos = { ox, oy }
    self.dst = { dx, dy }
@@ -15,7 +17,12 @@ end
 
 function Projectile:draw()
    -- love.
-   love.graphics.setColor(255,127,0)
+   if self.loyalty == Character.LOYALTY_ENEMY then
+      love.graphics.setColor(0, 0, 255)
+   else
+      love.graphics.setColor(255, 0 , 0)
+   end
+
    love.graphics.setLineWidth(self.size)
    love.graphics.line(self.pos[1], self.pos[2],
                       self.dst[1], self.dst[2])

diff --git a/tank.lua b/tank.lua
@@ -141,7 +141,8 @@ function Tank:shoot()
                            self.position.y,
                            self.target.position.x,
                            self.target.position.y,
-                           0.2))
+                           0.2,
+                           self.loyalty))
 end
 
 function Tank:seek_target()