From 89c07885fe40000681235f75798a3d4c519009a9 Mon Sep 17 00:00:00 2001
From: Aki <nthirtyone@gmail.com>
Date: Sat, 16 Jul 2016 22:33:52 +0200
Subject: Changed jump slighly

---
 player.lua | 30 +++++++++++++++++++++---------
 world.lua  |  4 ++--
 2 files changed, 23 insertions(+), 11 deletions(-)

diff --git a/player.lua b/player.lua
index ff15e6f..e6a2954 100644
--- a/player.lua
+++ b/player.lua
@@ -37,6 +37,7 @@ Player = {
 	jumpactive = false,
 	jumpdouble = true,
 	jumptimer = 0.14,
+	jumpnumber = 2,
 	-- Keys
 	controller = nil,
 	controller_empty = {isDown = function () return false end},
@@ -98,6 +99,10 @@ end
 
 -- Update callback of `Player`
 function Player:update (dt)
+	-- # LOCALS
+	-- velocity: x, y
+	local x,y = self.body:getLinearVelocity()
+
 	-- # VERTICAL MOVEMENT
 	-- Jumping
 	if self.jumpactive and self.jumptimer > 0 then
@@ -115,7 +120,6 @@ function Player:update (dt)
 
 	-- # HORIZONTAL MOVEMENT
 	-- Walking
-	local x,y = self.body:getLinearVelocity()
 	local controller = self:getController()
 	if controller:isDown("left") then
 		self.facing = -1
@@ -210,19 +214,27 @@ function Player:controllerPressed (key)
 	local controller = self:getController()
 	-- Jumping
 	if key == "jump" then
-		if not self.inAir then
-			self:createEffect("jump")
+		if self.jumpnumber > 0 then
+			-- General jump logics
 			self.jumpactive = true
+			-- Spawn proper effect
+			if not self.inAir then
+				self:createEffect("jump")
+			else
+				self:createEffect("doublejump")
+			end
+			-- Start salto if last jump
+			if self.jumpnumber == 1 then
+				self.salto = true
+			end
+			-- Animation clear
 			if (self.current == self.animations.attack) or
 			   (self.current == self.animations.attack_up) or
 			   (self.current == self.animations.attack_down) then
 				self:changeAnimation("idle")
 			end
-		elseif self.jumpdouble then
-			self:createEffect("doublejump")
-			self.jumpactive = true
-			self.jumpdouble = false
-			self.salto = true
+			-- Remove jump
+			self.jumpnumber = self.jumpnumber - 1
 		end
 	end
 
@@ -267,7 +279,7 @@ function Player:controllerReleased (key)
 	-- Jumping
 	if key == "jump" then
 		self.jumpactive = false
-		self.jumptimer = 0.12
+		self.jumptimer = Player.jumptimer -- take initial from metatable
 	end
 
 	-- Walking
diff --git a/world.lua b/world.lua
index 2207e00..f0f5e1f 100644
--- a/world.lua
+++ b/world.lua
@@ -358,12 +358,12 @@ function World.beginContact(a, b, coll)
 		if y == -1 then
 			print(b:getUserData().name .. " is not in air")
 			b:getUserData().inAir = false
-			b:getUserData().jumpdouble = true
+			b:getUserData().jumpnumber = 2
 			b:getUserData().salto = false
 			b:getUserData():createEffect("land")
 		end
 		local vx, vy = b:getUserData().body:getLinearVelocity()
-		if math.abs(x) == 1 or y == -1 then
+		if math.abs(x) == 1 or (y == -1 and x == 0) then
 			b:getUserData():playSound(3)
 		end
 	end
-- 
cgit v1.1