Make structures affect navigation via obstacles instead of custom col…

…liders
lampe-games · Aug 27, 2024 · 2914578 · 2914578
1 parent e121442
commit 2914578
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 123 deletions.
diff --git a/source/match/units/AircraftFactory.tscn b/source/match/units/AircraftFactory.tscn
@@ -1,12 +1,11 @@
-[gd_scene load_steps=14 format=3 uid="uid://cxilu6668nda6"]
+[gd_scene load_steps=11 format=3 uid="uid://cxilu6668nda6"]
 
 [ext_resource type="Script" path="res://source/match/units/AircraftFactory.gd" id="1_n6n1v"]
 [ext_resource type="PackedScene" uid="uid://cgsi062w5fjia" path="res://source/match/units/traits/Highlight.tscn" id="1_r5i7t"]
 [ext_resource type="PackedScene" uid="uid://3c1h14nqdumt" path="res://source/match/units/traits/Selection.tscn" id="2_56ml3"]
 [ext_resource type="PackedScene" uid="uid://bklfapayb1ryk" path="res://source/match/units/structure-geometries/AircraftFactory.tscn" id="2_mlisu"]
 [ext_resource type="PackedScene" uid="uid://d4cwip5hpxlmo" path="res://source/match/units/traits/MovementObstacle.tscn" id="3_j1buj"]
 [ext_resource type="PackedScene" uid="uid://c3ssj2p6voauk" path="res://source/match/units/traits/HealthBar.tscn" id="4_igtfr"]
-[ext_resource type="PackedScene" uid="uid://c471ahpwuxv57" path="res://source/match/units/traits/StaticMovementObstacle.tscn" id="6_rvkkl"]
 [ext_resource type="PackedScene" uid="uid://b8jwlpdvxgrr6" path="res://source/match/units/traits/RallyPoint.tscn" id="8_opfgx"]
 [ext_resource type="PackedScene" uid="uid://cd3v6508vjcu3" path="res://source/match/units/traits/ProductionQueue.tscn" id="9_c3qd5"]
 [ext_resource type="PackedScene" uid="uid://d4cm4yhtf11ur" path="res://source/match/units/traits/Targetability.tscn" id="9_qqlap"]
@@ -15,13 +14,6 @@
 height = 1.0
 radius = 1.5
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_ea0ur"]
-height = 1.0
-radius = 1.1
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_67hxr"]
-size = Vector3(0.1, 5, 0.1)
-
 [node name="AircraftFactory" type="Area3D"]
 collision_layer = 2
 collision_mask = 0
@@ -43,14 +35,10 @@ radius = 1.5
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_j1buj")]
 radius = 1.5
+vertices = PackedVector3Array(0, 0, -1.1, 0.777, 0, -0.777, 1.1, 0, 0, 0.777, 0, 0.777, 0, 0, 1.1, -0.777, 0, 0.777, -1.1, 0, 0, -0.777, 0, -0.777)
+affect_navigation_mesh = true
 path_height_offset = 0.6
 
