summaryrefslogtreecommitdiffhomepage
path: root/not
diff options
context:
space:
mode:
authorAki <nthirtyone@gmail.com>2017-04-03 23:56:03 +0200
committerAki <nthirtyone@gmail.com>2017-04-03 23:56:03 +0200
commitcd025014eac8d1adf70bc3238de5c034dea80c78 (patch)
tree890cb16958780bfc3b4fd0926f3f39d2e62ae117 /not
parent8552aee09a280f14dd84c64a0e13e3b0cb67d965 (diff)
downloadroflnauts-cd025014eac8d1adf70bc3238de5c034dea80c78.zip
roflnauts-cd025014eac8d1adf70bc3238de5c034dea80c78.tar.gz
roflnauts-cd025014eac8d1adf70bc3238de5c034dea80c78.tar.bz2
Renamed jumping-related variables, removed obsoletes.
Diffstat (limited to 'not')
-rw-r--r--not/Hero.lua37
-rw-r--r--not/World.lua4
2 files changed, 21 insertions, 20 deletions
diff --git a/not/Hero.lua b/not/Hero.lua
index 68329ad..daed8fc 100644
--- a/not/Hero.lua
+++ b/not/Hero.lua
@@ -14,15 +14,14 @@ Hero = {
lives = 3,
spawntimer = 2,
alive = true,
- punchcd = 0.25,
+ punchCooldown = 0.25,
punchdir = 0, -- a really bad thing
-- Movement
inAir = true,
salto = false,
- jumpactive = false,
- jumpdouble = true,
- jumptimer = 0.16,
- jumpnumber = 2,
+ isJumping = false,
+ jumpTimer = 0.16,
+ jumpCounter = 2,
-- Keys
controlset = nil,
-- Statics
@@ -68,7 +67,7 @@ function Hero:init (name, world, x, y)
fixture:setGroupIndex(self.group)
-- Actual `Hero` initialization.
self.world = world
- self.punchcd = 0
+ self.punchCooldown = 0
self.name = name
self:setAnimationsList(require("animations"))
self:createEffect("respawn")
@@ -94,9 +93,9 @@ function Hero:update (dt)
-- # VERTICAL MOVEMENT
-- Jumping
- if self.jumpactive and self.jumptimer > 0 then
+ if self.isJumping and self.jumpTimer > 0 then
self:setLinearVelocity(x,-160)
- self.jumptimer = self.jumptimer - dt
+ self.jumpTimer = self.jumpTimer - dt
end
-- Salto
@@ -163,7 +162,7 @@ function Hero:update (dt)
-- # PUNCH
-- Cooldown
- self.punchcd = self.punchcd - dt
+ self.punchCooldown = self.punchCooldown - dt
if not self.body:isDestroyed() then -- TODO: This is weird
for _,fixture in pairs(self.body:getFixtureList()) do -- TODO: getFixtures from `PhysicalBody` or similar.
if fixture:getUserData() ~= self then
@@ -185,7 +184,7 @@ function Hero:update (dt)
end
end
- if self.punchcd <= 0 and self.punchdir == 1 then
+ if self.punchCooldown <= 0 and self.punchdir == 1 then
self.punchdir = 0
end
end
@@ -197,9 +196,9 @@ function Hero:controlpressed (set, action, key)
local controlset = self:getControlSet()
-- Jumping
if action == "jump" then
- if self.jumpnumber > 0 then
+ if self.jumpCounter > 0 then
-- General jump logics
- self.jumpactive = true
+ self.isJumping = true
--self:playSound(6)
-- Spawn proper effect
if not self.inAir then
@@ -208,7 +207,7 @@ function Hero:controlpressed (set, action, key)
self:createEffect("doublejump")
end
-- Start salto if last jump
- if self.jumpnumber == 1 then
+ if self.jumpCounter == 1 then
self.salto = true
end
-- Animation clear
@@ -218,7 +217,7 @@ function Hero:controlpressed (set, action, key)
self:setAnimation("default")
end
-- Remove jump
- self.jumpnumber = self.jumpnumber - 1
+ self.jumpCounter = self.jumpCounter - 1
end
end
@@ -231,7 +230,7 @@ function Hero:controlpressed (set, action, key)
end
-- Punching
- if action == "attack" and self.punchcd <= 0 then
+ if action == "attack" and self.punchCooldown <= 0 then
local f = self.facing
self.salto = false
if isDown(controlset, "up") then
@@ -266,8 +265,8 @@ function Hero:controlreleased (set, action, key)
local controlset = self:getControlSet()
-- Jumping
if action == "jump" then
- self.jumpactive = false
- self.jumptimer = Hero.jumptimer -- take initial from metatable
+ self.isJumping = false
+ self.jumpTimer = Hero.jumpTimer -- take initial from metatable
end
-- Walking
if (action == "left" or action == "right") and not
@@ -342,7 +341,7 @@ end
-- TODO: attack functions needs to be renamed, because even I have problems understanding them.
function Hero:hit (direction)
-- start cooldown
- self.punchcd = Hero.punchcd -- INITIAL from metatable
+ self.punchCooldown = Hero.punchCooldown -- INITIAL from metatable
-- actual punch
-- TODO: use `PhysicalBody.addFixture`.
local fixture
@@ -389,7 +388,7 @@ function Hero:damage (direction)
self:applyLinearImpulse((42+10*self.combo)*horizontal, (68+10*self.combo)*vertical + 15)
self:setAnimation("damage")
self.combo = math.min(99, self.combo + 1)
- self.punchcd = 0.08 + self.combo*0.006
+ self.punchCooldown = 0.08 + self.combo*0.006
self:playSound(2)
end
diff --git a/not/World.lua b/not/World.lua
index 216f9dd..b7bd48c 100644
--- a/not/World.lua
+++ b/not/World.lua
@@ -386,10 +386,12 @@ function World.beginContact(a, b, coll)
if a:getCategory() == 1 then
local x,y = coll:getNormal()
if y < -0.6 then
+ -- TODO: remove debug messages
+ -- TODO: move landing to `not.Hero`
print(b:getUserData().name .. " is not in air")
-- Move them to Hero
b:getUserData().inAir = false
- b:getUserData().jumpnumber = 2
+ b:getUserData().jumpCounter = 2
b:getUserData().salto = false
b:getUserData():createEffect("land")
end