diff --git a/client/Global.tscn b/client/Global.tscn index c32cf4c..f247240 100644 --- a/client/Global.tscn +++ b/client/Global.tscn @@ -2,7 +2,7 @@ [ext_resource type="Script" path="res://Global.gd" id="1_tr8a5"] [ext_resource type="Environment" uid="uid://dixa0yso2s1u3" path="res://world/Environment.tres" id="2_leqw1"] -[ext_resource type="CameraAttributesPractical" uid="uid://b835orxyqq6w5" path="res://world/CameraPractical.tres" id="3_tsbch"] +[ext_resource type="CameraAttributesPractical" uid="uid://b835orxyqq6w5" path="res://camera/CameraPractical.tres" id="3_tsbch"] [node name="Global" type="Node"] script = ExtResource("1_tr8a5") diff --git a/client/Main.tscn b/client/Main.tscn index 375cb70..609c60a 100644 --- a/client/Main.tscn +++ b/client/Main.tscn @@ -15,13 +15,13 @@ [ext_resource type="PackedScene" uid="uid://cpdoq0oh84mfw" path="res://camera/Camera.tscn" id="12_aljdh"] [ext_resource type="Environment" uid="uid://dixa0yso2s1u3" path="res://world/Environment.tres" id="12_cscto"] [ext_resource type="PackedScene" uid="uid://hnn0n1xc2qt7" path="res://assets/tree/Tree.blend" id="14_7jtdl"] -[ext_resource type="CameraAttributesPractical" uid="uid://b835orxyqq6w5" path="res://world/CameraPractical.tres" id="15_6h2nx"] [ext_resource type="PackedScene" uid="uid://cb2t7bvvf3gwh" path="res://enemy/slime/Slime.tscn" id="15_hgl78"] [ext_resource type="Script" path="res://world/PlayerManager.gd" id="16_dp6bj"] [ext_resource type="PackedScene" uid="uid://dagn5bf7ou3sd" path="res://ui/UI.tscn" id="17_43qhq"] [ext_resource type="Material" uid="uid://bdsblfaxbipaa" path="res://world/grass/GrassMaterial.tres" id="18_tja64"] [ext_resource type="MultiMesh" uid="uid://dog5aq5n2q025" path="res://assets/grass/grass.multimesh" id="19_ae26a"] [ext_resource type="PackedScene" uid="uid://cm0rho6adv2p7" path="res://world/water/Water.tscn" id="20_bmo3k"] +[ext_resource type="PackedScene" uid="uid://dl4vcp04t8iyr" path="res://item/soul/Soul.tscn" id="23_dht53"] [sub_resource type="StandardMaterial3D" id="StandardMaterial3D_he5c5"] diffuse_mode = 3 @@ -98,7 +98,6 @@ autostart = true [node name="Environment" type="WorldEnvironment" parent="World"] environment = ExtResource("12_cscto") -camera_attributes = ExtResource("15_6h2nx") [node name="Sun" type="DirectionalLight3D" parent="World/Environment"] transform = Transform3D(-0.350207, 0.827032, -0.439741, 0, 0.469472, 0.882948, 0.936672, 0.309215, -0.164412, 0, 3, 0) @@ -179,6 +178,9 @@ script = ExtResource("16_dp6bj") [node name="UI" parent="." instance=ExtResource("17_43qhq")] process_mode = 3 +[node name="Soul" parent="." instance=ExtResource("23_dht53")] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1, 1.37246, 4) + [connection signal="timeout" from="Client/Ping/Timer" to="Client/Ping" method="send_ping"] [connection signal="timeout" from="Client/Login/Timer" to="Client/Login" method="send_login"] [connection signal="timeout" from="Client/Statistics" to="Client" method="update_statistics"] diff --git a/client/camera/Camera.tscn b/client/camera/Camera.tscn index ad33c22..758f1cf 100644 --- a/client/camera/Camera.tscn +++ b/client/camera/Camera.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://cpdoq0oh84mfw"] +[gd_scene load_steps=5 format=3 uid="uid://cpdoq0oh84mfw"] [ext_resource type="Script" path="res://camera/FollowPlayer.gd" id="1_48rtd"] [ext_resource type="Script" path="res://camera/CameraPivot.gd" id="2_dylfm"] [ext_resource type="Script" path="res://camera/Camera.gd" id="2_pwdc2"] +[ext_resource type="CameraAttributesPractical" uid="uid://b835orxyqq6w5" path="res://camera/CameraPractical.tres" id="3_olar0"] [node name="Follow" type="Marker3D"] script = ExtResource("1_48rtd") @@ -16,6 +17,7 @@ sensitivity = 0.2 [node name="Camera" type="Camera3D" parent="Pivot"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 7.5) +attributes = ExtResource("3_olar0") current = true fov = 45.0 size = 10.0 diff --git a/client/world/CameraPractical.tres b/client/camera/CameraPractical.tres similarity index 84% rename from client/world/CameraPractical.tres rename to client/camera/CameraPractical.tres index 40dc39c..068c203 100644 --- a/client/world/CameraPractical.tres +++ b/client/camera/CameraPractical.tres @@ -1,6 +1,6 @@ [gd_resource type="CameraAttributesPractical" format=3 uid="uid://b835orxyqq6w5"] [resource] -dof_blur_far_enabled = true +exposure_multiplier = 0.5 dof_blur_far_transition = 50.0 dof_blur_near_enabled = true diff --git a/client/player/Player.tscn b/client/player/Player.tscn index d0ddc4c..2738431 100644 --- a/client/player/Player.tscn +++ b/client/player/Player.tscn @@ -6,7 +6,7 @@ [ext_resource type="PackedScene" uid="uid://cgqbkj8wbcatv" path="res://assets/hair/PonyTail.blend" id="3_umw6q"] [ext_resource type="FontFile" uid="uid://b7mov13kwi8u8" path="res://assets/font/ubuntu_nf_regular.ttf" id="4_76ehj"] [ext_resource type="Skin" uid="uid://bbqyiue1vj37f" path="res://assets/hoodie/Hoodie_Skin.tres" id="4_b1tg1"] -[ext_resource type="ArrayMesh" uid="uid://b3qvgfg41b7jo" path="res://assets/hoodie/Hoodie_Mesh.res" id="5_mkrgn"] +[ext_resource type="ArrayMesh" uid="uid://dbmluwi2atit" path="res://assets/hoodie/Hoodie_Mesh.res" id="5_mkrgn"] [ext_resource type="PackedScene" uid="uid://x102pryt2s5a" path="res://character/movement/MovementComponent.tscn" id="8_25qd0"] [ext_resource type="PackedScene" uid="uid://d0onbq0ad1ap4" path="res://character/rotation/RotationComponent.tscn" id="9_agxqu"] [ext_resource type="PackedScene" uid="uid://bivxnxwi863o0" path="res://character/animation/AnimationComponent.tscn" id="10_bcaeg"] @@ -24,89 +24,93 @@ script = ExtResource("1_8gebs") [node name="Female" parent="Model" instance=ExtResource("2_8nah6")] [node name="Armature" parent="Model/Female" index="0"] -transform = Transform3D(0.995541, 0.0478569, -0.0812847, -0.0469057, 0.998807, 0.0135727, 0.0818373, -0.00969949, 0.996599, -1.05381e-06, -0.00711502, 0.00603829) +transform = Transform3D(0.999999, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.000305099, -0.000408816) [node name="GeneralSkeleton" parent="Model/Female/Armature" index="0"] bones/1/rotation = Quaternion(1.10655e-09, -2.59221e-24, -2.34947e-16, 1) -bones/2/rotation = Quaternion(0.0106127, 0.0061452, 0.0135454, 0.999833) -bones/3/rotation = Quaternion(0.0212324, 0.0124238, 0.0257363, 0.999366) -bones/4/rotation = Quaternion(0.0212324, 0.0124238, 0.0257363, 0.999366) -bones/11/rotation = Quaternion(-0.0226131, 0.000417995, -0.000782817, 0.999744) -bones/12/rotation = Quaternion(-0.0226131, 0.00041802, -0.00078283, 0.999744) +bones/2/rotation = Quaternion(-2.64698e-23, 0, 0, 1) +bones/3/rotation = Quaternion(-7.45058e-09, -8.53484e-16, -4.44089e-16, 1) +bones/4/rotation = Quaternion(7.45058e-09, -2.08167e-17, -3.33067e-16, 1) +bones/11/rotation = Quaternion(2.98023e-08, -3.33067e-16, -1.77636e-15, 1) +bones/12/rotation = Quaternion(3.72529e-09, 3.59435e-15, -4.44089e-16, 1) bones/13/rotation = Quaternion(0.707107, -1.35146e-08, -1.15217e-08, 0.707107) bones/14/rotation = Quaternion(0.707107, -3.46447e-08, -1.09908e-09, 0.707107) -bones/15/rotation = Quaternion(0.510354, 0.474272, 0.574676, -0.429363) -bones/16/rotation = Quaternion(0.147678, 0.83228, -0.516329, -0.137494) -bones/17/rotation = Quaternion(0.0523164, -0.710684, 0.051662, 0.699659) -bones/18/rotation = Quaternion(0.0442343, 0.580786, 0.176085, 0.793552) -bones/19/rotation = Quaternion(0.116694, -0.0625513, -0.104637, 0.985658) -bones/20/rotation = Quaternion(0.0989349, 0.00127378, -0.0100822, 0.995042) -bones/21/rotation = Quaternion(-2.98023e-08, -2.98023e-08, -2.98023e-08, 1) -bones/22/rotation = Quaternion(0.242606, 0.0443104, -0.0693371, 0.966629) -bones/23/rotation = Quaternion(0.142512, -0.00254311, 0.0231811, 0.989518) -bones/24/rotation = Quaternion(0, -1.19209e-07, 0, 1) -bones/25/rotation = Quaternion(0.0921014, -0.0103497, -0.0608265, 0.993836) -bones/26/rotation = Quaternion(0.0901785, 0.000219584, 0.0019213, 0.995924) +bones/16/rotation = Quaternion(-2.98023e-08, 1, -2.98023e-08, -2.98023e-08) +bones/17/rotation = Quaternion(2.10734e-08, -0.707107, 0, 0.707107) +bones/18/rotation = Quaternion(0.0288902, 0.701957, -0.0496415, 0.7099) +bones/19/rotation = Quaternion(-0.0554471, 0.00107706, 0.0246517, 0.998157) +bones/20/rotation = Quaternion(-0.0144301, 0.000280172, 0.00955668, 0.99985) +bones/21/rotation = Quaternion(-0.0029327, 0.000187874, -0.00258715, 0.999992) +bones/22/rotation = Quaternion(-0.055445, -3.27826e-07, 0.0149855, 0.998349) +bones/23/rotation = Quaternion(-1.49012e-08, 0, -2.98023e-08, 1) +bones/24/rotation = Quaternion(0.00776948, -4.76837e-07, -0.00960994, 0.999924) +bones/25/rotation = Quaternion(-0.0554483, -2.08616e-07, 0.0149855, 0.998349) +bones/26/rotation = Quaternion(0, 1.49012e-08, 0, 1) bones/27/rotation = Quaternion(2.98023e-08, 2.98023e-08, 2.98023e-08, 1) -bones/28/rotation = Quaternion(0.165154, 0.00884447, -0.0589361, 0.984466) -bones/29/rotation = Quaternion(0.090618, -0.00120631, -0.00193921, 0.995883) -bones/30/rotation = Quaternion(0, 1.49012e-08, 0, 1) -bones/31/rotation = Quaternion(-0.144124, 0.641731, 0.137562, 0.740599) -bones/32/rotation = Quaternion(0.0971556, 0.0306568, -0.0228636, 0.994534) -bones/33/rotation = Quaternion(-1.49012e-08, 1.49012e-08, 0, 1) -bones/34/rotation = Quaternion(0.512517, -0.475648, -0.551246, -0.455206) -bones/35/rotation = Quaternion(-0.141908, 0.820729, -0.511312, 0.21172) -bones/36/rotation = Quaternion(0.0614412, 0.713017, -0.0602652, 0.695845) -bones/37/rotation = Quaternion(-0.0543144, -0.48594, -0.218214, 0.844568) -bones/38/rotation = Quaternion(0.117855, 0.0630393, 0.0680784, 0.988687) -bones/39/rotation = Quaternion(0.0455891, 0.00111282, 0.00525612, 0.998946) -bones/40/rotation = Quaternion(0, 5.96046e-08, 0, 1) -bones/41/rotation = Quaternion(0.193312, -0.00678019, 0.0324385, 0.980578) -bones/42/rotation = Quaternion(0.109045, 0.0103536, -0.0347182, 0.993376) -bones/43/rotation = Quaternion(1.49012e-08, 7.45058e-08, -4.47035e-08, 1) -bones/44/rotation = Quaternion(0.119383, 0.00551496, 0.0545327, 0.991334) -bones/45/rotation = Quaternion(0.0908674, 0.000456899, -0.00333831, 0.995857) +bones/28/rotation = Quaternion(-0.0554469, -2.98023e-07, 0.0149854, 0.998349) +bones/29/rotation = Quaternion(1.49012e-08, 2.98023e-08, 0, 1) +bones/30/rotation = Quaternion(-0.00621979, 1.93715e-07, 0.0114379, 0.999915) +bones/31/rotation = Quaternion(-0.0459777, 0.728478, 0.25833, 0.632828) +bones/32/rotation = Quaternion(-0.0219009, -0.00048776, 0.00526157, 0.999746) +bones/33/rotation = Quaternion(0.0390275, 0.000722662, -0.0124225, 0.999161) +bones/35/rotation = Quaternion(0, 1, 0, -5.96046e-08) +bones/36/rotation = Quaternion(0, 0.707107, 4.21468e-08, 0.707107) +bones/37/rotation = Quaternion(0.0288902, -0.701957, 0.0496415, 0.7099) +bones/38/rotation = Quaternion(-0.055447, -0.00107703, -0.0246517, 0.998157) +bones/39/rotation = Quaternion(-0.01443, -0.000280231, -0.0095567, 0.99985) +bones/40/rotation = Quaternion(-0.00293274, -0.000187755, 0.00258715, 0.999992) +bones/41/rotation = Quaternion(-0.055445, 2.98023e-07, -0.0149855, 0.998349) +bones/42/rotation = Quaternion(-4.47035e-08, 4.47035e-08, -1.49012e-08, 1) +bones/43/rotation = Quaternion(0.00776939, 5.0664e-07, 0.00960997, 0.999924) +bones/44/rotation = Quaternion(-0.0554483, 1.49012e-07, -0.0149856, 0.998349) +bones/45/rotation = Quaternion(1.49012e-08, -1.49012e-08, 1.49012e-08, 1) bones/46/rotation = Quaternion(0, -1.49012e-08, -1.49012e-08, 1) -bones/47/rotation = Quaternion(0.176473, 0.0112967, 0.0352683, 0.983609) -bones/48/rotation = Quaternion(0.0815352, 0.00364731, -0.0030745, 0.996659) -bones/49/rotation = Quaternion(0, 4.47035e-08, -4.47035e-08, 1) -bones/50/rotation = Quaternion(-0.137948, -0.61775, -0.121748, 0.764547) -bones/51/rotation = Quaternion(0.130968, -0.0275934, 0.00331908, 0.990997) -bones/52/rotation = Quaternion(-2.98023e-08, 0, -8.94069e-08, 1) -bones/53/rotation = Quaternion(0.0235545, 0.140936, 0.987094, -0.0723018) -bones/54/rotation = Quaternion(0.0045483, 0.991396, -0.13081, 0.00112335) -bones/55/rotation = Quaternion(0.0935469, 0.723518, -0.671481, 0.129938) -bones/56/rotation = Quaternion(-0.0280896, 0.999517, -0.001982, 0.0131158) -bones/57/rotation = Quaternion(-0.0606065, 0.0314289, 0.996173, -0.0545847) -bones/58/rotation = Quaternion(-0.00231955, 0.997177, -0.0750533, 0.000132893) -bones/59/rotation = Quaternion(-0.100123, 0.67561, -0.72831, -0.0556035) -bones/60/rotation = Quaternion(-0.00833549, 0.999661, 0.0240893, 0.00531644) +bones/47/rotation = Quaternion(-0.0554468, 2.38419e-07, -0.0149854, 0.998349) +bones/48/rotation = Quaternion(0, -1.49012e-08, 0, 1) +bones/49/rotation = Quaternion(-0.0062138, -4.61936e-07, -0.011438, 0.999915) +bones/50/rotation = Quaternion(-0.0459777, -0.728478, -0.25833, 0.632828) +bones/51/rotation = Quaternion(-0.0219009, 0.000487968, -0.00526172, 0.999746) +bones/52/rotation = Quaternion(0.0390272, -0.000721872, 0.0124239, 0.999161) +bones/53/rotation = Quaternion(1.78359e-07, 0.00610319, 0.999981, 7.87824e-09) +bones/54/rotation = Quaternion(-1.15267e-08, 1, -0.000802423, -2.059e-07) +bones/55/rotation = Quaternion(-1.81421e-07, 0.710845, -0.703349, 2.42514e-07) +bones/56/rotation = Quaternion(4.97719e-14, 1, 0, 1.92336e-13) +bones/57/rotation = Quaternion(1.22635e-07, 0.00610348, 0.999981, 4.94272e-08) +bones/58/rotation = Quaternion(-5.5979e-08, 1, -0.000803839, -1.20528e-07) +bones/59/rotation = Quaternion(-1.8142e-07, 0.710844, -0.70335, 2.42513e-07) +bones/60/rotation = Quaternion(-1.28748e-14, 1, 0, 1.16815e-13) -[node name="Hoodie" type="MeshInstance3D" parent="Model/Female/Armature/GeneralSkeleton" index="2"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.000305099, -0.000408816) -mesh = ExtResource("5_mkrgn") -skin = ExtResource("4_b1tg1") +[node name="Chest" parent="Model/Female/Armature/GeneralSkeleton" index="1"] +visible = false -[node name="BoneAttachment3D" type="BoneAttachment3D" parent="Model/Female/Armature/GeneralSkeleton" index="3"] -transform = Transform3D(0.989937, -0.128748, 0.0587304, 0.129651, 0.991489, -0.0118236, -0.0567083, 0.0193191, 0.998204, -0.0399633, 1.37256, 0.00421853) +[node name="BoneAttachment3D" type="BoneAttachment3D" parent="Model/Female/Armature/GeneralSkeleton" index="2"] +transform = Transform3D(1, 6.4651e-15, 4.77396e-15, -6.4651e-15, 1, -6.92683e-08, -4.77396e-15, 6.92683e-08, 1, 1.57651e-10, 1.37156, -0.0247111) bone_name = "Head" bone_idx = 12 [node name="PonyTail" parent="Model/Female/Armature/GeneralSkeleton/BoneAttachment3D" instance=ExtResource("3_umw6q")] +[node name="Hips" parent="Model/Female/Armature/GeneralSkeleton" index="4"] +visible = false + +[node name="Hoodie" type="MeshInstance3D" parent="Model/Female/Armature/GeneralSkeleton" index="5"] +mesh = ExtResource("5_mkrgn") +skin = ExtResource("4_b1tg1") + [node name="Collision" type="CollisionShape3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.8, 0) shape = SubResource("CapsuleShape3D_2f50n") [node name="Label" type="Label3D" parent="."] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0) -pixel_size = 0.001 +pixel_size = 0.0005 billboard = 1 double_sided = false -alpha_cut = 1 +alpha_antialiasing_mode = 1 +outline_modulate = Color(0.0627451, 0.0627451, 0.0627451, 0.498039) text = "Player" font = ExtResource("4_76ehj") -font_size = 128 +font_size = 256 outline_size = 32 [node name="Health" parent="." instance=ExtResource("2_np5ag")] diff --git a/client/project.godot b/client/project.godot index 1ab86a5..21635d0 100644 --- a/client/project.godot +++ b/client/project.godot @@ -105,6 +105,11 @@ open_chat={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null) ] } +open_inventory={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":73,"key_label":0,"unicode":105,"echo":false,"script":null) +] +} toggle_fullscreen={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":true,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194309,"key_label":0,"unicode":0,"echo":false,"script":null)