diff --git a/animations/baked_mm_molik_idle.res b/animations/baked_mm_molik_idle.res index ff2e58a..4387fdc 100644 Binary files a/animations/baked_mm_molik_idle.res and b/animations/baked_mm_molik_idle.res differ diff --git a/levels/prototype.tscn b/levels/prototype.tscn index e952e30..43882ee 100644 --- a/levels/prototype.tscn +++ b/levels/prototype.tscn @@ -65,15 +65,15 @@ size = Vector3(1.5958366, 1.7258911, 1.7827377) material = ExtResource("5_foctg") [node name="CSGBox3D33" type="CSGBox3D" parent="."] -transform = Transform3D(0.92477864, 0, 0.38050553, 0, 1, 0, -0.38050553, 0, 0.92477864, 23.520184, 2.5820146, 65.654816) +transform = Transform3D(0.92477864, 0, 0.38050553, 0, 1, 0, -0.38050553, 0, 0.92477864, 23.317924, 2.5820146, 65.163246) use_collision = true -size = Vector3(3.1851254, 4.3287125, 3.5466423) +size = Vector3(3.1851254, 4.3287125, 4.609747) material = ExtResource("5_foctg") [node name="CSGBox3D39" type="CSGBox3D" parent="."] -transform = Transform3D(0.9044105, 0, -0.42666352, 0, 1, 0, 0.42666352, 0, 0.9044105, 26.24633, 2.5820146, 73.96512) +transform = Transform3D(0.7889983, 0, -0.61439544, 0, 1, 0, 0.61439544, 0, 0.7889983, 25.233984, 2.5820146, 75.37221) use_collision = true -size = Vector3(3.1851254, 4.3287125, 3.5466423) +size = Vector3(3.1851254, 4.3287125, 8.943421) material = ExtResource("5_foctg") [node name="CSGBox3D34" type="CSGBox3D" parent="."] @@ -89,9 +89,9 @@ size = Vector3(3.1851254, 4.3287125, 3.5466423) material = ExtResource("5_foctg") [node name="CSGBox3D37" type="CSGBox3D" parent="."] -transform = Transform3D(0.48819482, 0, 0.8727346, 0, 1, 0, -0.8727346, 0, 0.48819482, -4.4885178, 2.5820165, 72.37653) +transform = Transform3D(0.48819482, 0, 0.8727346, 0, 1, 0, -0.8727346, 0, 0.48819482, -2.9990053, 2.5820165, 69.71377) use_collision = true -size = Vector3(3.1851254, 4.3287125, 3.5466423) +size = Vector3(9.287249, 4.3287125, 3.5466423) material = ExtResource("5_foctg") [node name="CSGBox3D38" type="CSGBox3D" parent="."] @@ -107,9 +107,9 @@ size = Vector3(3.1851254, 4.3287125, 3.5466423) material = ExtResource("5_foctg") [node name="CSGBox3D40" type="CSGBox3D" parent="."] -transform = Transform3D(0.28944945, 0, 0.95719326, 0, 1, 0, -0.95719326, 0, 0.28944945, 11.995628, 2.5820165, 98.357735) +transform = Transform3D(0.28944945, 0, 0.95719326, 0, 1, 0, -0.95719326, 0, 0.28944945, 12.17768, 2.5820165, 97.7557) use_collision = true -size = Vector3(4.3513517, 4.3287125, 3.5466423) +size = Vector3(5.6092696, 4.3287125, 3.5466423) material = ExtResource("5_foctg") [node name="CSGCombiner3D" type="CSGCombiner3D" parent="."] @@ -410,6 +410,12 @@ operation = 2 size = Vector3(3.6301231, 4.774475, 54.19715) material = ExtResource("5_bno23") +[node name="CSGBox3D27" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D17"] +transform = Transform3D(1, 0, 0, 0, 0.9999999, 2.9802322e-08, 0, -2.9802322e-08, 0.9999999, -5.761688, -4.051338, 24.22068) +operation = 2 +size = Vector3(6.8897686, 4.774475, 3.0849934) +material = ExtResource("5_bno23") + [node name="CSGBox3D28" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D17"] transform = Transform3D(1, 0, 0, 0, 0.9999999, 2.9802322e-08, 0, -2.9802322e-08, 0.9999999, -5.740879, -4.1464105, -11.956085) operation = 2 @@ -464,15 +470,21 @@ size = Vector3(5.1586266, 9.294983, 54.072815) material = ExtResource("5_bno23") [node name="CSGBox3D28" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D19"] -transform = Transform3D(-4.3699842e-08, -2.8797661e-08, 0.9999999, 0.02298396, 0.9997357, 2.979445e-08, -0.99973583, 0.022983959, -4.3026414e-08, -0.29299164, -1.9253736, -26.123158) +transform = Transform3D(-4.3699842e-08, -2.8797661e-08, 0.9999999, 0.02298396, 0.9997357, 2.9794448e-08, -0.99973583, 0.022983959, -4.3026777e-08, -0.48029327, -1.9253736, -26.123158) operation = 2 -size = Vector3(3.6301231, 4.774475, 5.5291176) +size = Vector3(3.6301231, 4.774475, 5.903719) +material = ExtResource("5_bno23") + +[node name="CSGBox3D30" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D19"] +transform = Transform3D(-4.3699842e-08, -2.8797661e-08, 0.9999999, 0.02298396, 0.9997357, 2.9794448e-08, -0.99973583, 0.022983959, -4.3027494e-08, 0.6492691, -1.9541526, -24.871353) +operation = 2 +size = Vector3(6.1343975, 4.774475, 3.7259297) material = ExtResource("5_bno23") [node name="CSGBox3D29" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D19"] -transform = Transform3D(-4.3699842e-08, -2.8797661e-08, 0.9999999, 0.02298396, 0.9997357, 2.9794448e-08, -0.99973583, 0.022983959, -4.3027118e-08, 0.8085251, -2.5020893, -1.0377293) +transform = Transform3D(-4.3699842e-08, -2.8797661e-08, 0.9999999, 0.02298396, 0.9997357, 2.9794448e-08, -0.99973583, 0.022983959, -4.3027544e-08, 0.8085251, -2.5328088, 0.29847717) operation = 2 -size = Vector3(53.81424, 4.774475, 3.3260822) +size = Vector3(51.14112, 4.774475, 3.3260822) material = ExtResource("5_bno23") [node name="CSGBox3D31" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D19"] diff --git a/models/characters/viewmodels/meshes/molikman_cloak.res b/models/characters/viewmodels/meshes/molikman_cloak.res index 05a5db1..4b2ca13 100644 Binary files a/models/characters/viewmodels/meshes/molikman_cloak.res and b/models/characters/viewmodels/meshes/molikman_cloak.res differ diff --git a/players/molikman.tscn b/players/molikman.tscn index 5d48ade..18f9b97 100644 --- a/players/molikman.tscn +++ b/players/molikman.tscn @@ -12,7 +12,7 @@ [ext_resource type="Texture2D" uid="uid://ce5c0hj7iyvxs" path="res://models/characters/viewmodels/molikman_hands_tex_molik.png" id="8_5684k"] [ext_resource type="Texture2D" uid="uid://twxsiwqgu1dy" path="res://models/characters/viewmodels/molikman_hands_tex_bomb.png" id="9_mfvjl"] [ext_resource type="Script" uid="uid://bl8gfrrc512q2" path="res://players/player/dead_player_spectator.gd" id="10_nar88"] -[ext_resource type="Animation" uid="uid://chu2frqklotem" path="res://animations/baked_mm_molik_idle.res" id="12_5684k"] +[ext_resource type="Animation" uid="uid://caor6fhuuneka" path="res://animations/baked_mm_molik_idle.res" id="12_5684k"] [ext_resource type="Script" uid="uid://dalwlndejfdhm" path="res://gui/crosshair.gd" id="13_a8vk2"] [ext_resource type="Script" uid="uid://vmhlmhd6gjx6" path="res://gui/hud/player_healthbar.gd" id="14_dy7an"] [ext_resource type="PackedScene" uid="uid://bqdcjq12tbh0s" path="res://gui/weapon_display/weapon_display.tscn" id="14_tgg0h"] @@ -13171,6 +13171,7 @@ bones/53/scale = Vector3(1, 1, 1) [node name="Coat" type="MeshInstance3D" parent="Camera3D/molikman_hands/Hands/Skeleton3D"] mesh = ExtResource("5_x16f1") skin = SubResource("Skin_xd1kh") +surface_material_override/0 = ExtResource("2_330gv") [node name="Molikman" type="MeshInstance3D" parent="Camera3D/molikman_hands/Hands/Skeleton3D"] mesh = SubResource("ArrayMesh_7i6yw") diff --git a/weapons/bomb/active_bomb.tscn b/weapons/bomb/active_bomb.tscn index 9f0a967..436d729 100644 --- a/weapons/bomb/active_bomb.tscn +++ b/weapons/bomb/active_bomb.tscn @@ -43,7 +43,6 @@ one_shot = true [node name="BeepAudio" type="AudioStreamPlayer3D" parent="."] stream = ExtResource("3_0eiu1") -attenuation_model = 3 unit_size = 50.0 bus = &"GameplayMain" attenuation_filter_cutoff_hz = 20500.0 @@ -60,10 +59,9 @@ metadata/_custom_type_script = "uid://da0xv360va3b3" [node name="BoomAudio" type="AudioStreamPlayer3D" parent="."] stream = ExtResource("6_uibus") -attenuation_model = 3 volume_db = 20.0 -unit_size = 100.0 -max_distance = 500.0 +unit_size = 20.0 +max_distance = 100.0 bus = &"GameplayMisc" script = ExtResource("4_rcpur") metadata/_custom_type_script = "uid://da0xv360va3b3"