Merge branch 'main' of https://git.mrdanielsnider.com/snider/project-dung
This commit is contained in:
commit
69c3a4e9ea
Binary file not shown.
File diff suppressed because one or more lines are too long
@ -69,10 +69,12 @@ func modify_inventory(item_name, item_amount):
|
|||||||
|
|
||||||
func _unhandled_input(event):
|
func _unhandled_input(event):
|
||||||
if event.is_action_pressed("action"):
|
if event.is_action_pressed("action"):
|
||||||
|
$DungMan/AnimationTree["parameters/Activate/active"] = true
|
||||||
|
yield(get_tree().create_timer(0.2), "timeout")
|
||||||
for area in $"%TriggerVolume".get_overlapping_areas():
|
for area in $"%TriggerVolume".get_overlapping_areas():
|
||||||
if try_trigger_interact(area):
|
if try_trigger_interact(area):
|
||||||
break
|
break
|
||||||
|
|
||||||
func try_trigger_interact(area):
|
func try_trigger_interact(area):
|
||||||
var owner = area
|
var owner = area
|
||||||
if area.has_meta("owner"):
|
if area.has_meta("owner"):
|
||||||
@ -82,6 +84,7 @@ func try_trigger_interact(area):
|
|||||||
return false
|
return false
|
||||||
|
|
||||||
var result = owner.on_player_interact(self)
|
var result = owner.on_player_interact(self)
|
||||||
|
|
||||||
if not result:
|
if not result:
|
||||||
print("player failed to interacted with ", owner)
|
print("player failed to interacted with ", owner)
|
||||||
return
|
return
|
||||||
@ -112,7 +115,7 @@ func get_item_in_hand():
|
|||||||
var item_to_return = null
|
var item_to_return = null
|
||||||
if item_in_hand != null:
|
if item_in_hand != null:
|
||||||
item_to_return = drop_item_in_hand()
|
item_to_return = drop_item_in_hand()
|
||||||
return item_to_return
|
return item_to_return
|
||||||
|
|
||||||
|
|
||||||
func _on_blink_timer_timeout():
|
func _on_blink_timer_timeout():
|
||||||
|
Loading…
x
Reference in New Issue
Block a user