warrior lv1

assets/models/items/weapons/rapier/rapier.tscn

@@ -3,7 +3,6 @@
 [ext_resource type="PackedScene" uid="uid://chmkj4cj2pc1v" path="res://assets/models/items/weapons/rapier/rapier.glb" id="1_e4kwr"]
 
 [node name="rapier" unique_id=795567087 instance=ExtResource("1_e4kwr")]
-transform = Transform3D(-30, 0, -2.6226833e-06, 0, 30, 0, 2.6226833e-06, 0, -30, 0, 15, 0)
 
 [node name="Mesh1_0" parent="." index="0" unique_id=609425921]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.08045673, 0)

assets/models/units/warrior/lv1/warrior.glb.import → assets/models/units/warrior/lv1/warrior.fbx.import

@@ -3,13 +3,13 @@
 importer="scene"
 importer_version=1
 type="PackedScene"
-uid="uid://cneoi78i8r2fe"
-path="res://.godot/imported/warrior.glb-f7d857af4d3128e902c16222085d016f.scn"
+uid="uid://d2wttvhx0s63m"
+path="res://.godot/imported/warrior.fbx-7d52916b3755e80bc8e091b3f7b6582f.scn"
 
 [deps]
 
-source_file="res://assets/models/units/warrior/lv1/warrior.glb"
-dest_files=["res://.godot/imported/warrior.glb-f7d857af4d3128e902c16222085d016f.scn"]
+source_file="res://assets/models/units/warrior/lv1/warrior.fbx"
+dest_files=["res://.godot/imported/warrior.fbx-7d52916b3755e80bc8e091b3f7b6582f.scn"]
 
 [params]
 
@@ -17,6 +17,7 @@ nodes/root_type=""
 nodes/root_name=""
 nodes/root_script=null
 mesh_library/use_node_names_as_mesh_names=false
+mesh_library/create_categories_from_hierarchy=false
 array_mesh/deduplicate_surfaces=true
 nodes/apply_root_scale=true
 nodes/root_scale=1.0
@@ -32,7 +33,7 @@ meshes/force_disable_compression=false
 skins/use_named_skins=true
 animation/import=true
 animation/fps=30
-animation/trimming=false
+animation/trimming=true
 animation/remove_immutable_tracks=true
 animation/import_rest_as_RESET=false
 import_script/path=""
@@ -40,6 +41,7 @@ materials/extract=0
 materials/extract_format=0
 materials/extract_path=""
 _subresources={}
-gltf/naming_version=2
-gltf/embedded_image_handling=1
-gltf/texture_map_mode=1
+fbx/importer=0
+fbx/allow_geometry_helper_nodes=false
+fbx/embedded_image_handling=1
+fbx/naming_version=2

assets/models/units/warrior/lv1/warrior_texture_0.png.import → assets/models/units/warrior/lv1/warrior_0.png.import

@@ -2,21 +2,21 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://b313khobewfnm"
-path.s3tc="res://.godot/imported/warrior_texture_0.png-88400c654d610b337eee36f3eafe849d.s3tc.ctex"
-path.etc2="res://.godot/imported/warrior_texture_0.png-88400c654d610b337eee36f3eafe849d.etc2.ctex"
+uid="uid://c1wa53f1gj63t"
+path.s3tc="res://.godot/imported/warrior_0.png-5cc4e97d0e3e04559b8ce4a062758cb9.s3tc.ctex"
+path.etc2="res://.godot/imported/warrior_0.png-5cc4e97d0e3e04559b8ce4a062758cb9.etc2.ctex"
 metadata={
 "imported_formats": ["s3tc_bptc", "etc2_astc"],
 "vram_texture": true
 }
 generator_parameters={
-"md5": "3675f9387f5278de73fc35e4934ef42e"
+"md5": "8e847bf8f4f0ca60f826d0aa70a95560"
 }
 
 [deps]
 
