Clean up enemy

This commit is contained in:
Mathilde Grapin 2023-07-01 13:26:45 +02:00
parent a08afcb147
commit a56ffa78c5
13 changed files with 90 additions and 99 deletions

View file

@ -9,10 +9,9 @@
[sub_resource type="Animation" id="Animation_ouyrp"]
length = 0.001
[sub_resource type="Animation" id="Animation_6vdwd"]
resource_name = "idle"
[sub_resource type="Animation" id="Animation_jt5bg"]
resource_name = "hit_ball"
length = 0.4
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
@ -23,7 +22,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("3_5xsrd")]
"values": [ExtResource("2_5t5q0")]
}
tracks/1/type = "value"
tracks/1/imported = false
@ -50,9 +49,10 @@ tracks/2/keys = {
"values": [0, 1, 2, 3]
}
[sub_resource type="Animation" id="Animation_jt5bg"]
resource_name = "throw"
[sub_resource type="Animation" id="Animation_6vdwd"]
resource_name = "idle"
length = 0.4
loop_mode = 1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
@ -63,7 +63,7 @@ tracks/0/keys = {
"times": PackedFloat32Array(0),
"transitions": PackedFloat32Array(1),
"update": 1,
"values": [ExtResource("2_5t5q0")]
"values": [ExtResource("3_5xsrd")]
}
tracks/1/type = "value"
tracks/1/imported = false
@ -134,8 +134,8 @@ tracks/2/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_gnukq"]
_data = {
"RESET": SubResource("Animation_ouyrp"),
"hit_ball": SubResource("Animation_jt5bg"),
"idle": SubResource("Animation_6vdwd"),
"throw": SubResource("Animation_jt5bg"),
"walk": SubResource("Animation_etqki")
}
@ -172,6 +172,5 @@ shape = SubResource("RectangleShape2D_rlijp")
[node name="EnemyBehaviorTree" parent="." instance=ExtResource("3_jk76t")]
[connection signal="go_to_ball" from="." to="EnemyBehaviorTree" method="_on_enemy_go_to_ball"]
[connection signal="body_entered" from="Area2D" to="." method="_on_area_2d_body_entered"]
[connection signal="body_exited" from="Area2D" to="." method="_on_area_2d_body_exited"]

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=15 format=3 uid="uid://b51tdt5kunai"]
[gd_scene load_steps=14 format=3 uid="uid://b51tdt5kunai"]
[ext_resource type="Script" path="res://addons/beehave/nodes/beehave_tree.gd" id="1_b2pc4"]
[ext_resource type="Script" path="res://addons/beehave/nodes/composites/sequence.gd" id="2_80fm4"]
@ -8,7 +8,6 @@
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/wait_action.gd" id="6_eyknc"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/can_throw_ball_condition.gd" id="7_k5qlq"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/throw_ball_action.gd" id="8_wytqf"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/get_random_target_action.gd" id="8_y68xp"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/can_go_to_ball_condition.gd" id="10_3puvl"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/get_ball_destination_action.gd" id="11_bvy6m"]
[ext_resource type="Script" path="res://scripts/enemy/behavior_tree/move_to_destination_action.gd" id="11_tjc85"]
@ -29,7 +28,7 @@ script = ExtResource("4_0jr1a")
[node name="TimeLimiterDecorator" type="Node" parent="MainSelector/WaitSequence"]
script = ExtResource("5_012bh")
wait_time = 2.0
wait_time = 1.0
[node name="Wait" type="Node" parent="MainSelector/WaitSequence/TimeLimiterDecorator"]
script = ExtResource("6_eyknc")
@ -40,9 +39,6 @@ script = ExtResource("2_80fm4")
[node name="CanThrowBall" type="Node" parent="MainSelector/ThrowBallSequence"]
script = ExtResource("7_k5qlq")
[node name="GetRandomTarget" type="Node" parent="MainSelector/ThrowBallSequence"]
script = ExtResource("8_y68xp")
[node name="ThrowBall" type="Node" parent="MainSelector/ThrowBallSequence"]
script = ExtResource("8_wytqf")
@ -64,8 +60,5 @@ script = ExtResource("2_80fm4")
[node name="CanReturnBall" type="Node" parent="MainSelector/SequenceComposite"]
script = ExtResource("13_lrd2w")
[node name="GetRandomTarget2" type="Node" parent="MainSelector/SequenceComposite"]
script = ExtResource("8_y68xp")
[node name="ReturnBall" type="Node" parent="MainSelector/SequenceComposite"]
script = ExtResource("14_qbh47")