bif/retrace
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- ternary (conditional) operator in godot ! :D

Browse Source
This commit is contained in:
SyntaX 2019-11-21 08:31:40 +01:00
parent ecfba2d7f3
commit 0c3d96030b
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Characters/Player/Player.gd
View File

@ -54,7 +54,7 @@ func _physics_process(delta):
process_input() process_input()
process_movement(delta) process_movement(delta)
func _process(delta): func _process(_delta):
check_interact() check_interact()
process_animations() process_animations()
@ -95,11 +95,7 @@ func process_movement(delta):
_vel.y += delta * GRAVITY _vel.y += delta * GRAVITY
# set movement speed # set movement speed
var target = _dir var target = _dir * (SPRINT_SPEED if _is_sprinting else MOVE_SPEED)
if _is_sprinting:
target *= SPRINT_SPEED
else:
target *= MOVE_SPEED
var hvel = _vel var hvel = _vel
hvel = hvel.linear_interpolate(target, ACCEL * delta) hvel = hvel.linear_interpolate(target, ACCEL * delta)

2
Characters/Player/UI/UI.gd
View File

@ -17,7 +17,7 @@ func _ready():
func add_item (name): func add_item (name):
Logger.info("Adding item \"" + name + "\" to inventory") Logger.info("Adding item \"" + name + "\" to inventory")
#TODO: global member for inventory? #TODO: global member for inventory?
var text #= Texture.new() var text
if name == "Key": if name == "Key":
text = load("res://Models/key/key.png") text = load("res://Models/key/key.png")
elif name == "Keycard": elif name == "Keycard":