Fix standard enemy logic

Zennysoft.Game.Ma/src/enemy/Enemy.cs

@@ -65,18 +65,19 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
     _enemyLogic.Set(_player);
     SetPhysicsProcess(true);
     EnemyModelView.HitPlayer += EnemyModelView_HitPlayer;
-  }
-
-  public void OnResolved()
-  {
     EnemyBinding = _enemyLogic.Bind();
 
     EnemyBinding
       .Handle((in EnemyLogic.Output.Activate _) =>
       {
         if (!_activated)
+        {
           Activate();
-        _activated = true;
+          _activated = true;
+
+          if (this is IHaveFollowBehavior)
+            _enemyLogic.Input(new EnemyLogic.Input.Follow());
+        }
       })
       .Handle((in EnemyLogic.Output.Idle _) =>
       {
@@ -99,7 +100,6 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
 
   public virtual void Activate()
   {
-
   }
 
   public virtual void Idle()
@@ -114,7 +114,7 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
 
   public virtual void PerformAction()
   {
-    PerformAction();
+    EnemyModelView.PlayPrimaryAttackAnimation();
   }
 
   public virtual void ReturnToDefaultState()

Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs

@@ -25,12 +25,16 @@ public partial class Sproingy : Enemy2D, IHavePatrolBehavior, IHaveEngagePlayerB
     FollowBehavior.OnVelocityComputed += OnVelocityComputed;
     EngagePlayerBehavior.TakeAction += EngagePlayerBehavior_TakeAction;
     EngagePlayerBehavior.AcquireTarget += EngagePlayerBehavior_AcquireTarget;
-    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
     PlayerDetector.BodyEntered += PlayerDetector_BodyEntered;
     PlayerDetector.BodyExited += PlayerDetector_BodyExited;
     SetPhysicsProcess(true);
   }
 
+  public void OnResolved()
+  {
+    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
+  }
+
   public override void _ExitTree()
   {
     PatrolBehavior.OnVelocityComputed -= OnVelocityComputed;

Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.tscn

@@ -26,6 +26,7 @@ material = SubResource("StandardMaterial3D_p4gkk")
 top_radius = 0.0
 
 [sub_resource type="CylinderShape3D" id="CylinderShape3D_drfkj"]
+radius = 1.0
 
 [node name="Sproingy" type="CharacterBody3D"]
 process_mode = 1
@@ -81,8 +82,6 @@ shape = SubResource("CylinderShape3D_drfkj")
 
 [node name="EnemyModelView" parent="Visual" instance=ExtResource("4_o3b7p")]
 unique_name_in_owner = true
-_upperThreshold = 0.5
-_lowerThreshold = -0.5
 
 [node name="Components" type="Node3D" parent="."]
 

Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/Michael.cs

@@ -25,9 +25,13 @@ public partial class Michael : Enemy2D, IHavePatrolBehavior, IHaveEngagePlayerBe
     FollowBehavior.OnVelocityComputed += OnVelocityComputed;
     EngagePlayerBehavior.TakeAction += EngagePlayerBehavior_TakeAction;
     EngagePlayerBehavior.AcquireTarget += EngagePlayerBehavior_AcquireTarget;
-    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
     PlayerDetector.BodyEntered += PlayerDetector_BodyEntered;
     PlayerDetector.BodyExited += PlayerDetector_BodyExited;
     SetPhysicsProcess(true);
   }
+
+  public void OnResolved()
+  {
+    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
+  }
 }

Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEater.cs

@@ -1,6 +1,8 @@
 using Chickensoft.AutoInject;
 using Chickensoft.Introspection;
 using Godot;
+using System;
+using System.Collections.Generic;
 
 namespace Zennysoft.Game.Ma;
 
@@ -9,6 +11,10 @@ public partial class FilthEater : Enemy2D, IHavePatrolBehavior, IHaveEngagePlaye
 {
   public override void _Notification(int what) => this.Notify(what);
 
+  [Export] private float PrimaryAttackChance { get; set; } = 0.75f;
+
+  [Export] private float SecondaryAttackChance { get; set; } = 0.25f;
+
   [Node] public NavigationAgent3D NavigationAgent { get; set; }
   [Node] public PatrolBehavior PatrolBehavior { get; set; } = default!;
   [Node] public FollowBehavior FollowBehavior { get; set; } = default!;
@@ -25,13 +31,23 @@ public partial class FilthEater : Enemy2D, IHavePatrolBehavior, IHaveEngagePlaye
     FollowBehavior.OnVelocityComputed += OnVelocityComputed;
     EngagePlayerBehavior.TakeAction += PerformAction;
     EngagePlayerBehavior.AcquireTarget += EngagePlayerBehavior_AcquireTarget;
-    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
     PlayerDetector.BodyEntered += PlayerDetector_BodyEntered;
     PlayerDetector.BodyExited += PlayerDetector_BodyExited;
     SetPhysicsProcess(true);
   }
 
-  public override void PerformAction() => EnemyModelView.PlaySecondaryAttackAnimation();
+  public void OnResolved()
+  {
+    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
+  }
+
+  public override void PerformAction()
+  {
+    var rng = new RandomNumberGenerator();
+    var options = new List<Action>() { EnemyModelView.PlayPrimaryAttackAnimation, EnemyModelView.PlaySecondaryAttackAnimation };
+    var selection = rng.RandWeighted([PrimaryAttackChance, SecondaryAttackChance]);
+    options[(int)selection].Invoke();
+  }
 
   public override void _ExitTree()
   {

Zennysoft.Game.Ma/src/enemy/enemy_types/03. filth_eater/FilthEaterModelView.tscn

@@ -2658,45 +2658,6 @@ animations = [{
 
 [sub_resource type="SphereShape3D" id="SphereShape3D_kct8n"]
 
-[sub_resource type="Animation" id="Animation_8qeb2"]
-length = 0.001
-tracks/0/type = "value"
-tracks/0/imported = false
-tracks/0/enabled = true
-tracks/0/path = NodePath("..:position")
-tracks/0/interp = 1
-tracks/0/loop_wrap = true
-tracks/0/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 0,
-"values": [Vector3(0, 0, 0)]
-}
-tracks/1/type = "value"
-tracks/1/imported = false
-tracks/1/enabled = true
-tracks/1/path = NodePath("../ProjectileHitbox:monitoring")
-tracks/1/interp = 1
-tracks/1/loop_wrap = true
-tracks/1/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 1,
-"values": [false]
-}
-tracks/2/type = "value"
-tracks/2/imported = false
-tracks/2/enabled = true
-tracks/2/path = NodePath(".:visible")
-tracks/2/interp = 1
-tracks/2/loop_wrap = true
-tracks/2/keys = {
-"times": PackedFloat32Array(0),
-"transitions": PackedFloat32Array(1),
-"update": 1,
-"values": [false]
-}
-
 [sub_resource type="Animation" id="Animation_xrn7e"]
 resource_name = "fire"
 tracks/0/type = "value"
@@ -2751,6 +2712,45 @@ tracks/3/keys = {
 "values": [false, true, false]
 }
 
+[sub_resource type="Animation" id="Animation_8qeb2"]
+length = 0.001
+tracks/0/type = "value"
+tracks/0/imported = false
+tracks/0/enabled = true
+tracks/0/path = NodePath("..:position")
+tracks/0/interp = 1
+tracks/0/loop_wrap = true
+tracks/0/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 0,
+"values": [Vector3(0, 0, 0)]
+}
+tracks/1/type = "value"
+tracks/1/imported = false
+tracks/1/enabled = true
+tracks/1/path = NodePath("../ProjectileHitbox:monitoring")
+tracks/1/interp = 1
+tracks/1/loop_wrap = true
+tracks/1/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [false]
+}
+tracks/2/type = "value"
+tracks/2/imported = false
+tracks/2/enabled = true
+tracks/2/path = NodePath(".:visible")
+tracks/2/interp = 1
+tracks/2/loop_wrap = true
+tracks/2/keys = {
+"times": PackedFloat32Array(0),
+"transitions": PackedFloat32Array(1),
+"update": 1,
+"values": [false]
+}
+
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_q8n6h"]
 _data = {
 &"Fire": SubResource("Animation_xrn7e"),

Zennysoft.Game.Ma/src/enemy/enemy_types/04. sara/Sara.cs

@@ -30,12 +30,16 @@ public partial class Sara : Enemy2D, IHavePatrolBehavior, IHaveEngagePlayerBehav
     FollowBehavior.OnVelocityComputed += OnVelocityComputed;
     EngagePlayerBehavior.TakeAction += EngagePlayerBehavior_TakeAction;
     EngagePlayerBehavior.AcquireTarget += EngagePlayerBehavior_AcquireTarget;
-    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
     PlayerDetector.BodyEntered += PlayerDetector_BodyEntered;
     PlayerDetector.BodyExited += PlayerDetector_BodyExited;
     SetPhysicsProcess(true);
   }
 
