Fixed MCV breakage by having Player manually associate skin with visuals, still not...

[frog-ninja.git] / player / moves / slash.gd

diff --git a/player/moves/slash.gd b/player/moves/slash.gd
index ecabe45635b2cd8f17778cd5ad393561c137fd56..b95b2c8c5a16d6855661c1ffbd2cbd5677d066a0 100644 (file)
--- a/player/moves/slash.gd
+++ b/player/moves/slash.gd
@@ -3,29 +3,19 @@ class_name Slash
 
 
 var finished := false
 
 
 var finished := false

-const slash_walk_speed := 4.0

 
 
 func should_enter(input: InputPacket) -> String:
        if finished:
 
 
 func should_enter(input: InputPacket) -> String:
        if finished:

-               input.actions.sort_custom(moves_priority_sort)
-               return input.actions[0]
-       return "slash"
-
-
-func update(input: InputPacket, delta: float):
-       player.velocity = get_new_velocity_from_input(input, delta, slash_walk_speed)
-       player.move_and_slide()
-       update_skin(delta)
+               input.player_actions.sort_custom(moves_priority_sort)
+               return input.player_actions[0]
+       return state_name

 
 
 func on_enter_state():
        finished = false
 
 
 func on_enter_state():
        finished = false

-       player.skin.animation_tree.animation_finished.connect(_on_animation_finished)
-       player.skin.transition_slash()

 
 
 func _on_animation_finished(_name: String):
        # TODO: make sure animation is finished by using name
        finished = true
 
 
 func _on_animation_finished(_name: String):
        # TODO: make sure animation is finished by using name
        finished = true

-       player.skin.animation_tree.animation_finished.disconnect(_on_animation_finished)