From 5de3bf344e2cf9ee5f8e5a5362e4f2ac89162b7d Mon Sep 17 00:00:00 2001 From: Serhii Snitsaruk Date: Fri, 16 Dec 2022 04:16:19 +0100 Subject: [PATCH] Cleanup waypoints test project --- test/ai/tasks/play_animation.gd | 4 ++-- test/ai/tasks/start_animation.gd | 4 ++-- test/ai/trees/waypoints_agent.tres | 2 +- test/tests/waypoints/test_waypoints.tscn | 12 +++++------- 4 files changed, 10 insertions(+), 12 deletions(-) diff --git a/test/ai/tasks/play_animation.gd b/test/ai/tasks/play_animation.gd index 62fa245..fa5fba3 100644 --- a/test/ai/tasks/play_animation.gd +++ b/test/ai/tasks/play_animation.gd @@ -2,7 +2,7 @@ extends BTAction @export var animation_name: String -@export var player_path: NodePath +@export var animation_player: NodePath var _player: AnimationPlayer var _finished: bool @@ -13,7 +13,7 @@ func _generate_name() -> String: func _setup() -> void: - _player = agent.get_node(player_path) + _player = agent.get_node(animation_player) func _enter() -> void: diff --git a/test/ai/tasks/start_animation.gd b/test/ai/tasks/start_animation.gd index cca526c..375a0e3 100644 --- a/test/ai/tasks/start_animation.gd +++ b/test/ai/tasks/start_animation.gd @@ -2,7 +2,7 @@ extends BTAction @export var animation_name: String -@export var player_path: NodePath +@export var animation_player: NodePath var _player: AnimationPlayer @@ -12,7 +12,7 @@ func _generate_name() -> String: func _setup() -> void: - _player = agent.get_node(player_path) + _player = agent.get_node(animation_player) func _tick(p_delta: float) -> int: diff --git a/test/ai/trees/waypoints_agent.tres b/test/ai/trees/waypoints_agent.tres index 7a70e94..7973f53 100644 --- a/test/ai/trees/waypoints_agent.tres +++ b/test/ai/trees/waypoints_agent.tres @@ -12,7 +12,7 @@ tolerance = 50.0 [sub_resource type="BTAction" id="BTAction_yq1vl"] script = ExtResource("2_hcuvn") animation_name = "bounce" -player_path = NodePath("AnimationPlayer") +animation_player = NodePath("AnimationPlayer") [sub_resource type="BTSequence" id="BTSequence_a2ng0"] children = [SubResource("BTAction_3xal7"), SubResource("BTAction_yq1vl")] diff --git a/test/tests/waypoints/test_waypoints.tscn b/test/tests/waypoints/test_waypoints.tscn index e054d22..275b0d3 100644 --- a/test/tests/waypoints/test_waypoints.tscn +++ b/test/tests/waypoints/test_waypoints.tscn @@ -10,23 +10,21 @@ script = ExtResource("1_kmjjq") [node name="Waypoints" type="Node2D" parent="."] [node name="WP1" type="Marker2D" parent="Waypoints"] -position = Vector2(283, 184) +position = Vector2(258, 126) script = ExtResource("3_1aub7") [node name="WP2" type="Marker2D" parent="Waypoints"] -position = Vector2(938, 100) +position = Vector2(830, 131) script = ExtResource("3_1aub7") [node name="WP3" type="Marker2D" parent="Waypoints"] -position = Vector2(838, 490) -script = ExtResource("3_1aub7") - -[node name="WP4" type="Marker2D" parent="Waypoints"] -position = Vector2(177, 515) +position = Vector2(534, 492) script = ExtResource("3_1aub7") [node name="Agent" parent="." instance=ExtResource("1_esee5")] +y_sort_enabled = true position = Vector2(57, 59) [node name="Agent2" parent="." instance=ExtResource("1_esee5")] +y_sort_enabled = true position = Vector2(316, 590)