-source_file="res://assets/models/units/warrior/lv1/warrior_texture_0.png"
-dest_files=["res://.godot/imported/warrior_texture_0.png-88400c654d610b337eee36f3eafe849d.s3tc.ctex", "res://.godot/imported/warrior_texture_0.png-88400c654d610b337eee36f3eafe849d.etc2.ctex"]
+source_file="res://assets/models/units/warrior/lv1/warrior_0.png"
+dest_files=["res://.godot/imported/warrior_0.png-5cc4e97d0e3e04559b8ce4a062758cb9.s3tc.ctex", "res://.godot/imported/warrior_0.png-5cc4e97d0e3e04559b8ce4a062758cb9.etc2.ctex"]
 
 [params]
 

sandbox/units/striker_fit_test.tscn

-[gd_scene format=3 uid="uid://dwvbc5m3myqbk"]
-
-[ext_resource type="Script" uid="uid://daq4ko8ryry3w" path="res://src/entities/units/base/base_unit.gd" id="1_base_unit"]
-[ext_resource type="PackedScene" uid="uid://c2aiejcidlihv" path="res://src/entities/units/striker/striker.tscn" id="2_iytoq"]
-[ext_resource type="PackedScene" uid="uid://dcb3y3h3xmxlf" path="res://assets/models/items/weapons/azure_blade/azure_blade.glb" id="3_1wbmh"]
-
-[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_body"]
-radius = 0.4
-height = 1.2
-
-[sub_resource type="CapsuleMesh" id="CapsuleMesh_unit"]
-radius = 0.4
-height = 1.2
-
-[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ring"]
-albedo_color = Color(0.098039, 0.901961, 0.098039, 1)
-emission_enabled = true
-emission = Color(0.098039, 0.901961, 0.098039, 1)
-emission_energy_multiplier = 2.0
-
-[sub_resource type="TorusMesh" id="TorusMesh_selection"]
-material = SubResource("StandardMaterial3D_ring")
-inner_radius = 0.65
-outer_radius = 0.7
-
-[node name="StrikerUnit" type="CharacterBody3D" unique_id=1844747242]
-script = ExtResource("1_base_unit")
-
-[node name="CollisionShape3D" type="CollisionShape3D" parent="." unique_id=332342782]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0)
-shape = SubResource("CapsuleShape3D_body")
-
-[node name="VisualMesh" type="MeshInstance3D" parent="." unique_id=758090532]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.6, 0)
-visible = false
-mesh = SubResource("CapsuleMesh_unit")
-
-[node name="SelectionRing" type="MeshInstance3D" parent="." unique_id=1378906746]
-transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.02, 0)
-mesh = SubResource("TorusMesh_selection")
-
-[node name="NavigationAgent3D" type="NavigationAgent3D" parent="." unique_id=462079662]
-
-[node name="striker" parent="." unique_id=1533136548 instance=ExtResource("2_iytoq")]
-
-[node name="Skeleton3D" parent="striker/Armature" parent_id_path=PackedInt32Array(1533136548, 141876740) index="0" unique_id=700524040]
-bones/0/rotation = Quaternion(0.053775016, -0.07558027, 0.95148146, -0.2933922)
-bones/1/rotation = Quaternion(-0.11642271, -0.9713257, 0.18020546, 0.102460474)
-bones/2/rotation = Quaternion(0.55354464, 0.045569547, -0.0009506773, 0.83157134)
-bones/3/rotation = Quaternion(-0.49771708, 0.11763392, 0.21810035, 0.8311873)
-bones/4/rotation = Quaternion(-0.37741533, 0.09441602, 0.034894247, 0.9205573)
-bones/5/rotation = Quaternion(-0.73469806, -0.4706895, 0.35849488, 0.33189112)
-bones/6/rotation = Quaternion(0.54929906, -0.055585526, -0.007583472, 0.8337405)
-bones/7/rotation = Quaternion(-0.6469232, -0.114821404, -0.31046525, 0.6869628)
-bones/8/rotation = Quaternion(-0.3751127, -0.089608364, -0.033254314, 0.92203856)
-bones/9/rotation = Quaternion(0.610278, 0.6213914, 0.3507232, 0.3441319)
-bones/10/rotation = Quaternion(0.066713676, -0.0066856947, -0.021492973, 0.99751824)
-bones/11/rotation = Quaternion(-0.021008668, 0.007633576, -0.001313759, 0.9997493)
-bones/12/rotation = Quaternion(0.57989126, 0.49733877, -0.42518228, 0.48538694)
-bones/13/rotation = Quaternion(0.2573209, 0.1580452, -0.12015072, 0.9457122)
-bones/14/rotation = Quaternion(-0.5427628, -0.19160645, 0.28051028, 0.7681209)
-bones/15/rotation = Quaternion(-0.019803066, -0.26306573, 0.22688207, 0.93751204)
-bones/16/rotation = Quaternion(-0.6120462, 0.4637878, -0.43958727, -0.46590066)
-bones/17/rotation = Quaternion(0.3186677, -0.28127205, -0.13971356, 0.89432496)
-bones/18/rotation = Quaternion(-0.428532, 0.14101788, -0.15769473, 0.87841153)
-bones/19/rotation = Quaternion(0.11561307, -0.49338162, -0.2142872, 0.8350384)
-bones/20/rotation = Quaternion(-0.12836885, 0.17267549, -0.025799042, 0.9762372)
-bones/21/rotation = Quaternion(0.23437437, 0.25792313, -0.13371938, 0.9277196)
-bones/22/rotation = Quaternion(-0.27558565, -2.7975927e-08, 0.0022902817, 0.9612738)
-bones/23/rotation = Quaternion(0.5067052, 1.4996291e-09, -0.0042108223, 0.8621092)
-
-[node name="RightHandAttachment" type="BoneAttachment3D" parent="striker/Armature/Skeleton3D" index="1" unique_id=133354659]
-transform = Transform3D(0.7814436, -0.5886768, 0.20690073, -0.07732609, 0.23766617, 0.96826494, -0.61916757, -0.77264214, 0.14020297, -0.5518764, 0.18081048, 1.128352)
-bone_name = "RightHand"
-bone_idx = 19
-
-[node name="azure_blade" parent="striker/Armature/Skeleton3D/RightHandAttachment" unique_id=536876812 instance=ExtResource("3_1wbmh")]
-transform = Transform3D(-0.7711027, -0.35320297, 0.52976245, -0.61729014, 0.21077795, -0.7579746, 0.15605667, -0.91149354, -0.38056016, 0.016528487, 0.16035584, -0.038040265)
-
-[editable path="striker"]

