net.dreditor.dialogues.implementation 0.1.6 → 0.1.8

package/InstantDialogueEnder.cs

@@ -1,92 +1,92 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues.Ending;
-using DREditor.Dialogues.Finishing;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Serialization;
-
-namespace DREditor.Dialogues.Implementation
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(DialogueEnder) + ", " +
-        "\n\n")]
-    public class InstantDialogueEnder : DialogueEnder
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] DialogueFinisher InstantDialogueFinisher = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected int collectionID = 1;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string orderFieldName = "resolveOrder";
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected DialogueComponentCollection<IResolvableDialogueComponent> resolvableCollection = new();
-
-        /// <summary>
-        ///
-        /// </summary>
-        [FormerlySerializedAs("ResolvableComponents")]
-        [Tooltip("")]
-        [SerializeField] protected List<DialogueComponent> overrideComponents = new();
-
-
-        protected virtual void Awake() => resolvableCollection.Initialize(transform, orderFieldName, collectionID);
-
-        protected virtual void OnValidate() => resolvableCollection.Initialize(transform, orderFieldName, collectionID);
-
-
-        /// <inheritdoc/>
-        public override void StopDialogue() => StartCoroutine(EndDialogue());
-
-        /// <inheritdoc/>
-        public override IEnumerator EndDialogue(bool finishDialogue = true)
-        {
-            UnityEngine.Debug.Log($"REPORT:  {ToString()}: Instant dialogue has started to resolve.");
-
-            yield return ResolveDialogueComponents();
-
-            yield return InstantDialogueFinisher.FinishDialogueRoutine(finishDialogue);
-
-            UnityEngine.Debug.Log($"REPORT: {ToString()}: Instant dialogue has resolved.");
-
-            yield break;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual IEnumerator ResolveDialogueComponents()
-        {
-            IEnumerable componentList = overrideComponents.Count > 0 ? overrideComponents : resolvableCollection.components;
-
-            foreach (var component in componentList)
-                if (component != null && component is IResolvableDialogueComponent resolvable)
-                    if (resolvable.UseRoutineToResolve())
-                        yield return resolvable.ResolveRoutine();
-                    else
-                        resolvable.Resolve();
-
-            yield break;
-        }
-
-        /// <inheritdoc/>
-        public override void FinishDialogue() => InstantDialogueFinisher.FinishDialogue();
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues.Ending;
+using DREditor.Dialogues.Finishing;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace DREditor.Dialogues.Implementation
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(DialogueEnder) + ", " +
+        "\n\n")]
+    public class InstantDialogueEnder : DialogueEnder
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] DialogueFinisher InstantDialogueFinisher = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected int collectionID = 1;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string orderFieldName = "resolveOrder";
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected DialogueComponentCollection<IResolvableDialogueComponent> resolvableCollection = new();
+
+        /// <summary>
+        ///
+        /// </summary>
+        [FormerlySerializedAs("ResolvableComponents")]
+        [Tooltip("")]
+        [SerializeField] protected List<DialogueComponent> overrideComponents = new();
+
+
+        protected virtual void Awake() => resolvableCollection.Initialize(transform, orderFieldName, collectionID);
+
+        protected virtual void OnValidate() => resolvableCollection.Initialize(transform, orderFieldName, collectionID);
+
+
+        /// <inheritdoc/>
+        public override void StopDialogue() => StartCoroutine(EndDialogue());
+
+        /// <inheritdoc/>
+        public override IEnumerator EndDialogue(bool finishDialogue = true)
+        {
+            UnityEngine.Debug.Log($"REPORT:  {ToString()}: Instant dialogue has started to resolve.");
+
+            yield return ResolveDialogueComponents();
+
+            yield return InstantDialogueFinisher.FinishDialogueRoutine(finishDialogue);
+
+            UnityEngine.Debug.Log($"REPORT: {ToString()}: Instant dialogue has resolved.");
+
+            yield break;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual IEnumerator ResolveDialogueComponents()
+        {
+            IEnumerable componentList = overrideComponents.Count > 0 ? overrideComponents : resolvableCollection.components;
+
+            foreach (var component in componentList)
+                if (component != null && component is IResolvableDialogueComponent resolvable)
+                    if (resolvable.UseRoutineToResolve())
+                        yield return resolvable.ResolveRoutine();
+                    else
+                        resolvable.Resolve();
+
+            yield break;
+        }
+
+        /// <inheritdoc/>
+        public override void FinishDialogue() => InstantDialogueFinisher.FinishDialogue();
+    }
 }

package/InstantDialogueEnder.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: c1665a4e3e9abcc4b83a6548fd0f27a6
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: c1665a4e3e9abcc4b83a6548fd0f27a6
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/InstantDialogueFinisher.cs

