nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

let character jump up forward when pushing against a wall; other fixes;

Browse Source
This commit is contained in:
Turánszki János
2024-08-23 07:24:46 +02:00
parent dc2cfa4bca
commit 6b8ff71daa
13 changed files with 115 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Content/scripts/character_controller/character_controller.lua
+10 -8
View File
@@ -470,7 +470,7 @@ local function Character(model_scene, start_transform, controllable, anim_scene)
dir = vector.TransformNormal(dir.Normalize(), rotation_matrix)
dir.SetY(0)
charactercomponent.Turn(dir.Normalize())
local speed = 0
local speed = self.walk_speed
if self.state == States.WALK then
speed = self.walk_speed
elseif self.state == States.JOG then
@@ -580,15 +580,17 @@ local function Character(model_scene, start_transform, controllable, anim_scene)
if self.state == States.SWIM_IDLE then
self.state = States.SWIM
self:MoveDirection(lookDir)
elseif self.ground_intersect then
if(input.Down(KEYBOARD_BUTTON_LSHIFT) or input.Down(GAMEPAD_BUTTON_6)) then
if input.Down(string.byte('E')) or input.Down(GAMEPAD_BUTTON_5) then
self.state = States.RUN
elseif self.ground_intersect or charactercomponent.IsWallIntersect() then
if self.ground_intersect then
if(input.Down(KEYBOARD_BUTTON_LSHIFT) or input.Down(GAMEPAD_BUTTON_6)) then
if input.Down(string.byte('E')) or input.Down(GAMEPAD_BUTTON_5) then
self.state = States.RUN
else
self.state = States.JOG
end
else
self.state = States.JOG
self.state = States.WALK
end
else
self.state = States.WALK
end
self:MoveDirection(lookDir)
end