diff --git a/BodyConfig/bodyBuilderMenu.tscn b/BodyConfig/bodyBuilderMenu.tscn index 5b4a7ea..38939cd 100644 --- a/BodyConfig/bodyBuilderMenu.tscn +++ b/BodyConfig/bodyBuilderMenu.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://BodyConfig/BodyParts/Tesso.tscn" type="PackedScene" id=1] +[ext_resource path="res://BodyParts/Tesso.tscn" type="PackedScene" id=1] [ext_resource path="res://BodyConfig/bodyBuildingScript.gd" type="Script" id=2] + [node name="Body Builder Menu" type="Spatial"] script = ExtResource( 2 ) torsoPath = NodePath("Torso") diff --git a/Ingame/BodyParts/Arm.gd b/BodyParts/Arm.gd similarity index 93% rename from Ingame/BodyParts/Arm.gd rename to BodyParts/Arm.gd index 511a3f7..f3f6ffe 100644 --- a/Ingame/BodyParts/Arm.gd +++ b/BodyParts/Arm.gd @@ -10,7 +10,7 @@ func _ready() -> void: func action(): - anim.play("ArmatureAction.001") + anim.play("ArmatureAction001") func push(body): diff --git a/Ingame/BodyParts/Arm.tscn b/BodyParts/Arm.tscn similarity index 89% rename from Ingame/BodyParts/Arm.tscn rename to BodyParts/Arm.tscn index 877159a..eda4bfe 100644 --- a/Ingame/BodyParts/Arm.tscn +++ b/BodyParts/Arm.tscn @@ -1,8 +1,9 @@ [gd_scene load_steps=6 format=2] -[ext_resource path="res://Ingame/BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1] +[ext_resource path="res://BodyParts/PushingBodyPart.tscn" type="PackedScene" id=1] [ext_resource path="res://3D Input/untitled.glb" type="PackedScene" id=2] -[ext_resource path="res://Ingame/BodyParts/Arm.gd" type="Script" id=3] +[ext_resource path="res://BodyParts/Arm.gd" type="Script" id=3] + [sub_resource type="SphereShape" id=1] diff --git a/Ingame/BodyBase/BodyBase.gd b/BodyParts/BodyBase/BodyBase.gd similarity index 100% rename from Ingame/BodyBase/BodyBase.gd rename to BodyParts/BodyBase/BodyBase.gd diff --git a/Ingame/BodyBase/BodyBase.tscn b/BodyParts/BodyBase/BodyBase.tscn similarity index 95% rename from Ingame/BodyBase/BodyBase.tscn rename to BodyParts/BodyBase/BodyBase.tscn index 98f5f5a..130277f 100644 --- a/Ingame/BodyBase/BodyBase.tscn +++ b/BodyParts/BodyBase/BodyBase.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=7 format=2] -[ext_resource path="res://Ingame/BodyBase/BodyBase.gd" type="Script" id=1] +[ext_resource path="res://BodyParts/BodyBase/BodyBase.gd" type="Script" id=1] + [sub_resource type="CapsuleMesh" id=1] diff --git a/Ingame/BodyParts/BodyPart.gd b/BodyParts/BodyPart.gd similarity index 100% rename from Ingame/BodyParts/BodyPart.gd rename to BodyParts/BodyPart.gd diff --git a/Ingame/BodyParts/BodyPart.tscn b/BodyParts/BodyPart.tscn similarity index 67% rename from Ingame/BodyParts/BodyPart.tscn rename to BodyParts/BodyPart.tscn index e88fea5..8581c4b 100644 --- a/Ingame/BodyParts/BodyPart.tscn +++ b/BodyParts/BodyPart.tscn @@ -1,6 +1,7 @@ [gd_scene load_steps=2 format=2] -[ext_resource path="res://Ingame/BodyParts/BodyPart.gd" type="Script" id=1] +[ext_resource path="res://BodyParts/BodyPart.gd" type="Script" id=1] + [node name="BodyPart" type="Spatial"] script = ExtResource( 1 ) diff --git a/Ingame/BodyParts/PushingBodyPart.gd b/BodyParts/PushingBodyPart.gd similarity index 100% rename from Ingame/BodyParts/PushingBodyPart.gd rename to BodyParts/PushingBodyPart.gd diff --git a/Ingame/BodyParts/PushingBodyPart.tscn b/BodyParts/PushingBodyPart.tscn similarity index 52% rename from Ingame/BodyParts/PushingBodyPart.tscn rename to BodyParts/PushingBodyPart.tscn index fcc8150..9812a88 100644 --- a/Ingame/BodyParts/PushingBodyPart.tscn +++ b/BodyParts/PushingBodyPart.tscn @@ -1,7 +1,8 @@ [gd_scene load_steps=3 format=2] -[ext_resource path="res://Ingame/BodyParts/BodyPart.tscn" type="PackedScene" id=1] -[ext_resource path="res://Ingame/BodyParts/PushingBodyPart.gd" type="Script" id=2] +[ext_resource path="res://BodyParts/BodyPart.tscn" type="PackedScene" id=1] +[ext_resource path="res://BodyParts/PushingBodyPart.gd" type="Script" id=2] + [node name="PushingBodyPart" index="0" instance=ExtResource( 1 )] script = ExtResource( 2 ) diff --git a/BodyConfig/BodyParts/Tesso.tscn b/BodyParts/Tesso.tscn similarity index 100% rename from BodyConfig/BodyParts/Tesso.tscn rename to BodyParts/Tesso.tscn diff --git a/Ingame/Testing.tscn b/Ingame/Testing.tscn index 849b184..d50581e 100644 --- a/Ingame/Testing.tscn +++ b/Ingame/Testing.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=2] -[ext_resource path="res://Ingame/BodyParts/Arm.tscn" type="PackedScene" id=1] -[ext_resource path="res://Ingame/BodyBase/BodyBase.tscn" type="PackedScene" id=3] +[ext_resource path="res://BodyParts/Arm.tscn" type="PackedScene" id=1] +[ext_resource path="res://BodyParts/BodyBase/BodyBase.tscn" type="PackedScene" id=3] [sub_resource type="PlaneMesh" id=1] size = Vector2( 10, 10 ) diff --git a/project.godot b/project.godot index c994b43..c3958d8 100644 --- a/project.godot +++ b/project.godot @@ -12,17 +12,17 @@ _global_script_classes=[ { "base": "Spatial", "class": "BodyBase", "language": "GDScript", -"path": "res://Ingame/BodyBase/BodyBase.gd" +"path": "res://BodyParts/BodyBase/BodyBase.gd" }, { "base": "Spatial", "class": "BodyPart", "language": "GDScript", -"path": "res://Ingame/BodyParts/BodyPart.gd" +"path": "res://BodyParts/BodyPart.gd" }, { "base": "BodyPart", "class": "PushingBodyPart", "language": "GDScript", -"path": "res://Ingame/BodyParts/PushingBodyPart.gd" +"path": "res://BodyParts/PushingBodyPart.gd" } ] _global_script_class_icons={ "BodyBase": "",