From: Clifton Palmer Date: Wed, 7 May 2025 11:19:34 +0000 (+0300) Subject: Made Model its own scene X-Git-Url: http://git.purplebirdman.com/frog-ninja.git/commitdiff_plain/8225ba902c437bcadc8735df85a340e8bd10ed3d?ds=sidebyside;hp=38bec94dddbd6aa14799d7af8e3259dbcf8f682b Made Model its own scene --- diff --git a/player/model.tscn b/player/model.tscn new file mode 100644 index 0000000..1bbff92 --- /dev/null +++ b/player/model.tscn @@ -0,0 +1,48 @@ +[gd_scene load_steps=10 format=3 uid="uid://bhtypq3nj4tur"] + +[ext_resource type="Script" uid="uid://bwox6frn7fmgt" path="res://player/model.gd" id="1_1ourq"] +[ext_resource type="Script" uid="uid://bv5k167ugxmso" path="res://player/moves/idle.gd" id="2_5lj4n"] +[ext_resource type="Script" uid="uid://cqurhmxam2nl0" path="res://player/moves/walk.gd" id="3_nixw6"] +[ext_resource type="Script" uid="uid://bdiks0m7vsn5w" path="res://player/moves/dash.gd" id="4_0s86x"] +[ext_resource type="Script" uid="uid://b0oj5iuvr8omo" path="res://player/moves/fall.gd" id="5_i7dkp"] +[ext_resource type="Script" uid="uid://whl70vbdv7gu" path="res://player/fall_to_roll.gd" id="6_asdm8"] +[ext_resource type="Script" uid="uid://cgb5nb8cw7cmn" path="res://player/fall_to_landing.gd" id="7_k52t5"] +[ext_resource type="Script" uid="uid://d28gnkyqsg3t" path="res://player/moves/slash.gd" id="8_srsrq"] +[ext_resource type="Script" uid="uid://c8c16gqh0fmwv" path="res://player/moves/shoot.gd" id="9_h07gm"] + +[node name="Model" type="Node"] +script = ExtResource("1_1ourq") + +[node name="Idle" type="Node" parent="."] +script = ExtResource("2_5lj4n") + +[node name="Walk" type="Node" parent="."] +script = ExtResource("3_nixw6") + +[node name="Dash" type="Node" parent="."] +script = ExtResource("4_0s86x") + +[node name="Timer" type="Timer" parent="Dash"] +wait_time = 0.25 + +[node name="Fall" type="Node" parent="."] +script = ExtResource("5_i7dkp") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + +[node name="FallToRoll" type="Node" parent="."] +script = ExtResource("6_asdm8") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + +[node name="FallToLanding" type="Node" parent="."] +script = ExtResource("7_k52t5") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + +[node name="Slash" type="Node" parent="."] +script = ExtResource("8_srsrq") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + +[node name="Shoot" type="Node" parent="."] +script = ExtResource("9_h07gm") +metadata/_custom_type_script = "uid://c886t1c86q0m6" + +[connection signal="timeout" from="Dash/Timer" to="Dash" method="_on_timer_timeout"] diff --git a/player/moves/walk.gd b/player/moves/walk.gd index 8f57d98..75d4403 100644 --- a/player/moves/walk.gd +++ b/player/moves/walk.gd @@ -2,7 +2,7 @@ extends Move class_name Walk -const skin_lean_limit := PI/4 +const skin_lean_limit := PI/8 func update(input: InputPacket, delta: float): diff --git a/player/player.tscn b/player/player.tscn index 90a1d18..3f30231 100644 --- a/player/player.tscn +++ b/player/player.tscn @@ -1,18 +1,10 @@ -[gd_scene load_steps=15 format=3 uid="uid://cchu1yltrhuk3"] +[gd_scene load_steps=7 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="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"] -[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"] +[ext_resource type="PackedScene" uid="uid://bhtypq3nj4tur" path="res://player/model.tscn" id="5_qjkh3"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"] @@ -44,40 +36,5 @@ unique_name_in_owner = true unique_name_in_owner = true script = ExtResource("3_g1dw6") -[node name="Model" type="Node" parent="."] +[node name="Model" parent="." instance=ExtResource("5_qjkh3")] 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" - -[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"]