net.dreditor.textdisplaying 0.1.6 → 0.1.7

package/CGLineTextDisplayer.cs

@@ -1,13 +1,13 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-
-namespace DREditor.TextDisplaying
-{
-    /// <summary>
-    ///
-    /// </summary>
-    public class CGLineTextDisplayer : DialogueLineTextDisplayer
-    {
-        /// <inheritdoc/>
-        protected override bool SkipDisplayingText() => !inCGMode.Value && !inVideoMode.Value;
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+
+namespace DREditor.TextDisplaying
+{
+    /// <summary>
+    ///
+    /// </summary>
+    public class CGLineTextDisplayer : DialogueLineTextDisplayer
+    {
+        /// <inheritdoc/>
+        protected override bool SkipDisplayingText() => !inCGMode.Value && !inVideoMode.Value;
+    }
 }

package/CGLineTextDisplayer.cs.meta

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

package/ClearTextOnLineEnd.cs

@@ -1,18 +1,18 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.LineReading;
-using DREditor.Services;
-
-namespace DREditor.TextDisplaying
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ILineEndProcess) +
-        "\n\n")]
-    public class ClearTextOnLineEnd : DialogueComponent, ILineEndProcess
-    {
-        /// <inheritdoc/>
-        public virtual void LineEndProcess(Line currentLine = null) => ServiceLocator.GetService<ITextDisplayerHandler>().ClearText();
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.LineReading;
+using DREditor.Services;
+
+namespace DREditor.TextDisplaying
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ILineEndProcess) +
+        "\n\n")]
+    public class ClearTextOnLineEnd : DialogueComponent, ILineEndProcess
+    {
+        /// <inheritdoc/>
+        public virtual void LineEndProcess(Line currentLine = null) => ServiceLocator.GetService<ITextDisplayerHandler>().ClearText();
+    }
 }

package/ClearTextOnLineEnd.cs.meta

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

package/ColorByCharacterTextModifier.cs

@@ -1,46 +1,46 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using TMPro;
-using UnityEngine;
-
-namespace DREditor.TextDisplaying
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(TextDisplayModifier) +
-        "\n\n")]
-    public class ColorByCharacterTextModifier : TextDisplayModifier
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string characterFirstName = "Tutorial";
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected Color characterTextColor = new(0.27776733f, 0.735849023f, 0.136525407f, 255);
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected Color32 normalColor = new(255, 255, 255, 255);
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        public override string ApplyModification(string text, Line currentLine = null, TMP_Text box = null)
-        {
-            bool useTutorialColor = currentLine.Speaker != null && currentLine.Speaker.FirstName.Equals(characterFirstName);
-
-            box.color = useTutorialColor ? characterTextColor : normalColor;
-
-            return text;
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using TMPro;
+using UnityEngine;
+
+namespace DREditor.TextDisplaying
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(TextDisplayModifier) +
+        "\n\n")]
+    public class ColorByCharacterTextModifier : TextDisplayModifier
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string characterFirstName = "Tutorial";
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected Color characterTextColor = new(0.27776733f, 0.735849023f, 0.136525407f, 255);
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected Color32 normalColor = new(255, 255, 255, 255);
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        public override string ApplyModification(string text, Line currentLine = null, TMP_Text box = null)
+        {
+            bool useTutorialColor = currentLine.Speaker != null && currentLine.Speaker.FirstName.Equals(characterFirstName);
+
+            box.color = useTutorialColor ? characterTextColor : normalColor;
+
+            return text;
+        }
+    }
 }

package/ColorByCharacterTextModifier.cs.meta

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

package/DREditor.TextDisplaying.asmdef

