mirror of
https://github.com/git-learning-game/oh-my-git.git
synced 2024-11-03 19:04:40 +01:00
Smooth movement of player
This commit is contained in:
parent
b7710e1422
commit
b91ebe0f36
1 changed files with 19 additions and 15 deletions
|
@ -33,26 +33,15 @@ func _input(event):
|
||||||
if event.is_action_pressed("save"):
|
if event.is_action_pressed("save"):
|
||||||
if text_edit.visible:
|
if text_edit.visible:
|
||||||
save()
|
save()
|
||||||
|
|
||||||
if has_focus():
|
if has_focus():
|
||||||
var speed = 30
|
if Input.is_action_pressed("pickup"):
|
||||||
if event.is_action_pressed("down", true):
|
|
||||||
player.move(Vector2(0,speed))
|
|
||||||
if event.is_action_pressed("up", true):
|
|
||||||
player.move(Vector2(0,-speed))
|
|
||||||
if event.is_action_pressed("right", true):
|
|
||||||
player.move(Vector2(speed, 0))
|
|
||||||
if event.is_action_pressed("left", true):
|
|
||||||
player.move(Vector2(-speed,0))
|
|
||||||
if event.is_action_pressed("pickup"):
|
|
||||||
if player.held:
|
if player.held:
|
||||||
player.held = null
|
player.held = null
|
||||||
else:
|
else:
|
||||||
for item in world.get_children():
|
for item in world.get_children():
|
||||||
if item != player:
|
if item != player and item.item_type == "wd":
|
||||||
if item.position.distance_to(player.position) < 50:
|
if item.position.distance_to(player.position) < 150:
|
||||||
player.held = item
|
player.held = item
|
||||||
print("player picked up item " + item.label)
|
|
||||||
|
|
||||||
func clear():
|
func clear():
|
||||||
pass
|
pass
|
||||||
|
@ -63,6 +52,21 @@ func clear():
|
||||||
func substr2(s):
|
func substr2(s):
|
||||||
return s.substr(2)
|
return s.substr(2)
|
||||||
|
|
||||||
|
func _process(delta):
|
||||||
|
if has_focus():
|
||||||
|
var speed = 300*delta
|
||||||
|
var motion = Vector2(0, 0)
|
||||||
|
if Input.is_action_pressed("down"):
|
||||||
|
motion += Vector2(0,1)
|
||||||
|
if Input.is_action_pressed("up"):
|
||||||
|
motion += Vector2(0,-1)
|
||||||
|
if Input.is_action_pressed("right"):
|
||||||
|
motion += Vector2(1, 0)
|
||||||
|
if Input.is_action_pressed("left"):
|
||||||
|
motion += Vector2(-1, 0)
|
||||||
|
if motion.length() > 0:
|
||||||
|
player.move(motion.normalized()*speed)
|
||||||
|
|
||||||
func update():
|
func update():
|
||||||
if true:#grid:
|
if true:#grid:
|
||||||
clear()
|
clear()
|
||||||
|
|
Loading…
Reference in a new issue