Skip to content

Commit

Permalink
Jumping right and left now work.
Browse files Browse the repository at this point in the history
  • Loading branch information
JesterXL committed Jan 16, 2012
1 parent 8a8f161 commit 19b27c0
Show file tree
Hide file tree
Showing 3 changed files with 42 additions and 3 deletions.
4 changes: 2 additions & 2 deletions code/com/jxl/zombiestick/players/PlayerJXL.lua
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ require "com.jxl.zombiestick.states.MovingLeftState"
require "com.jxl.zombiestick.states.MovingRightState" require "com.jxl.zombiestick.states.MovingRightState"
require "com.jxl.zombiestick.states.JumpState" require "com.jxl.zombiestick.states.JumpState"
require "com.jxl.zombiestick.states.JumpRightState" require "com.jxl.zombiestick.states.JumpRightState"
--require "com.jxl.zombiestick.states.JumpLeftState" require "com.jxl.zombiestick.states.JumpLeftState"


require "com.jxl.zombiestick.players.BasePlayer" require "com.jxl.zombiestick.players.BasePlayer"
PlayerJXL = {} PlayerJXL = {}
Expand Down Expand Up @@ -105,7 +105,7 @@ function PlayerJXL:new(params)
player.fsm:addState2(MovingRightState:new()) player.fsm:addState2(MovingRightState:new())
player.fsm:addState2(JumpState:new()) player.fsm:addState2(JumpState:new())
player.fsm:addState2(JumpRightState:new()) player.fsm:addState2(JumpRightState:new())
--player.fsm:addState2(JumpLeftState:new()) player.fsm:addState2(JumpLeftState:new())
player.fsm:setInitialState("ready", player) player.fsm:setInitialState("ready", player)


return player return player
Expand Down
39 changes: 39 additions & 0 deletions code/com/jxl/zombiestick/states/JumpLeftState.lua
Original file line number Original file line Diff line number Diff line change
@@ -0,0 +1,39 @@
require "com.jxl.zombiestick.states.JumpState"

JumpLeftState = {}

function JumpLeftState:new()
local state = JumpState:new("jumpLeft")
state.xForce = nil

state.superOnEnterState = state.onEnterState
function state:onEnterState(event)
print("JumpLeftState::onEnterState")
self:superOnEnterState(event)

local player = self.player
player:setDirection("left")
self.xForce = -player.jumpForwardForce
--local multiplier = 60
--player:applyForce(xForce* multiplier, self.jumpForce * multiplier, 40, 32)
end

state.superOnExitState = state.onExitState
function state:onExitState(event)
local player = self.player
player:applyLinearImpulse(self.xForce / 3, 0, 40, 32)
self:superOnExitState(event)
end

state.superTick = state.tick
function state:tick(time)
local player = self.player
player.x = player.x + self.xForce
self:superTick(time)
end

return state

end

return JumpLeftState
2 changes: 1 addition & 1 deletion code/com/jxl/zombiestick/states/JumpRightState.lua
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function JumpRightState:new()
state.superOnExitState = state.onExitState state.superOnExitState = state.onExitState
function state:onExitState(event) function state:onExitState(event)
local player = self.player local player = self.player
player:applyLinearImpulse(player.speed / 3, 0, 40, 32) player:applyLinearImpulse(self.xForce / 3, 0, 40, 32)
self:superOnExitState(event) self:superOnExitState(event)
end end


Expand Down

0 comments on commit 19b27c0

Please sign in to comment.