+  public void OnResolved()
+  {
+    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
+  }
+
   public override void PerformAction()
   {
     var rng = new RandomNumberGenerator();

Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/Ballos.cs

@@ -30,12 +30,16 @@ public partial class Ballos : Enemy2D, IHavePatrolBehavior, IHaveEngagePlayerBeh
     FollowBehavior.OnVelocityComputed += OnVelocityComputed;
     EngagePlayerBehavior.TakeAction += EngagePlayerBehavior_TakeAction;
     EngagePlayerBehavior.AcquireTarget += EngagePlayerBehavior_AcquireTarget;
-    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
     PlayerDetector.BodyEntered += PlayerDetector_BodyEntered;
     PlayerDetector.BodyExited += PlayerDetector_BodyExited;
     SetPhysicsProcess(true);
   }
 
+  public void OnResolved()
+  {
+    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
+  }
+
   public override void PerformAction()
   {
     var rng = new RandomNumberGenerator();

Zennysoft.Game.Ma/src/enemy/enemy_types/06. chariot/Chariot.cs

@@ -36,6 +36,11 @@ public partial class Chariot : Enemy2D, IHavePatrolBehavior, IHaveEngagePlayerBe
     SetPhysicsProcess(true);
   }
 
+  public void OnResolved()
+  {
+    _enemyLogic.Input(new EnemyLogic.Input.Patrol());
+  }
+
   public override void Activate()
   {
     EnemyModelView.PlayActivateAnimation();

Zennysoft.Game.Ma/src/enemy/enemy_types/07. chinthe/Chinthe.cs

@@ -54,12 +54,6 @@ public partial class Chinthe : Enemy2D, IHaveEngagePlayerBehavior, IHaveFollowBe
     EnemyModelView.PlayActivateAnimation();
   }
 
