mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-05 19:26:01 +00:00
Dialogue skipping
This commit is contained in:
parent
2214db888f
commit
a7b984328b
6 changed files with 82 additions and 15 deletions
|
|
@ -7,13 +7,14 @@ public partial class DialogueStarter : ChainActivable
|
|||
{
|
||||
|
||||
[Export] private string _trackName = "timeline";
|
||||
|
||||
[Export] public StringName PauseActionName { get; private set; } = "pause";
|
||||
//[Export] private Array<Node2D> _dialogueEndActivationTargets;
|
||||
|
||||
private Node _dialogic;
|
||||
|
||||
private GameManager _gameManager;
|
||||
|
||||
private bool _dialogueActive = false;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
base._Ready();
|
||||
|
|
@ -23,6 +24,15 @@ public partial class DialogueStarter : ChainActivable
|
|||
_dialogic = GetNode("/root/Dialogic");
|
||||
_dialogic.ProcessMode = ProcessModeEnum.Always;
|
||||
}
|
||||
|
||||
public override void _Process(double delta)
|
||||
{
|
||||
if (!_dialogueActive) return;
|
||||
if (Input.IsActionJustPressed(PauseActionName))
|
||||
{
|
||||
_dialogic.Call("end_timeline");
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTimelineEnded()
|
||||
{
|
||||
|
|
@ -37,6 +47,7 @@ public partial class DialogueStarter : ChainActivable
|
|||
|
||||
public override bool Activate(ActivationType activationType = ActivationType.Toggle)
|
||||
{
|
||||
_dialogueActive = true;
|
||||
if (GlobalState.Instance.SessionSettings.SkipDialogues)
|
||||
{
|
||||
DialogueEndAction();
|
||||
|
|
@ -57,6 +68,7 @@ public partial class DialogueStarter : ChainActivable
|
|||
|
||||
private void DialogueEndAction()
|
||||
{
|
||||
_dialogueActive = false;
|
||||
_gameManager.ChangeState(GameState.Playing);
|
||||
ActivateTargets();
|
||||
// foreach (var activationTarget in _dialogueEndActivationTargets)
|
||||
|
|
|
|||
|
|
@ -6,8 +6,12 @@ public partial class DialogueAutoStarter : Node2D
|
|||
{
|
||||
[Export] private StringName _trackName = "timeline";
|
||||
[Export] private StringName _finishedScenePath;
|
||||
|
||||
[Export] public StringName PauseActionName { get; private set; } = "pause";
|
||||
|
||||
private Node _dialogic;
|
||||
|
||||
private bool _dialogueActive = false;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
|
|
@ -19,6 +23,15 @@ public partial class DialogueAutoStarter : Node2D
|
|||
CallDeferred(MethodName.Activate);
|
||||
}
|
||||
|
||||
public override void _Process(double delta)
|
||||
{
|
||||
if (!_dialogueActive) return;
|
||||
if (Input.IsActionJustPressed(PauseActionName))
|
||||
{
|
||||
_dialogic.Call("end_timeline");
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTimelineEnded()
|
||||
{
|
||||
if (_dialogic.IsConnected("timeline_ended", Callable.From(OnTimelineEnded)))
|
||||
|
|
@ -31,6 +44,8 @@ public partial class DialogueAutoStarter : Node2D
|
|||
|
||||
public bool Activate()
|
||||
{
|
||||
_dialogueActive = true;
|
||||
|
||||
if (GlobalState.Instance.SessionSettings.SkipDialogues)
|
||||
{
|
||||
DialogueEndAction();
|
||||
|
|
@ -47,6 +62,7 @@ public partial class DialogueAutoStarter : Node2D
|
|||
|
||||
private void DialogueEndAction()
|
||||
{
|
||||
_dialogueActive = false;
|
||||
GlobalState.Instance.GotoScene(_finishedScenePath);
|
||||
}
|
||||
}
|
||||
19
Scripts/Misc/DialogueSkipListener.cs
Normal file
19
Scripts/Misc/DialogueSkipListener.cs
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
using Godot;
|
||||
|
||||
namespace Cirno.Scripts.Misc;
|
||||
|
||||
public partial class DialogueSkipListener : Node2D
|
||||
{
|
||||
[Export] public StringName PauseActionName { get; private set; }= "pause";
|
||||
|
||||
[Signal]
|
||||
public delegate void SkippedEventHandler();
|
||||
|
||||
public override void _Process(double delta)
|
||||
{
|
||||
if (Input.IsActionJustPressed(PauseActionName))
|
||||
{
|
||||
EmitSignalSkipped();
|
||||
}
|
||||
}
|
||||
}
|
||||
1
Scripts/Misc/DialogueSkipListener.cs.uid
Normal file
1
Scripts/Misc/DialogueSkipListener.cs.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://b3eytmrd7ic3d
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using Godot;
|
||||
using Cirno.Scripts.Misc;
|
||||
using Godot;
|
||||
|
||||
namespace Cirno.Scripts.Resources.Events;
|
||||
|
||||
|
|
@ -10,6 +11,8 @@ public partial class DialogueStartEvent : EventResource
|
|||
private GameManager _gameManager;
|
||||
private bool _isComplete = false;
|
||||
|
||||
private DialogueSkipListener _listener;
|
||||
|
||||
public override void Init(Node2D parent)
|
||||
{
|
||||
_gameManager = parent.GetGameManager();
|
||||
|
|
@ -25,6 +28,8 @@ public partial class DialogueStartEvent : EventResource
|
|||
return;
|
||||
}
|
||||
|
||||
CreateSkipListener(parent);
|
||||
|
||||
Hud.Instance?.HideHud();
|
||||
|
||||
_dialogic.Connect("timeline_ended", Callable.From(OnTimelineEnded));
|
||||
|
|
@ -34,6 +39,21 @@ public partial class DialogueStartEvent : EventResource
|
|||
_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();
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue