maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-01 08:45:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Enemy AI

Browse source
This commit is contained in:
Marco 2025-03-21 10:30:44 +01:00
commit f2bdec7ad7
14 changed files with 200 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scenes/Actors/Fairy_FSM.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=20 format=3 uid="uid://clieeuln36a7a"]
[gd_scene load_steps=21 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"]
@ -10,6 +10,7 @@
[ext_resource type="Script" uid="uid://mb4ugq74a17c" path="res://Scripts/Components/FSM/Enemy/PlayerDetectionModule.cs" id="5_rkav6"]
[ext_resource type="Script" uid="uid://7mig30eneu8x" path="res://Scripts/Components/FSM/Enemy/Shooting.cs" id="7_br0mr"]
[ext_resource type="Script" uid="uid://bflvr26h52c55" path="res://Scripts/Components/FSM/Enemy/EnemyStorageModule.cs" id="8_fu65u"]
[ext_resource type="Script" uid="uid://4hwtlc1ftjsc" path="res://Scripts/Components/FSM/Enemy/Dead.cs" id="8_pi7ab"]
[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"]
@ -63,6 +64,9 @@ PlayerDetection = NodePath("../../PlayerDetection")
DamageReceiver = NodePath("../../DamageReceiver")
EquippedWeapon = NodePath("../../EnemyWeapon")
[node name="Dead" type="Node2D" parent="StateMachine"]
script = ExtResource("8_pi7ab")
[node name="AnimatedSprite2D" type="AnimatedSprite2D" parent="."]
sprite_frames = ExtResource("1_ho0th")
animation = &"down"
@ -102,7 +106,7 @@ script = ExtResource("14_w08b8")
StorageModule = NodePath("../Storage")
[node name="NavigationAgent2D" type="NavigationAgent2D" parent="NavigationModule"]
target_desired_distance = 64.0
target_desired_distance = 8.0
path_max_distance = 800.0
path_postprocessing = 1
avoidance_enabled = true

8
Scenes/Maps/PlayerFSMTest.tscn
View file

File diff suppressed because one or more lines are too long

2
Scenes/test.tscn
View file

@ -1119,7 +1119,7 @@ position = Vector2(-2000, -736)
[node name="ControlPad8" parent="Parallax2D/Factory Tilemaps/LevelProps" node_paths=PackedStringArray("Targets") instance=ExtResource("12_hfkf1")]
position = Vector2(-2027, -735)
Targets = [NodePath("../HorizontalForceField")]
Requirements = Array[ExtResource("6_8tdlb")]([ExtResource("84_ma1ta")])
Requirements = [ExtResource("84_ma1ta")]
[node name="Ammo6" parent="Parallax2D/Factory Tilemaps/LevelProps" instance=ExtResource("34_17pjh")]
position = Vector2(-872, -220)

12
Scripts/Components/FSM/Enemy/Alert.cs
View file

@ -27,9 +27,11 @@ public partial class Alert : EnemyStateBase
base.EnterState();
GD.Print($"Entered {Name}");
NavigationModule.Init(MainObject);
PlayerDetection.SetRange(StorageModule.Root.EnemyResource.PlayerDetectionRange);
_isPlayerInRange = PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.PlayerDetectionRange);
//_isPlayerInRange = PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.ViewRange);
//GD.Print($"Player In Range: {_isPlayerInRange}");
PlayerDetection.PlayerInRange += PlayerDetectionOnPlayerInRange;
@ -38,10 +40,8 @@ public partial class Alert : EnemyStateBase
DamageReceiver.ChangeState(true);
DamageReceiver.HealthProvider.ResourceDepleted += HealthProviderOnResourceDepleted;
}
private void HealthProviderOnResourceDepleted()
{
ChangeState(EnemyState.Dead);
@ -68,14 +68,14 @@ public partial class Alert : EnemyStateBase
private void PlayerDetectionOnPlayerInRange()
{
_isPlayerInRange = true;
//_isPlayerInRange = true;
GD.Print("Player In Range");
}
public override void PhysicsProcessState(double delta)
{
base.PhysicsProcessState(delta);
if (_isPlayerInRange && PlayerDetection.IsPlayerInSight())
if (PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.ViewRange) && PlayerDetection.IsPlayerInSight())
{
GD.Print("Player is in sight, shooting");
StateMachine.SetState(EnemyState.Shooting);

8
Scripts/Components/FSM/Enemy/Dead.cs Normal file
View file

@ -0,0 +1,8 @@
using Cirno.Scripts.Enums;
namespace Cirno.Scripts.Components.FSM.Enemy;
public partial class Dead : EnemyStateBase
{
public override EnemyState StateId => EnemyState.Dead;
}

1
Scripts/Components/FSM/Enemy/Dead.cs.uid Normal file
View file

@ -0,0 +1 @@
uid://4hwtlc1ftjsc

2
Scripts/Components/FSM/Enemy/Idle.cs
View file

@ -32,7 +32,7 @@ public partial class Idle : EnemyStateBase
GD.Print("Entered Idle");
PlayerDetection.SetRange(StorageModule.Root.EnemyResource.PlayerDetectionRange);
_isPlayerInRange = PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.PlayerDetectionRange);
_isPlayerInRange = PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.ViewRange);
PlayerDetection.PlayerInRange += PlayerDetectionOnPlayerInRange;