-  public override void Idle()
-  {
-    EnemyModelView.PlayIdleAnimation();
-    EnemyModelView.PlayIdleAnimation();
-  }
-
   private void Teleport(object sender, EventArgs e)
   {
     var targetPosition = _player.GlobalBasis.Z;

Zennysoft.Game.Ma/src/enemy/enemy_types/12. Shield of Heaven/ShieldModelView.tscn

@@ -3004,7 +3004,7 @@ tracks/0/keys = {
 "times": PackedFloat32Array(0),
 "transitions": PackedFloat32Array(1),
 "update": 1,
-"values": [23]
+"values": [0]
 }
 
 [sub_resource type="AnimationLibrary" id="AnimationLibrary_yuosm"]
@@ -3294,7 +3294,6 @@ modulate = Color(1, 1, 1, 0.788235)
 billboard = 1
 texture_filter = 0
 sprite_frames = SubResource("SpriteFrames_ie7uh")
-frame = 23
 
 [node name="Attack 2 VFX" type="AnimatedSprite3D" parent="VFX Animation Player"]
 sprite_frames = SubResource("SpriteFrames_lgwan")

Zennysoft.Game.Ma/src/enemy/state/states/EnemyLogic.State.Activated.cs

@@ -9,18 +9,9 @@ public partial class EnemyLogic
   {
     [Meta, Id("enemy_logic_state_activated")]
     public partial record Activated : Alive,
-      IGet<ReachedPlayer>,
-      IGet<Patrol>,
-      IGet<Follow>,
       IGet<Reset>
     {
       public Activated() => OnAttach(() => Output(new Output.Activate()));
     }
-
-    public Transition On(in ReachedPlayer input) => To<EngagePlayer>();
-
-    public Transition On(in Patrol _) => To<Patrolling>();
-
-    public Transition On(in Follow _) => To<FollowPlayer>();
   }
 }

Zennysoft.Game.Ma/src/enemy/state/states/EnemyLogic.State.Alive.cs

@@ -11,6 +11,9 @@ public partial class EnemyLogic
     public abstract partial record Alive : State,
       IGet<Input.Idle>,
       IGet<Move>,
