added sounds to ui and game, prepared interaction with character
This commit is contained in:
parent
b5ace17da9
commit
21d7cf417a
42 changed files with 450 additions and 155 deletions
|
|
@ -41,7 +41,7 @@ func _physics_process(delta: float) -> void:
|
|||
var collider: Object = collision.get_collider()
|
||||
|
||||
# if the monster collided with the player...
|
||||
if collider.name == "Player":
|
||||
if collider.name == "Player" and collider.battle_state == Enums.BattleState.NOT_IN_BATTLE:
|
||||
velocity = Vector3.ZERO
|
||||
in_battle = true
|
||||
collider.start_battle(self)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue