maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-13 16:15:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Changed player to new one

Browse source
This commit is contained in:
Marco 2025-03-02 11:58:30 +01:00
commit 1c1436a539
27 changed files with 323 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

20
Scripts/Resources/Events/ControlEnemyEvent.cs
View file

@ -30,16 +30,18 @@ public partial class ControlEnemyEvent : EventResource
if (_parent.GetNode<Node2D>(Target) is Enemy enemy)
{
_gameManager.CameraTargetObject(enemy);
_gameManager.Player.RequestMovementDisable(true);
GameManager.Instance.Player.SetState((int)PlayerState.Controlling);
// _gameManager.Player.RequestMovementDisable(true);
enemy.AssumeControl();
if (_gameManager.Player.WingsSprite != null)
{
var sprite = new Sprite2D();
sprite.SetTexture(_gameManager.Player.WingsSprite);
//sprite.GlobalPosition = enemy.GlobalPosition;
sprite.SetZIndex(1);
enemy.CallDeferred("add_child", sprite);
}
// TODO: Do this on the enemy as a module instead
// if (_gameManager.Player.WingsSprite != null)
// {
// var sprite = new Sprite2D();
// sprite.SetTexture(_gameManager.Player.WingsSprite);
// //sprite.GlobalPosition = enemy.GlobalPosition;
// sprite.SetZIndex(1);
// enemy.CallDeferred("add_child", sprite);
// }
}
_isComplete = true;

6
Scripts/Resources/Events/MovePlayerEvent.cs
View file

@ -35,7 +35,8 @@ public partial class MovePlayerEvent : EventResource
protected async Task MovePlayer()
{
_gameManager.Player.RequestMovementDisable(true);
GameManager.Instance.Player.SetState((int)PlayerState.Cutscene);
//_gameManager.Player.RequestMovementDisable(true);
Tween tween = _gameManager.GetTree().CreateTween();
tween.SetEase(EaseType);
@ -45,7 +46,8 @@ public partial class MovePlayerEvent : EventResource
// Wait for the tween to finish
await ToSignal(tween, "finished");
_gameManager.Player.RequestMovementDisable(false);
GameManager.Instance.Player.SetState((int)PlayerState.Active);
//_gameManager.Player.RequestMovementDisable(false);
_isComplete = true;
}

2
Scripts/Resources/Events/UpdateCheckPointEvent.cs
View file

@ -18,7 +18,7 @@ public partial class UpdateCheckPointEvent : EventResource
public override void Start(Node2D parent)
{
_gameManager.LastCheckpointPosition = parent.GetNode<Node2D>(Target).GlobalPosition;
_gameManager.Player.LastCheckPointPosition = parent.GetNode<Node2D>(Target).GlobalPosition;
// _gameManager.Player.LastCheckPointPosition = parent.GetNode<Node2D>(Target).GlobalPosition;
}
public override void UpdateEvent(double delta)