martin
/
TinyAdventure
1
0
Fork 0
Code Issues 10 Pull Requests Packages Projects 1 Releases Wiki Activity

Fixed pickup of items.

main
Martin Felis 2024-12-29 11:24:58 +01:00
parent eb334af25e
commit 49c7d179d6
3 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
objects/pickup_item.tscn
View File

@ -11,6 +11,8 @@ script = ExtResource("1_1i8k2")
[node name="Area3D" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0502824, 0)
collision_layer = 128
collision_mask = 3
[node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D"]
shape = SubResource("CylinderShape3D_1ndog")

50
objects/player.tscn
View File

@ -145,7 +145,7 @@ graph_offset = Vector2(-12, 57.7514)
[node name="Player" type="CharacterBody3D"]
collision_layer = 2
collision_mask = 99
collision_mask = 227
script = ExtResource("1_qkf7c")
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
@ -171,7 +171,7 @@ unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0.98728)
[node name="RightHandBone" type="BoneAttachment3D" parent="."]
transform = Transform3D(-0.000245277, -0.060994, 0.395322, 0.399998, -0.000998511, 9.39905e-05, 0.000972602, 0.395321, 0.0609945, -0.196308, 0.255021, 0.0428891)
transform = Transform3D(-1.52242e-06, -0.0599648, 0.39548, 0.4, -7.47918e-06, 2.87653e-07, 7.48562e-06, 0.39548, 0.059965, -0.196423, 0.256404, 0.0426314)
bone_name = "Knife"
bone_idx = 17
use_external_skeleton = true
@ -191,31 +191,31 @@ transform = Transform3D(0.4, 0, 0, 0, 0.4, 0, 0, 0, 0.4, 0, 0, 0)
[node name="Skeleton3D" parent="Geometry/Rogue/Rig" index="0"]
bones/0/rotation = Quaternion(0, 1.19209e-07, 0, 1)
bones/1/position = Vector3(0, 0.384015, 0)
bones/1/position = Vector3(0, 0.392054, 0)
bones/1/rotation = Quaternion(-1.11123e-10, 0.0431578, 2.57241e-09, 0.999068)
bones/2/rotation = Quaternion(0, 7.10543e-15, 0, 1)
bones/4/position = Vector3(0.212007, 0.134132, 8.40246e-08)
bones/4/rotation = Quaternion(-0.557227, -0.0589019, -0.640409, 0.525267)
bones/5/rotation = Quaternion(3.53107e-09, -5.37127e-08, -0.504998, 0.86312)
bones/7/rotation = Quaternion(-0.321597, -0.330373, 0.148496, 0.874859)
bones/4/rotation = Quaternion(-0.559902, -0.0608832, -0.643988, 0.517768)
bones/5/rotation = Quaternion(3.63846e-08, -4.87802e-08, -0.494697, 0.869066)
bones/7/rotation = Quaternion(-0.321061, -0.325319, 0.145714, 0.877414)
bones/8/position = Vector3(8.34815e-10, 0.0961251, -0.0575001)
bones/8/rotation = Quaternion(0.000263864, 0.000263843, -0.706138, 0.708075)
bones/8/rotation = Quaternion(1.87733e-06, 1.88723e-06, -0.7071, 0.707114)
bones/10/position = Vector3(-0.212007, 0.134132, 8.40246e-08)
bones/10/rotation = Quaternion(-0.615575, 0.0789903, 0.615165, 0.486209)
bones/11/rotation = Quaternion(3.48848e-08, 5.59303e-08, 0.527837, 0.849346)
bones/13/rotation = Quaternion(-0.32013, 0.306065, -0.230361, 0.866473)
bones/10/rotation = Quaternion(-0.61824, 0.0807315, 0.618023, 0.478862)
bones/11/rotation = Quaternion(2.13395e-08, 5.09682e-08, 0.517918, 0.85543)
bones/13/rotation = Quaternion(-0.319287, 0.300523, -0.227338, 0.869517)
bones/14/position = Vector3(-8.34815e-10, 0.0961251, -0.0575001)
bones/14/rotation = Quaternion(0.000864221, 0.00101792, 0.70621, 0.708001)
bones/14/rotation = Quaternion(6.00351e-06, 7.06823e-06, 0.707101, 0.707113)
bones/19/rotation = Quaternion(-5.8061e-11, -0.0313416, -1.88013e-09, 0.999509)
bones/21/position = Vector3(0.170945, 0.113587, 1.39233e-08)
bones/21/rotation = Quaternion(0.992635, 0.0831384, 0.0759082, 0.0447321)
bones/22/rotation = Quaternion(0.283644, 6.50864e-08, -1.98938e-07, 0.95893)
bones/23/rotation = Quaternion(-0.563338, -0.206472, 0.0574476, 0.797947)
bones/21/rotation = Quaternion(0.993715, 0.0837138, 0.0735059, 0.0109465)
bones/22/rotation = Quaternion(0.195675, 6.26355e-08, -1.32242e-07, 0.980669)
bones/23/rotation = Quaternion(-0.517602, -0.209495, 0.0436658, 0.828428)
bones/24/rotation = Quaternion(-3.04797e-08, 0.920355, -0.391084, 6.94849e-08)
bones/25/position = Vector3(-0.170945, 0.113587, 1.39233e-08)
bones/25/rotation = Quaternion(0.995364, -0.0309504, 0.0308318, 0.0856815)
bones/26/rotation = Quaternion(0.342497, -6.2314e-08, 2.37478e-07, 0.939519)
bones/27/rotation = Quaternion(-0.5955, 0.113932, -0.0144529, 0.795104)
bones/25/rotation = Quaternion(0.997321, -0.0294585, 0.0315288, 0.0590685)
bones/26/rotation = Quaternion(0.27406, -6.38134e-08, 1.92784e-07, 0.961713)
bones/27/rotation = Quaternion(-0.559067, 0.114513, -0.00863194, 0.821131)
bones/28/rotation = Quaternion(3.04797e-08, 0.920355, -0.391084, -6.94849e-08)
bones/29/position = Vector3(0.170945, 0.29231, 0.575812)
bones/29/rotation = Quaternion(0.707107, -2.29302e-07, -4.60551e-08, 0.707107)
@ -239,30 +239,30 @@ bones/40/position = Vector3(-6.31128e-09, 0.16565, 1.36608e-09)
bones/41/rotation = Quaternion(1, 4.44086e-16, 1.94707e-07, 6.91739e-22)
bones/43/position = Vector3(0.453507, 1.10676, -0.588859)
bones/43/rotation = Quaternion(-0.707107, -7.27951e-08, -7.27951e-08, 0.707107)
bones/44/position = Vector3(0.520841, 0.784538, -0.0576374)
bones/44/position = Vector3(0.520841, 0.788298, -0.0576373)
bones/44/rotation = Quaternion(0.794627, -1.2666e-07, 0.607098, -5.96046e-08)
bones/45/position = Vector3(-0.453507, 1.10676, -0.58886)
bones/45/rotation = Quaternion(-0.707107, -7.27951e-08, -7.27951e-08, 0.707107)
bones/46/position = Vector3(-0.510844, 0.784538, 0.0597369)
bones/46/position = Vector3(-0.510844, 0.788298, 0.0597369)
bones/46/rotation = Quaternion(-0.758253, -1.82539e-07, 0.651961, -1.11759e-08)
[node name="Knife_Offhand" parent="Geometry/Rogue/Rig/Skeleton3D" index="0"]
transform = Transform3D(-2.37077e-06, 0.262864, 0.964832, 0.999995, -0.00272665, 0.000745657, 0.00282705, 0.964828, -0.262863, 0.50763, 0.6331, -0.017908)
transform = Transform3D(5.46137e-08, 0.262865, 0.964832, 0.999999, -2.01881e-05, 5.76439e-06, 2.13358e-05, 0.964832, -0.262865, 0.507764, 0.636685, -0.0185381)
[node name="1H_Crossbow" parent="Geometry/Rogue/Rig/Skeleton3D" index="1"]
transform = Transform3D(0.988305, -0.152485, 0.000613197, 0.000234957, -0.00249643, -0.999996, 0.152486, 0.988302, -0.00243165, -0.489256, 0.742206, 0.0972399)
transform = Transform3D(0.988699, -0.149912, 3.81024e-06, 7.00889e-07, -1.88461e-05, -0.999999, 0.149913, 0.988699, -1.88633e-05, -0.489506, 0.745638, 0.0963391)
[node name="2H_Crossbow" parent="Geometry/Rogue/Rig/Skeleton3D" index="2"]
transform = Transform3D(0.988305, -0.152485, 0.000613197, 0.000234957, -0.00249643, -0.999996, 0.152486, 0.988302, -0.00243165, -0.489256, 0.742206, 0.0972399)
transform = Transform3D(0.988699, -0.149912, 3.81024e-06, 7.00889e-07, -1.88461e-05, -0.999999, 0.149913, 0.988699, -1.88633e-05, -0.489506, 0.745638, 0.0963391)
[node name="Knife" parent="Geometry/Rogue/Rig/Skeleton3D" index="3"]
transform = Transform3D(-0.000613192, -0.152485, 0.988305, 0.999996, -0.00249628, 0.000234976, 0.0024315, 0.988302, 0.152486, -0.490771, 0.637552, 0.107223)
transform = Transform3D(-3.80606e-06, -0.149912, 0.988699, 0.999999, -1.8698e-05, 7.19133e-07, 1.87141e-05, 0.988699, 0.149912, -0.491058, 0.641009, 0.106579)
[node name="Throwable" parent="Geometry/Rogue/Rig/Skeleton3D" index="4"]
transform = Transform3D(-0.000613177, -0.152485, 0.988305, 0.999996, -0.00249626, 0.000234962, 0.00243149, 0.988302, 0.152486, -0.518256, 0.637102, 0.28536)
transform = Transform3D(-3.79032e-06, -0.149912, 0.988699, 0.999999, -1.86832e-05, 7.05445e-07, 1.87015e-05, 0.988699, 0.149913, -0.518079, 0.641006, 0.284788)
[node name="Rogue_Cape" parent="Geometry/Rogue/Rig/Skeleton3D" index="5"]
transform = Transform3D(0.996275, -5.14962e-09, 0.0862354, 5.13044e-09, 1, 4.44078e-10, -0.0862354, 1.47756e-15, 0.996275, -4.17227e-09, 1.19422, 1.19714e-15)
transform = Transform3D(0.996275, -5.14962e-09, 0.0862354, 5.13044e-09, 1, 4.44078e-10, -0.0862354, 1.47756e-15, 0.996275, -4.17227e-09, 1.20226, 1.19714e-15)
[node name="AnimationPlayer" type="AnimationPlayer" parent="Geometry"]
root_node = NodePath("../Rogue")

1
project.godot
View File

@ -201,3 +201,4 @@ locale/translations_pot_files=PackedStringArray("res://dialogue/bridge_builder_m
3d_physics/layer_5="Actionable"
3d_physics/layer_6="Structure"
3d_physics/layer_7="Non Player Character"
3d_physics/layer_8="Items"