sandbox/units/warrior_fit_test.tscn

@@ -41,12 +41,12 @@ mesh = SubResource("TorusMesh_dx6da")
 
 [node name="warrior" parent="." unique_id=1583845935 instance=ExtResource("1_gy7ce")]
 
-[node name="BoneAttachment3D" type="BoneAttachment3D" parent="warrior/Armature/Skeleton3D" parent_id_path=PackedInt32Array(1583845935, 869110456) index="1" unique_id=275485168]
-transform = Transform3D(0.4100439, -0.6252991, 0.6639764, -0.86364293, -0.5002463, 0.06224379, 0.2932307, -0.5989617, -0.7451581, -18.670631, 37.889347, -12.24264)
+[node name="BoneAttachment3D" type="BoneAttachment3D" parent="warrior/Armature/Skeleton3D" parent_id_path=PackedInt32Array(1583845935, 1756619771) index="1" unique_id=275485168]
+transform = Transform3D(0.8432909, 0.43229055, -0.31934905, 0.53308886, -0.7483676, 0.39466572, -0.06838015, -0.50305945, -0.8615419, -0.05954457, -0.23949414, 0.5811317)
 bone_name = "RightHand"
 bone_idx = 19
 
 [node name="rapier" parent="warrior/Armature/Skeleton3D/BoneAttachment3D" unique_id=795567087 instance=ExtResource("2_gy7ce")]
