Cleaned up animation associations with states

[frog-ninja.git] / skin / skin.gd

diff --git a/skin/skin.gd b/skin/skin.gd
index 6d8b923b145ea423efea3e1e65b944b31edc1bc3..7780b64d82784ea5051db9620c5a767b74991e26 100644 (file)
--- a/skin/skin.gd
+++ b/skin/skin.gd
@@ -2,37 +2,49 @@ extends Node3D
 class_name AnimatedSkin
 
 
-@onready var _tree: AnimationTree = %AnimationTree
+@onready var animation_tree: AnimationTree = $AnimationTree
+@onready var animation_player: AnimationPlayer = $AnimationPlayer
 
 
-func sword_visible(b: bool = true):
-       %weapon_R.visible = b
+func left_hand_visible(b: bool = true):
+       %hand_L.visible = b
 
 
-func gun_visible(b: bool = true):
-       %weapon_L.visible = b
-
+func right_hand_visible(b: bool = true):
+       %hand_R.visible = b
+       
 
 func set_walking_speed(s: float):
-       _tree.set("parameters/walking/blend_position", s)
+       animation_tree.set("parameters/walking speed/blend_position", s)
 
+### state transitions
 
-func transition_move():
-       _tree.set("parameters/movement/transition_request", "move")
+func transition(to_state: String):
+       animation_tree.set("parameters/state/transition_request", to_state)
+       
+func transition_idle():
+       transition("idle")
 
+func transition_move():
+       transition("move")
 
-func transition_falling():
-       # TODO: falling state
-       _tree.set("parameters/movement/transition_request", "move")
+func transition_dash():
+       transition("dash")
 
+func transition_slash():
+       transition("slash")
 
-func transition_dash():
-       _tree.set("parameters/movement/transition_request", "dash")
+func transition_shoot():
+       transition("shoot")
 
+func transition_fall():
+       transition("fall")
 
-func transition_slash():
-       _tree.set("parameters/movement/transition_request", "slash")
+func transition_fallToRoll():
+       transition("fallToRoll")
 
+func transition_fallToLanding():
+       transition("fallToLanding")
 
-func transition_gunfire():
-       _tree.set("parameters/movement/transition_request", "gunfire")
+func transition_suddenStop():
+       transition("suddenStop")