Add FSM components for player and enemy state management, including initialization and module resolution

This commit is contained in:
MaddoScientisto 2026-02-26 23:13:57 +01:00
commit b6cc5a00e8
57 changed files with 526 additions and 506 deletions

View file

@ -1,5 +1,4 @@
using System;
using Cirno.Scripts.Components.Actors;
using Cirno.Scripts.Components.Actors;
using Cirno.Scripts.Resources;
using Godot;
@ -13,7 +12,7 @@ public partial class PlayerFSMItemUseModule : ModuleBase<PlayerState, CharacterB
[Export]
public ActorResourceProvider Shield { get; set; }
[Export] private PlayerStorageModule _storageModule;
private PlayerStorageModule _storageModule;
public Vector2 FacingDirection
{
@ -21,7 +20,7 @@ public partial class PlayerFSMItemUseModule : ModuleBase<PlayerState, CharacterB
private set => _storageModule.FacingDirection = value;
}
public bool Enabled { get; set; } = false;
public bool Enabled { get; set; }
public override void EnterState(PlayerState state)
{
@ -40,6 +39,7 @@ public partial class PlayerFSMItemUseModule : ModuleBase<PlayerState, CharacterB
{
InventoryManager.Instance.ItemUsed += this.UseItem;
_machine = machine;
_storageModule ??= StateMachine.GetModule<PlayerStorageModule>();
}
private void UseItem(LootItem item, int totalcount)
@ -48,94 +48,8 @@ public partial class PlayerFSMItemUseModule : ModuleBase<PlayerState, CharacterB
GD.Print($"Used {item.ItemName} in player");
item.ItemEffect?.Execute(this, item);
return;
// switch (item.Item)
// {
// case ItemTypes.KeycardRed:
// break;
// case ItemTypes.KeycardBlue:
// break;
// case ItemTypes.KeycardGreen:
// break;
// case ItemTypes.Ammo:
// break;
// case ItemTypes.Medkit:
// Heal(item);
// break;
// case ItemTypes.FrogBomb:
// SpawnSpiderBomb(item);
// break;
// case ItemTypes.Bomb:
// SpawnBomb(item);
// break;
// case ItemTypes.Mine:
// break;
// case ItemTypes.Battery:
// RechargeShield(item);
// break;
// case ItemTypes.Weapon:
// break;
// case ItemTypes.Power:
// break;
// case ItemTypes.Points:
// break;
// case ItemTypes.Credits:
// break;
// case ItemTypes.KeyItem:
// break;
// }
}
// private void SpawnBomb(LootItem item)
// {
// GD.Print("Spawned bomb");
// }
//
// private void Heal(LootItem item)
// {
// Health.CurrentResource += Mathf.CeilToInt(Health.MaxResource * 25 / 100);
// }
//
// private void RechargeShield(LootItem item)
// {
// Shield.CurrentResource += Mathf.CeilToInt(Health.MaxResource * 25 / 100);
// }
//
// private void SpawnSpiderBomb(LootItem item)
// {
// //var bullet = item.WeaponData.BulletData.BulletScene.Instantiate<Bullet>();
// //bullet.Initialize(item.WeaponData.BulletData.MakeBullet(this.GlobalPosition, 1,0, 0), GameManager.Instance);
//
//
// //InventoryManager.Instance.RemoveItem(item.ItemKey, 1);
// // emit projectile
// var bullet = this.CreateChildOf<Bullet>(GameManager.Instance.BulletsContainer, item.WeaponData.BulletData.BulletScene, this.GlobalPosition);
//
// var bulletData = item.WeaponData.MakeBullet(this.GlobalPosition);
//
// bullet.Initialize(bulletData, GameManager.Instance);
// bullet.SetDirection(FacingDirection);
// bullet.RotateSpriteDegrees(-90);
// //bullet.SetDirection(_facingDirection);
// bullet.Speed = item.WeaponData.BulletData.BulletSpeed;
//
// _machine.SetState(PlayerState.Controlling);
//
// //RequestMovementDisable(true);
// // set camera
// GameManager.Instance.CameraTargetObject(bullet);
// // set event destroy
// bullet.OnDestroy += () =>
// {
// GameManager.Instance.CameraTargetPlayer();
// _machine.SetState(PlayerState.Active);
// //RequestMovementDisable(false);
// };
// }
public override void Process(double delta)
{