From 3bf7a73c1bed339f78fbf7ba87f771c436be7aeb Mon Sep 17 00:00:00 2001 From: ncusimano Date: Sun, 20 Aug 2023 13:29:27 -0600 Subject: [PATCH] Resolve Merges Kept incoming changes --- godot/Models/grape_man.tscn | 7 ++----- godot/villager_shared.tscn | 20 +++++++++++++++----- 2 files changed, 17 insertions(+), 10 deletions(-) diff --git a/godot/Models/grape_man.tscn b/godot/Models/grape_man.tscn index 0a7d283..56ec005 100644 --- a/godot/Models/grape_man.tscn +++ b/godot/Models/grape_man.tscn @@ -154,7 +154,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.0617842, 0, 0, 0.99809) +bones/0/rotation = Quaternion(0.0838794, 0, 0, 0.996476) 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) @@ -191,8 +191,5 @@ stream = ExtResource("5_b32re") [node name="sad" type="AudioStreamPlayer" parent="." index="7"] stream = ExtResource("6_qe4bi") -[node name="soundboard" type="AudioStreamPlayer" parent="." index="8"] +[node name="woohoo" type="AudioStreamPlayer" parent="." index="8"] stream = ExtResource("6_qe4bi") - -[node name="footstep" type="AudioStreamPlayer" parent="." index="9"] -volume_db = -17.0 diff --git a/godot/villager_shared.tscn b/godot/villager_shared.tscn index fb7528d..ca3dda5 100644 --- a/godot/villager_shared.tscn +++ b/godot/villager_shared.tscn @@ -1,17 +1,27 @@ -[gd_scene load_steps=4 format=3 uid="uid://c4s6y758n77lw"] +[gd_scene load_steps=5 format=3 uid="uid://c4s6y758n77lw"] [ext_resource type="PackedScene" uid="uid://dmtmign72vtlm" path="res://slime_shared.tscn" id="1_qm1jp"] [ext_resource type="Script" path="res://Villager.gd" id="2_uf6mh"] -[sub_resource type="SphereShape3D" id="SphereShape3D_uj6ya"] -radius = 0.193616 +[sub_resource type="SphereShape3D" id="SphereShape3D_k5rhc"] +radius = 0.05 + +[sub_resource type="SphereShape3D" id="SphereShape3D_wx128"] +radius = 0.1 [node name="villager" instance=ExtResource("1_qm1jp")] script = ExtResource("2_uf6mh") -[node name="Area3D" type="Area3D" parent="." index="2"] +[node name="CollisionDetection" type="Area3D" parent="." index="2"] + +[node name="slime_collision" type="CollisionShape3D" parent="CollisionDetection" index="0"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0408143, 0) +shape = SubResource("SphereShape3D_k5rhc") + +[node name="Area3D" type="Area3D" parent="." index="3"] [node name="CollisionShape3D" type="CollisionShape3D" parent="Area3D" index="0"] -shape = SubResource("SphereShape3D_uj6ya") +shape = SubResource("SphereShape3D_wx128") +[connection signal="body_entered" from="CollisionDetection" to="." method="_on_collision_detection_body_entered"] [connection signal="body_entered" from="Area3D" to="." method="_on_area_3d_body_entered"]