-[node name="StaticMovementObstacle" parent="." instance=ExtResource("6_rvkkl")]
-shape = SubResource("CylinderShape3D_ea0ur")
-
-[node name="PreventNavmeshIsland" type="CollisionShape3D" parent="StaticMovementObstacle"]
-shape = SubResource("BoxShape3D_67hxr")
-
 [node name="HealthBar" parent="." instance=ExtResource("4_igtfr")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
 size = Vector2(250, 10)

diff --git a/source/match/units/AntiAirTurret.tscn b/source/match/units/AntiAirTurret.tscn
@@ -1,23 +1,18 @@
-[gd_scene load_steps=12 format=3 uid="uid://cfa8cpnpk5pcb"]
+[gd_scene load_steps=10 format=3 uid="uid://cfa8cpnpk5pcb"]
 
 [ext_resource type="Script" path="res://source/match/units/AntiAirTurret.gd" id="1_ec2s5"]
 [ext_resource type="PackedScene" uid="uid://cgsi062w5fjia" path="res://source/match/units/traits/Highlight.tscn" id="1_tbjvv"]
 [ext_resource type="PackedScene" uid="uid://cm3iqdsdeo625" path="res://source/match/units/structure-geometries/AntiAirTurret.tscn" id="2_bhouy"]
 [ext_resource type="PackedScene" uid="uid://3c1h14nqdumt" path="res://source/match/units/traits/Selection.tscn" id="2_ookx0"]
 [ext_resource type="PackedScene" uid="uid://d4cwip5hpxlmo" path="res://source/match/units/traits/MovementObstacle.tscn" id="3_hgb44"]
 [ext_resource type="PackedScene" uid="uid://c3ssj2p6voauk" path="res://source/match/units/traits/HealthBar.tscn" id="4_qhoj1"]
-[ext_resource type="PackedScene" uid="uid://c471ahpwuxv57" path="res://source/match/units/traits/StaticMovementObstacle.tscn" id="6_tt140"]
 [ext_resource type="PackedScene" uid="uid://d4cm4yhtf11ur" path="res://source/match/units/traits/Targetability.tscn" id="7_6bghh"]
 [ext_resource type="PackedScene" uid="uid://cd66t0u7kf84j" path="res://source/match/units/traits/RotateRandomlyWhenLookingForTargetsIdle.tscn" id="8_hqxqv"]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_xa2u4"]
 height = 0.8
 radius = 0.6
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_65kle"]
-height = 0.8
-radius = 0.2
-
 [node name="AntiAirTurret" type="Area3D"]
 collision_layer = 2
 collision_mask = 0
@@ -60,11 +55,10 @@ radius = 0.6
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_hgb44")]
 radius = 0.6
+vertices = PackedVector3Array(0, 0, -0.2, 0.142, 0, -0.142, 0.2, 0, 0, 0.142, 0, 0.142, 0, 0, 0.2, -0.142, 0, 0.142, -0.2, 0, 0, -0.142, 0, -0.142)
+affect_navigation_mesh = true
 path_height_offset = 0.6
 
-[node name="StaticMovementObstacle" parent="." instance=ExtResource("6_tt140")]
-shape = SubResource("CylinderShape3D_65kle")
-
 [node name="HealthBar" parent="." instance=ExtResource("4_qhoj1")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0)
 size = Vector2(110, 10)

diff --git a/source/match/units/AntiGroundTurret.tscn b/source/match/units/AntiGroundTurret.tscn
@@ -1,23 +1,18 @@
-[gd_scene load_steps=12 format=3 uid="uid://b8pckq1xn44ss"]
+[gd_scene load_steps=10 format=3 uid="uid://b8pckq1xn44ss"]
 
 [ext_resource type="PackedScene" uid="uid://cgsi062w5fjia" path="res://source/match/units/traits/Highlight.tscn" id="1_5gp2d"]
 [ext_resource type="Script" path="res://source/match/units/AntiGroundTurret.gd" id="1_6hw4x"]
 [ext_resource type="PackedScene" uid="uid://3c1h14nqdumt" path="res://source/match/units/traits/Selection.tscn" id="2_f1d12"]
 [ext_resource type="PackedScene" uid="uid://bmiqncjpgsw2e" path="res://source/match/units/structure-geometries/AntiGroundTurret.tscn" id="2_tlome"]
 [ext_resource type="PackedScene" uid="uid://d4cwip5hpxlmo" path="res://source/match/units/traits/MovementObstacle.tscn" id="3_ds80w"]
 [ext_resource type="PackedScene" uid="uid://c3ssj2p6voauk" path="res://source/match/units/traits/HealthBar.tscn" id="4_r6emo"]
-[ext_resource type="PackedScene" uid="uid://c471ahpwuxv57" path="res://source/match/units/traits/StaticMovementObstacle.tscn" id="6_w6nbo"]
 [ext_resource type="PackedScene" uid="uid://d4cm4yhtf11ur" path="res://source/match/units/traits/Targetability.tscn" id="7_4hifs"]
 [ext_resource type="PackedScene" uid="uid://cd66t0u7kf84j" path="res://source/match/units/traits/RotateRandomlyWhenLookingForTargetsIdle.tscn" id="8_l7mop"]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_7usmv"]
 height = 0.8
 radius = 0.6
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_t2frt"]
-height = 0.8
-radius = 0.2
-
 [node name="AntiGroundTurret" type="Area3D"]
 collision_layer = 2
 collision_mask = 0
@@ -54,11 +49,10 @@ radius = 0.6
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_ds80w")]
 radius = 0.6
+vertices = PackedVector3Array(0, 0, -0.2, 0.142, 0, -0.142, 0.2, 0, 0, 0.142, 0, 0.142, 0, 0, 0.2, -0.142, 0, 0.142, -0.2, 0, 0, -0.142, 0, -0.142)
+affect_navigation_mesh = true
 path_height_offset = 0.6
 
-[node name="StaticMovementObstacle" parent="." instance=ExtResource("6_w6nbo")]
-shape = SubResource("CylinderShape3D_t2frt")
-
 [node name="HealthBar" parent="." instance=ExtResource("4_r6emo")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.1, 0)
 size = Vector2(110, 10)

diff --git a/source/match/units/CommandCenter.tscn b/source/match/units/CommandCenter.tscn
@@ -1,12 +1,11 @@
-[gd_scene load_steps=14 format=3 uid="uid://ct0ejt0trkhrf"]
+[gd_scene load_steps=11 format=3 uid="uid://ct0ejt0trkhrf"]
 
 [ext_resource type="Script" path="res://source/match/units/CommandCenter.gd" id="1_hpo2s"]
 [ext_resource type="PackedScene" uid="uid://cgsi062w5fjia" path="res://source/match/units/traits/Highlight.tscn" id="2_c41i5"]
 [ext_resource type="PackedScene" uid="uid://bxx81l3t16rrs" path="res://source/match/units/structure-geometries/CommandCenter.tscn" id="2_hwq4d"]
 [ext_resource type="PackedScene" uid="uid://3c1h14nqdumt" path="res://source/match/units/traits/Selection.tscn" id="3_slmue"]
 [ext_resource type="PackedScene" uid="uid://d4cwip5hpxlmo" path="res://source/match/units/traits/MovementObstacle.tscn" id="4_f5u8t"]
 [ext_resource type="PackedScene" uid="uid://c3ssj2p6voauk" path="res://source/match/units/traits/HealthBar.tscn" id="5_xuulo"]
-[ext_resource type="PackedScene" uid="uid://c471ahpwuxv57" path="res://source/match/units/traits/StaticMovementObstacle.tscn" id="6_5gbe5"]
 [ext_resource type="PackedScene" uid="uid://b8jwlpdvxgrr6" path="res://source/match/units/traits/RallyPoint.tscn" id="8_8qw5y"]
 [ext_resource type="PackedScene" uid="uid://cd3v6508vjcu3" path="res://source/match/units/traits/ProductionQueue.tscn" id="9_y6bg8"]
 [ext_resource type="PackedScene" uid="uid://d4cm4yhtf11ur" path="res://source/match/units/traits/Targetability.tscn" id="17_dco2r"]
@@ -15,13 +14,6 @@
 height = 0.8
 radius = 1.8
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_2xy8f"]
-height = 0.8
-radius = 1.4
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_mt1cx"]
-size = Vector3(0.1, 5, 0.1)
-
 [node name="CommandCenter" type="Area3D"]
 collision_layer = 2
 collision_mask = 0
@@ -43,14 +35,10 @@ radius = 2.0
 
 [node name="MovementObstacle" parent="." instance=ExtResource("4_f5u8t")]
 radius = 2.0
+vertices = PackedVector3Array(0, 0, -1.4, 0.99, 0, -0.99, 1.4, 0, 0, 0.99, 0, 0.99, 0, 0, 1.4, -0.99, 0, 0.99, -1.4, 0, 0, -0.99, 0, -0.99)
+affect_navigation_mesh = true
 path_height_offset = 0.6
 
-[node name="StaticMovementObstacle" parent="." instance=ExtResource("6_5gbe5")]
-shape = SubResource("CylinderShape3D_2xy8f")
-
-[node name="PreventNavmeshIsland" type="CollisionShape3D" parent="StaticMovementObstacle"]
-shape = SubResource("BoxShape3D_mt1cx")
-
 [node name="HealthBar" parent="." instance=ExtResource("5_xuulo")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2, 0)
 size = Vector2(380, 10)

diff --git a/source/match/units/VehicleFactory.tscn b/source/match/units/VehicleFactory.tscn
@@ -1,12 +1,11 @@
-[gd_scene load_steps=14 format=3 uid="uid://h5lqor1xl2sf"]
+[gd_scene load_steps=11 format=3 uid="uid://h5lqor1xl2sf"]
 
 [ext_resource type="Script" path="res://source/match/units/VehicleFactory.gd" id="1_1a20j"]
 [ext_resource type="PackedScene" uid="uid://cgsi062w5fjia" path="res://source/match/units/traits/Highlight.tscn" id="1_8fcgb"]
 [ext_resource type="PackedScene" uid="uid://3c1h14nqdumt" path="res://source/match/units/traits/Selection.tscn" id="2_h27kt"]
 [ext_resource type="PackedScene" uid="uid://inepf56pyube" path="res://source/match/units/structure-geometries/VehicleFactory.tscn" id="2_j6xs6"]
 [ext_resource type="PackedScene" uid="uid://d4cwip5hpxlmo" path="res://source/match/units/traits/MovementObstacle.tscn" id="3_cp6bx"]
 [ext_resource type="PackedScene" uid="uid://c3ssj2p6voauk" path="res://source/match/units/traits/HealthBar.tscn" id="4_xd2eg"]
-[ext_resource type="PackedScene" uid="uid://c471ahpwuxv57" path="res://source/match/units/traits/StaticMovementObstacle.tscn" id="6_rohol"]
 [ext_resource type="PackedScene" uid="uid://d4cm4yhtf11ur" path="res://source/match/units/traits/Targetability.tscn" id="7_j4kwk"]
 [ext_resource type="PackedScene" uid="uid://b8jwlpdvxgrr6" path="res://source/match/units/traits/RallyPoint.tscn" id="8_h714l"]
 [ext_resource type="PackedScene" uid="uid://cd3v6508vjcu3" path="res://source/match/units/traits/ProductionQueue.tscn" id="9_3s532"]
@@ -15,13 +14,6 @@
 height = 1.0
 radius = 1.5
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_x8l2r"]
-height = 1.0
-radius = 1.1
-
-[sub_resource type="BoxShape3D" id="BoxShape3D_jajvw"]
-size = Vector3(0.1, 5, 0.1)
-
 [node name="VehicleFactory" type="Area3D"]
 collision_layer = 2
 collision_mask = 0
@@ -43,14 +35,10 @@ radius = 1.5
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_cp6bx")]
 radius = 1.5
+vertices = PackedVector3Array(0, 0, -1.1, 0.777, 0, -0.777, 1.1, 0, 0, 0.777, 0, 0.777, 0, 0, 1.1, -0.777, 0, 0.777, -1.1, 0, 0, -0.777, 0, -0.777)
+affect_navigation_mesh = true
 path_height_offset = 0.6
 
-[node name="StaticMovementObstacle" parent="." instance=ExtResource("6_rohol")]
-shape = SubResource("CylinderShape3D_x8l2r")
-
-[node name="PreventNavmeshIsland" type="CollisionShape3D" parent="StaticMovementObstacle"]
-shape = SubResource("BoxShape3D_jajvw")
-
 [node name="HealthBar" parent="." instance=ExtResource("4_xd2eg")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 1.75, 0)
 size = Vector2(250, 10)

diff --git a/source/match/units/non-player/ResourceA.tscn b/source/match/units/non-player/ResourceA.tscn
@@ -1,20 +1,15 @@
-[gd_scene load_steps=10 format=3 uid="uid://bf3jjdafqvh0w"]
+[gd_scene load_steps=8 format=3 uid="uid://bf3jjdafqvh0w"]
 
 [ext_resource type="Script" path="res://source/match/units/non-player/ResourceA.gd" id="1_3daqx"]
 [ext_resource type="PackedScene" uid="uid://cgsi062w5fjia" path="res://source/match/units/traits/Highlight.tscn" id="1_d3pi2"]
 [ext_resource type="PackedScene" uid="uid://4jj1yjsdku8f" path="res://assets/models/kenney-spacekit/rock_crystalsLargeA.glb" id="2_0hxur"]
 [ext_resource type="PackedScene" uid="uid://3c1h14nqdumt" path="res://source/match/units/traits/Selection.tscn" id="2_pgrb1"]
 [ext_resource type="PackedScene" uid="uid://d4cwip5hpxlmo" path="res://source/match/units/traits/MovementObstacle.tscn" id="3_xabt4"]
 [ext_resource type="PackedScene" uid="uid://d4cm4yhtf11ur" path="res://source/match/units/traits/Targetability.tscn" id="5_vqxvf"]
-[ext_resource type="PackedScene" uid="uid://c471ahpwuxv57" path="res://source/match/units/traits/StaticMovementObstacle.tscn" id="6_y2ye1"]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_msmnm"]
 height = 0.6
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_wb6so"]
-height = 0.6
-radius = 0.1
-
 [node name="ResourceA" type="Area3D" groups=["resource_units"]]
 script = ExtResource("1_3daqx")
 
@@ -37,11 +32,10 @@ radius = 0.6
 
 [node name="MovementObstacle" parent="." instance=ExtResource("3_xabt4")]
 radius = 0.6
+vertices = PackedVector3Array(0, 0, -0.2, 0.142, 0, -0.142, 0.2, 0, 0, 0.142, 0, 0.142, 0, 0, 0.2, -0.142, 0, 0.142, -0.2, 0, 0, -0.142, 0, -0.142)
+affect_navigation_mesh = true
 path_height_offset = 0.6
 
-[node name="StaticMovementObstacle" parent="." instance=ExtResource("6_y2ye1")]
-shape = SubResource("CylinderShape3D_wb6so")
-
 [node name="Targetability" parent="." instance=ExtResource("5_vqxvf")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 0.6
diff --git a/source/match/units/non-player/ResourceB.tscn b/source/match/units/non-player/ResourceB.tscn
@@ -1,20 +1,15 @@
-[gd_scene load_steps=10 format=3 uid="uid://bufgjfa3ne3uk"]
+[gd_scene load_steps=8 format=3 uid="uid://bufgjfa3ne3uk"]
 
 [ext_resource type="Script" path="res://source/match/units/non-player/ResourceB.gd" id="1_57n8v"]
 [ext_resource type="PackedScene" uid="uid://cgsi062w5fjia" path="res://source/match/units/traits/Highlight.tscn" id="2_c8mwe"]
 [ext_resource type="PackedScene" uid="uid://cqi7sb6vpnwt5" path="res://assets/models/kenney-spacekit/rock_crystalsLargeB.glb" id="2_ox5xj"]
 [ext_resource type="PackedScene" uid="uid://3c1h14nqdumt" path="res://source/match/units/traits/Selection.tscn" id="3_6dh54"]
 [ext_resource type="PackedScene" uid="uid://d4cwip5hpxlmo" path="res://source/match/units/traits/MovementObstacle.tscn" id="4_sxjck"]
 [ext_resource type="PackedScene" uid="uid://d4cm4yhtf11ur" path="res://source/match/units/traits/Targetability.tscn" id="5_y6273"]
-[ext_resource type="PackedScene" uid="uid://c471ahpwuxv57" path="res://source/match/units/traits/StaticMovementObstacle.tscn" id="6_vvgyq"]
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_msmnm"]
 height = 0.8
 
-[sub_resource type="CylinderShape3D" id="CylinderShape3D_002vj"]
-height = 0.8
-radius = 0.1
-
 [node name="ResourceB" type="Area3D" groups=["resource_units"]]
 script = ExtResource("1_57n8v")
 
@@ -37,11 +32,10 @@ radius = 0.6
 
 [node name="MovementObstacle" parent="." instance=ExtResource("4_sxjck")]
 radius = 0.6
+vertices = PackedVector3Array(0, 0, -0.2, 0.142, 0, -0.142, 0.2, 0, 0, 0.142, 0, 0.142, 0, 0, 0.2, -0.142, 0, 0.142, -0.2, 0, 0, -0.142, 0, -0.142)
+affect_navigation_mesh = true
 path_height_offset = 0.6
 
-[node name="StaticMovementObstacle" parent="." instance=ExtResource("6_vvgyq")]
-shape = SubResource("CylinderShape3D_002vj")
-
 [node name="Targetability" parent="." instance=ExtResource("5_y6273")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.05, 0)
 radius = 0.6
diff --git a/source/match/units/traits/MovementObstacle.gd b/source/match/units/traits/MovementObstacle.gd
@@ -11,6 +11,13 @@ func _ready():
 	await get_tree().process_frame  # wait for navigation to be operational
 	set_navigation_map(_match.navigation.get_navigation_map_rid_by_domain(domain))
 	_align_unit_position_to_navigation()
+	_affect_navigation_if_needed()
+
+
+func _exit_tree():
+	if affect_navigation_mesh:
+		remove_from_group(Constants.Match.Navigation.DOMAIN_TO_GROUP_MAPPING[domain])
+		MatchSignals.schedule_navigation_rebake.emit(domain)
 
 
 func _align_unit_position_to_navigation():
@@ -20,3 +27,9 @@ func _align_unit_position_to_navigation():
 		)
 		- Vector3(0, path_height_offset, 0)
 	)
