summaryrefslogtreecommitdiffhomepage
path: root/player.lua
diff options
context:
space:
mode:
Diffstat (limited to 'player.lua')
-rw-r--r--player.lua11
1 files changed, 9 insertions, 2 deletions
diff --git a/player.lua b/player.lua
index 0e8031e..4ed62e8 100644
--- a/player.lua
+++ b/player.lua
@@ -23,7 +23,7 @@ Player = {
spawntimer = 0,
alive = true,
punchcd = 0,
- punchinitial = 0.28,
+ punchinitial = 0.25,
punchdir = 0,
-- Animation
animations = require "animations",
@@ -42,7 +42,7 @@ Player = {
key_right = "right",
key_up = "up",
key_down = "down",
- key_hit = "return" -- don't ask
+ key_hit = "return"
}
-- Constructor of `Player`
@@ -307,6 +307,11 @@ function Player:hit (horizontal, vertical)
end
end
+-- Hittest
+function Player:testHit (caller, direction)
+
+end
+
-- Taking damage of `Player` by successful hit test
function Player:damage (horizontal, vertical)
self:createEffect("hit")
@@ -324,6 +329,7 @@ function Player:die ()
self.alive = false
self.spawntimer = 1
self.world.camera:startShake()
+ self.body:setActive(false)
end
-- And then respawn. Like Jon Snow.
@@ -331,6 +337,7 @@ function Player:respawn ()
self.alive = true
self.body:setLinearVelocity(0,0)
self.body:setPosition(290/2, 180/2-80)
+ self.body:setActive(true)
self:createEffect("respawn")
self:changeAnimation("idle")
end \ No newline at end of file