-transform = Transform3D(-30, 0, -4.529874e-06, 0, 40, 0, 4.529874e-06, 0, -30, 0, 25, 0)
+transform = Transform3D(-0.17364825, -0.9848076, 0, 0.9848081, -0.17364818, 0, 0, 0, 1.0000008, -0.6, 0, 0)
 
 [editable path="warrior"]

src/entities/units/warrior/lv1/warrior.tscn

 [gd_scene format=3 uid="uid://c6wju2s7ey11q"]
 
-[ext_resource type="PackedScene" uid="uid://cneoi78i8r2fe" path="res://assets/models/units/warrior/lv1/warrior.glb" id="1_warrior_glb"]
+[ext_resource type="PackedScene" uid="uid://d2wttvhx0s63m" path="res://assets/models/units/warrior/lv1/warrior.fbx" id="1_51hg6"]
 [ext_resource type="AnimationLibrary" uid="uid://bfq5qy0qjjddl" path="res://assets/models/units/warrior/warrior_anim.tres" id="2_warrior_anim"]
 
-[node name="warrior" unique_id=1583845935 instance=ExtResource("1_warrior_glb")]
-transform = Transform3D(-1.5, 0, -1.3113416e-07, 0, 1.5, 0, 1.3113416e-07, 0, -1.5, 0, 0, 0)
+[node name="warrior" unique_id=1947524413 instance=ExtResource("1_51hg6")]
+transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, 0, 0, 0)
 
