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

Migrated player state machine

Browse source
This commit is contained in:
Marco 2025-03-05 10:55:14 +01:00
commit 9c3f22760b
19 changed files with 108 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Scripts/Components/Actors/ActivationProvider.cs
View file

@ -23,7 +23,7 @@ public partial class ActivationProvider : Area2D
[Signal]
public delegate void InteractableAreaExitedEventHandler(Interactable interactable);
public void Init(ActorStateMachine actor)
public void Init(CharacterBody2D actor)
{
if (SelectorScene is not null && _selector is null)
{

4
Scripts/Components/Actors/EnemyPossessionMovement.cs
View file

@ -78,7 +78,7 @@ public partial class EnemyPossessionMovement : ActorFreeMovement
{
GameManager.Instance.CameraTargetObject(_parent);
//GameManager.Instance.Player.RequestMovementDisable(true);
GameManager.Instance.Player.SetState((int)PlayerState.Controlling);
GameManager.Instance.Player.SetState(PlayerState.Controlling);
_previousAiState = _actorAi.Ai;
_actorAi.Ai = AiState.Controlled;
@ -94,7 +94,7 @@ public partial class EnemyPossessionMovement : ActorFreeMovement
GameManager.Instance.CameraTargetPlayer();
//GameManager.Instance.Player.RequestMovementDisable(false);
GameManager.Instance.Player.SetState((int)PlayerState.Active);
GameManager.Instance.Player.SetState(PlayerState.Active);
DamageReceiver.BulletGroup = BulletOwner.Enemy;