+
+
+func _affect_navigation_if_needed():
+	if affect_navigation_mesh:
+		add_to_group(Constants.Match.Navigation.DOMAIN_TO_GROUP_MAPPING[domain])
+		MatchSignals.schedule_navigation_rebake.emit(domain)
diff --git a/source/match/units/traits/StaticMovementObstacle.gd b/source/match/units/traits/StaticMovementObstacle.gd
diff --git a/source/match/units/traits/StaticMovementObstacle.tscn b/source/match/units/traits/StaticMovementObstacle.tscn
diff --git a/tests/manual/TestPlayerVsAI.tscn b/tests/manual/TestPlayerVsAI.tscn
@@ -65,22 +65,25 @@ transform = Transform3D(-0.22473, 0, 0.974421, 0, 1, 0, -0.974421, 0, -0.22473,
 [node name="VehicleFactory" parent="Players/Human" index="3" instance=ExtResource("5_imqfl")]
 transform = Transform3D(0.802099, 0, 0.597191, 0, 1, 0, -0.597191, 0, 0.802099, 6.69677, 0, 5.61306)
 
-[node name="AntiGroundTurret" parent="Players/Human" index="4" instance=ExtResource("6_i5onm")]
+[node name="VehicleFactory2" parent="Players/Human" index="4" instance=ExtResource("5_imqfl")]
+transform = Transform3D(0.802099, 0, 0.597191, 0, 1, 0, -0.597191, 0, 0.802099, 4.65118, 0, 18.0781)
+
+[node name="AntiGroundTurret" parent="Players/Human" index="5" instance=ExtResource("6_i5onm")]
 transform = Transform3D(-0.452979, 0, -0.891521, 0, 1, 0, 0.891521, 0, -0.452979, 22.2618, 7.62939e-06, 9.86056)
 
-[node name="AntiAirTurret" parent="Players/Human" index="5" instance=ExtResource("7_hplpe")]
+[node name="AntiAirTurret" parent="Players/Human" index="6" instance=ExtResource("7_hplpe")]
 transform = Transform3D(-0.775077, 0, -0.631867, 0, 1, 0, 0.631867, 0, -0.775077, 20.3453, -3.8147e-06, 17.1744)
 
-[node name="Drone" parent="Players/Human" index="6" instance=ExtResource("8_8jgl1")]
+[node name="Drone" parent="Players/Human" index="7" instance=ExtResource("8_8jgl1")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.9318, 0, 4.14556)
 
-[node name="Helicopter" parent="Players/Human" index="7" instance=ExtResource("9_52a3q")]
+[node name="Helicopter" parent="Players/Human" index="8" instance=ExtResource("9_52a3q")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.67897, 0, 3.61146)
 
-[node name="Tank" parent="Players/Human" index="8" instance=ExtResource("10_60e5v")]
+[node name="Tank" parent="Players/Human" index="9" instance=ExtResource("10_60e5v")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 17.2469, 0, 5.45996)
 
-[node name="Worker" parent="Players/Human" index="9" instance=ExtResource("11_mhynl")]
+[node name="Worker" parent="Players/Human" index="10" instance=ExtResource("11_mhynl")]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 11.5856, 0, 14.6178)
 
 [node name="SimpleClairvoyantAI" parent="Players" index="1" instance=ExtResource("15_6w32d")]