Added interpolated dashing

[frog-ninja.git] / player / player.tscn

diff --git a/player/player.tscn b/player/player.tscn
index 4d86286d93133f4442f4a0383ce61c5e70b091a4..a51c523c4071d275e17153790294f36585f3a041 100644 (file)
--- a/player/player.tscn
+++ b/player/player.tscn
@@ -1,9 +1,14 @@
-[gd_scene load_steps=6 format=3 uid="uid://cchu1yltrhuk3"]
+[gd_scene load_steps=11 format=3 uid="uid://cchu1yltrhuk3"]

 
 [ext_resource type="PackedScene" uid="uid://dvkx3t15l7mfb" path="res://skin/prototype_skin.tscn" id="1_4flbx"]
 [ext_resource type="Script" uid="uid://dcv34jq0jett0" path="res://player/player.gd" id="1_onrkg"]
 
 [ext_resource type="PackedScene" uid="uid://dvkx3t15l7mfb" path="res://skin/prototype_skin.tscn" id="1_4flbx"]
 [ext_resource type="Script" uid="uid://dcv34jq0jett0" path="res://player/player.gd" id="1_onrkg"]

-[ext_resource type="Script" uid="uid://bspr3vafk6wi2" path="res://player/InputHandler.gd" id="3_g1dw6"]
-[ext_resource type="Script" uid="uid://c5mn28v6ujngk" path="res://player/CameraHandler.gd" id="3_yw30f"]
+[ext_resource type="Script" uid="uid://bspr3vafk6wi2" path="res://player/input/InputHandler.gd" id="3_g1dw6"]
+[ext_resource type="Script" uid="uid://c5mn28v6ujngk" path="res://player/input/CameraHandler.gd" id="3_yw30f"]
+[ext_resource type="Script" uid="uid://bwox6frn7fmgt" path="res://player/model.gd" id="5_qjkh3"]
+[ext_resource type="Script" uid="uid://bv5k167ugxmso" path="res://player/moves/idle.gd" id="6_g6k8r"]
+[ext_resource type="Script" uid="uid://cqurhmxam2nl0" path="res://player/moves/walk.gd" id="7_rgyib"]
+[ext_resource type="Script" uid="uid://bdiks0m7vsn5w" path="res://player/moves/dash.gd" id="8_hg6s5"]
+[ext_resource type="Script" uid="uid://b0oj5iuvr8omo" path="res://player/moves/fall.gd" id="9_hg6s5"]

 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"]
 
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"]
 


@@ -19,18 +24,40 @@ shape = SubResource("CapsuleShape3D_sh265")
 [node name="skin" parent="." instance=ExtResource("1_4flbx")]
 unique_name_in_owner = true
 
 [node name="skin" parent="." instance=ExtResource("1_4flbx")]
 unique_name_in_owner = true
 

-[node name="CameraPivot" type="Node3D" parent="."]
+[node name="CameraHandler" type="Node3D" parent="."]

 unique_name_in_owner = true
 script = ExtResource("3_yw30f")
 
 unique_name_in_owner = true
 script = ExtResource("3_yw30f")
 

-[node name="spring" type="SpringArm3D" parent="CameraPivot"]
+[node name="spring" type="SpringArm3D" parent="CameraHandler"]

 unique_name_in_owner = true
 transform = Transform3D(-1, -2.99003e-08, 8.21505e-08, 0, 0.939693, 0.34202, -8.74228e-08, 0.34202, -0.939693, 0, 1.52762, 0)
 spring_length = 3.0
 
 unique_name_in_owner = true
 transform = Transform3D(-1, -2.99003e-08, 8.21505e-08, 0, 0.939693, 0.34202, -8.74228e-08, 0.34202, -0.939693, 0, 1.52762, 0)
 spring_length = 3.0
 

-[node name="camera" type="Camera3D" parent="CameraPivot/spring"]
+[node name="camera" type="Camera3D" parent="CameraHandler/spring"]

 unique_name_in_owner = true
 
 [node name="Input" type="Node" parent="."]
 unique_name_in_owner = true
 script = ExtResource("3_g1dw6")
 unique_name_in_owner = true
 
 [node name="Input" type="Node" parent="."]
 unique_name_in_owner = true
 script = ExtResource("3_g1dw6")

+
+[node name="Model" type="Node" parent="."]
+unique_name_in_owner = true
+script = ExtResource("5_qjkh3")
+
+[node name="Idle" type="Node" parent="Model"]
+script = ExtResource("6_g6k8r")
+
+[node name="Walk" type="Node" parent="Model"]
+script = ExtResource("7_rgyib")
+
+[node name="Dash" type="Node" parent="Model"]
+script = ExtResource("8_hg6s5")
+
+[node name="Timer" type="Timer" parent="Model/Dash"]
+wait_time = 0.25
+
+[node name="Fall" type="Node" parent="Model"]
+script = ExtResource("9_hg6s5")
+metadata/_custom_type_script = "uid://c886t1c86q0m6"
+
+[connection signal="timeout" from="Model/Dash/Timer" to="Model/Dash" method="_on_timer_timeout"]