Rendo/Chelimbalo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Map improvements

Browse source
This commit is contained in:
Rendo 2025-11-29 18:59:54 +05:00
commit edd1894bcd
2 changed files with 53 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

81
levels/prototype_scene.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=21 format=3 uid="uid://cqrh2cc7m2i7f"] [gd_scene load_steps=22 format=3 uid="uid://cqrh2cc7m2i7f"]
[ext_resource type="Environment" uid="uid://d0cfgtx2yxw13" path="res://environments/prototype_environment.tres" id="1_i6jab"] [ext_resource type="Environment" uid="uid://d0cfgtx2yxw13" path="res://environments/prototype_environment.tres" id="1_i6jab"]
[ext_resource type="Script" uid="uid://ypgm3aplt78m" path="res://scripts/multiplayer/team_spawner.gd" id="4_pi0y7"] [ext_resource type="Script" uid="uid://ypgm3aplt78m" path="res://scripts/multiplayer/team_spawner.gd" id="4_pi0y7"]
@ -6,6 +6,7 @@
[ext_resource type="Material" uid="uid://dynpcduei1wfn" path="res://materials/Bluemat.tres" id="4_yx0ab"] [ext_resource type="Material" uid="uid://dynpcduei1wfn" path="res://materials/Bluemat.tres" id="4_yx0ab"]
[ext_resource type="Material" uid="uid://mlha6r17v2en" path="res://materials/DarkBluemat.tres" id="5_bno23"] [ext_resource type="Material" uid="uid://mlha6r17v2en" path="res://materials/DarkBluemat.tres" id="5_bno23"]
[ext_resource type="Material" uid="uid://duvlktlyurohd" path="res://materials/Yellowmat.tres" id="5_foctg"] [ext_resource type="Material" uid="uid://duvlktlyurohd" path="res://materials/Yellowmat.tres" id="5_foctg"]
[ext_resource type="Material" uid="uid://jdfticwelku4" path="res://materials/Greenmat.tres" id="6_8bje3"]
[ext_resource type="Script" uid="uid://dncldab5y4yod" path="res://scripts/item_spawner.gd" id="6_61ure"] [ext_resource type="Script" uid="uid://dncldab5y4yod" path="res://scripts/item_spawner.gd" id="6_61ure"]
[ext_resource type="PackedScene" uid="uid://cxdgk74ln5xpn" path="res://scenes/weapons/droppable_bomb.tscn" id="6_bno23"] [ext_resource type="PackedScene" uid="uid://cxdgk74ln5xpn" path="res://scenes/weapons/droppable_bomb.tscn" id="6_bno23"]
[ext_resource type="Material" uid="uid://cyej4ph6hcnou" path="res://materials/Orangemat.tres" id="6_foctg"] [ext_resource type="Material" uid="uid://cyej4ph6hcnou" path="res://materials/Orangemat.tres" id="6_foctg"]
@ -59,11 +60,6 @@ use_collision = true
size = Vector3(126.25586, 1, 100.838135) size = Vector3(126.25586, 1, 100.838135)
material = ExtResource("4_y6i55") material = ExtResource("4_y6i55")
[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"] [node name="CSGBox3D18" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 20.487278, 2.707026, -9.567705) 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) size = Vector3(4.0271816, 4.5787354, 5.284851)
@ -127,23 +123,23 @@ material = ExtResource("5_bno23")
[node name="CSGBox3D10" type="CSGBox3D" parent="CSGCombiner3D"] [node name="CSGBox3D10" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8908911, 11.176111, 39.495316) 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) size = Vector3(101.37683, 21.516907, 5.6578064)
material = ExtResource("5_bno23") material = ExtResource("6_8bje3")
[node name="CSGBox3D11" type="CSGBox3D" parent="CSGCombiner3D"] [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) 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) size = Vector3(85.006775, 21.300598, 5.6578064)
material = ExtResource("5_bno23") material = ExtResource("6_8bje3")
[node name="CSGBox3D12" type="CSGBox3D" parent="CSGCombiner3D"] [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) transform = Transform3D(-1, 0, 8.742278e-08, 0, 1, 0, -8.742278e-08, 0, -1, 2.2212105, 11.069246, -43.06659)
material_override = ExtResource("9_ysk2e") material_override = ExtResource("9_ysk2e")
size = Vector3(101.37683, 21.303177, 5.6578064) size = Vector3(101.37683, 21.303177, 5.6578064)
material = ExtResource("5_bno23") material = ExtResource("6_8bje3")
[node name="CSGBox3D13" type="CSGBox3D" parent="CSGCombiner3D"] [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) 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) size = Vector3(85.006775, 4.5787354, 5.6578064)
material = ExtResource("5_bno23") material = ExtResource("6_8bje3")
[node name="CSGBox3D14" type="CSGBox3D" parent="CSGCombiner3D"] [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) transform = Transform3D(-0.50000006, 0, -0.8660254, 0, 1, 0, 0.8660254, 0, -0.50000006, -48.2127, 2.7070298, -31.084457)
@ -153,7 +149,7 @@ material = ExtResource("5_bno23")
[node name="CSGBox3D15" type="CSGBox3D" parent="CSGCombiner3D"] [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) 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) size = Vector3(41.872528, 34.853943, 27.1624)
material = ExtResource("5_bno23") material = ExtResource("6_8bje3")
[node name="CSGBox3D8" type="CSGBox3D" parent="CSGCombiner3D"] [node name="CSGBox3D8" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 2.613397, 14.892656) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -8.189109, 2.613397, 14.892656)
@ -171,11 +167,6 @@ polygon = PackedVector2Array(-1.3562565, -1.5799096, -1.3376074, 1.3967638, 3.46
depth = 14.19 depth = 14.19
material = ExtResource("5_bno23") 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"] [node name="CSGBox3D3" type="CSGBox3D" parent="CSGCombiner3D"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -12.175511, 8.376497, -12.051787) 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) size = Vector3(9.126762, 15.917679, 8.480011)
@ -206,6 +197,34 @@ transform = Transform3D(1, 0, 0, 0, 0.93200153, -0.3624543, 0, 0.3624543, 0.9320
size = Vector3(33.342323, 1.3384781, 10.485079) size = Vector3(33.342323, 1.3384781, 10.485079)
material = ExtResource("7_8bje3") material = ExtResource("7_8bje3")
[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="CSGBox3D" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D2"]
transform = Transform3D(0.83269906, 0, -0.55372584, 0, 1, 0, 0.55372584, 0, 0.83269906, -8.022983, -9.618128, -0.23815984)
operation = 2
size = Vector3(10.669815, 4.566284, 3.4625244)
material = ExtResource("7_8bje3")
[node name="CSGBox3D3" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D2"]
transform = Transform3D(0.9337244, 0, 0.35799336, 0, 1, 0, -0.35799336, 0, 0.9337244, 2.7047615, -9.61813, -0.02129364)
operation = 2
size = Vector3(20.339264, 4.566284, 3.4625244)
material = ExtResource("7_8bje3")
[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="CSGBox3D2" type="CSGBox3D" parent="CSGCombiner3D/CSGBox3D7"]
transform = Transform3D(0.95141774, 0, -0.3079045, 0, 1, 0, 0.3079045, 0, 0.95141774, 6.694298, -9.599453, -3.8414078)
operation = 2
size = Vector3(20.339264, 4.566284, 3.4625244)
material = ExtResource("7_8bje3")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."] [node name="AnimationPlayer" type="AnimationPlayer" parent="."]
libraries = { libraries = {
&"": SubResource("AnimationLibrary_bno23") &"": SubResource("AnimationLibrary_bno23")
@ -247,6 +266,21 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -28.858309, 4.6431036, 12.873
script = ExtResource("6_61ure") script = ExtResource("6_61ure")
item = ExtResource("6_bno23") item = ExtResource("6_bno23")
[node name="CSGBox3D30" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.8463913, 0.33205223, -18.39247)
size = Vector3(0.49205017, 0.6567383, 21.270905)
material = ExtResource("9_ysk2e")
[node name="CSGBox3D31" type="CSGBox3D" parent="."]
transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 8.300152, 0.33205223, -28.774506)
size = Vector3(0.49205017, 0.6567383, 15.680862)
material = ExtResource("9_ysk2e")
[node name="CSGBox3D32" type="CSGBox3D" parent="."]
transform = Transform3D(-1.0000001, 0, 0, 0, 1, 0, 0, 0, -1.0000001, 15.965797, 0.33205223, -18.300764)
size = Vector3(0.49205017, 0.6567383, 21.278908)
material = ExtResource("9_ysk2e")
[node name="PlantA" type="Area3D" parent="."] [node name="PlantA" type="Area3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8366356, 1.4274807, -21.45604) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 1.8366356, 1.4274807, -21.45604)
collision_layer = 0 collision_layer = 0
@ -271,18 +305,3 @@ shape = SubResource("BoxShape3D_1wlgq")
[node name="CollisionShape3D2" type="CollisionShape3D" parent="PlantADeadzone"] [node name="CollisionShape3D2" type="CollisionShape3D" parent="PlantADeadzone"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.8295212, -7.2330484, 25.29969) transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.8295212, -7.2330484, 25.29969)
shape = SubResource("BoxShape3D_5uqia") shape = SubResource("BoxShape3D_5uqia")
[node name="CSGBox3D" type="CSGBox3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0.8463913, 0.33205223, -18.39247)
size = Vector3(0.49205017, 0.6567383, 21.270905)
material = ExtResource("9_ysk2e")
[node name="CSGBox3D2" type="CSGBox3D" parent="."]
transform = Transform3D(-4.371139e-08, 0, 1, 0, 1, 0, -1, 0, -4.371139e-08, 8.300152, 0.33205223, -28.774506)
size = Vector3(0.49205017, 0.6567383, 15.680862)
material = ExtResource("9_ysk2e")
[node name="CSGBox3D3" type="CSGBox3D" parent="."]
transform = Transform3D(-1.0000001, 0, 0, 0, 1, 0, 0, 0, -1.0000001, 15.965797, 0.33205223, -18.300764)
size = Vector3(0.49205017, 0.6567383, 21.278908)
material = ExtResource("9_ysk2e")

3
scenes/molikman.tscn
View file

@ -303,6 +303,7 @@ metadata/_custom_type_script = "uid://3777rkbebgjm"
[node name="Crouch" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("stand_up_area", "player", "animation_player", "weapon_system")] [node name="Crouch" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("stand_up_area", "player", "animation_player", "weapon_system")]
script = ExtResource("9_oprun") script = ExtResource("9_oprun")
max_speed = 3.0
acceleration = 50.0 acceleration = 50.0
deceleration = 50.0 deceleration = 50.0
stand_up_area = NodePath("../../StandArea") stand_up_area = NodePath("../../StandArea")
@ -312,6 +313,7 @@ weapon_system = NodePath("../../WeaponSystem")
[node name="Stand" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("player", "weapon_system")] [node name="Stand" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("player", "weapon_system")]
script = ExtResource("10_a8ls1") script = ExtResource("10_a8ls1")
max_speed = 6.0
acceleration = 100.0 acceleration = 100.0
deceleration = 50.0 deceleration = 50.0
JUMP_VELOCITY = 6.0 JUMP_VELOCITY = 6.0
@ -320,6 +322,7 @@ weapon_system = NodePath("../../WeaponSystem")
[node name="Walk" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("player", "weapon_system")] [node name="Walk" type="Node" parent="BodyStateMachine" node_paths=PackedStringArray("player", "weapon_system")]
script = ExtResource("11_qfm1y") script = ExtResource("11_qfm1y")
max_speed = 3.0
acceleration = 50.0 acceleration = 50.0
deceleration = 50.0 deceleration = 50.0
player = NodePath("../..") player = NodePath("../..")