2
Scripts/Components/FSM/Enemy/PlayerDetectionModule.cs
View file

@ -42,7 +42,7 @@ public partial class PlayerDetectionModule : Area2D
return false;
}
return this.GlobalPosition.DistanceTo(GameManager.Instance.PlayerPosition.Value) < range;
return this.GlobalPosition.DistanceTo(GameManager.Instance.PlayerPosition.Value) <= range;
}
public bool IsPlayerInSight()

7
Scripts/Components/FSM/Enemy/Shooting.cs
View file

@ -26,7 +26,7 @@ public partial class Shooting : EnemyStateBase
base.EnterState();
GD.Print($"Entered {Name}");
_isPlayerInRange = PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.PlayerDetectionRange);
//_isPlayerInRange = PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.ViewRange);
PlayerDetection.PlayerOutOfRange += PlayerDetectionOnPlayerOutOfRange;
@ -55,7 +55,6 @@ public partial class Shooting : EnemyStateBase
private void PlayerDetectionOnPlayerOutOfRange()
{
_isPlayerInRange = false;
StateMachine.SetState(EnemyState.Alert);
}
@ -75,7 +74,7 @@ public partial class Shooting : EnemyStateBase
{
base.PhysicsProcessState(delta);
if (_isPlayerInRange && PlayerDetection.IsPlayerInSight())
if (PlayerDetection.IsPlayerInRange(StorageModule.Root.EnemyResource.ViewRange) && PlayerDetection.IsPlayerInSight())
{
// SHOOT
Shoot();
@ -84,7 +83,6 @@ public partial class Shooting : EnemyStateBase
{
StateMachine.SetState(EnemyState.Alert);
}
}
private void Shoot()
@ -92,7 +90,6 @@ public partial class Shooting : EnemyStateBase
if (EquippedWeapon == null) return;
if (!PlayerDetection.LastKnownPlayerPosition.HasValue) return;
var direction = ( PlayerDetection.LastKnownPlayerPosition.Value - MainObject.GlobalPosition).Normalized();
// Shoot at the player's last known position

1
Scripts/Resources/EnemyResource.cs
View file

@ -18,6 +18,7 @@ public partial class EnemyResource : Resource
[Export] public Array<LootDrop> LootDrops { get; private set; }
[ExportCategory("AI")] [Export] public float PlayerDetectionRange { get; private set; } = 90f;
[Export] public float ViewRange { get; private set; } = 120f;
[Export] public float AlarmReactRange { get; private set; }
[Export] public float PlayerDisengageRange { get; private set; }
}

BIN
Tilesets/Solid_Blocks.aseprite (Stored with Git LFS) Normal file
View file

Binary file not shown.

BIN
Tilesets/Solid_Blocks.png (Stored with Git LFS) Normal file
View file

Binary file not shown.

34
Tilesets/Solid_Blocks.png.import Normal file
View file

