From c2581f62e0cd3b788877f9289964716b071eb7f4 Mon Sep 17 00:00:00 2001 From: Aki Date: Mon, 1 Aug 2016 18:06:22 +0200 Subject: Debug colors to fit all maps --- ground.lua | 2 +- player.lua | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ground.lua b/ground.lua index 8b83af3..6b0be18 100644 --- a/ground.lua +++ b/ground.lua @@ -46,7 +46,7 @@ function Ground:draw (offset_x, offset_y, scale, debug) love.graphics.draw(self.sprite, (self.body:getX()+offset_x)*scale, (self.body:getY()+offset_y)*scale, 0, scale, scale) -- debug draw if debug then - love.graphics.setColor(180, 180, 180, 120) + love.graphics.setColor(255, 69, 0, 140) love.graphics.polygon("fill", self.world.camera:translatePoints(self.body:getWorldPoints(self.shape:getPoints()))) end end \ No newline at end of file diff --git a/player.lua b/player.lua index b9fbd68..9aa4347 100644 --- a/player.lua +++ b/player.lua @@ -301,7 +301,7 @@ function Player:draw (offset_x, offset_y, scale, debug) love.graphics.draw(self.sprite, self.current[self.frame], (self.body:getX()+offset_x)*scale, (self.body:getY()+offset_y)*scale, self.rotate, self.facing*scale, 1*scale, 12, 15) -- debug draw if debug then - love.graphics.setColor(50, 255, 50, 100) + love.graphics.setColor(137, 255, 0, 140) love.graphics.polygon("fill", self.world.camera:translatePoints(self.body:getWorldPoints(self.shape:getPoints()))) love.graphics.setColor(255,255,255,255) end @@ -378,7 +378,7 @@ function Player:damage (horizontal, vertical) self.body:applyLinearImpulse((42+10*self.combo)*horizontal, (68+10*self.combo)*vertical + 15) self:changeAnimation("damage") self.combo = math.min(20, self.combo + 1) - self.punchcd = 0.08 + self.punchcd = 0.07 + self.combo*0.005 self:playSound(2) end -- cgit v1.1