mirror of
https://gitlab.com/MaddoScientisto/cirnogodot.git
synced 2026-06-11 16:05:54 +00:00
Terminal dialogue and entities fix
This commit is contained in:
parent
fe33f8d225
commit
dd979fe50a
16 changed files with 1078 additions and 912 deletions
|
|
@ -1,10 +1,12 @@
|
|||
using Cirno.Scripts.Resources.Events;
|
||||
using Cirno.Scripts.Interactables;
|
||||
using Cirno.Scripts.Misc;
|
||||
using Cirno.Scripts.Resources.Events;
|
||||
using Godot;
|
||||
using Godot.Collections;
|
||||
|
||||
namespace Cirno.Scripts.Activables;
|
||||
|
||||
public partial class ScriptableArea3D : Area3D, IActivable
|
||||
public partial class ScriptableArea3D : Area3D, IActivable, IInteractable
|
||||
{
|
||||
[Export] public Array<EventResource> Events { get; set; } = [];
|
||||
|
||||
|
|
@ -71,4 +73,19 @@ public partial class ScriptableArea3D : Area3D, IActivable
|
|||
{
|
||||
return true;
|
||||
}
|
||||
|
||||
public Vector2 GetGlobalPosition2D()
|
||||
{
|
||||
return new Vector2(this.GlobalPosition.X, this.GlobalPosition.Z);
|
||||
}
|
||||
|
||||
public Vector2 GetScreenPosition()
|
||||
{
|
||||
if (CameraController3D.Instance is null)
|
||||
{
|
||||
return this.GetGlobalPosition2D();
|
||||
}
|
||||
|
||||
return CameraController3D.Instance.UnprojectPosition(this.GlobalPosition);
|
||||
}
|
||||
}
|
||||
55
Scripts/Activables/Terminal3D.cs
Normal file
55
Scripts/Activables/Terminal3D.cs
Normal file
|
|
@ -0,0 +1,55 @@
|
|||
using Cirno.Scripts.Interactables;
|
||||
using Cirno.Scripts.Misc;
|
||||
using Cirno.Scripts.Utils;
|
||||
using Godot;
|
||||
using Godot.Collections;
|
||||
|
||||
namespace Cirno.Scripts.Activables;
|
||||
|
||||
[Tool]
|
||||
public partial class Terminal3D : Area3D, IInteractable
|
||||
{
|
||||
[Export] public StringName TimelineName = "timeline";
|
||||
private DialogueTools _dialogueInstance;
|
||||
|
||||
public override void _Ready()
|
||||
{
|
||||
if (Engine.IsEditorHint()) return;
|
||||
_dialogueInstance = new DialogueTools();
|
||||
_dialogueInstance.Init(this, TimelineName);
|
||||
}
|
||||
|
||||
public void _func_godot_apply_properties(Dictionary<string, string> props)
|
||||
{
|
||||
TimelineName = props["timeline"];
|
||||
}
|
||||
|
||||
public bool Activate(ActivationType activationType = ActivationType.Toggle)
|
||||
{
|
||||
if (Engine.IsEditorHint()) return false;
|
||||
_dialogueInstance.Start(this);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public bool CanActivate()
|
||||
{
|
||||
if (Engine.IsEditorHint()) return false;
|
||||
return true;
|
||||
}
|
||||
|
||||
public Vector2 GetGlobalPosition2D()
|
||||
{
|
||||
return new Vector2(this.GlobalPosition.X, this.GlobalPosition.Z);
|
||||
}
|
||||
|
||||
public Vector2 GetScreenPosition()
|
||||
{
|
||||
if (CameraController3D.Instance is null)
|
||||
{
|
||||
return this.GetGlobalPosition2D();
|
||||
}
|
||||
|
||||
return CameraController3D.Instance.UnprojectPosition(this.GlobalPosition);
|
||||
}
|
||||
}
|
||||
1
Scripts/Activables/Terminal3D.cs.uid
Normal file
1
Scripts/Activables/Terminal3D.cs.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://duy020jwtwver
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using Cirno.Scripts.Misc;
|
||||
using Cirno.Scripts.Utils;
|
||||
using Godot;
|
||||
|
||||
namespace Cirno.Scripts.Resources.Events;
|
||||
|
|
@ -7,78 +8,18 @@ namespace Cirno.Scripts.Resources.Events;
|
|||
public partial class DialogueStartEvent : EventResource
|
||||
{
|
||||
[Export] public StringName TimelineName = "timeline";
|
||||
private Node _dialogic;
|
||||
private bool _isComplete = false;
|
||||
|
||||
private DialogueSkipListener _listener;
|
||||
|
||||
|
||||
private DialogueTools _dialogueInstance;
|
||||
|
||||
public override void Init(Node parent)
|
||||
{
|
||||
_dialogic = parent.GetNode("/root/Dialogic");
|
||||
_dialogic.ProcessMode = Node.ProcessModeEnum.Always;
|
||||
_dialogueInstance = new DialogueTools();
|
||||
_dialogueInstance.Init(parent, TimelineName);
|
||||
}
|
||||
|
||||
public override void Start(Node 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;
|
||||
ChangeState(GameState.Dialogue);
|
||||
}
|
||||
|
||||
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);
|
||||
_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();
|
||||
ChangeState(GameState.Playing);
|
||||
if (_dialogic.IsConnected("timeline_ended", Callable.From(OnTimelineEnded)))
|
||||
{
|
||||
_dialogic.Disconnect("timeline_ended", Callable.From(OnTimelineEnded));
|
||||
}
|
||||
|
||||
DialogueEndAction();
|
||||
}
|
||||
|
||||
private void DialogueEndAction()
|
||||
{
|
||||
_isComplete = true;
|
||||
_dialogueInstance.Start(parent);
|
||||
}
|
||||
|
||||
public override void UpdateEvent(double delta)
|
||||
|
|
@ -87,6 +28,6 @@ public partial class DialogueStartEvent : EventResource
|
|||
|
||||
public override bool IsComplete()
|
||||
{
|
||||
return _isComplete;
|
||||
return _dialogueInstance.IsComplete;
|
||||
}
|
||||
}
|
||||
85
Scripts/Utils/DialogueTools.cs
Normal file
85
Scripts/Utils/DialogueTools.cs
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
using Cirno.Scripts.Misc;
|
||||
using Godot;
|
||||
|
||||
namespace Cirno.Scripts.Utils;
|
||||
|
||||
public partial class DialogueTools : RefCounted
|
||||
{
|
||||
private Node _dialogic;
|
||||
private bool _isComplete = false;
|
||||
public bool IsComplete => _isComplete;
|
||||
private DialogueSkipListener _listener;
|
||||
|
||||
private StringName TimelineName;
|
||||
|
||||
public void Init(Node parent, StringName timelineName)
|
||||
{
|
||||
_dialogic = parent.GetNode("/root/Dialogic");
|
||||
_dialogic.ProcessMode = Node.ProcessModeEnum.Always;
|
||||
TimelineName = timelineName;
|
||||
}
|
||||
|
||||
public void Start(Node 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;
|
||||
ChangeState(GameState.Dialogue);
|
||||
}
|
||||
|
||||
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);
|
||||
_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();
|
||||
ChangeState(GameState.Playing);
|
||||
if (_dialogic.IsConnected("timeline_ended", Callable.From(OnTimelineEnded)))
|
||||
{
|
||||
_dialogic.Disconnect("timeline_ended", Callable.From(OnTimelineEnded));
|
||||
}
|
||||
|
||||
DialogueEndAction();
|
||||
}
|
||||
|
||||
private void DialogueEndAction()
|
||||
{
|
||||
_isComplete = true;
|
||||
}
|
||||
|
||||
}
|
||||
1
Scripts/Utils/DialogueTools.cs.uid
Normal file
1
Scripts/Utils/DialogueTools.cs.uid
Normal file
|
|
@ -0,0 +1 @@
|
|||
uid://dqe13b0edlud1
|
||||
Loading…
Add table
Add a link
Reference in a new issue