From b4f6f65f2bfeda5fd5dc2a08d3ea2d50fc2a5736 Mon Sep 17 00:00:00 2001 From: Rendo Date: Fri, 28 Nov 2025 21:46:32 +0500 Subject: [PATCH] new map --- environments/prototype_environment.tres | 2 + levels/prototype_scene.tscn | 204 +++++++++++++++++------- materials/Bluemat.tres | 2 +- materials/OrangeMat.tres | 2 +- project.godot | 2 - scenes/molikman.tscn | 4 + 6 files changed, 151 insertions(+), 65 deletions(-) diff --git a/environments/prototype_environment.tres b/environments/prototype_environment.tres index bdcf61b..30a9da2 100644 --- a/environments/prototype_environment.tres +++ b/environments/prototype_environment.tres @@ -12,6 +12,8 @@ sky_material = SubResource("ProceduralSkyMaterial_jbyth") [resource] background_mode = 2 sky = SubResource("Sky_hb4cm") +ambient_light_color = Color(1, 1, 1, 1) tonemap_mode = 3 +ssao_enabled = true volumetric_fog_enabled = true volumetric_fog_density = 0.0 diff --git a/levels/prototype_scene.tscn b/levels/prototype_scene.tscn index 731ad14..406877a 100644 --- a/levels/prototype_scene.tscn +++ b/levels/prototype_scene.tscn @@ -10,35 +10,11 @@ [sub_resource type="Animation" id="Animation_y6i55"] length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("CSGCombiner3D/CSGBox3D7:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Vector3(-10.610777, 3.2577968, -10.344306)] -} [sub_resource type="Animation" id="Animation_pi0y7"] resource_name = "main" length = 5.0 loop_mode = 2 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath("CSGCombiner3D/CSGBox3D7:position") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0, 5), -"transitions": PackedFloat32Array(-2, -2), -"update": 0, -"values": [Vector3(-10.610777, 3.2577968, -10.344306), Vector3(-13.402859, 6.188627, 10.213315)] -} [sub_resource type="AnimationLibrary" id="AnimationLibrary_bno23"] _data = { @@ -51,6 +27,7 @@ _data = { [node name="DirectionalLight3D" type="DirectionalLight3D" parent="."] transform = Transform3D(-0.8660254, -0.43301278, 0.25, 0, 0.49999997, 0.86602545, -0.50000006, 0.75, -0.43301266, 0, 0, 0) shadow_enabled = true +shadow_opacity = 0.72 [node name="WorldEnvironment" type="WorldEnvironment" parent="."] environment = ExtResource("1_i6jab") @@ -59,47 +36,152 @@ environment = ExtResource("1_i6jab") use_collision = true collision_mask = 9 -[node name="CSGBox3D2" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.774414, 2.211084, -2.7798462) -size = Vector3(1, 3.9007568, 10.341309) -material = ExtResource("5_bno23") - -[node name="CSGBox3D3" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.6651913, 0, -0.746673, 0, 1, 0, 0.746673, 0, 0.6651913, -3.2896764, 2.2110848, -14.45882) -size = Vector3(10.241699, 3.9007568, 10.341309) -material = ExtResource("5_bno23") - -[node name="CSGBox3D7" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.6651913, 0, -0.746673, 0, 1, 0, 0.746673, 0, 0.6651913, -10.610777, 3.2577968, -10.344306) -size = Vector3(4.6240234, 1.4752808, 4.2929688) -material = ExtResource("5_bno23") - -[node name="CSGBox3D4" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.2536462, 0.36299103, -0.8966053, -0.098810926, 0.9317926, 0.3492834, 0.962237, 0, 0.27221313, 17.497704, 2.2110848, -14.45882) -size = Vector3(10.241699, 3.9007568, 10.341309) -material = ExtResource("5_bno23") - -[node name="CSGBox3D5" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.2536462, 0.36299103, -0.8966053, -0.098810926, 0.9317926, 0.3492834, 0.962237, 0, 0.27221313, 14.175301, -0.97636676, 16.262775) -size = Vector3(10.241699, 8.579285, 15.858276) -material = ExtResource("5_bno23") - -[node name="CSGBox3D6" type="CSGBox3D" parent="CSGCombiner3D"] -transform = Transform3D(0.2464775, -0.4244365, -0.87126493, 0.11553718, 0.90545774, -0.40840852, 0.9622371, -1.5334081e-09, 0.27221313, -19.380054, -0.97636676, 16.262775) -size = Vector3(10.241699, 8.579285, 15.858276) -material = ExtResource("5_bno23") - [node name="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D"] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -3.774414, 0, 1.8908081) material_override = ExtResource("5_bno23") use_collision = true -size = Vector3(70.1814, 1, 50.408203) +size = Vector3(126.25586, 1, 100.838135) material = ExtResource("4_y6i55") -[node name="CSGPolygon3D" type="CSGPolygon3D" parent="CSGCombiner3D"] -transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -3.3137877, 0.02481842, -3.7979093) -polygon = PackedVector2Array(1.1265539, -0.16863012, -3.9689837, 4.1396155, -6.226393, 4.152759, -7.117619, 0.24168777) -depth = 2.64 +[node name="CSGBox3D2" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.225314, 11.40127, -0.67839193) +size = Vector3(22.55111, 21.967224, 14.480225) +material = ExtResource("5_bno23") + +[node name="CSGBox3D18" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.487278, 2.707026, -9.567705) +size = Vector3(4.0271816, 4.5787354, 5.284851) +material = ExtResource("5_bno23") + +[node name="CSGBox3D22" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.487278, 6.839224, -24.810701) +size = Vector3(4.0271816, 3.7450104, 35.770844) +material = ExtResource("5_bno23") + +[node name="CSGBox3D19" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.487278, 2.707026, -23.270264) +size = Vector3(4.0271816, 4.5787354, 14.136078) +material = ExtResource("5_bno23") + +[node name="CSGBox3D20" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.347204, 2.707026, -39.01053) +size = Vector3(4.307333, 4.5787354, 7.6101303) +material = ExtResource("5_bno23") + +[node name="CSGBox3D5" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 4.018885, 0.9641862) +size = Vector3(3.9233856, 7.2024536, 17.76538) +material = ExtResource("5_bno23") + +[node name="CSGBox3D25" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.14979744, 2.707026, -6.3106613) +size = Vector3(1.047142, 4.5787354, 14.125183) +material = ExtResource("5_bno23") + +[node name="CSGBox3D6" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 2.707026, 24.290133) +size = Vector3(3.9233856, 4.5787354, 9.820068) +material = ExtResource("5_bno23") + +[node name="CSGBox3D23" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 3.8318734, 24.290133) +size = Vector3(3.9233856, 6.82843, 9.820068) +material = ExtResource("5_bno23") + +[node name="CSGBox3D26" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(0.9261539, 0, 0.37714583, 0, 1, 0, -0.37714583, 0, 0.9261539, 18.061287, 5.907801, 25.213737) +size = Vector3(3.9233856, 10.980286, 10.570801) +material = ExtResource("5_bno23") + +[node name="CSGBox3D27" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(0.9261539, 0, 0.37714583, 0, 1, 0, -0.37714583, 0, 0.9261539, 22.358187, 5.907801, 13.242789) +size = Vector3(3.9233856, 10.980286, 17.174194) +material = ExtResource("5_bno23") + +[node name="CSGBox3D28" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(0.9261539, 0, 0.37714583, 0, 1, 0, -0.37714583, 0, 0.9261539, 30.807379, 5.907801, 33.162186) +size = Vector3(3.9233856, 10.980286, 9.805786) +material = ExtResource("5_bno23") + +[node name="CSGBox3D10" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8908911, 11.176111, 39.495316) +size = Vector3(101.37683, 21.516907, 5.6578064) +material = ExtResource("5_bno23") + +[node name="CSGBox3D11" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 50.289783, 11.067961, 1.4346962) +size = Vector3(85.006775, 21.300598, 5.6578064) +material = ExtResource("5_bno23") + +[node name="CSGBox3D12" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 2.2212105, 11.069246, -43.06659) +size = Vector3(101.37683, 21.303177, 5.6578064) +material = ExtResource("5_bno23") + +[node name="CSGBox3D13" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(-4.371139e-08, 0, -1, 0, 1, 0, 1, 0, -4.371139e-08, -46.17769, 2.7070298, -5.005974) +size = Vector3(85.006775, 4.5787354, 5.6578064) +material = ExtResource("5_bno23") + +[node name="CSGBox3D14" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(-0.50000006, 0, -0.8660254, 0, 1, 0, 0.8660254, 0, -0.50000006, -48.2127, 2.7070298, -31.084457) +size = Vector3(41.872528, 4.5787354, 35.261032) +material = ExtResource("5_bno23") + +[node name="CSGBox3D15" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(0.8660254, 0, -0.5, 0, 1, 0, 0.5, 0, 0.8660254, -32.975563, 17.84463, 39.652107) +size = Vector3(41.872528, 34.853943, 27.1624) +material = ExtResource("5_bno23") + +[node name="CSGBox3D8" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 2.613397, 14.892656) +size = Vector3(3.9233856, 4.391477, 14.298218) +material = ExtResource("5_bno23") + +[node name="CSGBox3D9" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -9.855904, 1.8220601, 14.801653) +size = Vector3(3.9233856, 2.8088036, 14.480225) +material = ExtResource("5_bno23") + +[node name="CSGPolygon3D" type="CSGPolygon3D" parent="CSGCombiner3D/CSGBox3D9"] +transform = Transform3D(-1, 0, -8.742278e-08, 0, 1, 0, 8.742278e-08, 0, -1, -3.3341227, 0, -7.254325) +polygon = PackedVector2Array(-1.3562565, -1.5799096, -1.3376074, 1.3967638, 3.4623585, -1.4471698) +depth = 14.19 +material = ExtResource("5_bno23") + +[node name="CSGBox3D7" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(0.7781335, 0, 0.62809885, 0, 1, 0, -0.62809885, 0, 0.7781335, 11.133803, 11.382593, 6.4941206) +size = Vector3(17.700146, 21.92987, 14.480225) +material = ExtResource("5_bno23") + +[node name="CSGBox3D3" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.175511, 8.376497, -12.051787) +size = Vector3(9.126762, 15.917679, 8.480011) +material = ExtResource("5_bno23") + +[node name="CSGBox3D17" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -33.36447, 9.907686, -16.614532) +size = Vector3(19.777737, 18.980057, 17.6055) +material = ExtResource("5_bno23") + +[node name="CSGBox3D16" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -22.201584, 11.806246, -32.960644) +size = Vector3(29.178907, 22.777176, 17.689468) +material = ExtResource("5_bno23") + +[node name="CSGBox3D4" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.0154533, 9.821699, -20.33673) +size = Vector3(5.681938, 18.808083, 7.111515) +material = ExtResource("5_bno23") + +[node name="CSGBox3D21" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.4263325, 3.1404138, -35.9143) +size = Vector3(17.193996, 5.445511, 2.406681) +material = ExtResource("5_bno23") + +[node name="CSGBox3D24" type="CSGBox3D" parent="CSGCombiner3D"] +transform = Transform3D(1, 0, 0, 0, 0.93200153, -0.3624543, 0, 0.3624543, 0.93200153, 2.6995444, 6.9419756, -39.9535) +size = Vector3(33.342323, 1.3384781, 10.485079) material = ExtResource("5_bno23") [node name="AnimationPlayer" type="AnimationPlayer" parent="."] @@ -111,12 +193,12 @@ autoplay = "main" [node name="PlayersContainer" type="Node3D" parent="."] [node name="DefenceSpawn" type="Marker3D" parent="PlayersContainer"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.2367034, 0.5180037, -10.260834) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 37.170197, 0.5180037, 9.210396) script = ExtResource("4_pi0y7") spawn_radius = 10.0 [node name="AttackSpawn" type="Marker3D" parent="PlayersContainer"] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -32.38732, 0.5180037, 8.271217) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -32.595993, 0.5180037, 1.4365778) script = ExtResource("4_pi0y7") team = 1 spawn_radius = 5.0 diff --git a/materials/Bluemat.tres b/materials/Bluemat.tres index 1764a7f..3beab6d 100644 --- a/materials/Bluemat.tres +++ b/materials/Bluemat.tres @@ -1,4 +1,4 @@ [gd_resource type="ORMMaterial3D" format=3 uid="uid://mlha6r17v2en"] [resource] -albedo_color = Color(0.19944665, 0.5091224, 0.99999994, 1) +albedo_color = Color(0.24278381, 0.50552464, 0.98835534, 1) diff --git a/materials/OrangeMat.tres b/materials/OrangeMat.tres index ab0671e..951ef22 100644 --- a/materials/OrangeMat.tres +++ b/materials/OrangeMat.tres @@ -1,4 +1,4 @@ [gd_resource type="ORMMaterial3D" format=3 uid="uid://bx3f5vx71ynh5"] [resource] -albedo_color = Color(1, 0.53333336, 0, 1) +albedo_color = Color(0.64, 0.64, 0.64, 1) diff --git a/project.godot b/project.godot index b1a0edc..1063b70 100644 --- a/project.godot +++ b/project.godot @@ -25,8 +25,6 @@ Session="*res://scripts/multiplayer/session.gd" window/size/viewport_width=1280 window/size/viewport_height=720 -window/stretch/mode="viewport" -window/stretch/aspect="ignore" [input] diff --git a/scenes/molikman.tscn b/scenes/molikman.tscn index c3bbd4a..3646fd8 100644 --- a/scenes/molikman.tscn +++ b/scenes/molikman.tscn @@ -270,16 +270,20 @@ metadata/_custom_type_script = "uid://3777rkbebgjm" [node name="Crouch" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("stand_up_area", "player", "animation_player")] script = ExtResource("9_oprun") +SPEED = 3.125 stand_up_area = NodePath("../../StandArea") player = NodePath("../..") animation_player = NodePath("../../AnimationPlayer") [node name="Stand" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("player")] script = ExtResource("10_a8ls1") +SPEED = 6.25 +JUMP_VELOCITY = 6.0 player = NodePath("../..") [node name="Walk" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("player")] script = ExtResource("11_qfm1y") +SPEED = 3.125 player = NodePath("../..") [node name="Fall" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("player")]