summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-04-03 23:24:04 +0200
committerAki <nthirtyone@gmail.com>2017-04-03 23:24:04 +0200
commit8552aee09a280f14dd84c64a0e13e3b0cb67d965 (patch)
treef27d34630cf168bafc8dce1b36eaa71bf3ddf7e9
parentcedc95538ded6ca0845f13e8ec2fdbf2b8c0c8ed (diff)
downloadroflnauts-8552aee09a280f14dd84c64a0e13e3b0cb67d965.zip
roflnauts-8552aee09a280f14dd84c64a0e13e3b0cb67d965.tar.gz
roflnauts-8552aee09a280f14dd84c64a0e13e3b0cb67d965.tar.bz2
Maximum combo increased to 990
-rw-r--r--not/Hero.lua6
1 files changed, 3 insertions, 3 deletions
diff --git a/not/Hero.lua b/not/Hero.lua
index ec7f39f..68329ad 100644
--- a/not/Hero.lua
+++ b/not/Hero.lua
@@ -126,8 +126,8 @@ function Hero:update (dt)
end
-- Custom linear damping
- if not isDown(controlset, "left") and
- not isDown(controlset, "right")
+ if not isDown(controlset, "left") and
+ not isDown(controlset, "right")
then
local face = nil
if x < -12 then
@@ -388,7 +388,7 @@ function Hero:damage (direction)
self:setLinearVelocity(x,0)
self:applyLinearImpulse((42+10*self.combo)*horizontal, (68+10*self.combo)*vertical + 15)
self:setAnimation("damage")
- self.combo = math.min(27, self.combo + 1)
+ self.combo = math.min(99, self.combo + 1)
self.punchcd = 0.08 + self.combo*0.006
self:playSound(2)
end