summaryrefslogtreecommitdiffhomepage
path: root/not/Player.lua
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2018-04-09 01:56:08 +0200
committerAki <nthirtyone@gmail.com>2018-04-09 01:56:08 +0200
commit6124f00707856980f1c5a7809ebf03351783f4a4 (patch)
treefe01cc030d298993d90f8c0dd68c5474405be3f7 /not/Player.lua
parent5ce7f80fcdbc16ed74d56865df3114a800b3788d (diff)
downloadroflnauts-6124f00707856980f1c5a7809ebf03351783f4a4.zip
roflnauts-6124f00707856980f1c5a7809ebf03351783f4a4.tar.gz
roflnauts-6124f00707856980f1c5a7809ebf03351783f4a4.tar.bz2
Punch animations firing now also happens in Hero
Diffstat (limited to 'not/Player.lua')
-rw-r--r--not/Player.lua13
1 files changed, 0 insertions, 13 deletions
diff --git a/not/Player.lua b/not/Player.lua
index c6c4431..3722cb3 100644
--- a/not/Player.lua
+++ b/not/Player.lua
@@ -45,24 +45,11 @@ function Player:controlpressed (set, action, key)
-- Punching
if action == "attack" and self.punchCooldown <= 0 then
local f = self.facing
- self.salto = false
if self:isControlDown("up") then
- -- Punch up
- if self.current ~= self.animations.damage then
- self:setAnimation("attack_up")
- end
self:punch("up")
elseif self:isControlDown("down") then
- -- Punch down
- if self.current ~= self.animations.damage then
- self:setAnimation("attack_down")
- end
self:punch("down")
else
- -- Punch horizontal
- if self.current ~= self.animations.damage then
- self:setAnimation("attack")
- end
if f == 1 then
self:punch("right")
else