diff --git a/packed-scenes/knight.tscn b/packed-scenes/knight.tscn index a7f1145..908a4d8 100644 --- a/packed-scenes/knight.tscn +++ b/packed-scenes/knight.tscn @@ -31704,6 +31704,7 @@ graph_offset = Vector2(-318, -48.186) [node name="Knight" type="CharacterBody3D" node_paths=PackedStringArray("spring_arm", "model") groups=["player"]] transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0) collision_layer = 4 +collision_mask = 25 script = ExtResource("1_kj8gh") spring_arm = NodePath("SpringArm3D") model = NodePath("Rig") @@ -31727,43 +31728,43 @@ bones/0/name = "root" bones/0/parent = -1 bones/0/rest = Transform3D(1, 0, 2.38419e-07, 0, 1, 0, -2.38419e-07, 0, 1, 0, 0, 0) bones/0/enabled = true -bones/0/position = Vector3(0, 0.00033996653, 0) +bones/0/position = Vector3(0, 0.00051125773, 0) bones/0/rotation = Quaternion(-2.1973744e-11, -0.000638415, -3.8059562e-11, 0.9999998) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "hips" bones/1/parent = 0 bones/1/rest = Transform3D(1, 0, -2.38419e-07, 0, 1, 0, 2.38419e-07, 0, 1, 0, 0.405663, 0) bones/1/enabled = true -bones/1/position = Vector3(1.5318359e-18, 0.38879403, -1.5318359e-18) -bones/1/rotation = Quaternion(0.0022295667, 0.042224288, -9.268839e-06, 0.99910575) +bones/1/position = Vector3(1.0831419e-18, 0.3830444, 2.58241e-25) +bones/1/rotation = Quaternion(0.0021013343, 0.042223815, -3.819298e-06, 0.99910605) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "spine" bones/2/parent = 1 bones/2/rest = Transform3D(1, 0, 1.42109e-14, 0, 1, 0, -1.42109e-14, 0, 1, 0, 0.191978, 0) bones/2/enabled = true bones/2/position = Vector3(0, 0.191978, 0) -bones/2/rotation = Quaternion(0.002497674, 0.001549107, -0.00017450638, 0.99999577) +bones/2/rotation = Quaternion(0.0025025683, -0.0015096358, 7.607508e-05, 0.9999957) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "chest" bones/3/parent = 2 bones/3/rest = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.374988, 0) bones/3/enabled = true bones/3/position = Vector3(0, 0.374988, 0) -bones/3/rotation = Quaternion(0.0009406028, 0.00021111459, 2.0443573e-05, 0.9999995) +bones/3/rotation = Quaternion(0.00095853594, 0.00016158301, -0.00023410548, 0.9999995) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "upperarm.l" bones/4/parent = 3 bones/4/rest = Transform3D(0.0572842, 0.998357, -3.57628e-07, -3.57628e-07, 4.76837e-07, 1, 0.998357, -0.0572841, 4.76837e-07, 0.212007, 0.134132, 8.40246e-08) bones/4/enabled = true -bones/4/position = Vector3(0.21186186, 0.13385099, -0.0010325551) -bones/4/rotation = Quaternion(-0.56457347, -0.063391276, -0.6389454, 0.5186397) +bones/4/position = Vector3(0.21155712, 0.1336984, -0.0009502411) +bones/4/rotation = Quaternion(-0.5632811, -0.060399666, -0.6336199, 0.52687013) bones/4/scale = Vector3(0.999999, 0.999999, 1) bones/5/name = "lowerarm.l" bones/5/parent = 4 bones/5/rest = Transform3D(0.993887, 0.110402, -1.19007e-07, -0.110402, 0.993887, 3.28831e-09, 1.18643e-07, 9.87045e-09, 1, -3.21966e-09, 0.241897, -1.19406e-07) bones/5/enabled = true bones/5/position = Vector3(-3.21966e-09, 0.241897, -1.19406e-07) -bones/5/rotation = Quaternion(3.1835565e-08, -5.6209483e-08, -0.5001328, 0.86594874) +bones/5/rotation = Quaternion(3.7021298e-08, -5.071121e-08, -0.5068316, 0.8620452) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "wrist.l" bones/6/parent = 5 @@ -31777,14 +31778,14 @@ bones/7/parent = 6 bones/7/rest = Transform3D(1, 1.09104e-05, 2.66204e-07, -1.09104e-05, 1, -2.40181e-09, -2.66204e-07, 2.39891e-09, 1, 9.08162e-13, 0.0738258, 2.22045e-16) bones/7/enabled = true bones/7/position = Vector3(9.08162e-13, 0.0738258, 2.22045e-16) -bones/7/rotation = Quaternion(-0.3139887, -0.3305022, 0.13995647, 0.87897193) +bones/7/rotation = Quaternion(-0.3153584, -0.33485505, 0.14072372, 0.8767086) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "handslot.l" bones/8/parent = 7 bones/8/rest = Transform3D(-1.19209e-07, 1, -2.22045e-16, -1, -1.19209e-07, -4.55307e-09, -4.55307e-09, -2.22045e-16, 1, 8.34815e-10, 0.0961251, -0.0575001) bones/8/enabled = true bones/8/position = Vector3(-1.695765e-09, 0.0961252, -0.0575) -bones/8/rotation = Quaternion(-0.0010940416, 0.0012004321, -0.70295227, 0.7112353) +bones/8/rotation = Quaternion(-0.00088720076, 0.0013334863, -0.70235723, 0.7118229) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "1H_Sword_Offhand" bones/9/parent = 8 @@ -31825,15 +31826,15 @@ bones/14/name = "upperarm.r" bones/14/parent = 3 bones/14/rest = Transform3D(0.0572841, -0.998357, 4.47035e-07, 5.06639e-07, 4.17232e-07, 1, -0.998357, -0.0572842, 4.76837e-07, -0.212007, 0.134132, 8.40246e-08) bones/14/enabled = true -bones/14/position = Vector3(-0.21159247, 0.13371612, -0.0009597792) -bones/14/rotation = Quaternion(-0.62205255, 0.08118228, 0.611434, 0.48229516) +bones/14/position = Vector3(-0.21189721, 0.13386868, -0.0010420948) +bones/14/rotation = Quaternion(-0.6192182, 0.08141826, 0.6118496, 0.48536584) bones/14/scale = Vector3(0.999999, 0.999999, 1) bones/15/name = "lowerarm.r" bones/15/parent = 14 bones/15/rest = Transform3D(0.993887, -0.110402, 1.19007e-07, 0.110402, 0.993887, 3.28831e-09, -1.18643e-07, 9.87045e-09, 1, -7.12186e-11, 0.241897, -1.19406e-07) bones/15/enabled = true bones/15/position = Vector3(-7.12186e-11, 0.241897, -1.19406e-07) -bones/15/rotation = Quaternion(2.3638336e-08, 4.9544266e-08, 0.52246404, 0.8526614) +bones/15/rotation = Quaternion(3.852633e-08, 5.6858802e-08, 0.53054243, 0.8476584) bones/15/scale = Vector3(1, 1, 1) bones/16/name = "wrist.r" bones/16/parent = 15 @@ -31847,14 +31848,14 @@ bones/17/parent = 16 bones/17/rest = Transform3D(1, -1.09104e-05, -1.78637e-07, 1.09104e-05, 1, -2.40084e-09, 1.78637e-07, 2.39889e-09, 1, 1.33227e-15, 0.0738258, 2.22045e-16) bones/17/enabled = true bones/17/position = Vector3(1.33227e-15, 0.0738258, 2.22045e-16) -bones/17/rotation = Quaternion(-0.31236398, 0.30756757, -0.2192416, 0.87164456) +bones/17/rotation = Quaternion(-0.31285167, 0.31003007, -0.22333848, 0.8695546) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "handslot.r" bones/18/parent = 17 bones/18/rest = Transform3D(-1.19209e-07, -1, 2.22045e-16, 1, -1.19209e-07, -4.55301e-09, 4.55301e-09, -2.22045e-16, 1, -8.34815e-10, 0.0961251, -0.0575001) bones/18/enabled = true bones/18/position = Vector3(-1.4181621e-08, 0.0961251, -0.0575) -bones/18/rotation = Quaternion(-0.0007025136, -0.0006304098, 0.7032215, 0.7109703) +bones/18/rotation = Quaternion(-0.00015401734, -2.3545876e-05, 0.70263493, 0.7115506) bones/18/scale = Vector3(1, 1, 1) bones/19/name = "1H_Sword" bones/19/parent = 18 @@ -31875,7 +31876,7 @@ bones/21/parent = 3 bones/21/rest = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.268797, 0) bones/21/enabled = true bones/21/position = Vector3(0, 0.268797, 0) -bones/21/rotation = Quaternion(-0.0028570513, -0.03241834, -6.12679e-05, 0.9994703) +bones/21/rotation = Quaternion(-0.0028369161, -0.029370032, -0.00024617545, 0.9995645) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "Knight_Helmet" bones/22/parent = 21 @@ -31895,71 +31896,71 @@ bones/24/name = "upperleg.l" bones/24/parent = 1 bones/24/rest = Transform3D(1, -1.42215e-07, -2.65602e-08, -1.43052e-07, -0.999396, -0.0347412, -2.16035e-08, 0.0347411, -0.999398, 0.170945, 0.113587, 1.39233e-08) bones/24/enabled = true -bones/24/position = Vector3(0.170945, 0.113587, 0.0020144095) -bones/24/rotation = Quaternion(0.9930321, 0.08043484, 0.07434007, 0.043486755) +bones/24/position = Vector3(0.170945, 0.113587, -0.0008175167) +bones/24/rotation = Quaternion(0.99253446, 0.08113696, 0.07482224, 0.051901277) bones/24/scale = Vector3(1, 1, 1) bones/25/name = "lowerleg.l" bones/25/parent = 24 bones/25/rest = Transform3D(1, 1.6129e-07, 1.20856e-07, -1.3212e-07, 0.977433, -0.211248, -1.52201e-07, 0.211248, 0.977433, 3.57982e-09, 0.227077, -6.13986e-09) bones/25/enabled = true bones/25/position = Vector3(3.57982e-09, 0.227077, -6.13986e-09) -bones/25/rotation = Quaternion(0.253984, 6.3747486e-08, -1.7749221e-07, 0.96720845) +bones/25/rotation = Quaternion(0.31100962, 6.48454e-08, -2.1855239e-07, 0.95040685) bones/25/scale = Vector3(1, 1, 1) bones/26/name = "foot.l" bones/26/parent = 25 bones/26/rest = Transform3D(1, 4.64335e-08, 6.01239e-08, -7.59277e-08, 0.585515, 0.810661, 2.4383e-09, -0.810662, 0.585514, 1.83222e-10, 0.149437, 9.66537e-10) bones/26/enabled = true bones/26/position = Vector3(1.83222e-10, 0.149437, 9.66537e-10) -bones/26/rotation = Quaternion(-0.5448108, -0.20358016, 0.0498319, 0.81194407) +bones/26/rotation = Quaternion(-0.56677693, -0.20118403, 0.059413362, 0.79671764) bones/26/scale = Vector3(1, 1, 0.999999) bones/27/name = "toes.l" bones/27/parent = 26 bones/27/rest = Transform3D(-1, -1.75424e-09, 1.51741e-07, -1.10452e-07, 0.694106, -0.719873, -1.04062e-07, -0.719873, -0.694106, -2.1306e-10, 0.16565, 5.17174e-09) bones/27/enabled = true bones/27/position = Vector3(-2.1306e-10, 0.16565, 5.17174e-09) -bones/27/rotation = Quaternion(-1.0200053e-08, 0.9203551, -0.39108407, 7.8109814e-08) +bones/27/rotation = Quaternion(-1.0197146e-08, 0.9203551, -0.39108407, 7.8119825e-08) bones/27/scale = Vector3(1, 1, 1) bones/28/name = "upperleg.r" bones/28/parent = 1 bones/28/rest = Transform3D(1, 1.49611e-07, -6.08626e-08, 1.47406e-07, -0.999396, -0.0347412, -6.60234e-08, 0.0347411, -0.999398, -0.170945, 0.113587, 1.39233e-08) bones/28/enabled = true -bones/28/position = Vector3(-0.170945, 0.113587, -0.0020143765) -bones/28/rotation = Quaternion(0.9963035, -0.02970281, 0.030412462, 0.07464689) +bones/28/position = Vector3(-0.170945, 0.113587, 0.0008175475) +bones/28/rotation = Quaternion(0.9945792, -0.030799989, 0.029842721, 0.09472563) bones/28/scale = Vector3(1, 1, 1) bones/29/name = "lowerleg.r" bones/29/parent = 28 bones/29/rest = Transform3D(1, -1.6129e-07, -1.20856e-07, 1.3212e-07, 0.977433, -0.211248, 1.52201e-07, 0.211248, 0.977433, -3.57982e-09, 0.227077, -6.13986e-09) bones/29/enabled = true bones/29/position = Vector3(-3.57982e-09, 0.227077, -6.13986e-09) -bones/29/rotation = Quaternion(0.32275677, -6.336303e-08, 2.2444966e-07, 0.94648194) +bones/29/rotation = Quaternion(0.3526237, -6.2438666e-08, 2.4504394e-07, 0.9357652) bones/29/scale = Vector3(1, 1, 1) bones/30/name = "foot.r" bones/30/parent = 29 bones/30/rest = Transform3D(1, -1.55132e-07, 2.93521e-07, -1.47115e-07, 0.585515, 0.810661, -2.97621e-07, -0.810662, 0.585514, -1.83221e-10, 0.149437, 9.66542e-10) bones/30/enabled = true bones/30/position = Vector3(-1.83221e-10, 0.149437, 9.66542e-10) -bones/30/rotation = Quaternion(-0.5747434, 0.11177962, -0.01191112, 0.8105761) +bones/30/rotation = Quaternion(-0.600817, 0.11135964, -0.015075144, 0.79144853) bones/30/scale = Vector3(1, 1, 0.999999) bones/31/name = "toes.r" bones/31/parent = 30 bones/31/rest = Transform3D(-1, 1.75425e-09, -1.51741e-07, 1.10452e-07, 0.694106, -0.719873, 1.04062e-07, -0.719873, -0.694106, 2.13058e-10, 0.16565, 5.17174e-09) bones/31/enabled = true bones/31/position = Vector3(2.13058e-10, 0.16565, 5.17174e-09) -bones/31/rotation = Quaternion(2.8970371e-08, 0.9188988, -0.39449328, -6.933857e-08) +bones/31/rotation = Quaternion(3.036192e-08, 0.9203551, -0.39108407, -6.953354e-08) bones/31/scale = Vector3(1, 1, 1) bones/32/name = "kneeIK.l" bones/32/parent = 0 bones/32/rest = Transform3D(1, -2.59151e-07, -3.89414e-07, -3.89414e-07, 0, -1, 2.59151e-07, 1, 0, 0.170945, 0.29231, 0.575812) bones/32/enabled = true -bones/32/position = Vector3(0.170945, 0.29374385, 0.57724583) +bones/32/position = Vector3(0.170945, 0.2933799, 0.5768819) bones/32/rotation = Quaternion(0.7071068, -2.2930195e-07, -4.605519e-08, 0.7071068) bones/32/scale = Vector3(1, 1, 1) bones/33/name = "control-toe-roll.l" bones/33/parent = 0 bones/33/rest = Transform3D(1, 1.99485e-07, -3.55271e-14, 3.55271e-14, 0, 1, 1.99485e-07, -1, 0, 0.170945, 0.0259903, 0.245789) bones/33/enabled = true -bones/33/position = Vector3(0.20149983, 0.03047813, 0.21324638) -bones/33/rotation = Quaternion(-0.7094032, -7.011335e-08, -7.088546e-08, 0.7048029) +bones/33/position = Vector3(0.20149983, 0.027762832, 0.19321045) +bones/33/rotation = Quaternion(-0.69282955, -7.178747e-08, -6.925056e-08, 0.7211014) bones/33/scale = Vector3(1, 1, 1) bones/34/name = "control-heel-roll.l" bones/34/parent = 33 @@ -32000,15 +32001,15 @@ bones/39/name = "kneeIK.r" bones/39/parent = 0 bones/39/rest = Transform3D(1, -2.59151e-07, 1.50996e-07, 1.50996e-07, 0, -1, 2.59151e-07, 1, 0, -0.170945, 0.29231, 0.575812) bones/39/enabled = true -bones/39/position = Vector3(-0.170945, 0.29374385, 0.57724583) +bones/39/position = Vector3(-0.170945, 0.2933799, 0.5768818) bones/39/rotation = Quaternion(0.7071068, -3.823849e-08, 1.4500897e-07, 0.7071068) bones/39/scale = Vector3(1, 1, 1) bones/40/name = "control-toe-roll.r" bones/40/parent = 0 bones/40/rest = Transform3D(1, 1.99485e-07, 0, 0, 0, 1, 1.99485e-07, -1, 0, -0.170945, 0.0259903, 0.245789) bones/40/enabled = true -bones/40/position = Vector3(-0.170945, 0.027567755, 0.23239177) -bones/40/rotation = Quaternion(-0.6938518, -7.190569e-08, -6.9137016e-08, 0.7201178) +bones/40/position = Vector3(-0.170945, 0.02783467, 0.24941792) +bones/40/rotation = Quaternion(-0.70904064, -7.0396325e-08, -7.066399e-08, 0.70516765) bones/40/scale = Vector3(1, 1, 1) bones/41/name = "control-heel-roll.r" bones/41/parent = 40 @@ -32056,8 +32057,8 @@ bones/47/name = "handIK.l" bones/47/parent = 0 bones/47/rest = Transform3D(-2.38419e-07, 1, 0, 0, 0, 1, 1, 2.38419e-07, 0, 0.713181, 1.10676, 2.54914e-07) bones/47/enabled = true -bones/47/position = Vector3(0.52067727, 0.7865202, -0.05320663) -bones/47/rotation = Quaternion(0.79958457, 0.010900124, 0.6004523, 0.001701499) +bones/47/position = Vector3(0.52067727, 0.7841314, -0.05339924) +bones/47/rotation = Quaternion(0.799423, 0.010695671, 0.60067123, 0.0016434311) bones/47/scale = Vector3(1, 1, 1) bones/48/name = "elbowIK.r" bones/48/parent = 0 @@ -32070,12 +32071,12 @@ bones/49/name = "handIK.r" bones/49/parent = 0 bones/49/rest = Transform3D(1.19209e-07, -1, -1.19209e-07, 0, -1.19209e-07, 1, -1, -1.19209e-07, 0, -0.713182, 1.10676, -8.51573e-08) bones/49/enabled = true -bones/49/position = Vector3(-0.5107404, 0.7865202, 0.062288024) -bones/49/rotation = Quaternion(0.76405555, -0.010269626, -0.6450654, 0.002086809) +bones/49/position = Vector3(-0.5107404, 0.7841314, 0.0620955) +bones/49/rotation = Quaternion(0.76388174, -0.010068458, -0.6452746, 0.0020175208) bones/49/scale = Vector3(1, 1, 1) [node name="1H_Sword_Offhand" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.014143884, 0.26710448, 0.96356314, 0.9998628, 0.012024753, 0.011344261, -0.008556169, 0.9635919, -0.26723754, 0.51521456, 0.63632447, 0.0037799887) +transform = Transform3D(-0.016497025, 0.26816204, 0.9632318, 0.9998554, 0.008290631, 0.014817096, -0.00401205, 0.9633371, -0.26825967, 0.51675445, 0.6351288, 0.0034316517) visible = false bone_name = "1H_Sword_Offhand" bone_idx = 9 @@ -32085,7 +32086,7 @@ mesh = SubResource("ArrayMesh_rvosg") skeleton = NodePath("") [node name="Badge_Shield" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.014143851, 0.2671043, 0.9635632, 0.99986285, 0.012022215, 0.011344931, -0.008553548, 0.96359193, -0.26723734, 0.66541964, 0.63809294, -0.037878335) +transform = Transform3D(-0.016496988, 0.2681619, 0.96323186, 0.9998554, 0.008288093, 0.014817766, -0.004009429, 0.9633372, -0.26825947, 0.66690785, 0.63743865, -0.038386006) visible = false bone_name = "Badge_Shield" bone_idx = 10 @@ -32095,7 +32096,7 @@ mesh = SubResource("ArrayMesh_0xags") skeleton = NodePath("") [node name="Rectangle_Shield" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.014143851, 0.2671043, 0.9635632, 0.99986285, 0.012022215, 0.011344931, -0.008553548, 0.96359193, -0.26723734, 0.66541964, 0.63809294, -0.037878335) +transform = Transform3D(-0.016496988, 0.2681619, 0.96323186, 0.9998554, 0.008288093, 0.014817766, -0.004009429, 0.9633372, -0.26825947, 0.66690785, 0.63743865, -0.038386006) visible = false bone_name = "Rectangle_Shield" bone_idx = 11 @@ -32105,7 +32106,7 @@ mesh = SubResource("ArrayMesh_qr44s") skeleton = NodePath("") [node name="Round_Shield" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.014143851, 0.2671043, 0.9635632, 0.99986285, 0.012022215, 0.011344931, -0.008553548, 0.96359193, -0.26723734, 0.66541964, 0.63809294, -0.037878335) +transform = Transform3D(-0.016496988, 0.2681619, 0.96323186, 0.9998554, 0.008288093, 0.014817766, -0.004009429, 0.9633372, -0.26825947, 0.66690785, 0.63743865, -0.038386006) bone_name = "Round_Shield" bone_idx = 12 @@ -32114,7 +32115,7 @@ mesh = SubResource("ArrayMesh_bb24p") skeleton = NodePath("") [node name="Spike_Shield" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.014143851, 0.2671043, 0.9635632, 0.99986285, 0.012022215, 0.011344931, -0.008553548, 0.96359193, -0.26723734, 0.66541964, 0.63809294, -0.037878335) +transform = Transform3D(-0.016496988, 0.2681619, 0.96323186, 0.9998554, 0.008288093, 0.014817766, -0.004009429, 0.9633372, -0.26825947, 0.66690785, 0.63743865, -0.038386006) bone_name = "Spike_Shield" bone_idx = 13 @@ -32123,7 +32124,7 @@ mesh = SubResource("ArrayMesh_jnwr3") skeleton = NodePath("") [node name="1H_Sword" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(0.0156984, -0.16184086, 0.98669136, 0.99983174, 0.011868961, -0.013961831, -0.009450979, 0.9867446, 0.16199967, -0.50040793, 0.64129543, 0.1424351) +transform = Transform3D(0.0126273045, -0.1607346, 0.98691624, 0.9998864, 0.010089995, -0.011151015, -0.008165288, 0.9869452, 0.16084322, -0.4988582, 0.6385482, 0.14292471) bone_name = "1H_Sword" bone_idx = 19 @@ -32142,7 +32143,7 @@ shape = SubResource("CapsuleShape3D_nge0l") disabled = true [node name="2H_Sword" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(0.015698383, -0.16184086, 0.98669136, 0.99983174, 0.011868946, -0.013961817, -0.009450966, 0.9867446, 0.16199967, -0.50040793, 0.64129543, 0.1424351) +transform = Transform3D(0.01262729, -0.1607346, 0.98691624, 0.9998864, 0.01008998, -0.011151002, -0.008165275, 0.9869452, 0.16084322, -0.4988582, 0.6385482, 0.14292471) bone_name = "2H_Sword" bone_idx = 20 @@ -32151,7 +32152,7 @@ mesh = SubResource("ArrayMesh_ys2n7") skeleton = NodePath("") [node name="Knight_Helmet" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(0.9997604, 0.00090577424, 0.021867901, -0.0007837864, 0.9999841, -0.005586331, -0.02187261, 0.005567854, 0.9997452, 0.00067425927, 1.1993271, 0.007270704) +transform = Transform3D(0.9997625, 0.0012587747, 0.021752767, -0.0011413982, 0.99998474, -0.0054075094, -0.021759253, 0.005381396, 0.9997486, 0.00045063088, 1.1937505, 0.0070946123) bone_name = "Knight_Helmet" bone_idx = 22 @@ -32170,7 +32171,7 @@ transform = Transform3D(-0.999711, 2.27778e-05, 0.024046, 5.34939e-07, 1, -0.000 shape = SubResource("CapsuleShape3D_i3cyd") [node name="Knight_Cape" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(0.99624217, 0.0010934913, 0.08660357, -0.00011242587, 0.9999358, -0.011332302, -0.08661039, 0.011279982, 0.9961783, 0.0006689787, 1.1993277, 0.00712482) +transform = Transform3D(0.9967612, 0.001057018, 0.08040971, -0.00016317016, 0.99993813, -0.011121927, -0.0804165, 0.011072785, 0.9966997, 0.00045529613, 1.193751, 0.006949257) visible = false bone_name = "Knight_Cape" bone_idx = 23 diff --git a/packed-scenes/projectile.tscn b/packed-scenes/projectile.tscn index c7e71d1..b2e19e1 100644 --- a/packed-scenes/projectile.tscn +++ b/packed-scenes/projectile.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=4 uid="uid://ct5l65uyr6ah4"] +[gd_scene load_steps=7 format=4 uid="uid://ct5l65uyr6ah4"] [ext_resource type="Script" uid="uid://bp0km7yaf1acs" path="res://scripts/projectile.gd" id="1_82dr7"] [ext_resource type="Texture2D" uid="uid://dp7oiixx3lh8m" path="res://resources/models/adventures/rogue_texture.png" id="2_s7p1a"] @@ -43,10 +43,20 @@ _surfaces = [{ blend_shape_mode = 0 shadow_mesh = SubResource("ArrayMesh_55kdo") -[node name="Projectile" type="Node3D"] +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_82dr7"] +points = PackedVector3Array(0.04128374, 0.3626984, -0.01389911, -0.061556876, 0.2713009, -0.036756866, -0.032973632, -0.30004406, -0.025322676, -0.0044026896, 0.28842872, 0.071804196, 0.04128374, -0.30572873, 0.008958648, 0.064145416, 0.2769856, -0.036756866, -0.02725206, -0.30572873, 0.03179515, 0.024143642, -0.30572873, -0.036756866, 0.024143642, -0.30572873, 0.037501622, -0.04440447, 0.3626984, -0.025322676, 0.0070035383, 0.2713009, 0.06607647, -0.0041874964, -0.37151226, -0.0017098819, -0.0044026896, 0.36845687, 0.04894644, -0.0386952, -0.30004406, 0.014675744, -0.021542793, -0.30572873, -0.036756866, 0.064145416, 0.28274405, -0.03103977, 0.04128374, -0.30572873, -0.008182013, -0.021542793, -0.30572873, 0.037501622, -0.055823, 0.31699964, -0.025322676, -0.0386952, -0.31141338, -0.008182013, 0.04128374, 0.36845687, -0.01960558, 0.03557448, -0.30004406, 0.02036096, 0.058423847, 0.29987186, -0.036756866, 0.0070035383, 0.3626984, 0.043218717, -0.055823, 0.29987186, -0.036756866, -0.0386952, 0.36845687, -0.01389911, 0.0067091268, -0.36631048, -0.0014341609, -0.0044026896, 0.2769856, 0.071804196, 0.058423847, 0.3055565, -0.025322676, -0.0386952, -0.31141338, 0.008958648, -0.0386952, -0.30004406, -0.01389911, 0.03557448, -0.30004406, -0.01960558) + +[node name="Projectile" type="Area3D"] transform = Transform3D(-4.371139e-08, -1, 0, 1, -4.371139e-08, 0, 0, 0, 1, 0, 0, 0) +collision_layer = 8 +collision_mask = 31 script = ExtResource("1_82dr7") [node name="arrow" type="MeshInstance3D" parent="."] mesh = SubResource("ArrayMesh_wk71i") skeleton = NodePath("") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("ConvexPolygonShape3D_82dr7") + +[connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/packed-scenes/rogue.tscn b/packed-scenes/rogue.tscn index 42d18b8..0feb156 100644 --- a/packed-scenes/rogue.tscn +++ b/packed-scenes/rogue.tscn @@ -31227,6 +31227,7 @@ graph_offset = Vector2(-341, -183.186) [node name="Rogue" type="CharacterBody3D" node_paths=PackedStringArray("spring_arm", "model") groups=["player"]] transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 0, 0, 0) collision_layer = 4 +collision_mask = 25 script = ExtResource("1_neebp") arrow_scene = ExtResource("2_7uuak") loaded = true @@ -31245,43 +31246,43 @@ bones/0/name = "root" bones/0/parent = -1 bones/0/rest = Transform3D(1, 0, 2.3841855e-07, 0, 1, 0, -2.3841855e-07, 0, 1, 0, 0, 0) bones/0/enabled = true -bones/0/position = Vector3(0, 1.3274615e-05, 0) +bones/0/position = Vector3(0, 4.5906527e-05, 0) bones/0/rotation = Quaternion(-1.0940686e-11, 0.00031804445, 1.8949824e-11, 1) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "hips" bones/1/parent = 0 bones/1/rest = Transform3D(1, 0, -2.3841855e-07, 0, 1, 0, 2.3841855e-07, 0, 1, 0, 0.40566343, 0) bones/1/enabled = true -bones/1/position = Vector3(1.7898864e-20, 0.39108154, 6.473029e-19) -bones/1/rotation = Quaternion(0.0004297197, 0.04297259, -6.0759725e-05, 0.9990762) +bones/1/position = Vector3(-5.212698e-19, 0.3882999, 1.8025374e-20) +bones/1/rotation = Quaternion(0.00040030995, 0.042972893, -5.9514656e-05, 0.99907625) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "spine" bones/2/parent = 1 bones/2/rest = Transform3D(1, 0, 1.4210855e-14, 0, 1, 0, -1.4210855e-14, 0, 1, 0, 0.1919775, 0) bones/2/enabled = true bones/2/position = Vector3(0, 0.1919775, 0) -bones/2/rotation = Quaternion(0.0004899222, -0.00015889338, 3.748677e-05, 0.99999994) +bones/2/rotation = Quaternion(0.00048730045, 0.00017892211, 1.0855466e-05, 0.99999994) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "chest" bones/3/parent = 2 bones/3/rest = Transform3D(1, 0, 0, 0, 0.99999994, 0, 0, 0, 1, 0, 0.37498796, 0) bones/3/enabled = true bones/3/position = Vector3(0, 0.37498796, 0) -bones/3/rotation = Quaternion(0.00019137302, -9.513164e-05, 4.0972776e-05, 1) +bones/3/rotation = Quaternion(0.00018717925, -8.950797e-05, 6.9886235e-05, 1) bones/3/scale = Vector3(1, 0.99999994, 1) bones/4/name = "upperarm.l" bones/4/parent = 3 bones/4/rest = Transform3D(0.057284202, 0.9983573, -4.5386042e-07, -3.8742996e-07, 4.768369e-07, 0.99999976, 0.9983573, -0.057284202, 4.1410917e-07, 0.21200737, 0.13413215, 8.402462e-08) bones/4/enabled = true -bones/4/position = Vector3(0.21194832, 0.13406248, -0.00018969185) -bones/4/rotation = Quaternion(-0.56041616, -0.061626263, -0.644539, 0.51643527) +bones/4/position = Vector3(0.2119793, 0.134078, -0.00019805766) +bones/4/rotation = Quaternion(-0.55976903, -0.060519774, -0.64145243, 0.52109) bones/4/scale = Vector3(0.99999934, 0.99999934, 0.99999976) bones/5/name = "lowerarm.l" bones/5/parent = 4 bones/5/rest = Transform3D(0.99388725, 0.11040192, -1.1900745e-07, -0.110401966, 0.9938869, 3.2883107e-09, 1.1864304e-07, 9.870443e-09, 0.99999994, -3.219665e-09, 0.2418973, -1.1940561e-07) bones/5/enabled = true bones/5/position = Vector3(-3.219665e-09, 0.2418973, -1.1940561e-07) -bones/5/rotation = Quaternion(2.3495534e-08, -4.3031733e-08, -0.49250963, 0.870307) +bones/5/rotation = Quaternion(3.5936797e-08, -5.8841795e-08, -0.500242, 0.8658856) bones/5/scale = Vector3(1.0000002, 0.9999999, 0.99999994) bones/6/name = "wrist.l" bones/6/parent = 5 @@ -31295,28 +31296,28 @@ bones/7/parent = 6 bones/7/rest = Transform3D(1, 1.091039e-05, 2.662036e-07, -1.0910391e-05, 0.99999994, -2.4018103e-09, -2.6620367e-07, 2.398906e-09, 0.99999994, 9.0816243e-13, 0.073825836, 2.220446e-16) bones/7/enabled = true bones/7/position = Vector3(9.0816243e-13, 0.073825836, 2.220446e-16) -bones/7/rotation = Quaternion(-0.31920698, -0.32608634, 0.14318904, 0.8782206) +bones/7/rotation = Quaternion(-0.31996244, -0.32821146, 0.14618346, 0.87665945) bones/7/scale = Vector3(1, 0.99999994, 0.99999994) bones/8/name = "handslot.l" bones/8/parent = 7 bones/8/rest = Transform3D(-1.1920929e-07, 1, -3.2072357e-16, -0.99999994, -1.192093e-07, -4.553069e-09, -4.553069e-09, -2.2204463e-16, 0.99999994, 8.348149e-10, 0.09612507, -0.057500124) bones/8/enabled = true bones/8/position = Vector3(4.437712e-10, 0.096125185, -0.057500035) -bones/8/rotation = Quaternion(1.7250986e-05, 0.00048312065, -0.7055554, 0.70865464) +bones/8/rotation = Quaternion(-5.7563728e-05, 0.0003969183, -0.7058323, 0.7083789) bones/8/scale = Vector3(0.99999994, 1, 0.99999994) bones/9/name = "upperarm.r" bones/9/parent = 3 bones/9/rest = Transform3D(0.05728419, -0.99835724, 4.4361707e-07, 5.6624367e-07, 4.7683673e-07, 0.99999976, -0.99835724, -0.05728419, 5.9262936e-07, -0.21200737, 0.13413215, 8.402462e-08) bones/9/enabled = true -bones/9/position = Vector3(-0.21195899, 0.13406782, -0.00019255819) -bones/9/rotation = Quaternion(-0.6185216, 0.08159557, 0.6187765, 0.47737706) +bones/9/position = Vector3(-0.21192801, 0.1340523, -0.00018419232) +bones/9/rotation = Quaternion(-0.6179149, 0.080209725, 0.61564386, 0.4824212) bones/9/scale = Vector3(0.9999993, 0.9999993, 0.99999976) bones/10/name = "lowerarm.r" bones/10/parent = 9 bones/10/rest = Transform3D(0.99388725, -0.11040192, 1.1900747e-07, 0.110401966, 0.9938869, 3.288313e-09, -1.1864305e-07, 9.870443e-09, 0.99999994, -7.1218566e-11, 0.24189733, -1.1940561e-07) bones/10/enabled = true bones/10/position = Vector3(-7.1218566e-11, 0.24189733, -1.1940561e-07) -bones/10/rotation = Quaternion(2.7849755e-08, 4.7520004e-08, 0.5155277, 0.85687304) +bones/10/rotation = Quaternion(2.1509576e-08, 4.6948106e-08, 0.5227685, 0.85247475) bones/10/scale = Vector3(1.0000002, 0.9999999, 0.99999994) bones/11/name = "wrist.r" bones/11/parent = 10 @@ -31330,91 +31331,91 @@ bones/12/parent = 11 bones/12/rest = Transform3D(1, -1.091039e-05, -1.7863715e-07, 1.0910391e-05, 0.99999994, -2.4008375e-09, 1.786372e-07, 2.3988884e-09, 0.99999994, 1.3322676e-15, 0.073825836, 2.220446e-16) bones/12/enabled = true bones/12/position = Vector3(1.3322676e-15, 0.073825836, 2.220446e-16) -bones/12/rotation = Quaternion(-0.31734625, 0.3012605, -0.22439992, 0.87073433) +bones/12/rotation = Quaternion(-0.31838337, 0.30401933, -0.2271529, 0.8686806) bones/12/scale = Vector3(1, 0.99999994, 0.99999994) bones/13/name = "handslot.r" bones/13/parent = 12 bones/13/rest = Transform3D(-1.1920929e-07, -1, 3.207168e-16, 0.99999994, -1.192093e-07, -4.553012e-09, 4.553012e-09, -2.2204463e-16, 0.99999994, -8.348149e-10, 0.09612507, -0.057500124) bones/13/enabled = true bones/13/position = Vector3(-1.5459904e-08, 0.096125126, -0.057499975) -bones/13/rotation = Quaternion(0.00022892327, 0.0004243129, 0.7058643, 0.7083469) +bones/13/rotation = Quaternion(0.00019804666, 0.00039927734, 0.7058896, 0.7083218) bones/13/scale = Vector3(0.99999994, 1, 0.99999994) bones/14/name = "head" bones/14/parent = 3 bones/14/rest = Transform3D(1, 0, 2.3841854e-07, 0, 1, 0, -2.3841854e-07, 0, 1, 0, 0.26879656, 0) bones/14/enabled = true bones/14/position = Vector3(0, 0.26879656, 0) -bones/14/rotation = Quaternion(-0.0005490717, -0.031005768, 1.0697551e-05, 0.9995191) +bones/14/rotation = Quaternion(-0.0005539667, -0.031366378, 3.2605156e-05, 0.99950784) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "upperleg.l" bones/15/parent = 1 bones/15/rest = Transform3D(1, -1.4221531e-07, -2.6560238e-08, -1.4305222e-07, -0.9993962, -0.034741182, -2.160345e-08, 0.034741133, -0.9993976, 0.17094506, 0.11358726, 1.3923272e-08) bones/15/enabled = true -bones/15/position = Vector3(0.17094508, 0.1135872, -0.0003205839) -bones/15/rotation = Quaternion(0.9937022, 0.083260745, 0.07349252, 0.014919878) +bones/15/position = Vector3(0.17094508, 0.1135872, -2.7399055e-06) +bones/15/rotation = Quaternion(0.9933333, 0.08293795, 0.074531496, 0.029245652) bones/15/scale = Vector3(1, 0.9999998, 1.0000012) bones/16/name = "lowerleg.l" bones/16/parent = 15 bones/16/rest = Transform3D(1, 1.6129098e-07, 1.208564e-07, -1.3212028e-07, 0.9774329, -0.21124826, -1.5220138e-07, 0.21124834, 0.97743255, 3.5797574e-09, 0.2270775, -6.140325e-09) bones/16/enabled = true bones/16/position = Vector3(3.5797574e-09, 0.2270775, -6.140325e-09) -bones/16/rotation = Quaternion(0.20736551, 6.412396e-08, -1.364133e-07, 0.9782635) +bones/16/rotation = Quaternion(0.24147674, 6.342827e-08, -1.6912848e-07, 0.9704066) bones/16/scale = Vector3(1, 1.0000005, 1.0000001) bones/17/name = "foot.l" bones/17/parent = 16 bones/17/rest = Transform3D(1, 4.6433247e-08, 6.012356e-08, -7.592726e-08, 0.5855154, 0.8106606, 2.4383358e-09, -0.81066227, 0.5855142, 1.8334093e-10, 0.14943703, 9.660811e-10) bones/17/enabled = true bones/17/position = Vector3(1.8334093e-10, 0.14943703, 9.660811e-10) -bones/17/rotation = Quaternion(-0.52325696, -0.20843197, 0.044665266, 0.8250838) +bones/17/rotation = Quaternion(-0.54130316, -0.2072299, 0.050382406, 0.8133316) bones/17/scale = Vector3(1, 1.0000008, 0.99999875) bones/18/name = "toes.l" bones/18/parent = 17 bones/18/rest = Transform3D(-1, -1.7553674e-09, 1.5174173e-07, -1.1045316e-07, 0.69410586, -0.719873, -1.0406117e-07, -0.7198729, -0.694106, -2.131959e-10, 0.16565003, 5.1714744e-09) bones/18/enabled = true bones/18/position = Vector3(-2.131959e-10, 0.16565003, 5.1714744e-09) -bones/18/rotation = Quaternion(-9.5248085e-09, 0.91995174, -0.39203158, 7.822368e-08) +bones/18/rotation = Quaternion(-9.829811e-09, 0.9203513, -0.39109263, 7.826989e-08) bones/18/scale = Vector3(1, 0.99999994, 1.0000001) bones/19/name = "upperleg.r" bones/19/parent = 1 bones/19/rest = Transform3D(1, 1.4961141e-07, -6.08626e-08, 1.4740668e-07, -0.9993962, -0.034741182, -6.6023446e-08, 0.034741133, -0.9993976, -0.17094506, 0.11358726, 1.3923272e-08) bones/19/enabled = true -bones/19/position = Vector3(-0.17094508, 0.11358732, 0.00032061542) -bones/19/rotation = Quaternion(0.9970224, -0.02953067, 0.031269245, 0.0640044) +bones/19/position = Vector3(-0.17094508, 0.11358732, 2.771481e-06) +bones/19/rotation = Quaternion(0.9963822, -0.03007052, 0.031022659, 0.07318414) bones/19/scale = Vector3(1, 0.9999998, 1.0000012) bones/20/name = "lowerleg.r" bones/20/parent = 19 bones/20/rest = Transform3D(1, -1.61291e-07, -1.2085643e-07, 1.3212028e-07, 0.9774329, -0.21124826, 1.5220141e-07, 0.21124834, 0.97743255, -3.5797574e-09, 0.2270775, -6.140325e-09) bones/20/enabled = true bones/20/position = Vector3(-3.5797574e-09, 0.2270775, -6.140325e-09) -bones/20/rotation = Quaternion(0.28353515, -6.3942274e-08, 1.9705784e-07, 0.95896184) +bones/20/rotation = Quaternion(0.3114344, -6.389704e-08, 2.1655013e-07, 0.95026773) bones/20/scale = Vector3(1, 1.0000005, 1.0000001) bones/21/name = "foot.r" bones/21/parent = 20 bones/21/rest = Transform3D(1, -1.5513157e-07, 2.9352182e-07, -1.4711539e-07, 0.5855154, 0.8106606, -2.9762074e-07, -0.81066227, 0.5855142, -1.8333904e-10, 0.14943703, 9.660859e-10) bones/21/enabled = true bones/21/position = Vector3(-1.8333904e-10, 0.14943703, 9.660859e-10) -bones/21/rotation = Quaternion(-0.56288296, 0.11398904, -0.009099057, 0.8185882) +bones/21/rotation = Quaternion(-0.57692945, 0.11376536, -0.011446258, 0.8087514) bones/21/scale = Vector3(1, 1.0000008, 0.99999875) bones/22/name = "toes.r" bones/22/parent = 21 bones/22/rest = Transform3D(-1, 1.7553639e-09, -1.5174174e-07, 1.1045316e-07, 0.69410586, -0.719873, 1.0406118e-07, -0.7198729, -0.694106, 2.1319319e-10, 0.16565003, 5.171479e-09) bones/22/enabled = true bones/22/position = Vector3(2.1319319e-10, 0.16565003, 5.171479e-09) -bones/22/rotation = Quaternion(3.0355682e-08, 0.9203548, -0.39108446, -6.953548e-08) +bones/22/rotation = Quaternion(3.0355896e-08, 0.9203548, -0.39108446, -6.9535375e-08) bones/22/scale = Vector3(1, 0.99999994, 1.0000001) bones/23/name = "kneeIK.l" bones/23/parent = 0 bones/23/rest = Transform3D(1, -2.5915057e-07, -3.8941417e-07, -3.8941423e-07, 0, -0.9999999, 2.591506e-07, 0.9999999, -1.00916915e-13, 0.17094491, 0.29231027, 0.57581246) bones/23/enabled = true -bones/23/position = Vector3(0.17094491, 0.29269242, 0.57619464) +bones/23/position = Vector3(0.17094491, 0.29260758, 0.57610977) bones/23/rotation = Quaternion(0.7071068, -2.2930868e-07, -4.604875e-08, 0.7071068) bones/23/scale = Vector3(1, 0.9999999, 0.9999999) bones/24/name = "control-toe-roll.l" bones/24/parent = 0 bones/24/rest = Transform3D(1, 1.994847e-07, -2.1316282e-14, 2.1316282e-14, 0, 1, 1.994847e-07, -1, 0, 0.17094497, 0.025990263, 0.24578938) bones/24/enabled = true -bones/24/position = Vector3(0.20205116, 0.025808737, 0.20387958) -bones/24/rotation = Quaternion(-0.70594573, -7.062788e-08, -7.04274e-08, 0.70826596) +bones/24/position = Vector3(0.20205116, 0.025962915, 0.20550987) +bones/24/rotation = Quaternion(-0.70710206, -7.0529005e-08, -7.052802e-08, 0.7071116) bones/24/scale = Vector3(1, 1, 1) bones/25/name = "control-heel-roll.l" bones/25/parent = 24 @@ -31455,15 +31456,15 @@ bones/30/name = "kneeIK.r" bones/30/parent = 0 bones/30/rest = Transform3D(1, -2.5915057e-07, 1.5099583e-07, 1.5099585e-07, 0, -0.9999999, 2.591506e-07, 0.9999999, 3.913066e-14, -0.17094518, 0.29231027, 0.57581234) bones/30/enabled = true -bones/30/position = Vector3(-0.17094518, 0.29269242, 0.5761945) +bones/30/position = Vector3(-0.17094518, 0.29260758, 0.57610965) bones/30/rotation = Quaternion(0.7071068, -3.824488e-08, 1.4501506e-07, 0.7071068) bones/30/scale = Vector3(1, 0.9999999, 0.9999999) bones/31/name = "control-toe-roll.r" bones/31/parent = 0 bones/31/rest = Transform3D(1, 1.9948473e-07, -7.1054274e-15, 7.1054274e-15, 0, 1, 1.9948473e-07, -1, 0, -0.1709451, 0.025990263, 0.24578929) bones/31/enabled = true -bones/31/position = Vector3(-0.1709451, 0.02605503, 0.24637353) -bones/31/rotation = Quaternion(-0.7065911, -7.0608124e-08, -7.044729e-08, 0.70762205) +bones/31/position = Vector3(-0.1709451, 0.026196871, 0.24401468) +bones/31/rotation = Quaternion(-0.7047171, -7.079057e-08, -7.026141e-08, 0.70948845) bones/31/scale = Vector3(1, 1, 1) bones/32/name = "control-heel-roll.r" bones/32/parent = 31 @@ -31511,8 +31512,8 @@ bones/38/name = "handIK.l" bones/38/parent = 0 bones/38/rest = Transform3D(-2.3841855e-07, 0.99999976, -1.4210854e-14, -5.9604638e-08, -3.5527128e-15, 0.99999994, 0.9999999, 2.3841852e-07, 5.960464e-08, 0.7131815, 1.1067611, 2.5491414e-07) bones/38/enabled = true -bones/38/position = Vector3(0.52073157, 0.786409, -0.056467615) -bones/38/rotation = Quaternion(0.795572, 0.0021880819, 0.605855, 0.00048565952) +bones/38/position = Vector3(0.52073157, 0.7866498, -0.05650429) +bones/38/rotation = Quaternion(0.7955404, 0.0021493314, 0.6058966, 0.0004758062) bones/38/scale = Vector3(0.9999999, 0.99999976, 0.99999994) bones/39/name = "elbowIK.r" bones/39/parent = 0 @@ -31525,17 +31526,17 @@ bones/40/name = "handIK.r" bones/40/parent = 0 bones/40/rest = Transform3D(1.1920929e-07, -1, -5.9604645e-08, 5.9604645e-08, -1.1920929e-07, 1, -1, -1.7881393e-07, 0, -0.71318156, 1.1067611, -8.515731e-08) bones/40/enabled = true -bones/40/position = Vector3(-0.51085526, 0.7864089, 0.060074303) -bones/40/rotation = Quaternion(-0.75948215, 0.0019429579, 0.6505253, -0.00024223464) +bones/40/position = Vector3(-0.51085526, 0.78664976, 0.060037628) +bones/40/rotation = Quaternion(-0.75944823, 0.0019048174, 0.65056497, -0.00023018353) bones/40/scale = Vector3(1, 1, 1) [node name="handslot_l" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.0032087537, 0.26408508, 0.96449333, 0.99999297, -0.0005301672, 0.0034723515, 0.0014284947, 0.9644987, -0.26408163, 0.508495, 0.6348848, -0.017900575) +transform = Transform3D(-0.0028749027, 0.2638365, 0.96456254, 0.9999952, 0.00046218684, 0.0028542918, 0.00030752388, 0.9645669, -0.26383683, 0.50828844, 0.6353663, -0.017329717) bone_name = "handslot.l" bone_idx = 8 [node name="handslot_r" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.002223684, -0.15279491, -0.9882548, -0.9999966, 0.0007785917, 0.0021300223, 0.00044367832, 0.98825693, -0.15279627, -0.49159193, 0.6388935, 0.1072343) +transform = Transform3D(-0.002340604, -0.15286726, -0.9882433, -0.9999963, 0.00074513373, 0.0022535678, 0.00039146826, 0.9882458, -0.15286875, -0.49159816, 0.63963985, 0.10765835) bone_name = "handslot.r" bone_idx = 13 @@ -31548,7 +31549,7 @@ skeleton = NodePath("") transform = Transform3D(1, 2.7939677e-09, 7.450581e-09, 0, 1.0000008, 1.033186e-09, -1.3038516e-08, -1.5279511e-09, 1.0000008, 0.56380576, 0.16657025, -0.003502518) [node name="chest" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(0.99629575, 0.00012009802, 0.08599308, 7.162662e-05, 0.9999975, -0.0022264468, -0.085993126, 0.002224359, 0.99629325, 9.379586e-05, 0.95805955, 0.0008522892) +transform = Transform3D(0.9962365, 0.000109913904, 0.086677976, 7.707911e-05, 0.9999977, -0.0021539808, -0.08667801, 0.002152555, 0.9962342, 0.00011078319, 0.9553106, 0.00081534253) bone_name = "chest" bone_idx = 3 diff --git a/packed-scenes/skeleton_warrior.tscn b/packed-scenes/skeleton_warrior.tscn index 2001e52..f4b7d61 100644 --- a/packed-scenes/skeleton_warrior.tscn +++ b/packed-scenes/skeleton_warrior.tscn @@ -546,6 +546,8 @@ graph_offset = Vector2(-403, -90.186005) viewport_path = NodePath("sprite_enemy_overlay/EnemyOverlay") [node name="Skeleton_Warrior" type="CharacterBody3D" node_paths=PackedStringArray("model")] +collision_layer = 16 +collision_mask = 13 script = ExtResource("2_gn4pp") attack_range = 2.0 model = NodePath("Rig") @@ -567,43 +569,43 @@ bones/0/name = "root" bones/0/parent = -1 bones/0/rest = Transform3D(1, 2.0611e-15, 2.40863e-07, -6.18329e-15, 1, 1.71143e-08, -2.40863e-07, -1.71143e-08, 1, 0, 0, 0) bones/0/enabled = true -bones/0/position = Vector3(0, 0.00018903674, -6.4704513e-12) +bones/0/position = Vector3(0, 4.4642104e-05, -1.5280306e-12) bones/0/rotation = Quaternion(-8.561838e-09, 0.00095386495, 9.846086e-11, 0.99999964) bones/0/scale = Vector3(1, 1, 1) bones/1/name = "hips" bones/1/parent = 0 bones/1/rest = Transform3D(1, -1.92983e-22, -2.06635e-07, 9.18536e-22, 1, 3.51128e-15, 2.06635e-07, -3.51128e-15, 1, -2.1013e-22, 0.405663, 8.88178e-16) bones/1/enabled = true -bones/1/position = Vector3(4.0930197e-19, 0.3856898, 1.3048926e-15) -bones/1/rotation = Quaternion(0.0007219652, 0.042828422, -0.00015782843, 0.9990822) +bones/1/position = Vector3(1.1830722e-18, 0.38110882, 1.3147045e-15) +bones/1/rotation = Quaternion(0.0007457528, 0.04282801, -0.00015882103, 0.9990822) bones/1/scale = Vector3(1, 1, 1) bones/2/name = "spine" bones/2/parent = 1 bones/2/rest = Transform3D(1, 8.67181e-22, 3.55271e-15, -8.67181e-22, 1, 3.52176e-23, -3.55271e-15, -3.52176e-23, 1, -4.36903e-23, 0.191978, -8.88178e-16) bones/2/enabled = true bones/2/position = Vector3(-3.0535532e-11, 0.191978, 1.6963566e-11) -bones/2/rotation = Quaternion(0.0008659453, 0.00050487515, 3.7429967e-05, 0.9999996) +bones/2/rotation = Quaternion(0.0008712988, 6.5682056e-05, 7.282109e-05, 0.9999997) bones/2/scale = Vector3(1, 1, 1) bones/3/name = "chest" bones/3/parent = 2 bones/3/rest = Transform3D(1, -2.05374e-22, -1.77636e-14, 2.05374e-22, 1, -1.11653e-14, 1.77636e-14, 1.11653e-14, 1, -9.6328e-23, 0.374988, 1.77636e-15) bones/3/enabled = true bones/3/position = Vector3(1.6852008e-11, 0.374988, 1.6398385e-10) -bones/3/rotation = Quaternion(0.0003340249, -0.00026801194, 0.00021237023, 0.99999994) +bones/3/rotation = Quaternion(0.00034422285, -0.00027644183, 0.00016912112, 0.99999994) bones/3/scale = Vector3(1, 1, 1) bones/4/name = "upperarm.l" bones/4/parent = 3 bones/4/rest = Transform3D(0.0572952, 0.998357, 5.96046e-08, -2.98023e-07, -1.19209e-07, 1, 0.998357, -0.0572953, 2.38419e-07, 0.212007, 0.134132, 8.92131e-08) bones/4/enabled = true -bones/4/position = Vector3(0.21198887, 0.13405284, -0.00035557756) -bones/4/rotation = Quaternion(-0.55959815, -0.060423724, -0.6398173, 0.52329034) +bones/4/position = Vector3(0.21194485, 0.13403079, -0.00034368143) +bones/4/rotation = Quaternion(-0.55481815, -0.06430795, -0.656061, 0.5075681) bones/4/scale = Vector3(0.999999, 0.999999, 1) bones/5/name = "lowerarm.l" bones/5/parent = 4 bones/5/rest = Transform3D(0.993885, 0.110424, -1.77241e-07, -0.110424, 0.993885, -4.82524e-07, 1.22875e-07, 4.99145e-07, 1, -3.31295e-09, 0.241897, 4.4799e-09) bones/5/enabled = true bones/5/position = Vector3(4.3339096e-08, 0.241897, -1.7245897e-07) -bones/5/rotation = Quaternion(2.0987494e-07, 8.1351e-08, -0.5042271, 0.86357117) +bones/5/rotation = Quaternion(1.9963335e-07, 2.0515191e-08, -0.47474182, 0.8801252) bones/5/scale = Vector3(1, 1, 1) bones/6/name = "wrist.l" bones/6/parent = 5 @@ -617,28 +619,28 @@ bones/7/parent = 6 bones/7/rest = Transform3D(1, 8.33334e-14, -2.83571e-14, -8.33334e-14, 1, -2.54025e-13, 2.83571e-14, 2.54025e-13, 1, -2.04281e-14, 0.0738259, -1.19209e-07) bones/7/enabled = true bones/7/position = Vector3(-7.3983597e-09, 0.0738259, -1.104577e-08) -bones/7/rotation = Quaternion(-0.31924865, -0.3301134, 0.14660661, 0.8761347) +bones/7/rotation = Quaternion(-0.3142685, -0.32912812, 0.13183555, 0.8806415) bones/7/scale = Vector3(1, 1, 1) bones/8/name = "handslot.l" bones/8/parent = 7 bones/8/rest = Transform3D(0, 1, -2.32809e-07, -1, 0, -6.82762e-08, -6.82761e-08, 2.32809e-07, 1, 8.34841e-10, 0.0961251, -0.0575) bones/8/enabled = true bones/8/position = Vector3(2.3117917e-10, 0.0961252, -0.0575) -bones/8/rotation = Quaternion(-0.0001497425, 0.0006288352, -0.70504636, 0.709161) +bones/8/rotation = Quaternion(0.0012317528, 0.002023693, -0.69993484, 0.7142029) bones/8/scale = Vector3(1, 1, 1) bones/9/name = "upperarm.r" bones/9/parent = 3 bones/9/rest = Transform3D(0.0572954, -0.998357, -1.49012e-07, 2.38419e-07, -1.19209e-07, 1, -0.998357, -0.0572954, 2.38419e-07, -0.212007, 0.134132, 7.46997e-08) bones/9/enabled = true -bones/9/position = Vector3(-0.21183684, 0.13397671, -0.00031452544) -bones/9/rotation = Quaternion(-0.6177844, 0.07988196, 0.61366016, 0.48516238) +bones/9/position = Vector3(-0.21188088, 0.13399877, -0.00032642088) +bones/9/rotation = Quaternion(-0.6138644, 0.08423769, 0.62876636, 0.46981648) bones/9/scale = Vector3(0.999999, 0.999999, 1) bones/10/name = "lowerarm.r" bones/10/parent = 9 bones/10/rest = Transform3D(0.993885, -0.110424, 1.06327e-07, 0.110424, 0.993885, -4.82539e-07, -5.23934e-08, 4.91329e-07, 1, 4.03071e-09, 0.241897, 3.62012e-09) bones/10/enabled = true bones/10/position = Vector3(-4.0220876e-08, 0.241897, -5.4639806e-08) -bones/10/rotation = Quaternion(1.8581436e-07, -8.713092e-08, 0.5258209, 0.8505954) +bones/10/rotation = Quaternion(2.1092681e-07, -6.4838005e-08, 0.49784875, 0.8672639) bones/10/scale = Vector3(1, 1, 1) bones/11/name = "wrist.r" bones/11/parent = 10 @@ -652,21 +654,21 @@ bones/12/parent = 11 bones/12/rest = Transform3D(1, -8.32931e-14, 2.83546e-14, 8.32931e-14, 1, -6.34575e-14, -2.83546e-14, 6.34575e-14, 1, 2.04281e-14, 0.0738259, -1.19209e-07) bones/12/enabled = true bones/12/position = Vector3(-1.4852477e-08, 0.0738259, -6.429319e-08) -bones/12/rotation = Quaternion(-0.3180289, 0.30663335, -0.2265459, 0.86805) +bones/12/rotation = Quaternion(-0.31288332, 0.30374113, -0.21209103, 0.8745644) bones/12/scale = Vector3(1, 1, 1) bones/13/name = "handslot.r" bones/13/parent = 12 bones/13/rest = Transform3D(0, -1, 2.32809e-07, 1, 0, -6.86063e-08, 6.86063e-08, 2.32809e-07, 1, -8.34841e-10, 0.0961251, -0.0575) bones/13/enabled = true bones/13/position = Vector3(-2.1093065e-08, 0.0961251, -0.0575) -bones/13/rotation = Quaternion(0.0001951252, 0.0006855003, 0.7049511, 0.70925564) +bones/13/rotation = Quaternion(0.0036720238, 0.0047832667, 0.7013167, 0.7128244) bones/13/scale = Vector3(1, 1, 1) bones/14/name = "head" bones/14/parent = 3 bones/14/rest = Transform3D(1, 8.09955e-22, 1.77636e-14, -8.09955e-22, 1, 1.49605e-14, -1.77636e-14, -1.49605e-14, 1, 4.67612e-25, 0.268797, 0) bones/14/enabled = true bones/14/position = Vector3(-2.7592258e-11, 0.268797, 7.293915e-11) -bones/14/rotation = Quaternion(-0.0009771294, -0.0319027, 0.00013871759, 0.99949056) +bones/14/rotation = Quaternion(-0.0009695825, -0.03160611, 0.00012094964, 0.9995) bones/14/scale = Vector3(1, 1, 1) bones/15/name = "Skeleton_Warrior_Helmet" bones/15/parent = 14 @@ -679,71 +681,71 @@ bones/16/name = "upperleg.l" bones/16/parent = 1 bones/16/rest = Transform3D(1, -1.31243e-07, -1.34242e-07, -1.35828e-07, -0.999396, -0.0347426, -1.29601e-07, 0.0347426, -0.999397, 0.170945, 0.113587, 1.70271e-08) bones/16/enabled = true -bones/16/position = Vector3(0.170945, 0.113587, 0.00071071344) -bones/16/rotation = Quaternion(0.99276936, 0.08233314, 0.07542437, 0.04406321) +bones/16/position = Vector3(0.170945, 0.113587, 0.0006371685) +bones/16/rotation = Quaternion(0.99191403, 0.08226739, 0.07646525, 0.05909196) bones/16/scale = Vector3(1, 1, 1) bones/17/name = "lowerleg.l" bones/17/parent = 16 bones/17/rest = Transform3D(1, 1.62704e-07, 1.37175e-07, -1.30054e-07, 0.977432, -0.211252, -1.68451e-07, 0.211252, 0.977432, -1.1194e-08, 0.227077, -2.32076e-08) bones/17/enabled = true bones/17/position = Vector3(3.8862208e-08, 0.227078, 5.712004e-10) -bones/17/rotation = Quaternion(0.2727201, 6.906575e-08, -1.931359e-07, 0.96209353) +bones/17/rotation = Quaternion(0.3131739, 7.366862e-08, -2.1485221e-07, 0.94969577) bones/17/scale = Vector3(1, 1, 1) bones/18/name = "foot.l" bones/18/parent = 17 bones/18/rest = Transform3D(1, -6.39488e-14, 1.68587e-07, -1.36667e-07, 0.585513, 0.810663, -9.87102e-08, -0.810663, 0.585513, -1.49012e-08, 0.149437, 3.72566e-09) bones/18/enabled = true bones/18/position = Vector3(4.4135756e-08, 0.149437, -7.63505e-09) -bones/18/rotation = Quaternion(-0.55749345, -0.20555085, 0.054677874, 0.8024713) +bones/18/rotation = Quaternion(-0.5771487, -0.20392911, 0.061181907, 0.78839654) bones/18/scale = Vector3(1, 1, 0.999999) bones/19/name = "toes.l" bones/19/parent = 18 bones/19/rest = Transform3D(-1, 1.21361e-07, 3.37844e-07, -1.58967e-07, 0.694106, -0.719873, -3.21865e-07, -0.719873, -0.694106, -1.6149e-10, 0.16565, 8.79764e-10) bones/19/enabled = true bones/19/position = Vector3(-6.9984254e-09, 0.16565, 2.6967339e-08) -bones/19/rotation = Quaternion(4.902662e-05, 0.92020136, -0.39144558, -1.0928057e-05) +bones/19/rotation = Quaternion(2.759227e-05, 0.9201821, -0.39149082, -6.070103e-06) bones/19/scale = Vector3(1, 0.999998, 1) bones/20/name = "upperleg.r" bones/20/parent = 1 bones/20/rest = Transform3D(1, 1.31243e-07, 2.02657e-07, 1.38205e-07, -0.999396, -0.0347426, 1.97975e-07, 0.0347426, -0.999397, -0.170945, 0.113587, 5.32468e-09) bones/20/enabled = true -bones/20/position = Vector3(-0.170945, 0.113587, -0.0007106854) -bones/20/rotation = Quaternion(0.99574167, -0.03044244, 0.030689765, 0.08142431) +bones/20/position = Vector3(-0.170945, 0.113587, -0.0006371404) +bones/20/rotation = Quaternion(0.99457985, -0.031209951, 0.030349415, 0.0944232) bones/20/scale = Vector3(1, 1, 1) bones/21/name = "lowerleg.r" bones/21/parent = 20 bones/21/rest = Transform3D(1, -1.65029e-07, -1.36672e-07, 1.32432e-07, 0.977432, -0.211252, 1.6845e-07, 0.211252, 0.977432, 1.18882e-08, 0.227077, -2.32075e-08) bones/21/enabled = true bones/21/position = Vector3(-9.410638e-09, 0.227077, -1.4126008e-08) -bones/21/rotation = Quaternion(0.3348429, -6.9762876e-08, 2.3499494e-07, 0.942274) +bones/21/rotation = Quaternion(0.36779612, -6.8589195e-08, 2.5876037e-07, 0.9299064) bones/21/scale = Vector3(1, 1, 1) bones/22/name = "foot.r" bones/22/parent = 21 bones/22/rest = Transform3D(1, 5.68434e-14, 1.68587e-07, -1.36668e-07, 0.585513, 0.810663, -9.87101e-08, -0.810663, 0.585513, 1.49012e-08, 0.149437, 3.72559e-09) bones/22/enabled = true bones/22/position = Vector3(1.6167903e-08, 0.149437, 6.877464e-09) -bones/22/rotation = Quaternion(-0.5875148, 0.113114856, -0.013722759, 0.80115104) +bones/22/rotation = Quaternion(-0.6066851, 0.11277694, -0.016317612, 0.78673273) bones/22/scale = Vector3(1, 1, 0.999999) bones/23/name = "toes.r" bones/23/parent = 22 bones/23/rest = Transform3D(-1, 1.21361e-07, 3.58529e-08, 5.84281e-08, 0.694106, -0.719873, -1.12251e-07, -0.719873, -0.694106, -1.61491e-10, 0.16565, 2.84604e-09) bones/23/enabled = true bones/23/position = Vector3(7.489696e-09, 0.16565, 2.473087e-08) -bones/23/rotation = Quaternion(-8.851691e-05, 0.92022204, -0.39139673, 2.022922e-05) +bones/23/rotation = Quaternion(-8.8435474e-05, 0.9202203, -0.39140084, 2.0176152e-05) bones/23/scale = Vector3(1, 0.999998, 1) bones/24/name = "kneeIK.l" bones/24/parent = 0 bones/24/rest = Transform3D(1, -2.47926e-07, -3.89414e-07, -3.89414e-07, 3.57628e-07, -1, 2.47926e-07, 1, 3.57628e-07, 0.170945, 0.29231, 0.575812) bones/24/enabled = true -bones/24/position = Vector3(0.170945, 0.29251057, 0.57601255) +bones/24/position = Vector3(0.170945, 0.2928967, 0.5763987) bones/24/rotation = Quaternion(0.7071068, -2.2534354e-07, -5.00141e-08, 0.7071068) bones/24/scale = Vector3(1, 1, 1) bones/25/name = "control-toe-roll.l" bones/25/parent = 0 bones/25/rest = Transform3D(1, 2.05345e-07, -6.39488e-14, -7.10543e-15, 3.57628e-07, 1, 2.05345e-07, -1, 3.57628e-07, 0.170945, 0.0259902, 0.245789) bones/25/enabled = true -bones/25/position = Vector3(0.20195252, 0.02812995, 0.20802225) -bones/25/rotation = Quaternion(-0.7087763, -7.2369545e-08, -7.280325e-08, 0.7054334) +bones/25/position = Vector3(0.20195252, 0.026823819, 0.20742838) +bones/25/rotation = Quaternion(-0.7071709, -7.254089e-08, -7.266158e-08, 0.70704263) bones/25/scale = Vector3(1, 1, 1) bones/26/name = "control-heel-roll.l" bones/26/parent = 25 @@ -784,15 +786,15 @@ bones/31/name = "kneeIK.r" bones/31/parent = 0 bones/31/rest = Transform3D(1, -2.47926e-07, 1.50996e-07, 1.50996e-07, 3.57628e-07, -1, 2.47926e-07, 1, 3.57628e-07, -0.170945, 0.29231, 0.575812) bones/31/enabled = true -bones/31/position = Vector3(-0.170945, 0.29251057, 0.57601255) +bones/31/position = Vector3(-0.170945, 0.2928967, 0.5763987) bones/31/rotation = Quaternion(0.7071068, -3.4279587e-08, 1.4104954e-07, 0.7071068) bones/31/scale = Vector3(1, 1, 1) bones/32/name = "control-toe-roll.r" bones/32/parent = 0 bones/32/rest = Transform3D(1, 2.05345e-07, -5.68434e-14, -1.42109e-14, 3.57628e-07, 1, 2.05345e-07, -1, 3.57628e-07, -0.170945, 0.0259902, 0.245789) bones/32/enabled = true -bones/32/position = Vector3(-0.170945, 0.026733119, 0.24071166) -bones/32/rotation = Quaternion(-0.7021489, -7.312426e-08, -7.206364e-08, 0.7120302) +bones/32/position = Vector3(-0.170945, 0.026151309, 0.2420744) +bones/32/rotation = Quaternion(-0.70363224, -7.2969975e-08, -7.2220715e-08, 0.71056443) bones/32/scale = Vector3(1, 1, 1) bones/33/name = "control-heel-roll.r" bones/33/parent = 32 @@ -840,8 +842,8 @@ bones/39/name = "handIK.l" bones/39/parent = 0 bones/39/rest = Transform3D(-1.19209e-07, 1, 0, -1.19209e-07, 0, 1, 1, 1.19209e-07, 1.19209e-07, 0.713181, 1.10676, 2.99767e-07) bones/39/enabled = true -bones/39/position = Vector3(0.5205538, 0.78555083, -0.055510063) -bones/39/rotation = Quaternion(0.7960126, 0.0036735793, 0.6052682, 0.000955766) +bones/39/position = Vector3(0.5205538, 0.7691192, -0.055347774) +bones/39/rotation = Quaternion(0.79615164, 0.0038443154, 0.6050841, 0.0010026048) bones/39/scale = Vector3(1, 1, 1) bones/40/name = "elbowIK.r" bones/40/parent = 0 @@ -854,12 +856,12 @@ bones/41/name = "handIK.r" bones/41/parent = 0 bones/41/rest = Transform3D(0, -1, -5.96046e-08, 1.78814e-07, -1.19209e-07, 1, -1, -5.96046e-08, 1.19209e-07, -0.713182, 1.10676, -6.1348e-08) bones/41/enabled = true -bones/41/position = Vector3(-0.51086646, 0.78555083, 0.059980694) -bones/41/rotation = Quaternion(-0.76022905, 0.0031352541, 0.64964765, -0.00022875812) +bones/41/position = Vector3(-0.51086646, 0.7691192, 0.060142945) +bones/41/rotation = Quaternion(-0.76037854, 0.0033028899, 0.64947176, -0.00028539493) bones/41/scale = Vector3(1, 1, 1) [node name="Skeleton_Warrior_Helmet" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(0.9997059, -0.00029309865, 0.02424451, 0.00033973806, 0.9999981, -0.0019196072, -0.024243906, 0.0019272796, 0.9997042, 0.00027722688, 1.1960851, 0.002448184) +transform = Transform3D(0.99971324, -0.00023451865, 0.023942128, 0.0002827404, 0.9999979, -0.002010728, -0.023941614, 0.0020169213, 0.9997113, 0.0002573577, 1.1913595, 0.0024997625) bone_name = "Skeleton_Warrior_Helmet" bone_idx = 15 @@ -914,7 +916,7 @@ transform = Transform3D(1, 6.366463e-12, 9.313226e-10, -2.0982043e-09, 1, -2.433 shape = SubResource("CapsuleShape3D_c30pj") [node name="lowerarm_r" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.5866178, -0.47170475, -0.65831053, -0.23689099, -0.67737037, 0.696456, -0.77444166, 0.56450146, 0.2856156, -0.38872725, 0.9622616, -0.086239174) +transform = Transform3D(-0.5719829, -0.47338277, -0.66988266, -0.22110336, -0.69745916, 0.68166184, -0.7899028, 0.5380122, 0.29426894, -0.38809457, 0.95080125, -0.079228215) bone_name = "lowerarm.r" bone_idx = 10 @@ -928,7 +930,7 @@ shape = SubResource("CapsuleShape3D_wwi0t") disabled = true [node name="lowerarm_l" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(-0.48175168, 0.5495201, 0.6825992, 0.088357426, -0.74451846, 0.6617282, 0.87184066, 0.37910146, 0.3101195, 0.37821457, 0.97981507, -0.15561137) +transform = Transform3D(-0.4694419, 0.5471431, 0.6930061, 0.0681653, -0.76006365, 0.6462628, 0.8803271, 0.3506218, 0.31951016, 0.37893438, 0.9674355, -0.14814314) bone_name = "lowerarm.l" bone_idx = 5 @@ -942,7 +944,7 @@ shape = SubResource("CapsuleShape3D_ba1wv") disabled = true [node name="lowerleg_r" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(0.99820244, -0.0592279, 0.009156641, -0.055976998, -0.8668109, 0.49548507, -0.021409485, -0.495107, -0.86856806, -0.18205409, 0.27581596, 0.051650353) +transform = Transform3D(0.99816555, -0.059277307, 0.012317149, -0.056702778, -0.843988, 0.53335667, -0.021220408, -0.53307676, -0.845801, -0.18203369, 0.27213973, 0.057563644) bone_name = "lowerleg.r" bone_idx = 21 @@ -956,7 +958,7 @@ shape = SubResource("CapsuleShape3D_r0iiv") disabled = true [node name="lowerleg_l" type="BoneAttachment3D" parent="Rig/Skeleton3D"] -transform = Transform3D(0.98385715, 0.17697002, -0.026581723, 0.16966796, -0.8752202, 0.45299298, 0.056901306, -0.45019048, -0.89111775, 0.2077707, 0.27626187, 0.0050822496) +transform = Transform3D(0.98351884, 0.1768392, -0.0376653, 0.17178091, -0.8489318, 0.49980617, 0.05641006, -0.49803898, -0.8653181, 0.20775603, 0.2722246, 0.011821548) bone_name = "lowerleg.l" bone_idx = 17 diff --git a/packed-scenes/stairs_mesh.tres b/packed-scenes/stairs_mesh.tres index 9148d9d..63f5f7a 100644 --- a/packed-scenes/stairs_mesh.tres +++ b/packed-scenes/stairs_mesh.tres @@ -1,6 +1,6 @@ [gd_resource type="ArrayMesh" load_steps=4 format=4 uid="uid://ccuur753aq06r"] -[ext_resource type="Texture2D" uid="uid://mmlj0yfrtogg" path="res://resources/models/dungeon/dungeon_texture.png" id="1_p66vc"] +[ext_resource type="Texture2D" uid="uid://dy2dk8nax2yxg" path="res://resources/models/dungeon/dungeon_texture.png" id="1_p66vc"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_tbwob"] resource_name = "texture" diff --git a/packed-scenes/target.tscn b/packed-scenes/target.tscn new file mode 100644 index 0000000..801d153 --- /dev/null +++ b/packed-scenes/target.tscn @@ -0,0 +1,57 @@ +[gd_scene load_steps=7 format=4 uid="uid://b0m8q6col4box"] + +[ext_resource type="Texture2D" uid="uid://0mf0tljb1w6b" path="res://resources/models/adventures/Textures/colormap.png" id="1_4u6j7"] +[ext_resource type="Script" uid="uid://bfl8kwerqb2kv" path="res://scripts/target.gd" id="1_ikhwp"] + +[sub_resource type="StandardMaterial3D" id="StandardMaterial3D_l8mi6"] +resource_name = "colormap" +cull_mode = 2 +albedo_texture = ExtResource("1_4u6j7") +texture_filter = 2 + +[sub_resource type="ArrayMesh" id="ArrayMesh_0n375"] +_surfaces = [{ +"aabb": AABB(-0.050000004, -0.17, -0.17, 0.10000001, 0.34, 0.34), +"format": 34896613377, +"index_count": 252, +"index_data": PackedByteArray("AAABAAIAAgABAAMAAwAEAAIAAgAFAAAABAADAAYABgADAAEABgAHAAQAAQAIAAYABwAGAAgAAQAAAAgACAAJAAcACQAIAAoAAAAKAAgACgALAAkADAALAAoACgANAAwADgAMAA0AAAAPAAoADwANAAoADQAPAA4ADwAAAAUABQAOAA8AEAARABIAEwARABAAEQATABQAFAASABEAEAAVABMAEgAUABYAFwAVABAAFgAYABIAGAAWABkAEgAaABAAGwAaABIAEgAYABsAGgAcABAAGAAdABsAGAAeAB0AEAAfABcAHAAfABAAIAAXAB8AHAAhAB8AHwAiACAAIQAiAB8AIQAjACIAJAAgACIAIwAlACIAIgAmACQAGQAkACYAJQAnACIAJwAmACIAJgAnABkAGQAnABgAJwAlAB4AGAAnAB4AKAApACoAKgArACgAKgAsACsALAAqAC0ALAAuACsALQAvACwALgAwACsALQAwAC8AMAAxACsALQAyADAAMAAyADEAMgAzADEANAA1ADYANgA3ADQANwA4ADQAOQA3ADYAOAA6ADQANgA7ADkAOAA8ADoAOwA9ADkAOwA+AD0AOwA/AD4APABAADoAPABBAEAAPwBCAEAAPwBDAD4AQQBDAEAAQwA/AEAARABFAEYARgBHAEQA"), +"name": "colormap", +"primitive": 3, +"uv_scale": Vector4(0, 0, 0, 0), +"vertex_count": 72, +"vertex_data": PackedByteArray("/v8AAP9/AAD+/30lfSUAAP9/fSV9JQAA////fwAAAAD/f/9/AAAAAP9/AAD/fwAA//+B2n0lAAD/f4HafSUAAP//////fwAA/3////9/AAD+/4HagdoAAP9/gdqB2gAA/3//f///AAD+//9///8AAP9/fSWB2gAA/v99JYHaAAAAAH0lfSUAAAAA/38AAAAAAACB2n0lAAD/f/9/AAAAAP9/gdp9JQAA/399JX0lAAD/f////38AAP9/AAD/fwAAAAD///9/AAD/f4HagdoAAAAA/3+/KAAAAACxvU1CAAAAAE1CTUIAAAAAP9f/fwAAAACxvbG9AAAAAAAA/38AAP9/fSWB2gAAAAC/KP9/AAAAAH0lgdoAAAAATUKxvQAA/3//f///AAAAAP9/P9cAAAAA/3///wAAAACB2oHaAAAAAB1fHV8AAAAA/39/UQAAAADhoB1fAAAAAH9R/38AAAAA/3+dcQAAAAB/rv9/AAAAAJ1x/38AAAAAYY7/fwAAAAD/f2GOAAAAAB1f4aAAAAAA4aDhoAAAAAD/f3+uAAAAAE1CTUIAAAAA/3+/KAAAAACxvU1CAAAAAP9/f1EAAAAAHV8dXwAAAADhoB1fAAAAAL8o/38AAAAAP9f/fwAAAAB/Uf9/AAAAAH+u/38AAAAA4aDhoAAAAACxvbG9AAAAAE1Csb0AAAAAHV/hoAAAAAD/fz/XAAAAAP9/f64AAAAAnXH/fwAAAAD/f51xAAAAAGGO/38AAAAA/39hjgAA") +}] +blend_shape_mode = 0 + +[sub_resource type="ArrayMesh" id="ArrayMesh_2f4dd"] +resource_name = "target-large_target-large" +_surfaces = [{ +"aabb": AABB(-0.050000004, -0.17, -0.17, 0.10000001, 0.34, 0.34), +"attribute_data": PackedByteArray("/zeY+f83GfL/Nxny/zeY+f83GfL/N5j5/zeY+f83GfL/N+XN/zf/3/83/9//N+XN/zf/3/83GfL/Nxny/zf/3/83GfL/Nxny/zf/3/83/9//N+XN/zflzf83Zcb/N2XG/zflzf835c3/N+XN/zflzf83Zcb/N2XG/zflzf83/9//Nxny/zdlxv83mPn/N+XN/zcZ8v83/9//lxmy/5f/n/+X5Y3/l/+f/5dWrP+XqJP/l5i5/5dlhv+XcrH/l4yO/5eok/+X5Y3/lxmy/5dWrP+X/5//l/+f/5cZsv+XGbL/l/+f/5f/n/+X5Y3/l+WN/5f/n/+XGbL/lxmy/5f/n/+X5Y3/l+WN/5dlhv+XZYb/l2WG/5dlhv+X5Y3/l+WN/5fljf+X/5//l/+f/5fljf+XGbL/l5i5/5eYuf+XGbL/l5i5/5cZsv+XGbL/l5i5/5eSpv+X/5//l2uZ/5dMqf+X/5//l7KW/5ffov+XHp3/l/+f/5eSpv+Xa5n/l/+f/5cZ8v+X/9//l+XN/5f/3/+XpOn/l1nW/5eY+f+XZcb/l6Pt/5da0v+XWdb/l+XN/5cZ8v+XpOn/l//f/5f/3/+XN+T/l//f/5fG2/+X/98="), +"format": 34896613399, +"index_count": 252, +"index_data": PackedByteArray("AAABAAIAAgADAAAABAAFAAYABgAHAAQACAAJAAoACgALAAgADAANAA4ADgAPAAwAEAARABIAEgATABAAEwASABQAFAAVABMAFgAXABgAGAAZABYAGgAbABwAHAAdABoAHgAfACAAIAAhAB4AIAAiACEAIgAjACEAIgAkACMAJAAlACMAJgAnACgAKAApACYAKQAqACYAKwApACgAKgAsACYAKAAtACsAKgAuACwALQAvACsALQAwAC8ALQAxADAALgAyACwALgAzADIAMQA0ADIAMQA1ADAAMwA1ADIANQAxADIANgA3ADgAOAA5ADYAOQA4ADoAOgA7ADkAPAA9AD4APgA/ADwAQABBAEIAQgBDAEAARABFAEYARgBHAEQASABJAEoASgBLAEgATABNAE4ATgBPAEwAUABRAFIAUgBTAFAAVABVAFYAVgBXAFQAVgBYAFcAWABWAFkAWABaAFcAWQBbAFgAWgBcAFcAWQBcAFsAXABdAFcAWQBeAFwAXABeAF0AXgBfAF0AYABhAGIAYgBjAGAAYwBkAGAAZQBjAGIAZABmAGAAYgBnAGUAZABoAGYAZwBpAGUAZwBqAGkAZwBrAGoAaABsAGYAaABtAGwAawBuAGwAawBvAGoAbQBvAGwAbwBrAGwAcABxAHIAcgBzAHAA"), +"material": SubResource("StandardMaterial3D_l8mi6"), +"name": "colormap", +"primitive": 3, +"uv_scale": Vector4(0, 0, 0, 0), +"vertex_count": 116, +"vertex_data": PackedByteArray("/v8AAP9////+/30lfSX///9/fSV9Jf///38AAP9////+/30lgdr/n/7/AAD/f/+//38AAP9//7//f30lgdr/n/7/gdqB2v+f/v//f///AID/f/9///8AgP9/gdqB2v+f/v//f///AID+/30lgdr/n/9/fSWB2v+f/3//f///AID/f30lfSX///7/fSV9Jf//////fwAA////f/9/AAD/////gdp9Jf///3+B2n0l////f////3//v///////f/+//v+B2oHa/5//f4Hagdr/n/9/gdp9Jf////+B2n0l/////////3////9/////f/////+B2n0l/7////9/AAD/v/7/fSV9Jf+///////9//7/+/wAA/3//v/7/gdqB2v+//v99JYHa/7/+//9/////vwAAfSV9Jf+/AAD/fwAA/78AAIHafSX/vwAA/3+/KP+/AABNQk1C/78AALG9TUL/vwAAAAD/f/+/AAD///9//78AAL8o/3//vwAAP9f/f/+/AACxvbG9/78AAIHagdr/vwAAfSWB2v+/AABNQrG9/78AAP9/////vwAA/38/1/+/AAB9JX0l////f30lfSX///9//38AAP//AAD/fwAA////f4HafSX//wAAgdp9Jf///3//f///AID/f30lgdr/nwAAfSWB2v+fAAD/f///AIAAAIHafSX///9/gdp9Jf///3////9///8AAP///3///wAA////f/+//3////9//7//f4Hagdr/nwAAgdqB2v+f/3+B2oHa/5//f/9///8AgAAA/3///wCAAACB2oHa/5//f30lgdr/n/9/AAD/f/+/AAAAAP9//78AAH0lgdr/n/9/AAD/f////399JX0l//8AAH0lfSX//wAAAAD/f///AAAdXx1f/78AAP9/f1H/vwAA4aAdX/+/AAB/Uf9//78AAP9/nXH/vwAAf67/f/+/AACdcf9//78AAGGO/3//vwAA/39hjv+/AAAdX+Gg/78AAOGg4aD/vwAA/39/rv+/AABNQk1C/78AAP9/vyj/vwAAsb1NQv+/AAD/f39R/78AAB1fHV//vwAA4aAdX/+/AAC/KP9//78AAD/X/3//vwAAf1H/f/+/AAB/rv9//78AAOGg4aD/vwAAsb2xvf+/AABNQrG9/78AAB1f4aD/vwAA/38/1/+/AAD/f3+u/78AAJ1x/3//vwAA/3+dcf+/AABhjv9//78AAP9/YY7/v/9//z98pf//fKX///9//z8AAP9/AAD/fwAA/38AAP9/////f/9/////f///////f/9///8AAP9/AAD/f/9///98pf//fKX///9/////f////3+B2v9/gdr///9/////f////3////9//3+B2v9/gdr/f/+//3//v/9/AAD/fwAA/38AAP9/AAD/fwAA/38AAP9/AAD/fwAA/3////9/////f////3////9/////f////3////9/////f////3////9/////f////3////9/////f////3///3yl//98pf///3////9/////f4Ha/3+B2v9///8AAP9/AAD/f/9/////f4Ha/3+B2v9//7//f/+/////f////3////9/////f////3//f////3///////38AAP9/AAD/fwAA/38AAP9//3//P3yl//98pf///3//P/9/////f////3////9/////f////3////9/////f////3////9/////f////3////9/////f////3////9/////f////3////9/////f////3////9/////f////3////9/////f////3////9/////f////3////9/////f///") +}] +blend_shape_mode = 0 +shadow_mesh = SubResource("ArrayMesh_0n375") + +[sub_resource type="ConvexPolygonShape3D" id="ConvexPolygonShape3D_d8tpd"] +points = PackedVector3Array(0.049990214, 0, 0.17, 0.050000004, 0.17, 0, 0.049990214, 0.12017815, 0.12017815, -0.050000004, 0, 0.17, 0.049990214, -0.12021144, 0.12017815, -0.050000004, 0.17, 0, 0.050000004, 0, -0.17, 0.050000004, 0.12017815, -0.12021144, -0.050000004, 0.12017815, 0.12017815, -0.050000004, -0.12021144, 0.12017815, 0.049990214, -0.17, 0, -0.050000004, 0.12017815, -0.12021144, 0.049990214, -0.12021144, -0.12021144, -0.050000004, 0, -0.17, -0.050000004, -0.17, 0, -0.050000004, -0.12021144, -0.12021144) + +[node name="Target" type="Area3D"] +script = ExtResource("1_ikhwp") + +[node name="target-large" type="MeshInstance3D" parent="."] +mesh = SubResource("ArrayMesh_2f4dd") +skeleton = NodePath("") + +[node name="CollisionShape3D" type="CollisionShape3D" parent="."] +shape = SubResource("ConvexPolygonShape3D_d8tpd") + +[connection signal="body_entered" from="." to="." method="_on_body_entered"] diff --git a/project.godot b/project.godot index 402c508..b1ede8b 100644 --- a/project.godot +++ b/project.godot @@ -116,6 +116,8 @@ reload={ 3d_physics/layer_1="objects" 3d_physics/layer_2="hitboxes" 3d_physics/layer_3="player" +3d_physics/layer_4="projectiles" +3d_physics/layer_5="enemies" [physics] diff --git a/resources/floors_mesh_library.tres b/resources/floors_mesh_library.tres index 7cac618..cc54247 100644 --- a/resources/floors_mesh_library.tres +++ b/resources/floors_mesh_library.tres @@ -1,6 +1,6 @@ [gd_resource type="MeshLibrary" load_steps=62 format=4 uid="uid://dje66fxvu4hnm"] -[ext_resource type="Texture2D" uid="uid://mmlj0yfrtogg" path="res://resources/models/dungeon/dungeon_texture.png" id="1_h3coj"] +[ext_resource type="Texture2D" uid="uid://dy2dk8nax2yxg" path="res://resources/models/dungeon/dungeon_texture.png" id="1_h3coj"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_ikev6"] resource_name = "texture" diff --git a/resources/models/adventures/Textures/colormap.png b/resources/models/adventures/Textures/colormap.png new file mode 100644 index 0000000..166a545 Binary files /dev/null and b/resources/models/adventures/Textures/colormap.png differ diff --git a/resources/models/adventures/Textures/colormap.png.import b/resources/models/adventures/Textures/colormap.png.import new file mode 100644 index 0000000..4bca8af --- /dev/null +++ b/resources/models/adventures/Textures/colormap.png.import @@ -0,0 +1,41 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://0mf0tljb1w6b" +path.s3tc="res://.godot/imported/colormap.png-d65d0d3f3589c232417b542d59e57791.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://resources/models/adventures/Textures/colormap.png" +dest_files=["res://.godot/imported/colormap.png-d65d0d3f3589c232417b542d59e57791.s3tc.ctex"] + +[params] + +compress/mode=2 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=true +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=0 diff --git a/resources/models/adventures/target-large.glb b/resources/models/adventures/target-large.glb new file mode 100644 index 0000000..1291694 Binary files /dev/null and b/resources/models/adventures/target-large.glb differ diff --git a/resources/models/adventures/target-large.glb.import b/resources/models/adventures/target-large.glb.import new file mode 100644 index 0000000..0aad6c1 --- /dev/null +++ b/resources/models/adventures/target-large.glb.import @@ -0,0 +1,49 @@ +[remap] + +importer="scene" +importer_version=1 +type="PackedScene" +uid="uid://c0itp1qbolycx" +path="res://.godot/imported/target-large.glb-be9fdfbe3e1fec5ec23d21b8886a2370.scn" + +[deps] + +source_file="res://resources/models/adventures/target-large.glb" +dest_files=["res://.godot/imported/target-large.glb-be9fdfbe3e1fec5ec23d21b8886a2370.scn"] + +[params] + +nodes/root_type="" +nodes/root_name="" +nodes/root_script=null +nodes/apply_root_scale=true +nodes/root_scale=1.0 +nodes/import_as_skeleton_bones=false +nodes/use_name_suffixes=true +nodes/use_node_type_suffixes=true +meshes/ensure_tangents=true +meshes/generate_lods=true +meshes/create_shadow_meshes=true +meshes/light_baking=1 +meshes/lightmap_texel_size=0.2 +meshes/force_disable_compression=false +skins/use_named_skins=true +animation/import=true +animation/fps=30 +animation/trimming=false +animation/remove_immutable_tracks=true +animation/import_rest_as_RESET=false +import_script/path="" +materials/extract=0 +materials/extract_format=0 +materials/extract_path="" +_subresources={ +"nodes": { +"PATH:target-large": { +"generate/physics": true, +"physics/shape_type": 1 +} +} +} +gltf/naming_version=2 +gltf/embedded_image_handling=1 diff --git a/resources/models/dungeon/Meshes/coin_stack_medium_coin_stack_medium.res b/resources/models/dungeon/Meshes/coin_stack_medium_coin_stack_medium.res index 3011495..58c6ea9 100644 Binary files a/resources/models/dungeon/Meshes/coin_stack_medium_coin_stack_medium.res and b/resources/models/dungeon/Meshes/coin_stack_medium_coin_stack_medium.res differ diff --git a/resources/models/dungeon/Meshes/wall_wall.res b/resources/models/dungeon/Meshes/wall_wall.res index 43f62bb..9e5c591 100644 Binary files a/resources/models/dungeon/Meshes/wall_wall.res and b/resources/models/dungeon/Meshes/wall_wall.res differ diff --git a/resources/models/dungeon/dungeon_texture.png.import b/resources/models/dungeon/dungeon_texture.png.import index ba47d34..2f7be70 100644 --- a/resources/models/dungeon/dungeon_texture.png.import +++ b/resources/models/dungeon/dungeon_texture.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://mmlj0yfrtogg" +uid="uid://dy2dk8nax2yxg" path.s3tc="res://.godot/imported/dungeon_texture.png-11ea8155099d409dbf1975efcd53b585.s3tc.ctex" metadata={ "imported_formats": ["s3tc_bptc"], diff --git a/resources/models/dungeon/floor_tile_small.res b/resources/models/dungeon/floor_tile_small.res index 8b5d188..34d3901 100644 Binary files a/resources/models/dungeon/floor_tile_small.res and b/resources/models/dungeon/floor_tile_small.res differ diff --git a/resources/models/dungeon/floor_tile_small_corner.res b/resources/models/dungeon/floor_tile_small_corner.res index f9cf13c..6c0a0b5 100644 Binary files a/resources/models/dungeon/floor_tile_small_corner.res and b/resources/models/dungeon/floor_tile_small_corner.res differ diff --git a/resources/models/dungeon/floor_tile_small_decorated_floor_tile_small_decorated.res b/resources/models/dungeon/floor_tile_small_decorated_floor_tile_small_decorated.res index 5d6d8e7..8a9364a 100644 Binary files a/resources/models/dungeon/floor_tile_small_decorated_floor_tile_small_decorated.res and b/resources/models/dungeon/floor_tile_small_decorated_floor_tile_small_decorated.res differ diff --git a/resources/models/dungeon/floor_wood_small.res b/resources/models/dungeon/floor_wood_small.res index ca763b1..46d9473 100644 Binary files a/resources/models/dungeon/floor_wood_small.res and b/resources/models/dungeon/floor_wood_small.res differ diff --git a/resources/models/dungeon/floor_wood_small_dark.res b/resources/models/dungeon/floor_wood_small_dark.res index a804bd2..960c265 100644 Binary files a/resources/models/dungeon/floor_wood_small_dark.res and b/resources/models/dungeon/floor_wood_small_dark.res differ diff --git a/resources/models/dungeon/stairs_wood_stairs_wood.res b/resources/models/dungeon/stairs_wood_stairs_wood.res index 5f84175..2a37155 100644 Binary files a/resources/models/dungeon/stairs_wood_stairs_wood.res and b/resources/models/dungeon/stairs_wood_stairs_wood.res differ diff --git a/resources/models/dungeon/wall_corner_wall_corner.res b/resources/models/dungeon/wall_corner_wall_corner.res index 99cc8aa..0aab9b7 100644 Binary files a/resources/models/dungeon/wall_corner_wall_corner.res and b/resources/models/dungeon/wall_corner_wall_corner.res differ diff --git a/scenes/game.tscn b/scenes/game.tscn index f891309..eec84fc 100644 --- a/scenes/game.tscn +++ b/scenes/game.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=135 format=4 uid="uid://b1i4juq2u7pwk"] +[gd_scene load_steps=136 format=4 uid="uid://b1i4juq2u7pwk"] [ext_resource type="Environment" uid="uid://d31wkt76cft8k" path="res://resources/world_environment.tres" id="1_03qki"] [ext_resource type="Script" uid="uid://bhxmmdt22sics" path="res://scripts/game_manager.gd" id="1_kvi4c"] @@ -14,7 +14,7 @@ [ext_resource type="PackedScene" uid="uid://cge36njo54fpk" path="res://packed-scenes/rogue.tscn" id="10_twgab"] [ext_resource type="PackedScene" uid="uid://d135lsanl2mnu" path="res://packed-scenes/wall_doorway.tscn" id="11_c5fdg"] [ext_resource type="PackedScene" uid="uid://bkh0th4s2lkcq" path="res://packed-scenes/chest.tscn" id="12_ead6y"] -[ext_resource type="Texture2D" uid="uid://mmlj0yfrtogg" path="res://resources/models/dungeon/dungeon_texture.png" id="12_gxtfn"] +[ext_resource type="Texture2D" uid="uid://dy2dk8nax2yxg" path="res://resources/models/dungeon/dungeon_texture.png" id="12_gxtfn"] [ext_resource type="Script" uid="uid://dgpo4qurgavv8" path="res://scripts/audio_manager.gd" id="12_o8q33"] [ext_resource type="MeshLibrary" uid="uid://bg0mbpvac5tuk" path="res://scenes/test_mesh_library.tres" id="13_5newe"] [ext_resource type="PackedScene" uid="uid://boygkamfqg6l6" path="res://packed-scenes/skeleton_warrior.tscn" id="13_8a4e7"] @@ -35,6 +35,7 @@ [ext_resource type="PackedScene" uid="uid://dwk0wsbkeoo1j" path="res://packed-scenes/tree_4_a_color_1.tscn" id="28_wljb1"] [ext_resource type="PackedScene" uid="uid://qdlf74wdelx6" path="res://packed-scenes/tree_bare_1_a_color_1.tscn" id="29_v2yb1"] [ext_resource type="PackedScene" uid="uid://b0yc4ewrfp34p" path="res://packed-scenes/tree_bare_2_a_color_1.tscn" id="30_js0lu"] +[ext_resource type="PackedScene" uid="uid://b0m8q6col4box" path="res://packed-scenes/target.tscn" id="36_twgab"] [sub_resource type="NavigationMesh" id="NavigationMesh_3mbqm"] vertices = PackedVector3Array(6.75, 1.5, -37, 8, 1.5, -36.75, 8, 1.5, -38, 6.5, 1.5, -37.5, 4, 1.5, -37.5, 2, 1.5, -38, 2, 1.5, -36.5, 3.75, 1.5, -36.75, 4.75, 1.5, -21.5, 4.75, 1.5, -20.75, 5.25, 1.5, -21, 6, 1.5, -22, 8, 1.5, -30, 6.75, 1.5, -35.25, 6.25, 1.5, -34.75, 5.75, 1.5, -30, 4, 1.5, -28, 4, 1.5, -22, 6, 1.5, -28, 4.75, 1.5, -28.25, 4, 1.5, -34.75, 2, 1.5, -30, 4.25, 1.5, -30, 4.75, 1.5, -29.5, 5.25, 1.5, -28.5, 5.25, 1.5, -29.5, 4.75, 2.75, -36.25, 4.75, 2.75, -35.75, 5.75, 2.75, -36, -18, 1.5, -28, -18.25, 1.5, -24.5, -17.25, 1.5, -21.75, 18.5, 1.5, -22, 18.5, 1.5, -28, 28.75, 9.5, -22, 28.75, 9.5, -28, 10, 9.5, -28, 10, 9.5, -22, 20, 1.5, -15.5, 22, 1.5, -15.5, 22, 1.5, -20.75, 20, 1.5, -21.25, 23.25, 1.5, -22, 23.25, 1.5, -28, 28.75, 1.5, -22, 28.75, 1.5, -28, 30, 1.5, -21, 36, 1.5, -21, 36, 1.5, -28, 30, 9.5, -21.25, 30, 9.5, -19.25, 36, 9.5, -19.25, 36, 9.5, -28, -18, 1.5, -21, -18.75, 1.5, -24, -20.5, 1.5, -21.75, -20, 1.5, -21.25, -27, 1.5, -22, -30, 1.5, -24, -30, 1.5, -20.75, -28, 1.5, -20.75, -20, 1.5, -15, -18, 1.5, -15, -7.5, 5.5, -11.5, -7.25, 5.5, -20.75, -7.5, 5.5, -22.5, -18.5, 5.5, -22.5, -18.75, 5.5, -11.25, 5.75, 1.5, -20, 4.5, 1.5, -20, 4, 1.5, -7.25, 6.5, 1.5, -1.75, 8, 1.5, -1.5, -0.75, 1.5, -20, -1.25, 2, -18.75, -1.5, 2, -18, -1.5, 2, -15.75, 4, 1.5, 0, 6, 1.5, 0, -5.5, 4.5, -18, -5.5, 4.5, -15.75, -1.5, 1.5, -14.75, 3, 1.5, -8, 18.25, 1.5, -17, 18, 1.5, -20, 18, 1.5, 0, 8, 1.5, 0, -3, 1.5, -14.75, -2.75, 1.5, -8, 30, 1.5, -10, 36, 1.5, -10, -23.25, 1.5, 0, -23.25, 1.5, -2, -27.25, 1.5, -2, -30, 1.5, 0, -28, 1.5, -3, -26, 1.5, -11.25, -22, 1.5, -11.25, -22, 1.5, -20, -26, 1.5, -20, -16, 1.5, -11, -10, 1.5, -11, -10, 1.5, -20, -16, 1.5, -20, -1.5, 1.5, -19.25, -6.5, 1.5, -19, -8, 1.5, -20, -6.5, 1.5, -15, -8, 1.5, -8, 22, 9.25, -19.5, 23, 9.5, -19.5, 23, 9.5, -20, 19, 5.5, -13.25, 19, 5.5, -12.75, 20.25, 4.75, -13, 20, 5.25, -13.75, 22, 6.5, -15.75, 20.25, 8.75, -19, 21, 5.5, -14.75, 23, 5.5, -13.5, 23, 5.5, -15, 22.25, 6, -15, 22, 5.25, -13.5, 22, 1.5, 1, 20, 1.5, 1, 22, 1.5, -7.700001, 22, 2, -9.15, 20.2, 2.75, -10.200001, 20.150002, 1.5, -7.4000015, 18.75, 9.5, -20, 19, 9.5, -18.75, 24, 1.5, -9.25, 28, 1.5, -9.25, 28, 1.5, -20, 24, 1.5, -20, 30, 9.5, -13.25, 31.5, 9.5, -13.25, 32, 9.5, -14, 34, 9.5, -14, 34.5, 9.5, -13.25, 36, 9.5, -13.25, -19.5, 3, -13.75, -19.5, 3, -13.25, -18.5, 3, -13.25, -18.5, 3, -13.75, 34.25, 9.5, -11.25, 36, 9.5, -10, 31.75, 9.5, -11.25, 30, 9.5, -10, 32.5, 11, -12.75, 32.5, 11, -12.25, 33.5, 11, -12.25, 33.5, 11, -12.75, -21.25, 1.5, -10, -26, 1.5, -4, -19, 1.5, -4, -19, 1.5, -10, -13, 1.5, -4, -12, 1.5, -3, -9, 1.5, -6, -10, 1.5, -7, -16.75, 1.5, -10, 30, 1.5, -4, 30, 1.5, -8, 28.75, 1.5, -8, 25, 1.5, -4, 24, 1.5, -3, 30.5, 5.5, -3.75, 30, 5.5, -3.5, 30.25, 5.5, 1.5, 35.5, 5.5, 1.5, 35.75, 5.5, -0.5, 37.75, 5.5, -0.5, 37.75, 5.5, -7.5, 30.75, 5.5, -7.75, 34, 1.5, -6, 34, 1.5, -7.75, 32, 1.5, -7.75, 32.5, 1.5, -5.5, 31.25, 1.5, -2, 29, 1.5, 0, 32.75, 1.5, 0, 32.5, 1.5, -1.75, 32, 1.5, -2.75, 32.5, 1.5, -4.25, 26, 1.5, 1.25, 28, 1.5, 1.25, 35, 1.5, -2.75, 35.25, 1.5, -3.25, 26, 1.5, -2, 49.5, 5.5, -0.5, 49.5, 5.5, -7.5, 0.25, 6.25, -0.75, 2, 7, -0.25, 2, 6.5, -1.25, -1, 5.5, -1, -3, 5.5, 0, -0.83333397, 5.5, -0.5, 0, 6.25, -1.0833321, -0.5, 5.5, -2.25, 2, 5.5, -2.25, 2, 5.5, -4.75, 1, 5.5, -5, 0.75, 5.5, -6, -10, 5.5, -6, -9.75, 5.5, 0, -12, 1.5, 0, 2, 1.5, 0, 2, 1.5, -6, 35.75, 1.5, -3.25, 36, 1.5, -2, 37.75, 1.5, -5.5, 37.75, 1.5, -4.5, 38.75, 1.5, -1.75, 45.5, 1.5, -4.25, 46, 1.5, -4.75, 37.25, 1.5, -4, 36, 1.5, -4, 48, 1.5, -4.25, 48, 1.5, -6, 45.25, 1.5, -2, 36.75, 1.5, -6, -11.5, 9.5, -3.25, -11, 9.5, -2.75, -11, 9.5, -3.5, 29.5, 5.5, 1.75, 24.5, 5.5, -3.5, 24.5, 5.5, 8.25, 29.5, 5.5, 8.25, 46.5, 3, -3.5, 46.5, 3, -2.75, 47, 3, -3, 47, 3, -3.5, -13.5, 5.5, 0.25, -12, 5.5, 0, -12, 5.5, -2, -30, 5.5, -2, -23, 5.5, 0, -30, 5.5, 0, -22, 5.5, 0.75, -14, 5.5, 1, -22, 5.5, 14, -14, 5.5, 14, -22, 1.5, 0.75, -15.5, 1.5, 2.5, -14, 1.5, 2, -14, 1.5, -2, -22, 1.5, 3.5, -15.5, 1.5, 3.5, 6, 1.5, 1, 4, 1.5, 1.25, 7, 1.5, 2, 3, 1.5, 2, 3, 1.5, 10, 7, 1.5, 10, 19.25, 1.5, 2, 17, 1.5, 10, 18, 1.5, 11, 22, 1.5, 11, 25.25, 1.5, 18, 24, 1.5, 18, 24, 1.5, 20, 26, 1.5, 17.25, 28, 1.5, 20, -9.25, 1.5, 2, -11.25, 1.5, 2, -10.25, 1.5, 2.5, -10.75, 1.5, 4, -12, 1.5, 4, -12.25, 1.5, 4.75, -10.75, 1.5, 6, -10.25, 1.5, 7, -9.25, 1.5, 7, -10.25, 1.5, 3.5, -15.25, 1.5, 4, -15.25, 1.5, 6, -14, 1.5, 6, -13.5, 1.5, 5.25, -13.5, 1.5, 4.75, -14, 1.5, 4, -12.5, 1.5, 5.25, -12, 1.5, 6, -22, 1.5, 7, -15.5, 1.5, 7, -4.75, 1.5, 8, -5.25, 2, 8, -5.25, 1.5, 10, -4.75, 1.5, 2, -9.25, 1.5, 8, -10.75, 1.5, 8, -6, 2.5, 7.25, -6, 5.5, 2.25, -8.25, 5.5, 2.25, -8.25, 2, 8, -8.25, 5, 3.6875, -5.75, 2, 8, -12, 1.5, 8, -12, 1.5, 10, -7.25, 1.5, 8.666668, -14, 1.5, 14, -14, 1.5, 8, -15.25, 1.5, 8, -22, 1.5, 14, 24.25, 5.5, 10.5, 29.5, 5.5, 21.5, 16.25, 5.5, 10.75, 16.5, 5.5, 21.5, 22.75, 1.5, 18, 22, 1.5, 17, 18, 1.5, 20, -12, 1.5, 15.25, -13.25, 1.5, 16, -12, 1.5, 17.5, -7.75, 1.5, 17.75, 14.25, 1.5, 17.5, 15.75, 1.5, 19.25, 16.25, 1.5, 19.25, 16, 1.5, 12, -12, 1.5, 12) @@ -1260,3 +1261,6 @@ grow_horizontal = 0 [node name="Rogue" parent="." instance=ExtResource("10_twgab")] transform = Transform3D(0.8, 0, 0, 0, 0.8, 0, 0, 0, 0.8, 23, 6, 20) + +[node name="Target" parent="." instance=ExtResource("36_twgab")] +transform = Transform3D(-2.1855695e-07, 0, 5, 0, 5, 0, -5, 0, -2.1855695e-07, 24, 6.5, 12) diff --git a/scripts/projectile.gd b/scripts/projectile.gd index adcc1d4..5546680 100644 --- a/scripts/projectile.gd +++ b/scripts/projectile.gd @@ -1,9 +1,17 @@ -extends Node3D +extends Area3D -var speed: float +var speed: float = 0.0 func _physics_process(delta): - translate(Vector3.FORWARD * speed * delta) + translate(-transform.basis.x * speed * delta) + #translate(Vector3.FORWARD * speed * delta) func shoot() -> void: - speed = 5 + speed = 30 + #var timer = get_tree().create_timer(3.0) # 3 seconds lifetime + #timer.timeout.connect(queue_free) + +func _on_body_entered(body: Node) -> void: + print("Projectile hits " + body.name + "...") + #TODO: Add damage to hit body + queue_free() diff --git a/scripts/rogue.gd b/scripts/rogue.gd index 66c9033..a4e058b 100644 --- a/scripts/rogue.gd +++ b/scripts/rogue.gd @@ -14,7 +14,7 @@ var footsteps := [ @onready var shoot_point: Node3D = $Rig/Skeleton3D/handslot_r/ShootPoint @export var loaded: bool -var current_arrow: Node3D +var current_arrow: Area3D func _ready() -> void: if loaded == true: diff --git a/scripts/target.gd b/scripts/target.gd new file mode 100644 index 0000000..050b4ca --- /dev/null +++ b/scripts/target.gd @@ -0,0 +1,4 @@ +extends Area3D + +func _on_body_entered(body: Node3D) -> void: + print(body.name + " hits the target...") diff --git a/scripts/target.gd.uid b/scripts/target.gd.uid new file mode 100644 index 0000000..47fa3d3 --- /dev/null +++ b/scripts/target.gd.uid @@ -0,0 +1 @@ +uid://bfl8kwerqb2kv