-[node name="Skeleton3D" parent="Armature" parent_id_path=PackedInt32Array(1364558243) index="0" unique_id=869110456]
-bones/0/position = Vector3(-1.910276, 33.06552, 3.5636556)
-bones/0/rotation = Quaternion(0.28815937, -0.48399922, 0.004976633, 0.8262471)
-bones/1/rotation = Quaternion(0.5620965, 0.24640833, -0.5738231, 0.54227066)
-bones/2/rotation = Quaternion(0.42321578, 0.052586436, 0.06714515, 0.9020059)
-bones/3/rotation = Quaternion(-0.42186385, -0.18076968, -0.09782138, 0.8830539)
-bones/4/rotation = Quaternion(-0.3672295, -0.11379034, -0.009377396, 0.92309606)
-bones/5/rotation = Quaternion(0.87915325, -0.055501558, 0.15420589, 0.44747052)
-bones/6/rotation = Quaternion(0.4259057, -0.05401285, -0.062089335, 0.9010171)
-bones/7/rotation = Quaternion(-0.55740386, 0.19286433, -0.07460873, 0.8040759)
-bones/8/rotation = Quaternion(-0.37955156, 0.10612711, 0.006433723, 0.919041)
-bones/9/rotation = Quaternion(-0.04820835, 0.035868984, 0.03551153, 0.9975612)
-bones/10/rotation = Quaternion(0.063555084, -0.005556316, -0.021568177, 0.9977298)
-bones/11/rotation = Quaternion(-0.026126284, 0.00060771336, -0.0020700088, 0.9996564)
-bones/12/rotation = Quaternion(0.594939, 0.51989836, -0.41137588, 0.45444834)
-bones/13/rotation = Quaternion(0.3044257, 0.07226572, -0.02087591, 0.9495615)
-bones/14/position = Vector3(5.990729e-06, 11.568957, 2.0486332e-06)
-bones/14/rotation = Quaternion(-0.34638062, -0.15226349, 0.21833093, 0.8995377)
-bones/15/rotation = Quaternion(0.022922574, -0.27042493, 0.27432233, 0.92254657)
-bones/16/position = Vector3(-2.2237325, 1.1260277, -0.28097144)
-bones/16/rotation = Quaternion(-0.6291889, 0.48313388, -0.41592285, -0.4446473)
-bones/17/rotation = Quaternion(0.36964628, -0.18361838, -0.21041645, 0.8862115)
-bones/18/position = Vector3(7.0502997e-06, 11.568421, -2.0685693e-06)
-bones/18/rotation = Quaternion(-0.22914784, 0.13075422, -0.07788659, 0.96142)
-bones/19/position = Vector3(1.6717445e-07, 8.329648, 1.0820704e-06)
-bones/19/rotation = Quaternion(-0.008124485, -0.44720575, 0.055150583, 0.8926922)
-bones/20/rotation = Quaternion(-0.11569695, 0.18120818, -0.018436808, 0.97644156)
-bones/21/rotation = Quaternion(0.25444955, 0.262842, -0.117302336, 0.9232604)
-bones/22/rotation = Quaternion(-0.17588644, 9.691889e-06, 2.6466496e-05, 0.9844105)
-bones/23/rotation = Quaternion(0.5060229, -6.436132e-06, 7.619528e-05, 0.86252004)
+[node name="Skeleton3D" parent="Armature" parent_id_path=PackedInt32Array(1122658972) index="0" unique_id=1756619771]
+bones/0/position = Vector3(0.0073099844, -0.00024791062, 0.51946986)
+bones/0/rotation = Quaternion(0.7336017, -0.40976235, -0.46098384, 0.28533718)
+bones/1/rotation = Quaternion(0.6953324, 0.35067883, -0.45900282, 0.4276139)
+bones/2/rotation = Quaternion(0.5667321, 0.09061526, 0.13510591, 0.8076819)
+bones/3/rotation = Quaternion(-0.6401579, -0.12262135, -0.015155749, 0.75824285)
+bones/4/rotation = Quaternion(-0.4466983, -0.10617086, 0.00024005448, 0.8883628)
+bones/5/rotation = Quaternion(0.77513295, 0.27862963, 0.30337262, 0.4790612)
+bones/6/rotation = Quaternion(0.4448868, 0.0130469, 0.2471058, 0.8607232)
+bones/7/rotation = Quaternion(-0.45060512, 0.099976465, -0.08400531, 0.8831211)
+bones/8/rotation = Quaternion(-0.45842803, 0.1347912, 0.014290656, 0.8783341)
+bones/9/rotation = Quaternion(-0.25834036, 0.20522211, 0.11844286, 0.9365444)
+bones/10/rotation = Quaternion(0.022619344, 0.08164339, -0.010146947, 0.9963533)
+bones/11/rotation = Quaternion(0.09123827, 0.059046026, -0.078700215, 0.9909569)
+bones/12/rotation = Quaternion(0.57781017, 0.62083524, -0.13990688, 0.51100403)
+bones/13/rotation = Quaternion(0.46895784, 0.08111248, 0.53484404, 0.6981699)
+bones/14/rotation = Quaternion(-0.3566624, -0.0653533, 0.09165615, 0.92742664)
+bones/15/rotation = Quaternion(-0.0009877216, 0.24114296, -0.086359695, 0.9666391)
+bones/16/rotation = Quaternion(-0.5165315, 0.38003513, 0.028065398, -0.7667991)
+bones/17/rotation = Quaternion(0.5776718, 0.08903898, -0.5365655, 0.6086582)
+bones/18/rotation = Quaternion(-0.28399494, 0.10896846, -0.39559907, 0.8665877)
+bones/19/rotation = Quaternion(0.0024361685, -0.54337037, -0.022761738, 0.83918095)
+bones/20/rotation = Quaternion(0.25569445, 0.07016864, 0.0060589095, 0.9641889)
+bones/21/rotation = Quaternion(0.078519985, 0.08745963, -0.024804013, 0.9927589)
+bones/22/rotation = Quaternion(-0.15805918, -2.3112833e-08, 0.0019670601, 0.9874277)
+bones/23/rotation = Quaternion(0.5403607, 5.8547363e-09, -0.0067247013, 0.84140664)
 
-[node name="AnimationPlayer" parent="." index="1" unique_id=799901728]
+[node name="AnimationPlayer" parent="." index="1" unique_id=189824221]
 libraries/ = ExtResource("2_warrior_anim")

src/entities/units/warrior/lv1/warrior_unit.tscn

