From 4ef9927141c48c0837822fe16dd67ea1c5e33080 Mon Sep 17 00:00:00 2001 From: Spencer Killen Date: Sat, 19 Aug 2023 18:56:38 -0600 Subject: [PATCH] a --- godot/Holster.gd | 7 +++++++ .../grape_animations/upper_body_idle.res.res | Bin 934 -> 934 bytes godot/Models/grape_man.tscn | 2 +- godot/player.tscn | 8 ++------ godot/villager.tscn | 8 +++----- 5 files changed, 13 insertions(+), 12 deletions(-) create mode 100644 godot/Holster.gd diff --git a/godot/Holster.gd b/godot/Holster.gd new file mode 100644 index 0000000..0cc6711 --- /dev/null +++ b/godot/Holster.gd @@ -0,0 +1,7 @@ +extends Node3D + +func _ready(): + set_as_top_level(true) + +func _process(delta): + global_transform.origin = $"../grape_man".get_pickup_bone_location() diff --git a/godot/Models/grape_animations/upper_body_idle.res.res b/godot/Models/grape_animations/upper_body_idle.res.res index 64a799844881fbc5ca36cd4194d1d5421586d65f..0f2924dd9e7642bc88c6dd43175e638f56c11870 100644 GIT binary patch delta 25 hcmZ3+zKnf>5y#E4WtRoMcvMVuRGk>WzA?>#832d+3F-g< delta 25 hcmZ3+zKnf>5y!Nv#*v#ZKQ@`@s5&u#ePfyfGXRFt3Gx5{ diff --git a/godot/Models/grape_man.tscn b/godot/Models/grape_man.tscn index 16ad635..58b3d2e 100644 --- a/godot/Models/grape_man.tscn +++ b/godot/Models/grape_man.tscn @@ -153,7 +153,7 @@ transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0) script = ExtResource("2_ksje8") [node name="Skeleton3D" parent="rig" index="0"] -bones/0/rotation = Quaternion(0.0676631, 0, 0, 0.997708) +bones/0/rotation = Quaternion(0.0930424, 0, 0, 0.995662) bones/1/rotation = Quaternion(-0.0891896, 1.18734e-07, -1.06322e-08, 0.996015) bones/2/rotation = Quaternion(0.0133933, -1.19199e-07, 1.5966e-09, 0.99991) bones/3/rotation = Quaternion(-0.00997737, 0.100365, -0.694951, 0.711948) diff --git a/godot/player.tscn b/godot/player.tscn index 67b71cb..26a60af 100644 --- a/godot/player.tscn +++ b/godot/player.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://7utef1nnena8"] [ext_resource type="Script" path="res://Player.gd" id="1_7gpdp"] -[ext_resource type="Script" path="res://Models/grape_man.gd" id="2_apuey"] +[ext_resource type="PackedScene" uid="uid://bgoo1lbt28na" path="res://Models/grape_man.tscn" id="2_ctyy5"] [ext_resource type="Script" path="res://Holster.gd" id="3_a68da"] [sub_resource type="CapsuleShape3D" id="CapsuleShape3D_kb4ms"] @@ -17,9 +17,7 @@ script = ExtResource("1_7gpdp") transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.21, 0) shape = SubResource("CapsuleShape3D_kb4ms") -[node name="grape_man" type="Node3D" parent="."] -transform = Transform3D(0.065, 0, 0, 0, 0.065, 0, 0, 0, 0.065, 0, 0, 0) -script = ExtResource("2_apuey") +[node name="grape_man" parent="." instance=ExtResource("2_ctyy5")] [node name="CameraMount" type="Node3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.3, 0) @@ -37,5 +35,3 @@ script = ExtResource("3_a68da") [node name="CollisionShape3D" type="CollisionShape3D" parent="Holster/Area3D"] transform = Transform3D(0.1, 0, 0, 0, 0.1, 0, 0, 0, 0.1, 0, 0, 0) shape = SubResource("SphereShape3D_6l1w6") - -[connection signal="anim_check_grab" from="grape_man" to="." method="_on_grape_man_anim_check_grab"] diff --git a/godot/villager.tscn b/godot/villager.tscn index d118819..054206d 100644 --- a/godot/villager.tscn +++ b/godot/villager.tscn @@ -6,13 +6,11 @@ [sub_resource type="CapsuleMesh" id="CapsuleMesh_b3srs"] -[node name="Node3D" type="Node3D"] +[node name="CharacterBody3D" type="CharacterBody3D"] script = ExtResource("1_ardgw") -[node name="RigidBody3D" type="RigidBody3D" parent="."] - -[node name="CollisionShape3D" type="CollisionShape3D" parent="RigidBody3D"] +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] shape = SubResource("CapsuleShape3D_s4x8n") -[node name="MeshInstance3D" type="MeshInstance3D" parent="RigidBody3D/CollisionShape3D"] +[node name="MeshInstance3D" type="MeshInstance3D" parent="CollisionShape3D"] mesh = SubResource("CapsuleMesh_b3srs")