Skip to content

Commit

Permalink
fix: ducks
Browse files Browse the repository at this point in the history
  • Loading branch information
@iiAzui
iiAzui committed Apr 7, 2024
1 parent 611f099 commit b05c4d4
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 45 deletions.
5 changes: 3 additions & 2 deletions duck_wall.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
[ext_resource type="Texture2D" uid="uid://cwh52xugiyjsk" path="res://assets/Images/DuckLabel.png" id="2_0pjk0"]

[sub_resource type="BoxShape3D" id="BoxShape3D_0u5qo"]
size = Vector3(9.87498, 1.83564, 0.4)
size = Vector3(9.87498, 1.80406, 0.4)

[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_fji80"]

Expand All @@ -16,10 +16,11 @@ albedo_color = Color(0.584314, 0.584314, 0.584314, 0.745098)
disable_receive_shadows = true

[node name="StaticBody3D" type="StaticBody3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.0942, 0)
script = ExtResource("1_o64j7")

[node name="CollisionShape3D" type="CollisionShape3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0102522, 0.544536, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.0102522, 0.839244, 0)
shape = SubResource("BoxShape3D_0u5qo")

[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
Expand Down
84 changes: 41 additions & 43 deletions game/zones/outside/outside_zone.tscn
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,34 +121,33 @@ _data = {
"Thumb": ExtResource("37_kpb8w")
}

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_7jmk3"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_pt1ed"]
animation = &"Grip"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_4e6fp"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_4120t"]
animation = &"Grip"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_qjca0"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_jhg1f"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Little_Distal_L", "Armature/Skeleton3D:Little_Intermediate_L", "Armature/Skeleton3D:Little_Metacarpal_L", "Armature/Skeleton3D:Little_Proximal_L", "Armature/Skeleton3D:Middle_Distal_L", "Armature/Skeleton3D:Middle_Intermediate_L", "Armature/Skeleton3D:Middle_Metacarpal_L", "Armature/Skeleton3D:Middle_Proximal_L", "Armature/Skeleton3D:Ring_Distal_L", "Armature/Skeleton3D:Ring_Intermediate_L", "Armature/Skeleton3D:Ring_Metacarpal_L", "Armature/Skeleton3D:Ring_Proximal_L", "Armature/Skeleton3D:Thumb_Distal_L", "Armature/Skeleton3D:Thumb_Metacarpal_L", "Armature/Skeleton3D:Thumb_Proximal_L", "Armature/Skeleton:Little_Distal_L", "Armature/Skeleton:Little_Intermediate_L", "Armature/Skeleton:Little_Proximal_L", "Armature/Skeleton:Middle_Distal_L", "Armature/Skeleton:Middle_Intermediate_L", "Armature/Skeleton:Middle_Proximal_L", "Armature/Skeleton:Ring_Distal_L", "Armature/Skeleton:Ring_Intermediate_L", "Armature/Skeleton:Ring_Proximal_L", "Armature/Skeleton:Thumb_Distal_L", "Armature/Skeleton:Thumb_Proximal_L"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_2v1cn"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_dwwps"]
animation = &"Grip 5"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_xy60s"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_fqcf1"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Index_Distal_L", "Armature/Skeleton3D:Index_Intermediate_L", "Armature/Skeleton3D:Index_Metacarpal_L", "Armature/Skeleton3D:Index_Proximal_L", "Armature/Skeleton:Index_Distal_L", "Armature/Skeleton:Index_Intermediate_L", "Armature/Skeleton:Index_Proximal_L"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_3jkad"]
graph_offset = Vector2(-536, 11)
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_7jmk3")
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_edb0f"]
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_pt1ed")
nodes/ClosedHand1/position = Vector2(-600, 300)
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_4e6fp")
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_4120t")
nodes/ClosedHand2/position = Vector2(-360, 300)
nodes/Grip/node = SubResource("AnimationNodeBlend2_qjca0")
nodes/Grip/node = SubResource("AnimationNodeBlend2_jhg1f")
nodes/Grip/position = Vector2(0, 20)
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_2v1cn")
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_dwwps")
nodes/OpenHand/position = Vector2(-600, 100)
nodes/Trigger/node = SubResource("AnimationNodeBlend2_xy60s")
nodes/Trigger/node = SubResource("AnimationNodeBlend2_fqcf1")
nodes/Trigger/position = Vector2(-360, 20)
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]