+      IGet<Patrol>,
+      IGet<Follow>,
+      IGet<ReachedPlayer>,
       IGet<Input.Defeated>
     {
       public Transition On(in Reset input)
@@ -21,11 +24,13 @@ public partial class EnemyLogic
 
       public Transition On(in Input.Defeated input) => To<Defeated>();
 
-      public Transition On(in Input.Idle input)
-      {
-        Output(new Output.Idle());
-        return ToSelf();
-      }
+      public Transition On(in Input.Idle input) => To<Idle>();
+
+      public Transition On(in Follow _) => To<FollowPlayer>();
+
+      public Transition On(in ReachedPlayer input) => To<EngagePlayer>();
+
+      public Transition On(in Patrol _) => To<Patrolling>();
 
       public Transition On(in Move input)
       {

Zennysoft.Game.Ma/src/enemy/state/states/EnemyLogic.State.EngagePlayer.cs

@@ -8,7 +8,7 @@ public partial class EnemyLogic
   public partial record State
   {
     [Meta, Id("enemy_logic_state_engage_player")]
-    public partial record EngagePlayer : Activated
+    public partial record EngagePlayer : Alive
     {
       public EngagePlayer()
       {
@@ -18,7 +18,6 @@ public partial class EnemyLogic
           if (enemy is IHaveEngagePlayerBehavior engagePlayerEnemy)
           {
             engagePlayerEnemy.EngagePlayerBehavior.Engage();
-            Input(new Input.Idle());
           }
         });
         OnDetach(() =>
@@ -27,7 +26,6 @@ public partial class EnemyLogic
           if (enemy is IHaveEngagePlayerBehavior engagePlayerEnemy)
           {
             engagePlayerEnemy.EngagePlayerBehavior.Disengage();
-            Input(new Input.Idle());
           }
         });
       }

Zennysoft.Game.Ma/src/enemy/state/states/EnemyLogic.State.FollowPlayer.cs

@@ -8,7 +8,7 @@ public partial class EnemyLogic
   public partial record State
   {
     [Meta, Id("enemy_logic_state_followplayer")]
-    public partial record FollowPlayer : Activated, IGet<Input.LoseTrackOfTarget>
+    public partial record FollowPlayer : Alive, IGet<Input.LoseTrackOfTarget>
     {
       public FollowPlayer()
       {
@@ -18,7 +18,6 @@ public partial class EnemyLogic
           if (enemy is IHaveFollowBehavior followEnemy)
           {
             followEnemy.FollowBehavior.StartFollow(followEnemy.NavigationAgent);
-            Input(new Input.Move());
           }
         });
         OnDetach(() =>
@@ -27,7 +26,6 @@ public partial class EnemyLogic
           if (enemy is IHaveFollowBehavior followEnemy)
           {
             followEnemy.FollowBehavior.StopFollow();
-            Input(new Input.Idle());
           }
         });
       }

Zennysoft.Game.Ma/src/enemy/state/states/EnemyLogic.State.Idle.cs

@@ -7,7 +7,7 @@ public partial class EnemyLogic
   public partial record State
   {
     [Meta, Id("enemy_logic_state_idle")]
-    public partial record Idle : Activated
+    public partial record Idle : Alive
     {
       public Idle() => OnAttach(() => Output(new Output.Idle()));
     }

Zennysoft.Game.Ma/src/enemy/state/states/EnemyLogic.State.Patrolling.cs

@@ -1,5 +1,4 @@
 using Chickensoft.Introspection;
-using Godot;
 using Zennysoft.Ma.Adapter.Entity;
 
 namespace Zennysoft.Game.Ma;
@@ -9,7 +8,7 @@ public partial class EnemyLogic
   public partial record State
   {
     [Meta, Id("enemy_logic_state_patrolling")]
-    public partial record Patrolling : Activated
+    public partial record Patrolling : Alive
     {
       public Patrolling()
       {
@@ -19,7 +18,6 @@ public partial class EnemyLogic
           if (enemy is IHavePatrolBehavior patrolEnemy)
           {
             patrolEnemy.PatrolBehavior.StartPatrol();
-            Input(new Input.Move());
           }
         });
         OnDetach(() =>
@@ -28,7 +26,6 @@ public partial class EnemyLogic
           if (enemy is IHavePatrolBehavior patrolEnemy)
           {
             patrolEnemy.PatrolBehavior.StopPatrol();
-            Input(new Input.Idle());
           }
         });
       }

Zennysoft.Game.Ma/src/map/Map.tscn

@@ -80,7 +80,7 @@ unique_name_in_owner = true
 script = ExtResource("2_00xd7")
 FolderName = "SetAFloors"
 FloorOdds = Array[float]([0.0, 1.0])
-Chinthe = 1.0
+Sproingy = 1.0
 
 [node name="Overworld" type="Node" parent="MapOrder"]
 script = ExtResource("3_v14r0")