X-Git-Url: http://git.purplebirdman.com/frog-ninja.git/blobdiff_plain/92f6f55bfa3f838fcbcb445a2bc2a271398c45fd..38bec94dddbd6aa14799d7af8e3259dbcf8f682b:/player/player.tscn diff --git a/player/player.tscn b/player/player.tscn index a51c523..90a1d18 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=11 format=3 uid="uid://cchu1yltrhuk3"] +[gd_scene load_steps=15 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"] @@ -9,6 +9,10 @@ [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"] +[ext_resource type="Script" uid="uid://d28gnkyqsg3t" path="res://player/moves/slash.gd" id="10_8t03j"] +[ext_resource type="Script" uid="uid://whl70vbdv7gu" path="res://player/fall_to_roll.gd" id="10_ebec5"] +[ext_resource type="Script" uid="uid://c8c16gqh0fmwv" path="res://player/moves/shoot.gd" id="11_2ieo8"] +[ext_resource type="Script" uid="uid://cgb5nb8cw7cmn" path="res://player/fall_to_landing.gd" id="11_yllr7"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"] @@ -17,7 +21,7 @@ collision_layer = 2 collision_mask = 5 script = ExtResource("1_onrkg") -[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +[node name="hitbox" type="CollisionShape3D" parent="." groups=["hitbox"]] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0) shape = SubResource("CapsuleShape3D_sh265") @@ -60,4 +64,20 @@ wait_time = 0.25 script = ExtResource("9_hg6s5") metadata/_custom_type_script = "uid://c886t1c86q0m6" +[node name="FallToRoll" type="Node" parent="Model"] +script = ExtResource("10_ebec5") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + +[node name="FallToLanding" type="Node" parent="Model"] +script = ExtResource("11_yllr7") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + +[node name="Slash" type="Node" parent="Model"] +script = ExtResource("10_8t03j") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + +[node name="Shoot" type="Node" parent="Model"] +script = ExtResource("11_2ieo8") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + [connection signal="timeout" from="Model/Dash/Timer" to="Model/Dash" method="_on_timer_timeout"]