Expand Down Expand Up @@ -191,39 +190,38 @@ _data = {
"Thumb": ExtResource("72_vpdgb")
}

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_l72t0"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_2dlfn"]
animation = &"Grip"

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_nmyk8"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_auuhq"]
animation = &"Grip"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_06ktx"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_w1upx"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Little_Distal_R", "Armature/Skeleton3D:Little_Intermediate_R", "Armature/Skeleton3D:Little_Metacarpal_R", "Armature/Skeleton3D:Little_Proximal_R", "Armature/Skeleton3D:Middle_Distal_R", "Armature/Skeleton3D:Middle_Intermediate_R", "Armature/Skeleton3D:Middle_Metacarpal_R", "Armature/Skeleton3D:Middle_Proximal_R", "Armature/Skeleton3D:Ring_Distal_R", "Armature/Skeleton3D:Ring_Intermediate_R", "Armature/Skeleton3D:Ring_Metacarpal_R", "Armature/Skeleton3D:Ring_Proximal_R", "Armature/Skeleton3D:Thumb_Distal_R", "Armature/Skeleton3D:Thumb_Metacarpal_R", "Armature/Skeleton3D:Thumb_Proximal_R", "Armature/Skeleton:Little_Distal_R", "Armature/Skeleton:Little_Intermediate_R", "Armature/Skeleton:Little_Proximal_R", "Armature/Skeleton:Middle_Distal_R", "Armature/Skeleton:Middle_Intermediate_R", "Armature/Skeleton:Middle_Proximal_R", "Armature/Skeleton:Ring_Distal_R", "Armature/Skeleton:Ring_Intermediate_R", "Armature/Skeleton:Ring_Proximal_R", "Armature/Skeleton:Thumb_Distal_R", "Armature/Skeleton:Thumb_Proximal_R"]

