Enemy state machine

This commit is contained in:
Marco 2025-03-20 18:22:40 +01:00
commit ef6c240e8e
37 changed files with 545 additions and 36 deletions

View file

@ -37,7 +37,6 @@ shape = SubResource("CircleShape2D_4awvh")
[node name="Health" type="Node2D" parent="DamageReceiver"]
script = ExtResource("6_6dpsy")
ResourceName = "Health"
MaxResource = 4.0
[connection signal="StateChanged" from="." to="Sprite2D" method="ChangeState"]
[connection signal="StateChanged" from="." to="DamageReceiver" method="ChangeState"]

View file

@ -129,7 +129,6 @@ EquippedWeapon = NodePath("../EnemyWeapon")
_playerDetection = NodePath("../PlayerDetection")
[node name="PlayerDetection" type="Area2D" parent="."]
visible = false
collision_layer = 0
collision_mask = 2
script = ExtResource("8_m5ma3")

View file

@ -0,0 +1,87 @@
[gd_scene load_steps=16 format=3 uid="uid://clieeuln36a7a"]
[ext_resource type="Script" uid="uid://dn6dbog1s2818" path="res://Scripts/Components/FSM/Enemy/EnemyStateMachine.cs" id="1_27djw"]
[ext_resource type="SpriteFrames" uid="uid://bcc5mlwwnkvri" path="res://Resources/Sprites/Fairy.tres" id="1_ho0th"]
[ext_resource type="Script" uid="uid://bi2edpdosngll" path="res://Scripts/Components/FSM/Enemy/EnemyFSMProxy.cs" id="1_jgko8"]
[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="2_rkav6"]
[ext_resource type="Script" uid="uid://rrelumir3g6n" path="res://Scripts/Components/FSM/Enemy/Init.cs" id="4_f112g"]
[ext_resource type="Script" uid="uid://bjrh5q24nuoec" path="res://Scripts/Components/FSM/Enemy/Idle.cs" id="4_kjmts"]
[ext_resource type="Script" uid="uid://dbmc3klko5x18" path="res://Scripts/Components/FSM/Enemy/Alert.cs" id="5_f112g"]
[ext_resource type="Script" uid="uid://mb4ugq74a17c" path="res://Scripts/Components/FSM/Enemy/PlayerDetectionModule.cs" id="5_rkav6"]
[ext_resource type="Script" uid="uid://bflvr26h52c55" path="res://Scripts/Components/FSM/Enemy/EnemyStorageModule.cs" id="8_fu65u"]
[ext_resource type="Script" uid="uid://cq3hkweplldbr" path="res://Scripts/Components/Actors/GenericDamageReceiver.cs" id="10_l7aey"]
[ext_resource type="PackedScene" uid="uid://dmumxecckh42r" path="res://Scenes/Activable/BrokenFloorEmitter.tscn" id="11_br0mr"]
[ext_resource type="Script" uid="uid://cqwvssstkrdmw" path="res://Scripts/Components/Actors/ActorResourceProvider.cs" id="12_w08b8"]
[sub_resource type="CircleShape2D" id="CircleShape2D_pnkma"]
[sub_resource type="CircleShape2D" id="CircleShape2D_5wstg"]
radius = 29.0
[sub_resource type="CircleShape2D" id="CircleShape2D_6x22m"]
radius = 5.0
[node name="FairyFsm" type="CharacterBody2D" node_paths=PackedStringArray("EnemyFSM")]
collision_layer = 16
collision_mask = 33
script = ExtResource("1_jgko8")
EnemyFSM = NodePath("StateMachine")
EnemyResource = ExtResource("2_rkav6")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_pnkma")
[node name="StateMachine" type="Node2D" parent="."]
script = ExtResource("1_27djw")
[node name="Init" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("DamageReceiver", "StorageModule")]
script = ExtResource("4_f112g")
DamageReceiver = NodePath("../../DamageReceiver")
StorageModule = NodePath("../../Storage")
[node name="Idle" type="Node2D" parent="StateMachine" node_paths=PackedStringArray("StorageModule", "PlayerDetection", "DamageReceiver")]
script = ExtResource("4_kjmts")
StorageModule = NodePath("../../Storage")
PlayerDetection = NodePath("../../PlayerDetection")
DamageReceiver = NodePath("../../DamageReceiver")
[node name="Alert" type="Node2D" parent="StateMachine"]
script = ExtResource("5_f112g")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
sprite_frames = ExtResource("1_ho0th")
animation = &"down"
[node name="PlayerDetection" type="Area2D" parent="."]
collision_layer = 0
collision_mask = 2
script = ExtResource("5_rkav6")
ObstaclesCollisionMask = 81
[node name="CollisionShape2D" type="CollisionShape2D" parent="PlayerDetection"]
shape = SubResource("CircleShape2D_5wstg")
[node name="Storage" type="Node2D" parent="." node_paths=PackedStringArray("Root")]
script = ExtResource("8_fu65u")
Root = NodePath("..")
[node name="DamageReceiver" type="Area2D" parent="." node_paths=PackedStringArray("HealthProvider")]
collision_layer = 64
collision_mask = 136
script = ExtResource("10_l7aey")
HealthProvider = NodePath("Health")
BulletGroup = 2
Debris = ExtResource("11_br0mr")
DeleteParentOnDeath = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="DamageReceiver"]
position = Vector2(0, 3.865)
shape = SubResource("CircleShape2D_6x22m")
[node name="Health" type="Node2D" parent="DamageReceiver"]
script = ExtResource("12_w08b8")
ResourceName = "Health"
[connection signal="area_entered" from="PlayerDetection" to="PlayerDetection" method="_on_area_entered"]
[connection signal="area_exited" from="PlayerDetection" to="PlayerDetection" method="_on_area_exited"]
[connection signal="area_entered" from="DamageReceiver" to="DamageReceiver" method="_on_damage_hitbox_area_entered"]