@ -0,0 +1,34 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://bohhuql3vrkws"
path="res://.godot/imported/Solid_Blocks.png-bb51cfe1b1789bbca6752d0871e1c29f.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://Tilesets/Solid_Blocks.png"
dest_files=["res://.godot/imported/Solid_Blocks.png-bb51cfe1b1789bbca6752d0871e1c29f.ctex"]
[params]
compress/mode=0
compress/high_quality=false
compress/lossy_quality=0.7
compress/hdr_compression=1
compress/normal_map=0
compress/channel_pack=0
mipmaps/generate=false
mipmaps/limit=-1
roughness/mode=0
roughness/src_normal=""
process/fix_alpha_border=true
process/premult_alpha=false
process/normal_map_invert_y=false
process/hdr_as_srgb=false
process/hdr_clamp_exposure=false
process/size_limit=0
detect_3d/compress_to=1

130
Tilesets/factory_tileset.tres
View file

@ -1,4 +1,4 @@
[gd_resource type="TileSet" load_steps=58 format=3 uid="uid://6k28roiljylj"]
[gd_resource type="TileSet" load_steps=60 format=3 uid="uid://6k28roiljylj"]
[ext_resource type="Texture2D" uid="uid://bty7p61v46chx" path="res://Resources/Textures/Tilemap_Canvas.tres" id="1_u4jco"]
[ext_resource type="PackedScene" uid="uid://bj28qiai2x2ar" path="res://Scenes/Props/Barrel.tscn" id="2_cxg4b"]
@ -21,6 +21,7 @@
[ext_resource type="Texture2D" uid="uid://df8t3kan5qgjb" path="res://Tilesets/Space.png" id="12_fb37q"]
[ext_resource type="Texture2D" uid="uid://v310x6wx801b" path="res://Tilesets/Beams2.png" id="19_hupu0"]
[ext_resource type="Texture2D" uid="uid://c741ej5hhmpv4" path="res://Tilesets/Conveyors.png" id="21_u4jco"]
[ext_resource type="Texture2D" uid="uid://bohhuql3vrkws" path="res://Tilesets/Solid_Blocks.png" id="22_y1d7q"]
[sub_resource type="NavigationPolygon" id="NavigationPolygon_l8pdw"]
vertices = PackedVector2Array(8, 8, -8, 8, -8, -8, 8, -8)
@ -1316,6 +1317,129 @@ texture = ExtResource("21_u4jco")
0:3/0/physics_layer_2/linear_velocity = Vector2(0, 40)
0:3/0/physics_layer_2/polygon_0/points = PackedVector2Array(-6, -6, 6, -6, 6, 6, -6, 6)
[sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_wdun3"]
texture = ExtResource("22_y1d7q")
0:0/0 = 0
0:0/0/terrain_set = 1
0:0/0/terrain = 0
0:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:0/0 = 0
1:0/0/terrain_set = 1
1:0/0/terrain = 0
1:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:0/0/terrains_peering_bit/right_side = 0
1:0/0/terrains_peering_bit/bottom_side = 0
2:0/0 = 0
2:0/0/terrain_set = 1
2:0/0/terrain = 0
2:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:0/0/terrains_peering_bit/right_side = 0
2:0/0/terrains_peering_bit/bottom_side = 0
2:0/0/terrains_peering_bit/left_side = 0
3:0/0 = 0
3:0/0/terrain_set = 1
3:0/0/terrain = 0
3:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:0/0/terrains_peering_bit/bottom_side = 0
3:0/0/terrains_peering_bit/left_side = 0
0:1/0 = 0
0:1/0/terrain_set = 1
0:1/0/terrain = 0
0:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:1/0/terrains_peering_bit/bottom_side = 0
1:1/0 = 0
1:1/0/terrain_set = 1
1:1/0/terrain = 0
1:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:1/0/terrains_peering_bit/right_side = 0
1:1/0/terrains_peering_bit/bottom_side = 0
1:1/0/terrains_peering_bit/top_side = 0
2:1/0 = 0
2:1/0/terrain_set = 1
2:1/0/terrain = 0
2:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:1/0/terrains_peering_bit/right_side = 0
2:1/0/terrains_peering_bit/bottom_side = 0
2:1/0/terrains_peering_bit/left_side = 0
2:1/0/terrains_peering_bit/top_side = 0
3:1/0 = 0
3:1/0/terrain_set = 1
3:1/0/terrain = 0
3:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:1/0/terrains_peering_bit/bottom_side = 0
3:1/0/terrains_peering_bit/left_side = 0
3:1/0/terrains_peering_bit/top_side = 0
0:2/0 = 0
0:2/0/terrain_set = 1
0:2/0/terrain = 0
0:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:2/0/terrains_peering_bit/top_side = 0
1:2/0 = 0
1:2/0/terrain_set = 1
1:2/0/terrain = 0
1:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:2/0/terrains_peering_bit/right_side = 0
1:2/0/terrains_peering_bit/top_side = 0
2:2/0 = 0
2:2/0/terrain_set = 1
2:2/0/terrain = 0
2:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:2/0/terrains_peering_bit/right_side = 0
2:2/0/terrains_peering_bit/left_side = 0
2:2/0/terrains_peering_bit/top_side = 0
3:2/0 = 0
3:2/0/terrain_set = 1
3:2/0/terrain = 0
3:2/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:2/0/terrains_peering_bit/left_side = 0
3:2/0/terrains_peering_bit/top_side = 0
0:3/0 = 0
0:3/0/terrain_set = 1
0:3/0/terrain = 0
0:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
0:3/0/terrains_peering_bit/right_side = 0
1:3/0 = 0
1:3/0/terrain_set = 1
1:3/0/terrain = 0
1:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
1:3/0/terrains_peering_bit/left_side = 0
2:3/0 = 0
2:3/0/terrain_set = 1
2:3/0/terrain = 0
2:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
2:3/0/terrains_peering_bit/right_side = 0
2:3/0/terrains_peering_bit/left_side = 0
3:3/0 = 0
3:3/0/terrain_set = 1
3:3/0/terrain = 0
3:3/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
3:3/0/terrains_peering_bit/bottom_side = 0
3:3/0/terrains_peering_bit/top_side = 0
4:0/0 = 0
4:0/0/terrain_set = 1
4:0/0/terrain = 0
4:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:0/0/terrains_peering_bit/right_side = 0
4:0/0/terrains_peering_bit/bottom_side = 0
4:1/0 = 0
4:1/0/terrain_set = 1
4:1/0/terrain = 0
4:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
4:1/0/terrains_peering_bit/right_side = 0
4:1/0/terrains_peering_bit/top_side = 0
5:1/0 = 0
5:1/0/terrain_set = 1
5:1/0/terrain = 0
5:1/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:1/0/terrains_peering_bit/left_side = 0
5:1/0/terrains_peering_bit/top_side = 0
5:0/0 = 0
5:0/0/terrain_set = 1
5:0/0/terrain = 0
5:0/0/physics_layer_0/polygon_0/points = PackedVector2Array(-8, -8, 8, -8, 8, 8, -8, 8)
5:0/0/terrains_peering_bit/bottom_side = 0
5:0/0/terrains_peering_bit/left_side = 0
[resource]
physics_layer_0/collision_layer = 1
physics_layer_0/collision_mask = 30
@ -1336,6 +1460,9 @@ terrain_set_0/terrain_4/name = "SimpleFence"
terrain_set_0/terrain_4/color = Color(0.28125, 0.5, 0.25, 1)
terrain_set_0/terrain_5/name = "Grid Floor"
terrain_set_0/terrain_5/color = Color(0.25, 0.5, 0.3125, 1)
terrain_set_1/mode = 2
terrain_set_1/terrain_0/name = "Blocks"
terrain_set_1/terrain_0/color = Color(0.5, 0.34375, 0.25, 1)
navigation_layer_0/layers = 1
custom_data_layer_0/name = "Conveyor"
custom_data_layer_0/type = 5
@ -1344,3 +1471,4 @@ sources/1 = SubResource("TileSetScenesCollectionSource_qg3vu")
sources/2 = SubResource("TileSetAtlasSource_wgdjv")
sources/3 = SubResource("TileSetAtlasSource_7u0cp")
sources/4 = SubResource("TileSetAtlasSource_y1d7q")
sources/5 = SubResource("TileSetAtlasSource_wdun3")