[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_xcy3f"]
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_jmeo0"]
animation = &"Grip 5"

[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_vqura"]
[sub_resource type="AnimationNodeBlend2" id="AnimationNodeBlend2_yy7hp"]
filter_enabled = true
filters = ["Armature/Skeleton3D:Index_Distal_R", "Armature/Skeleton3D:Index_Intermediate_R", "Armature/Skeleton3D:Index_Metacarpal_R", "Armature/Skeleton3D:Index_Proximal_R", "Armature/Skeleton:Index_Distal_R", "Armature/Skeleton:Index_Intermediate_R", "Armature/Skeleton:Index_Proximal_R"]

[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_qjo7y"]
[sub_resource type="AnimationNodeBlendTree" id="AnimationNodeBlendTree_5smfj"]
graph_offset = Vector2(-552.664, 107.301)
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_l72t0")
nodes/ClosedHand1/node = SubResource("AnimationNodeAnimation_2dlfn")
nodes/ClosedHand1/position = Vector2(-600, 300)
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_nmyk8")
nodes/ClosedHand2/node = SubResource("AnimationNodeAnimation_auuhq")
nodes/ClosedHand2/position = Vector2(-360, 300)
nodes/Grip/node = SubResource("AnimationNodeBlend2_06ktx")
nodes/Grip/node = SubResource("AnimationNodeBlend2_w1upx")
nodes/Grip/position = Vector2(0, 40)
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_xcy3f")
nodes/OpenHand/node = SubResource("AnimationNodeAnimation_jmeo0")
nodes/OpenHand/position = Vector2(-600, 100)
nodes/Trigger/node = SubResource("AnimationNodeBlend2_vqura")
nodes/Trigger/node = SubResource("AnimationNodeBlend2_yy7hp")
nodes/Trigger/position = Vector2(-360, 40)
node_connections = [&"Grip", 0, &"Trigger", &"Grip", 1, &"ClosedHand2", &"Trigger", 0, &"OpenHand", &"Trigger", 1, &"ClosedHand1", &"output", 0, &"Grip"]

[sub_resource type="CapsuleShape3D" id="CapsuleShape3D_gw432"]
height = 2.56469

[sub_resource type="CylinderMesh" id="CylinderMesh_vn0uq"]

Expand All @@ -247,25 +245,25 @@ zone_info = ExtResource("3_wyepd")

[node name="XROrigin3D" parent="." index="0"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.23795, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.19773, 0)

[node name="XRCamera3D" parent="XROrigin3D" index="0"]
current = true

[node name="Skeleton3D" parent="XROrigin3D/LeftHand/CollisionHandLeft/LeftHand/Hand_Nails_low_L/Armature" index="0"]
bones/1/rotation = Quaternion(0.323537, -2.56569e-05, -0.0272204, 0.945824)
bones/1/rotation = Quaternion(0.323537, -2.56577e-05, -0.0272204, 0.945824)
bones/2/rotation = Quaternion(-0.0904441, -0.0415175, -0.166293, 0.981042)
bones/3/rotation = Quaternion(-0.0466199, 0.020971, 0.0103276, 0.998639)
bones/5/rotation = Quaternion(-0.00128455, -0.0116081, -0.0168259, 0.99979)
bones/6/rotation = Quaternion(0.102925, -0.00993208, -0.00794417, 0.994608)
bones/7/rotation = Quaternion(-0.012859, -0.0236108, -0.323258, 0.945929)
bones/8/rotation = Quaternion(0.0120575, -0.00929194, -0.247472, 0.968775)
bones/10/rotation = Quaternion(-0.0357539, -0.000400033, 0.00636764, 0.99934)
bones/10/rotation = Quaternion(-0.0357539, -0.000400032, 0.00636764, 0.99934)
bones/11/rotation = Quaternion(-0.00264964, -0.00114471, -0.125992, 0.992027)
bones/12/rotation = Quaternion(0.0394225, 0.00193392, -0.228074, 0.972843)
bones/12/rotation = Quaternion(0.0394225, 0.00193393, -0.228074, 0.972843)
bones/13/rotation = Quaternion(-0.0123395, -0.00881294, -0.280669, 0.959685)
bones/15/rotation = Quaternion(-0.0702656, 0.0101908, -0.0243307, 0.99718)
bones/16/rotation = Quaternion(-0.0320635, -0.00223624, -0.0686366, 0.997124)
bones/16/rotation = Quaternion(-0.0320634, -0.00223624, -0.0686366, 0.997124)
bones/17/rotation = Quaternion(0.0253452, 0.00812462, -0.249005, 0.968136)
bones/18/rotation = Quaternion(0.00252232, 0.00788073, -0.243204, 0.96994)
bones/20/rotation = Quaternion(-0.0917369, 0.0203027, -0.010183, 0.995524)
Expand All @@ -283,34 +281,34 @@ visible = false
libraries = {
"": SubResource("AnimationLibrary_kw48d")
}
tree_root = SubResource("AnimationNodeBlendTree_3jkad")
tree_root = SubResource("AnimationNodeBlendTree_edb0f")

[node name="WristUI" parent="XROrigin3D/LeftHand/CollisionHandLeft" index="7"]
visible = false

[node name="Skeleton3D" parent="XROrigin3D/RightHand/CollisionHandRight/RightHand/Hand_Nails_low_R/Armature" index="0"]
bones/1/rotation = Quaternion(0.323537, 2.56569e-05, 0.0272204, 0.945824)
bones/1/rotation = Quaternion(0.323537, 2.56577e-05, 0.0272204, 0.945824)
bones/2/rotation = Quaternion(-0.0904441, 0.0415175, 0.166293, 0.981042)
bones/3/rotation = Quaternion(-0.0466199, -0.020971, -0.0103276, 0.998639)
bones/5/rotation = Quaternion(-0.00128455, 0.0116081, 0.0168259, 0.99979)
bones/6/rotation = Quaternion(0.102925, 0.00993208, 0.00794419, 0.994608)
bones/7/rotation = Quaternion(-0.012859, 0.0236108, 0.323258, 0.945929)
bones/8/rotation = Quaternion(0.0120575, 0.00929192, 0.247472, 0.968775)
bones/10/rotation = Quaternion(-0.0357539, 0.000400033, -0.00636763, 0.99934)
bones/8/rotation = Quaternion(0.0120575, 0.00929193, 0.247472, 0.968775)
bones/10/rotation = Quaternion(-0.0357539, 0.000400032, -0.00636763, 0.99934)
bones/11/rotation = Quaternion(-0.00264964, 0.00114471, 0.125992, 0.992027)
bones/12/rotation = Quaternion(0.0394225, -0.00193393, 0.228074, 0.972843)
bones/13/rotation = Quaternion(-0.0123395, 0.00881294, 0.280669, 0.959685)
bones/15/rotation = Quaternion(-0.0702656, -0.0101908, 0.0243307, 0.997179)
bones/16/rotation = Quaternion(-0.0320635, 0.00223624, 0.0686366, 0.997124)
bones/15/rotation = Quaternion(-0.0702656, -0.0101908, 0.0243307, 0.99718)
bones/16/rotation = Quaternion(-0.0320634, 0.00223624, 0.0686366, 0.997124)
bones/17/rotation = Quaternion(0.0253452, -0.00812462, 0.249005, 0.968136)
bones/18/rotation = Quaternion(0.00252233, -0.00788073, 0.243204, 0.96994)
bones/20/rotation = Quaternion(-0.0917369, -0.0203027, 0.010183, 0.995524)
bones/21/rotation = Quaternion(-0.0625182, 0.000225721, 0.115393, 0.991351)
bones/22/rotation = Quaternion(0.0585786, -0.0216483, 0.269905, 0.96086)
bones/23/rotation = Quaternion(0.00687176, 0.00357274, 0.211953, 0.977249)
bones/23/rotation = Quaternion(0.00687177, 0.00357275, 0.211953, 0.977249)

[node name="BoneAttachment3D" parent="XROrigin3D/RightHand/CollisionHandRight/RightHand/Hand_Nails_low_R/Armature/Skeleton3D" index="1"]
transform = Transform3D(0.54083, -0.840813, 0.0231736, 0.0826267, 0.0805243, 0.993322, -0.837064, -0.535303, 0.113023, -0.039902, 0.0402828, -0.150096)
transform = Transform3D(0.540829, -0.840813, 0.0231736, 0.0826268, 0.0805242, 0.993322, -0.837064, -0.535303, 0.113024, -0.039902, 0.0402828, -0.150096)

[node name="Poke" parent="XROrigin3D/RightHand/CollisionHandRight/RightHand/Hand_Nails_low_R/Armature/Skeleton3D/BoneAttachment3D" index="0"]
visible = false
Expand All @@ -319,7 +317,7 @@ visible = false
libraries = {
"": SubResource("AnimationLibrary_reqae")
}
tree_root = SubResource("AnimationNodeBlendTree_qjo7y")
tree_root = SubResource("AnimationNodeBlendTree_5smfj")

[node name="PlayerBody" parent="XROrigin3D" index="3"]
collision_layer = 524289
Expand All @@ -331,7 +329,7 @@ visible = false
visible = false

[node name="CollisionShape3D" type="CollisionShape3D" parent="XROrigin3D/PlayerBody" index="2"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.08165e-12, 2.5, 2.08165e-12)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 0)
shape = SubResource("CapsuleShape3D_gw432")

[node name="World" type="Node3D" parent="." index="1"]
Expand Down Expand Up @@ -372,19 +370,19 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0.25, -2.5)

[node name="DuckSpawnLocation1" type="Marker3D" parent="World" index="8"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.34, -20)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, -20)

[node name="DuckSpawnLocation2" type="Marker3D" parent="World" index="9"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20, 0.34, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -20, 1, 0)

[node name="DuckSpawnLocation3" type="Marker3D" parent="World" index="10"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.34, 20)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1, 20)

[node name="DuckSpawnLocation4" type="Marker3D" parent="World" index="11"]
unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 0.34, 0)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20, 1, 0)

[node name="Spawn" type="Marker3D" parent="World" index="12"]
unique_name_in_owner = true
Expand Down

0 comments on commit b05c4d4

Please sign in to comment.