Merge remote-tracking branch 'refs/remotes/origin/stage/molecular' into stage/molecular
This commit is contained in:
Martin committed
commit
9dd1d45698
28 files changed
+232
-194
No files matched your search
@@ -86,12 +86,9 @@ func _on_attack_hit(body: Node2D) -> void:
|
||||
if body.has_method("handle_damage"):
|
||||
body.handle_damage(damage, self)
|
||||
hit_hittable = true
|
||||
elif body.is_in_group("resources"):
|
||||
pass
|
||||
if hit_hittable:
|
||||
await get_tree().create_timer(0.2).timeout
|
||||
sprite.play("default")
|
||||
# TODO: resource handling logic
|
||||
|
||||
func _on_invulnerable_cooldown_timeout() -> void:
|
||||
hasiframes = false
|
||||
|
||||