Squashed commit of the following:

[frog-ninja.git] / asset / character / model / character_model.gd

diff --git a/asset/character/model/character_model.gd b/asset/character/model/character_model.gd
index 00dc2c6c5c467a4e5ae3857e87aca3c866e12c26..7e8e5754596880bf0d82a4dcb949556645dba822 100644 (file)
--- a/asset/character/model/character_model.gd
+++ b/asset/character/model/character_model.gd
@@ -43,6 +43,10 @@ func set_weapon_collision():
                        w.collision_mask = player.collision_mask
 
 
                        w.collision_mask = player.collision_mask
 
 

+func set_hitbox_monitoring(b: bool):
+       hitbox.monitoring = b
+
+

 func assemble_character_states():
        for node in $States.get_children():
                if node is State:
 func assemble_character_states():
        for node in $States.get_children():
                if node is State:


@@ -102,6 +106,11 @@ func assign_current_state(state_name: String):
        current_state.on_enter_state()
        player.state_name = current_state.name
        
        current_state.on_enter_state()
        player.state_name = current_state.name
        

+       # reset all stateful information
+       animator.play(&"RESET")
+       animator.advance(0)
+       
+       # connect signals and play state's animation

        animator.animation_started.connect(current_state._when_animation_started)
        animator.animation_finished.connect(current_state._when_animation_finished)
        animator.play_section(current_state.animation_name, 0.0, -1, -1, current_state.animation_speed_scale)
        animator.animation_started.connect(current_state._when_animation_started)
        animator.animation_finished.connect(current_state._when_animation_finished)
        animator.play_section(current_state.animation_name, 0.0, -1, -1, current_state.animation_speed_scale)