fix: self preservation plan in the wrong order

This commit is contained in:
Sara 2024-07-28 23:17:09 +02:00
parent 4ba6869a30
commit a2240797b8
17 changed files with 304 additions and 26 deletions

View file

@ -5,5 +5,6 @@ requirements_dict = {
"is_health_safe": false
}
desired_state_dict = {
"can_see_target": false,
"is_health_safe": true
}

View file

@ -5,7 +5,7 @@
[ext_resource type="AnimationLibrary" uid="uid://crkh5gahl2ci6" path="res://Animation/bean_characters.res" id="2_lrpu6"]
[sub_resource type="SphereShape3D" id="SphereShape3D_5pqvg"]
radius = 7.38627
radius = 8.42531
[sub_resource type="SphereShape3D" id="SphereShape3D_drlm2"]
radius = 1.0
@ -15,6 +15,8 @@ albedo_color = Color(1, 0.24, 0.24, 1)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_5r0b3"]
material = SubResource("StandardMaterial3D_ss47r")
radial_segments = 8
rings = 3
[sub_resource type="BoxMesh" id="BoxMesh_p8wvo"]
size = Vector3(0.2, 0.2, 0.5)
@ -29,7 +31,7 @@ editor_available_goals = [ExtResource("2_k42dl"), ExtResource("1_b1qo1")]
unique_name_in_owner = true
[node name="Planner" type="Planner" parent="."]
actions_inspector = [3, 2, 4, 5]
actions_inspector = [3, 2, 4, 5, 6]
unique_name_in_owner = true
[node name="EntityHealth" type="EntityHealth" parent="."]
@ -37,6 +39,8 @@ unique_name_in_owner = true
[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
unique_name_in_owner = true
path_desired_distance = 0.5
target_desired_distance = 0.2
path_height_offset = 0.5
[node name="AwarenessArea" type="Area3D" parent="."]
@ -47,7 +51,7 @@ collision_mask = 2
input_ray_pickable = false
[node name="CollisionShape3D" type="CollisionShape3D" parent="AwarenessArea"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 2.36036)
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, -0.238092)
shape = SubResource("SphereShape3D_5pqvg")
[node name="AnimationPlayer" type="AnimationPlayer" parent="."]

View file

@ -0,0 +1,5 @@
[gd_scene format=3 uid="uid://c82s8vpaethtv"]
[node name="NavMarker" type="NavMarker"]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 3.68886, 0.383154, -2.15328)
gizmo_extents = 1.0

View file

@ -9,7 +9,7 @@ height = 0.1
ground_marker_scene = ExtResource("1_t46fa")
[node name="Camera3D" type="Camera3D" parent="."]
transform = Transform3D(-1, 7.57104e-08, -4.37114e-08, 0, 0.5, 0.866025, 8.74228e-08, 0.866025, -0.5, 0, 8.41077, -4.42292)
transform = Transform3D(-1, 7.57104e-08, -4.37114e-08, 0, 0.5, 0.866025, 8.74228e-08, 0.866025, -0.5, 0, 10.1792, -3.46957)
[node name="MeshInstance3D" type="MeshInstance3D" parent="."]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0.0494189, 0)

View file

@ -10,6 +10,8 @@ albedo_color = Color(0.407843, 1, 0.447059, 1)
[sub_resource type="CapsuleMesh" id="CapsuleMesh_5r0b3"]
material = SubResource("StandardMaterial3D_n4q15")
radial_segments = 8
rings = 3
[sub_resource type="BoxMesh" id="BoxMesh_p8wvo"]
size = Vector3(0.2, 0.2, 0.5)
@ -31,6 +33,8 @@ unique_name_in_owner = true
[node name="NavigationAgent3D" type="NavigationAgent3D" parent="."]
unique_name_in_owner = true
path_desired_distance = 0.2
target_desired_distance = 0.5
path_height_offset = 0.5
debug_enabled = true

View file

