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 a9c3b91791c25b1626345568be7e31f55b84de76..b95b2c8c5a16d6855661c1ffbd2cbd5677d066a0 100644 (file)
--- a/player/moves/slash.gd
+++ b/player/moves/slash.gd
@@ -1,25 +1,21 @@
-extends Move
+extends Walk

 class_name Slash
 
 
 class_name Slash
 
 

-@onready var timer: Timer = $Timer
-

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

-               input.actions.sort_custom(moves_priority_sort)
-               return input.actions[0]
-       return "slash"
+               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(n: String):
+func _on_animation_finished(_name: String):
+       # TODO: make sure animation is finished by using name

        finished = true
        finished = true

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