@@ -1,20 +1,20 @@
-{
-    "name": "DREditor.TextDisplaying",
-    "rootNamespace": "",
-    "references": [
-        "Unity.InputSystem",
-        "Unity.TextMeshPro",
-        "DREditor",
-        "DREditor.Input",
-        "DREditor.Controls"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
+{
+    "name": "DREditor.TextDisplaying",
+    "rootNamespace": "",
+    "references": [
+        "Unity.InputSystem",
+        "Unity.TextMeshPro",
+        "DREditor",
+        "DREditor.Input",
+        "DREditor.Controls"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

package/DREditor.TextDisplaying.asmdef.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 216ecc2b0f7cee245becf1dd09a18743
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 216ecc2b0f7cee245becf1dd09a18743
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/DialogueLineTextDisplayer.cs

@@ -1,188 +1,188 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.LineReading;
-using DREditor.EventObjects;
-using DREditor.Services;
-using System.Collections;
-using TMPro;
-using UnityEngine;
-
-namespace DREditor.TextDisplaying
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ITextDisplayerHandler) + ", " + nameof(ILineTextDisplayRoutine) +
-        "\n\n")]
-    public class DialogueLineTextDisplayer : DialogueComponent, ITextDisplayerHandler, ILineTextDisplayRoutine
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected TextDisplayerBase TextDisplayer = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected TextMeshProUGUI dialogueBox = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected GameObjectWithEvent globalBox = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inTrialMode = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inFastForwardMode = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inCGMode = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inVideoMode = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent cgDialogueUIVisible = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected TMP_Text initializedGlobalBox;
-
-
-        protected virtual void OnEnable()
-        {
-            if (globalBox != null)
-                globalBox.AddListener(OnGlobalBoxUpdated);
-
-            if (globalBox.Value != null)
-                OnGlobalBoxUpdated(globalBox.Value);
-        }
-
-        protected virtual void OnDisable()
-        {
-            if (globalBox != null)
-                globalBox.RemoveListener(OnGlobalBoxUpdated);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="globalBox"></param>
-        protected virtual void OnGlobalBoxUpdated(GameObject globalBox)
-        {
-            if (globalBox != null)
-                globalBox.TryGetComponent(out initializedGlobalBox);
-        }
-
-
-        /// <inheritdoc/>
-        public virtual TMP_Text GetTextBox() => dialogueBox != null ? dialogueBox : initializedGlobalBox;
-
-        /// <inheritdoc/>
-        public virtual void ClearText() => TextDisplayer.ClearText();
-
-        /// <inheritdoc/>
-        public virtual bool ShouldProcess(Line currentLine)
-        {
-            if (TextDisplayer.ShouldProcess(currentLine))
-                return true;
-
-            bool result = !SkipDisplayingText() && !inFastForwardMode.Value;
-
-            if (inFastForwardMode.Value && !SkipDisplayingText())
-            {
-                ForceRegisterActiveService();
-
-                TextDisplayer.DisplayText(GetTextBox(), currentLine);
-            }
-
-            return result;
-        }
-
-        /// <inheritdoc/>
-        public virtual IEnumerator LineTextDisplay(Line currentLine)
-        {
-            if (SkipDisplayingText())
-                yield break;
-
-            ForceRegisterActiveService();
-
-            DisplayTextProcess(currentLine);
-
-            yield return WaitForTextToFinishDisplaying();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        protected virtual bool SkipDisplayingText() => inCGMode.Value || inVideoMode.Value;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void ForceRegisterActiveService()
-        {
-            if (!ServiceLocator.HasService<ITextDisplayerHandler>())
-                ServiceLocator.Register<ITextDisplayerHandler>(this);
-            else if (ServiceLocator.GetService<ITextDisplayerHandler>() != (ITextDisplayerHandler)this)
-                ReplaceActiveService();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void ReplaceActiveService()
-        {
-            ServiceLocator.Unregister(ServiceLocator.GetService<ITextDisplayerHandler>());
-
-            ServiceLocator.Register<ITextDisplayerHandler>(this);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="line"></param>
-        protected virtual void DisplayTextProcess(Line line)
-        {
-            if (!cgDialogueUIVisible.Value && (inCGMode.Value || inVideoMode.Value))
-                cgDialogueUIVisible.SetValue(true);
-
-            TextDisplayer.DisplayText(GetTextBox(), line);
-
-            TextDisplayer.SetWaitingForClick(true);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual IEnumerator WaitForTextToFinishDisplaying()
-        {
-            while (TextDisplayer.IsWaitingForClick() && !inFastForwardMode.Value)
-                yield return null;
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.LineReading;
+using DREditor.EventObjects;
+using DREditor.Services;
+using System.Collections;
+using TMPro;
+using UnityEngine;
+
+namespace DREditor.TextDisplaying
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ITextDisplayerHandler) + ", " + nameof(ILineTextDisplayRoutine) +
+        "\n\n")]
+    public class DialogueLineTextDisplayer : DialogueComponent, ITextDisplayerHandler, ILineTextDisplayRoutine
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected TextDisplayerBase TextDisplayer = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected TextMeshProUGUI dialogueBox = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected GameObjectWithEvent globalBox = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inTrialMode = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inFastForwardMode = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inCGMode = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inVideoMode = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent cgDialogueUIVisible = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected TMP_Text initializedGlobalBox;
+
+
+        protected virtual void OnEnable()
+        {
+            if (globalBox != null)
+                globalBox.AddListener(OnGlobalBoxUpdated);
+
+            if (globalBox.Value != null)
+                OnGlobalBoxUpdated(globalBox.Value);
+        }
+
+        protected virtual void OnDisable()
+        {
+            if (globalBox != null)
+                globalBox.RemoveListener(OnGlobalBoxUpdated);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="globalBox"></param>
+        protected virtual void OnGlobalBoxUpdated(GameObject globalBox)
+        {
+            if (globalBox != null)
+                globalBox.TryGetComponent(out initializedGlobalBox);
+        }
+
+
+        /// <inheritdoc/>
+        public virtual TMP_Text GetTextBox() => dialogueBox != null ? dialogueBox : initializedGlobalBox;
+
+        /// <inheritdoc/>
+        public virtual void ClearText() => TextDisplayer.ClearText();
+
+        /// <inheritdoc/>
+        public virtual bool ShouldProcess(Line currentLine)
+        {
+            if (TextDisplayer.ShouldProcess(currentLine))
+                return true;
+
+            bool result = !SkipDisplayingText() && !inFastForwardMode.Value;
+
+            if (inFastForwardMode.Value && !SkipDisplayingText())
+            {
+                ForceRegisterActiveService();
+
+                TextDisplayer.DisplayText(GetTextBox(), currentLine);
+            }
+
+            return result;
+        }
+
+        /// <inheritdoc/>
+        public virtual IEnumerator LineTextDisplay(Line currentLine)
+        {
+            if (SkipDisplayingText())
+                yield break;
+
+            ForceRegisterActiveService();
+
+            DisplayTextProcess(currentLine);
+
+            yield return WaitForTextToFinishDisplaying();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        protected virtual bool SkipDisplayingText() => inCGMode.Value || inVideoMode.Value;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void ForceRegisterActiveService()
+        {
+            if (!ServiceLocator.HasService<ITextDisplayerHandler>())
+                ServiceLocator.Register<ITextDisplayerHandler>(this);
+            else if (ServiceLocator.GetService<ITextDisplayerHandler>() != (ITextDisplayerHandler)this)
+                ReplaceActiveService();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void ReplaceActiveService()
+        {
+            ServiceLocator.Unregister(ServiceLocator.GetService<ITextDisplayerHandler>());
+
+            ServiceLocator.Register<ITextDisplayerHandler>(this);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="line"></param>
+        protected virtual void DisplayTextProcess(Line line)
+        {
+            if (!cgDialogueUIVisible.Value && (inCGMode.Value || inVideoMode.Value))
+                cgDialogueUIVisible.SetValue(true);
+
+            TextDisplayer.DisplayText(GetTextBox(), line);
+
+            TextDisplayer.SetWaitingForClick(true);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual IEnumerator WaitForTextToFinishDisplaying()
+        {
+            while (TextDisplayer.IsWaitingForClick() && !inFastForwardMode.Value)
+                yield return null;
+        }
+    }
 }