@@ -1,133 +1,133 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues.Finishing;
-using DREditor.EventObjects;
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace DREditor.Dialogues.Implementation
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(DialogueAssetFinisherBase) + ", " + nameof(DialogueFinisher) + ", " + 
-        nameof(IEndDialogueEvent) + ", " + nameof(IDialogueFinisher) +
-        "\n\n")]
-    public class InstantDialogueFinisher : DialogueAssetFinisherBase
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] BoolWithEvent inInstant = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] BoolWithEvent isGoingToMainMenu = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected int collectionID = 2;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string orderFieldName = "finishOrder";
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected DialogueComponentCollection<IFinishableDialogueComponent> finishableCollection = new();
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected List<DialogueComponent> overrideComponents = new();
-
-
-        protected virtual void Awake() => finishableCollection.Initialize(transform, orderFieldName, collectionID);
-
-        protected virtual void OnValidate() => finishableCollection.Initialize(transform, orderFieldName, collectionID);
-
-
-        /// <inheritdoc/>
-        public override void FinishDialogue() => StartCoroutine(FinishDialogueRoutine());
-
-        /// <inheritdoc/>
-        public override IEnumerator FinishDialogueRoutine(bool finishDialogue = true)
-        {
-            yield return FinishDialogueComponents();
-
-            SetInstantValueFalse();
-
-            CallOnDialogueEnd(); // NOTE: It is unknown why this is called twice but in the past caused issues when removed.
-
-            SetNoLongerInDialogueValues();
-
-            if (finishDialogue)
-                MoveToOriginalGameplayState();
-
-            UnityEngine.Debug.Log($"REPORT: {ToString()}: Instant dialogue has finished.");
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void SetInstantValueFalse() => inInstant.Value = false;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void MoveToOriginalGameplayState()
-        {
-            if (!isGoingToMainMenu.Value)
-                EnableMenuAccessIfNotInTrial();
-
-            CallOnDialogueEnd();
-
-            SetControlsBasedOnCurrentMode();
-
-            CallOnFinishedDialogue();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual IEnumerator FinishDialogueComponents()
-        {
-            IEnumerable componentList = overrideComponents.Count > 0 ? overrideComponents : finishableCollection.components;
-
-            foreach (DialogueComponent component in componentList)
-                if (component != null && component is IComplexFinishableDialogueComponent finishable)
-                    if (finishable.UseCoroutine())
-                        yield return finishable.OnFinishDialogueRoutine();
-                    else
-                        finishable.OnFinishDialogue();
-                else
-                    yield return EvaluateFinishingDialogueComponent(component);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="component"></param>
-        /// <returns></returns>
-        protected virtual IEnumerator EvaluateFinishingDialogueComponent(DialogueComponent component)
-        {
-            if (component != null && component is IFinishableDialogueComponent finishable)
-                finishable.OnFinishDialogue();
-            else if (component != null && component is IFinishableDialogueComponentRoutine finishableRoutine)
-                yield return finishableRoutine.OnFinishDialogueRoutine();
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues.Finishing;
+using DREditor.EventObjects;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace DREditor.Dialogues.Implementation
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(DialogueAssetFinisherBase) + ", " + nameof(DialogueFinisher) + ", " + 
+        nameof(IEndDialogueEvent) + ", " + nameof(IDialogueFinisher) +
+        "\n\n")]
+    public class InstantDialogueFinisher : DialogueAssetFinisherBase
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] BoolWithEvent inInstant = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] BoolWithEvent isGoingToMainMenu = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected int collectionID = 2;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string orderFieldName = "finishOrder";
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected DialogueComponentCollection<IFinishableDialogueComponent> finishableCollection = new();
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected List<DialogueComponent> overrideComponents = new();
+
+
+        protected virtual void Awake() => finishableCollection.Initialize(transform, orderFieldName, collectionID);
+
+        protected virtual void OnValidate() => finishableCollection.Initialize(transform, orderFieldName, collectionID);
+
+
+        /// <inheritdoc/>
+        public override void FinishDialogue() => StartCoroutine(FinishDialogueRoutine());
+
+        /// <inheritdoc/>
+        public override IEnumerator FinishDialogueRoutine(bool finishDialogue = true)
+        {
+            yield return FinishDialogueComponents();
+
+            SetInstantValueFalse();
+
+            CallOnDialogueEnd(); // NOTE: It is unknown why this is called twice but in the past caused issues when removed.
+
+            SetNoLongerInDialogueValues();
+
+            if (finishDialogue)
+                MoveToOriginalGameplayState();
+
+            UnityEngine.Debug.Log($"REPORT: {ToString()}: Instant dialogue has finished.");
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void SetInstantValueFalse() => inInstant.Value = false;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void MoveToOriginalGameplayState()
+        {
+            if (!isGoingToMainMenu.Value)
+                EnableMenuAccessIfNotInTrial();
+
+            CallOnDialogueEnd();
+
+            SetControlsBasedOnCurrentMode();
+
+            CallOnFinishedDialogue();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual IEnumerator FinishDialogueComponents()
+        {
+            IEnumerable componentList = overrideComponents.Count > 0 ? overrideComponents : finishableCollection.components;
+
+            foreach (DialogueComponent component in componentList)
+                if (component != null && component is IComplexFinishableDialogueComponent finishable)
+                    if (finishable.UseCoroutine())
+                        yield return finishable.OnFinishDialogueRoutine();
+                    else
+                        finishable.OnFinishDialogue();
+                else
+                    yield return EvaluateFinishingDialogueComponent(component);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="component"></param>
+        /// <returns></returns>
+        protected virtual IEnumerator EvaluateFinishingDialogueComponent(DialogueComponent component)
+        {
+            if (component != null && component is IFinishableDialogueComponent finishable)
+                finishable.OnFinishDialogue();
+            else if (component != null && component is IFinishableDialogueComponentRoutine finishableRoutine)
+                yield return finishableRoutine.OnFinishDialogueRoutine();
+        }
+    }
 }

package/InstantDialogueFinisher.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 7d5f35d61725333409320817a5c6dac8
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 7d5f35d61725333409320817a5c6dac8
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/InstantDialogueStarter.cs

@@ -1,83 +1,83 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.EventObjects;
-using DREditor.Services;
-using System.Collections;
-using UnityEngine;
-
-namespace DREditor.Dialogues.Implementation
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(PreparableDialogueStarter) +
-        "\n\n")]
-    public class InstantDialogueStarter : PreparableDialogueStarter
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent hasStartedDialogue = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inDialogue = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inInstant = null;
-
-
-        /// <inheritdoc/>
-        public override void StartDialogue<T>(SelectableObject actor, DialogueBase<T>[] dialogues, bool inleaving = false) 
-            => StartCoroutine(InstantDialogue(dialogues, inleaving));
-
-        public override void StartDialogue<T>(SelectableObject actor, DialogueBase<T> dialogue, bool inleaving = false) 
-            => StartCoroutine(InstantDialogue(new DialogueBase<T>[1] { dialogue }, inleaving));
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="dialogues"></param>
-        /// <param name="inleaving"></param>
-        protected virtual IEnumerator InstantDialogue<T2>(DialogueBase<T2>[] dialogues, bool inleaving = false) 
-            where T2 : Line
-        {
-            SetValueWithEvents();
-
-            InvokeDialoguePreparationEvent();
-
-            UnityEngine.Debug.Log($"REPORT: {nameof(InstantDialogueStarter)}: " +
-                $"Starting to Prepare Dialogue.");
-
-            yield return PrepareDialogueComponents();
-
-            UnityEngine.Debug.Log($"REPORT: {nameof(InstantDialogueStarter)}: " +
-                $"Finished preparing dialogue.");
-
-            ServiceLocator.GetService<IDialogueManager>()
-                .GetReader()
-                .PlayDialogues(dialogues, inleaving);
-
-            yield break;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void SetValueWithEvents()
-        {
-            inDialogue.SetValue(true);
-
-            hasStartedDialogue.SetValue(true);
-
-            inInstant.SetValue(true);
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.EventObjects;
+using DREditor.Services;
+using System.Collections;
+using UnityEngine;
+
+namespace DREditor.Dialogues.Implementation
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(PreparableDialogueStarter) +
+        "\n\n")]
+    public class InstantDialogueStarter : PreparableDialogueStarter
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent hasStartedDialogue = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inDialogue = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inInstant = null;
+
+
+        /// <inheritdoc/>
+        public override void StartDialogue<T>(SelectableObject actor, DialogueBase<T>[] dialogues, bool inleaving = false) 
+            => StartCoroutine(InstantDialogue(dialogues, inleaving));
+
+        public override void StartDialogue<T>(SelectableObject actor, DialogueBase<T> dialogue, bool inleaving = false) 
+            => StartCoroutine(InstantDialogue(new DialogueBase<T>[1] { dialogue }, inleaving));
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="dialogues"></param>
+        /// <param name="inleaving"></param>
+        protected virtual IEnumerator InstantDialogue<T2>(DialogueBase<T2>[] dialogues, bool inleaving = false) 
+            where T2 : Line
+        {
+            SetValueWithEvents();
+
+            InvokeDialoguePreparationEvent();
+
+            UnityEngine.Debug.Log($"REPORT: {nameof(InstantDialogueStarter)}: " +
+                $"Starting to Prepare Dialogue.");
+
+            yield return PrepareDialogueComponents();
+
+            UnityEngine.Debug.Log($"REPORT: {nameof(InstantDialogueStarter)}: " +
+                $"Finished preparing dialogue.");
+
+            ServiceLocator.GetService<IDialogueManager>()
+                .GetReader()
+                .PlayDialogues(dialogues, inleaving);
+
+            yield break;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void SetValueWithEvents()
+        {
+            inDialogue.SetValue(true);
+
+            hasStartedDialogue.SetValue(true);
+
+            inInstant.SetValue(true);
+        }
+    }
 }