X-Git-Url: http://git.purplebirdman.com/frog-ninja.git/blobdiff_plain/16f5fda45ed2a668758450eff052e0903d7ef3ae..8225ba902c437bcadc8735df85a340e8bd10ed3d:/player/player.tscn

diff --git a/player/player.tscn b/player/player.tscn
index fb4bbe3..3f30231 100644
--- a/player/player.tscn
+++ b/player/player.tscn
@@ -1,13 +1,10 @@
-[gd_scene load_steps=10 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/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://bwox6frn7fmgt" path="res://player/model.gd" id="5_qjkh3"]
-[ext_resource type="Script" uid="uid://bv5k167ugxmso" path="res://player/idle.gd" id="6_g6k8r"]
-[ext_resource type="Script" uid="uid://cqurhmxam2nl0" path="res://player/walk.gd" id="7_rgyib"]
-[ext_resource type="Script" uid="uid://bdiks0m7vsn5w" path="res://player/dash.gd" id="8_hg6s5"]
+[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="PackedScene" uid="uid://bhtypq3nj4tur" path="res://player/model.tscn" id="5_qjkh3"]
 
 [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_sh265"]
 
@@ -16,7 +13,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")
 
@@ -39,15 +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")