View file

@ -1,10 +1,8 @@
[gd_scene load_steps=20 format=3 uid="uid://dfat0erkvb513"]
[gd_scene load_steps=18 format=3 uid="uid://dfat0erkvb513"]
[ext_resource type="Script" uid="uid://c2mo5hc1qb6kf" path="res://Scripts/Components/Actors/Actor.cs" id="1_p2pib"]
[ext_resource type="Resource" uid="uid://cocl3qontm3be" path="res://Resources/Enemies/Base_Fairy.tres" id="2_oync8"]
[ext_resource type="SpriteFrames" uid="uid://bcc5mlwwnkvri" path="res://Resources/Sprites/Fairy.tres" id="2_ycldt"]
[ext_resource type="Script" uid="uid://tk6ytw246ubg" path="res://Scripts/Components/Actors/EnemyPossessionMovement.cs" id="3_bwdr1"]
[ext_resource type="Script" uid="uid://dq338w2lw5phl" path="res://Scripts/Components/Actors/KeyboardInputProvider.cs" id="4_5uoep"]
[ext_resource type="Script" uid="uid://pfxrvd1fofnj" path="res://Scripts/Components/Actors/FourWayAnimationHandler.cs" id="5_6u5xg"]
[ext_resource type="Script" uid="uid://ghq0lmohdvqf" path="res://Scripts/Components/Actors/ActorAi.cs" id="6_3slbl"]
[ext_resource type="Script" uid="uid://dsu7k7ds0cnba" path="res://Scripts/Components/Actors/EnemyNavigationMovement.cs" id="7_vtg4i"]
@ -36,12 +34,6 @@ EnemyData = ExtResource("2_oync8")
sprite_frames = ExtResource("2_ycldt")
animation = &"down"
[node name="MovementProvider" type="Node2D" parent="."]
script = ExtResource("3_bwdr1")
[node name="InputProvider" type="Node2D" parent="MovementProvider"]
script = ExtResource("4_5uoep")
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource("CircleShape2D_2b36v")

View file

@ -1,4 +1,4 @@
[gd_scene load_steps=72 format=4 uid="uid://dqyfnby0t7gu1"]
[gd_scene load_steps=73 format=4 uid="uid://dqyfnby0t7gu1"]
[ext_resource type="Script" uid="uid://doxmbokehw8ci" path="res://Scripts/GameManager.cs" id="1_c3v4x"]
[ext_resource type="Resource" uid="uid://cs3ihltcn2166" path="res://Resources/Items/IcicleGun.tres" id="3_6314l"]
@ -16,6 +16,7 @@
[ext_resource type="Script" uid="uid://c5nxsq3tyxcx6" path="res://Scripts/InventoryManager.cs" id="10_qmakk"]
[ext_resource type="PackedScene" uid="uid://dkwi1hu1bixoe" path="res://Scenes/HUD/HUD.tscn" id="11_hmqao"]
[ext_resource type="Script" uid="uid://bdshph801ac2i" path="res://Scenes/CameraTarget.gd" id="12_8to53"]
[ext_resource type="PackedScene" uid="uid://clieeuln36a7a" path="res://Scenes/Actors/Fairy_FSM.tscn" id="12_64bae"]
[ext_resource type="Script" uid="uid://cnkipcolyj61w" path="res://Scripts/AlarmManager.cs" id="13_8fnge"]
[ext_resource type="PackedScene" uid="uid://b0gpbkxdfbnjh" path="res://Scenes/Actors/ForceField_Horizontal.tscn" id="13_mljl7"]
[ext_resource type="PackedScene" uid="uid://d0yes7huiyisw" path="res://Scenes/Items/Blue_Keycard.tscn" id="14_0knpf"]
@ -226,6 +227,9 @@ texture = SubResource("GradientTexture1D_4gtx8")
position = Vector2(385, 111)
scale = Vector2(0.66, 2.04)
[node name="FairyFsm" parent="Tilemaps/AcidHitboxes" instance=ExtResource("12_64bae")]
position = Vector2(544, 160)
[node name="Actors" type="Node2D" parent="Tilemaps"]
y_sort_enabled = true
metadata/_edit_lock_ = true
@ -363,19 +367,16 @@ position = Vector2(436, 161)
position = Vector2(639.074, 158.001)
Script = ExtResource("45_4mkc6")
InvertSignal = true
EmitOnStart = true
[node name="FloorEmitter3" parent="Tilemaps/Actors" instance=ExtResource("44_b8ffn")]
position = Vector2(613, 186)
Script = ExtResource("45_4mkc6")
InvertSignal = true
EmitOnStart = true
[node name="FloorEmitter2" parent="Tilemaps/Actors" instance=ExtResource("44_b8ffn")]
position = Vector2(601, 147)
Script = SubResource("Resource_64bae")
InvertSignal = true
EmitOnStart = true
[node name="ScriptableAreaTrigger" parent="Tilemaps" instance=ExtResource("28_fuxq3")]
position = Vector2(230, 250)