@ -1,9 +1,10 @@
[gd_scene load_steps=10 format=3 uid="uid://c62s1jmtgajjk"]
[gd_scene load_steps=11 format=3 uid="uid://c62s1jmtgajjk"]
[ext_resource type="PackedScene" uid="uid://dsalxxq3xs842" path="res://rts_game_mode.tscn" id="1_4nchg"]
[ext_resource type="Environment" uid="uid://cnfk8yrvklysq" path="res://Environments/default_environment.tres" id="2_jq6bw"]
[ext_resource type="PackedScene" uid="uid://pme230qx1377" path="res://GameObjects/player_unit.tscn" id="3_wl7wm"]
[ext_resource type="PackedScene" uid="uid://ba17jrcaduowj" path="res://GameObjects/enemy_unit.tscn" id="4_0o33v"]
[ext_resource type="PackedScene" uid="uid://c82s8vpaethtv" path="res://GameObjects/nav_marker.tscn" id="5_ta2oq"]
[sub_resource type="NavigationMesh" id="NavigationMesh_8a2j6"]
vertices = PackedVector3Array(0, 0.4, -2, 1.75, 0.4, -3.25, 1.75, 0.4, -9.5, -0.75, 0.4, -0.25, 0, 0.4, -2, 1.75, 0.4, -9.5, -9.5, 0.4, -9.5, -9.5, 0.4, -0.25, 4.5, 0.4, -1.25, 4.5, 0.4, -0.5, 9.5, 0.4, -0.5, 3.25, 0.4, -2.5, 4.5, 0.4, -1.25, 9.5, 0.4, -0.5, 1.75, 0.4, -9.5, 1.75, 0.4, -3.25, 3.25, 0.4, -2.5, 9.5, 0.4, -0.5, 9.5, 0.4, -9.5, 1.75, 3.4, 1, 2.25, 3.4, 1, 3.5, 3.4, -0.5, 2.75, 3.4, -1.5, 1.5, 3.4, -2, 0.25, 3.4, -0.5, 3, 0.4, -0.5, 2.5, 0.4, -1.25, 1.5, 0.4, -1.5, 0.75, 0.4, -0.5, 1.75, 0.4, 0.5, 9.5, 0.4, -0.5, 4.5, 0.4, -0.5, 3.5, 0.4, 1.25, 9.5, 0.4, -0.5, 3.5, 0.4, 1.25, 2, 0.4, 2.25, 2, 0.4, 9.5, 9.5, 0.4, 9.5, 2, 0.4, 9.5, 2, 0.4, 2.25, 0, 0.4, 1, 0, 0.4, 1, -0.75, 0.4, -0.25, -9.5, 0.4, -0.25, -9.5, 0.4, 9.5, 2, 0.4, 9.5)
@ -64,3 +65,37 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -1.7165, 1.8999e-07, 3.29106)
[node name="Unit2" parent="." instance=ExtResource("4_0o33v")]
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 7.57207, -7.63685e-07, -6.40453)
[node name="NavRoom" type="NavRoom" parent="."]
[node name="NavMarker" parent="NavRoom" instance=ExtResource("5_ta2oq")]
marker_type = 1
transform = Transform3D(0.80479, 0, -0.593559, 0, 1, 0, 0.593559, 0, 0.80479, 3.65141, 0.4, -2.09859)
[node name="NavMarker2" parent="NavRoom" instance=ExtResource("5_ta2oq")]
marker_type = 1
transform = Transform3D(0.794658, 0, -0.607057, 0, 1, 0, 0.607057, 0, 0.794658, 3.07483, 0.4, -2.58758)
[node name="NavMarker3" parent="NavRoom" instance=ExtResource("5_ta2oq")]
marker_type = 1
transform = Transform3D(-0.784766, 0, 0.619792, 0, 1, 0, -0.619792, 0, -0.784766, 0.723487, 0.4, 1.45218)
[node name="NavMarker4" parent="NavRoom" instance=ExtResource("5_ta2oq")]
marker_type = 1
transform = Transform3D(-0.628248, 0, -0.778013, 0, 1, 0, 0.778013, 0, -0.628248, 3.51616, 0.4, 1.22172)
[node name="NavMarker8" parent="NavRoom" instance=ExtResource("5_ta2oq")]
marker_type = 1
transform = Transform3D(-0.635135, 0, -0.772401, 0, 1, 0, 0.772401, 0, -0.635135, 3.91311, 0.4, 0.527064)
[node name="NavMarker5" parent="NavRoom" instance=ExtResource("5_ta2oq")]
marker_type = 1
transform = Transform3D(-0.762273, 0, 0.647256, 0, 1, 0, -0.647256, 0, -0.762273, 0.0761999, 0.4, 1.04762)
[node name="NavMarker6" parent="NavRoom" instance=ExtResource("5_ta2oq")]
marker_type = 1
transform = Transform3D(0.652363, 0, 0.757906, 0, 1, 0, -0.757906, 0, 0.652363, -0.132873, 0.4, -1.68996)
[node name="NavMarker7" parent="NavRoom" instance=ExtResource("5_ta2oq")]
marker_type = 1
transform = Transform3D(0.668508, 0, 0.743705, 0, 1, 0, -0.743705, 0, 0.668508, 0.277942, 0.4, -2.19853)