@@ -42,29 +42,4 @@ mesh = SubResource("TorusMesh_selection")
 
 [node name="warrior" parent="." unique_id=1628540794 instance=ExtResource("2_warrior_scene")]
 
-[node name="Skeleton3D" parent="warrior/Armature" parent_id_path=PackedInt32Array(1628540794, 1364558243) index="0" unique_id=869110456]
-bones/0/position = Vector3(-1.910276, 33.06552, 3.5636556)
-bones/0/rotation = Quaternion(0.28815937, -0.48399922, 0.004976633, 0.8262471)
-bones/1/rotation = Quaternion(0.5620965, 0.24640833, -0.5738231, 0.54227066)
-bones/2/rotation = Quaternion(0.42321578, 0.052586436, 0.06714515, 0.9020059)
-bones/3/rotation = Quaternion(-0.42186385, -0.18076968, -0.09782138, 0.8830539)
-bones/4/rotation = Quaternion(-0.3672295, -0.11379034, -0.009377396, 0.92309606)
-bones/5/rotation = Quaternion(0.87915325, -0.055501558, 0.15420589, 0.44747052)
-bones/6/rotation = Quaternion(0.4259057, -0.05401285, -0.062089335, 0.9010171)
-bones/7/rotation = Quaternion(-0.55740386, 0.19286433, -0.07460873, 0.8040759)
-bones/8/rotation = Quaternion(-0.37955156, 0.10612711, 0.006433723, 0.919041)
-bones/9/rotation = Quaternion(-0.04820835, 0.035868984, 0.03551153, 0.9975612)
-bones/10/rotation = Quaternion(0.063555084, -0.005556316, -0.021568177, 0.9977298)
-bones/11/rotation = Quaternion(-0.026126284, 0.00060771336, -0.0020700088, 0.9996564)
-bones/12/rotation = Quaternion(0.594939, 0.51989836, -0.41137588, 0.45444834)
-bones/13/rotation = Quaternion(0.3044257, 0.07226572, -0.02087591, 0.9495615)
-bones/14/rotation = Quaternion(-0.34638062, -0.15226349, 0.21833093, 0.8995377)
-bones/15/rotation = Quaternion(0.022922574, -0.27042493, 0.27432233, 0.92254657)
-bones/16/rotation = Quaternion(-0.6291889, 0.48313388, -0.41592285, -0.4446473)
-bones/17/rotation = Quaternion(0.36964628, -0.18361838, -0.21041645, 0.8862115)
-bones/18/rotation = Quaternion(-0.22914784, 0.13075422, -0.07788659, 0.96142)
-bones/19/rotation = Quaternion(-0.008124485, -0.44720575, 0.055150583, 0.8926922)
-bones/20/rotation = Quaternion(-0.11569695, 0.18120818, -0.018436808, 0.97644156)
-bones/21/rotation = Quaternion(0.25444955, 0.262842, -0.117302336, 0.9232604)
-
 [editable path="warrior"]

src/entities/units/warrior/warrior_unit.gd

@@ -14,7 +14,7 @@ func _setup_unit_visuals() -> void:
 		return
 	_model_instance = node
 	
-	UnitHelper.apply_skin(_model_instance, "res://assets/models/units/warrior/lv1/warrior_texture_0.png")
+	UnitHelper.apply_skin(_model_instance, "res://assets/models/units/warrior/lv1/warrior_0.png")
 	attach_weapon(_model_instance)
 	
 	_model_anim_player = UnitHelper.find_animation_player(_model_instance)
@@ -38,7 +38,9 @@ func _get_weapon_config() -> Dictionary:
 		"attachment_name": "RightHandAttachment",
 		"weapon_scene_path": "res://assets/models/items/weapons/rapier/rapier.tscn",
 		"texture_path": "res://assets/models/items/weapons/rapier/rapier_Baked_BaseColor.png",
-		"preserve_scene_transform": true
+		"preserve_scene_transform": true,
+		"weapon_position": Vector3(-0.6, 0.0, 0),
+		"weapon_rotation": Vector3(0, 0, 100)
 	}
 
 func _update_animations() -> void: