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

Changed events to generic node

Browse source
This commit is contained in:
Marco 2025-06-23 18:30:42 +02:00
commit 7b2d32e727
17 changed files with 166 additions and 135 deletions
Download patch file Download diff file Expand all files Collapse all files

82
Scripts/Resources/Events/3D/GenericDialogueStartEvent.cs
View file

@ -1,82 +0,0 @@
using Cirno.Scripts.Misc;
using Godot;
namespace Cirno.Scripts.Resources.Events._3D;
[GlobalClass]
public partial class GenericDialogueStartEvent : EventResource
{
[Export] public StringName TimelineName = "timeline";
private Node _dialogic;
private GameManager _gameManager;
private bool _isComplete = false;
private DialogueSkipListener _listener;
public override void Init(Node2D parent)
{
_gameManager = parent.GetGameManager();
_dialogic = parent.GetNode("/root/Dialogic");
_dialogic.ProcessMode = Node.ProcessModeEnum.Always;
}
public override void Start(Node2D parent)
{
if (GlobalState.Instance.SessionSettings.SkipDialogues)
{
DialogueEndAction();
return;
}
CreateSkipListener(parent);
Hud.Instance?.HideHud();
_dialogic.Connect("timeline_ended", Callable.From(OnTimelineEnded));
var dialogicNode =_dialogic.Call("start", TimelineName.ToString());
((Node)dialogicNode).ProcessMode = Node.ProcessModeEnum.Always;
_gameManager.ChangeState(GameState.Dialogue);
}
private void CreateSkipListener(Node2D parent)
{
_listener = new DialogueSkipListener();
parent.AddChild(_listener);
_listener.ProcessMode = Node.ProcessModeEnum.Always;
_listener.Skipped += ListenerOnSkipped;
}
private void ListenerOnSkipped()
{
_listener.Skipped -= ListenerOnSkipped;
_listener.QueueFree();
_dialogic.Call("end_timeline");
}
private void OnTimelineEnded()
{
Hud.Instance?.ShowHud();
_gameManager.ChangeState(GameState.Playing);
if (_dialogic.IsConnected("timeline_ended", Callable.From(OnTimelineEnded)))
{
_dialogic.Disconnect("timeline_ended", Callable.From(OnTimelineEnded));
}
DialogueEndAction();
}
private void DialogueEndAction()
{
_isComplete = true;
}
public override void UpdateEvent(double delta)
{
}
public override bool IsComplete()
{
return _isComplete;
}
}

1
Scripts/Resources/Events/3D/GenericDialogueStartEvent.cs.uid
View file

@ -1 +0,0 @@
uid://no0it4lihfx

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

@ -10,7 +10,7 @@ public partial class ActivateEvent : EventResource
[Export] public Array<NodePath> Targets;
private Node2D _parent;
private Node _parent;
private bool _isComplete = false;
@ -37,12 +37,12 @@ public partial class ActivateEvent : EventResource
return true;
}
public override void Init(Node2D parent)
public override void Init(Node parent)
{
_parent = parent;
}
public override void Start(Node2D parent)
public override void Start(Node parent)
{
ActivateTargets();

14
Scripts/Resources/Events/AlarmDisableEvent.cs
View file

@ -7,21 +7,25 @@ namespace Cirno.Scripts.Resources.Events;
public partial class AlarmDisableEvent : EventResource
{
private bool _isComplete = false;
private AlarmManager _alarmManager;
public override bool IsComplete()
{
return _isComplete;
}
public override void Init(Node2D parent)
public override void Init(Node parent)
{
_alarmManager = parent.GetAlarmManager();
}
public override void Start(Node2D parent)
public override void Start(Node parent)
{
_alarmManager.DisableAlarm();
if (AlarmManager.Instance is null)
{
_isComplete = true;
return;
};
AlarmManager.Instance.DisableAlarm();
_isComplete = true;
}

27
Scripts/Resources/Events/AlarmEnableEvent.cs
View file

@ -7,21 +7,36 @@ namespace Cirno.Scripts.Resources.Events;
public partial class AlarmEnableEvent : EventResource
{
private bool _isComplete = false;
private AlarmManager _alarmManager;
public override bool IsComplete()
{
return _isComplete;
}
public override void Init(Node2D parent)
public override void Init(Node parent)
{
_alarmManager = parent.GetAlarmManager();
}
public override void Start(Node2D parent)
public override void Start(Node parent)
{
_alarmManager.SoundAlarm(parent.GlobalPosition);
if (AlarmManager.Instance is null)
{
_isComplete = true;
return;
}
switch (parent)
{
case Node2D node2D:
AlarmManager.Instance.SoundAlarm(node2D.GlobalPosition);
break;
case Node3D node3D:
AlarmManager.Instance.SoundAlarm(node3D.GlobalPosition);
break;
}
_isComplete = true;
}

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

@ -11,7 +11,7 @@ public partial class CameraTargetEvent : CameraTargetPlayerEvent
[Export]
public Vector2 Offset { get; private set; }
public override void Start(Node2D parent)
public override void Start(Node parent)
{
GameManager.Instance.CameraTargetObject(parent.GetNode<Node2D>(Target), Offset);
_isComplete = true;

4
Scripts/Resources/Events/CameraTargetPlayerEvent.cs
View file

@ -7,12 +7,12 @@ public partial class CameraTargetPlayerEvent : EventResource
{
protected bool _isComplete = false;
public override void Init(Node2D parent)
public override void Init(Node parent)
{
}
public override void Start(Node2D parent)
public override void Start(Node parent)
{
GameManager.Instance.CameraTargetPlayer();
_isComplete = true;

8
Scripts/Resources/Events/ControlActorEvent.cs
View file

@ -8,22 +8,20 @@ public partial class ControlActorEvent : EventResource
[Export]
public NodePath Target { get; set; }
private Node2D _parent;
private Node _parent;
private GameManager _gameManager;
private bool _isComplete = false;
public override bool IsComplete()
{
return _isComplete;
}
public override void Init(Node2D parent)
public override void Init(Node parent)
{
_gameManager = parent.GetGameManager();
_parent = parent;
}
public override void Start(Node2D parentNode)
public override void Start(Node parentNode)
{
_isComplete = false;

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

@ -8,28 +8,27 @@ public partial class ControlEnemyEvent : EventResource
[Export]
public NodePath Target { get; set; }
private Node2D _parent;
private Node _parent;
private GameManager _gameManager;
private bool _isComplete = false;
public override bool IsComplete()
{
return _isComplete;
}
public override void Init(Node2D parent)
public override void Init(Node parent)
{
_gameManager = parent.GetGameManager();
_parent = parent;
}
public override void Start(Node2D parentNode)
public override void Start(Node parentNode)
{
_isComplete = false;
if (_parent.GetNode<Node2D>(Target) is Enemy enemy)
{
_gameManager.CameraTargetObject(enemy);
GameManager.Instance.CameraTargetObject(enemy);
GameManager.Instance.Player.SetState(PlayerState.Controlling);
// _gameManager.Player.RequestMovementDisable(true);
enemy.AssumeControl();

24
Scripts/Resources/Events/DialogueStartEvent.cs
View file

@ -8,19 +8,17 @@ public partial class DialogueStartEvent : EventResource
{
[Export] public StringName TimelineName = "timeline";
private Node _dialogic;
private GameManager _gameManager;
private bool _isComplete = false;
private DialogueSkipListener _listener;
public override void Init(Node2D parent)
public override void Init(Node parent)
{
_gameManager = parent.GetGameManager();
_dialogic = parent.GetNode("/root/Dialogic");
_dialogic.ProcessMode = Node.ProcessModeEnum.Always;
}
public override void Start(Node2D parent)
public override void Start(Node parent)
{
if (GlobalState.Instance.SessionSettings.SkipDialogues)
{
@ -36,10 +34,22 @@ public partial class DialogueStartEvent : EventResource
var dialogicNode =_dialogic.Call("start", TimelineName.ToString());
((Node)dialogicNode).ProcessMode = Node.ProcessModeEnum.Always;
_gameManager.ChangeState(GameState.Dialogue);
ChangeState(GameState.Dialogue);
}
private void CreateSkipListener(Node2D parent)
private void ChangeState(GameState state)
{
if (GameManager.Instance is not null)
{
GameManager.Instance.ChangeState(state);
}
else if (GameController.Instance is not null)
{
GameController.Instance.ChangeState(state);
}
}
private void CreateSkipListener(Node parent)
{
_listener = new DialogueSkipListener();
parent.AddChild(_listener);
@ -57,7 +67,7 @@ public partial class DialogueStartEvent : EventResource
private void OnTimelineEnded()
{
Hud.Instance?.ShowHud();
_gameManager.ChangeState(GameState.Playing);
ChangeState(GameState.Playing);
if (_dialogic.IsConnected("timeline_ended", Callable.From(OnTimelineEnded)))
{
_dialogic.Disconnect("timeline_ended", Callable.From(OnTimelineEnded));

4
Scripts/Resources/Events/EventResource.cs
View file

@ -6,8 +6,8 @@ namespace Cirno.Scripts.Resources.Events;
public abstract partial class EventResource : Resource
{
[Export] public bool WaitForCompletion = true;
public abstract void Init(Node2D parent);
public abstract void Start(Node2D parent);
public abstract void Init(Node parent);
public abstract void Start(Node parent);
public abstract void UpdateEvent(double delta);
public abstract bool IsComplete();
}

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

@ -26,14 +26,13 @@ public partial class MovePlayerEvent : EventResource
private bool _isComplete = false;
private GameManager _gameManager;
public override void Init(Node2D parent)
public override void Init(Node parent)
{
_gameManager = parent.GetGameManager();
}
public override void Start(Node2D parentNode)
public override void Start(Node parentNode)
{
_isComplete = false;
_ = MovePlayer();
@ -45,8 +44,8 @@ public partial class MovePlayerEvent : EventResource
//_gameManager.Player.RequestMovementDisable(true);
var gtween = GTweenSequenceBuilder.New()
.Append(_gameManager.Player.MainObject.TweenGlobalPosition(
_gameManager.Player.MainObject.GlobalPosition + RelativeTargetPosition, MovementTime)
.Append(GameManager.Instance.Player.MainObject.TweenGlobalPosition(
GameManager.Instance.Player.MainObject.GlobalPosition + RelativeTargetPosition, MovementTime)
.SetEasing(GTweenEasing)
//.
)

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

@ -5,19 +5,18 @@ namespace Cirno.Scripts.Resources.Events;
[GlobalClass]
public partial class UpdateCheckPointEvent : EventResource
{
private GameManager _gameManager;
[Export]
public NodePath Target { get; set; }
public override void Init(Node2D parent)
public override void Init(Node parent)
{
_gameManager = parent.GetGameManager();
}
public override void Start(Node2D parent)
public override void Start(Node parent)
{
_gameManager.LastCheckpointPosition = parent.GetNode<Node2D>(Target).GlobalPosition;
GameManager.Instance.LastCheckpointPosition = parent.GetNode<Node2D>(Target).GlobalPosition;
// _gameManager.Player.LastCheckPointPosition = parent.GetNode<Node2D>(Target).GlobalPosition;
}

4
Scripts/Resources/Events/WaitEvent.cs
View file

@ -10,12 +10,12 @@ public partial class WaitEvent : EventResource
public float WaitTime { get; set; }
protected bool _isComplete = false;
public override void Init(Node2D parent)
public override void Init(Node parent)
{
}
public override void Start(Node2D parent)
public override void Start(Node parent)
{
_ = Wait();
}