net.dreditor.actors 0.1.6 → 0.1.7

package/Implementation/ActorFocusPrepare.cs

@@ -1,103 +1,103 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.Events;
-using DREditor.Dialogues.Starting;
-using DREditor.EventObjects;
-using DREditor.Services;
-using DREditor.Talkables;
-using System.Collections;
-using UnityEngine;
-
-namespace DREditor.Actors.Implementation
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(IPreparableDialogueComponent) +
-        "\n\n")]
-    public class ActorFocusPrepare : DialogueComponent, IPreparableDialogueComponent
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float prepareOrder = 3;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent isLoadingFile = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string panToTalkableEventString = "PanToTalkable";
-
-
-        public float Order { get => prepareOrder; }
-
-
-        /// <inheritdoc/>
-        public virtual bool UseRoutineToPrepare() => false;
-
-        /// <inheritdoc/>
-        public virtual void Prepare() => PrepareFocusing();
-
-        /// <inheritdoc/>
-        public virtual IEnumerator PrepareRoutine()
-        {
-            Prepare();
-
-            yield break;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void PrepareFocusing()
-        {
-            Talkable selectedObject = ServiceLocator.GetService<DialogueObjectManager>().GetStartObject() as Talkable;
-
-            if (selectedObject != null && selectedObject is Actor actor && actor != null)
-                actor.GetComponent<LayerHandler>().ToggleRender();
-
-            PanToFirstObjectInDialogue(selectedObject);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="selectedObject"></param>
-        protected virtual void PanToFirstObjectInDialogue(Talkable selectedObject)
-        {
-            if (selectedObject != null)
-                if (selectedObject is Actor actor)
-                    PanToFirstActorInDialogue(actor);
-                else if(selectedObject is Talkable item)
-                    DialogueEventSystem.TriggerEvent(panToTalkableEventString, item);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="actor"></param>
-        protected virtual void PanToFirstActorInDialogue(Actor actor)
-        {
-            if (!isLoadingFile.Value)
-                DialogueEventSystem.TriggerEvent(panToTalkableEventString, actor);
-
-            if (actor != null)
-                actor.GetComponent<LayerHandler>().FocusActor();
-
-            lastActor.SetValue(actor);
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.Events;
+using DREditor.Dialogues.Starting;
+using DREditor.EventObjects;
+using DREditor.Services;
+using DREditor.Talkables;
+using System.Collections;
+using UnityEngine;
+
+namespace DREditor.Actors.Implementation
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(IPreparableDialogueComponent) +
+        "\n\n")]
+    public class ActorFocusPrepare : DialogueComponent, IPreparableDialogueComponent
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float prepareOrder = 3;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent isLoadingFile = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string panToTalkableEventString = "PanToTalkable";
+
+
+        public float Order { get => prepareOrder; }
+
+
+        /// <inheritdoc/>
+        public virtual bool UseRoutineToPrepare() => false;
+
+        /// <inheritdoc/>
+        public virtual void Prepare() => PrepareFocusing();
+
+        /// <inheritdoc/>
+        public virtual IEnumerator PrepareRoutine()
+        {
+            Prepare();
+
+            yield break;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void PrepareFocusing()
+        {
+            Talkable selectedObject = ServiceLocator.GetService<DialogueObjectManager>().GetStartObject() as Talkable;
+
+            if (selectedObject != null && selectedObject is Actor actor && actor != null)
+                actor.GetComponent<LayerHandler>().ToggleRender();
+
+            PanToFirstObjectInDialogue(selectedObject);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="selectedObject"></param>
+        protected virtual void PanToFirstObjectInDialogue(Talkable selectedObject)
+        {
+            if (selectedObject != null)
+                if (selectedObject is Actor actor)
+                    PanToFirstActorInDialogue(actor);
+                else if(selectedObject is Talkable item)
+                    DialogueEventSystem.TriggerEvent(panToTalkableEventString, item);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="actor"></param>
+        protected virtual void PanToFirstActorInDialogue(Actor actor)
+        {
+            if (!isLoadingFile.Value)
+                DialogueEventSystem.TriggerEvent(panToTalkableEventString, actor);
+
+            if (actor != null)
+                actor.GetComponent<LayerHandler>().FocusActor();
+
+            lastActor.SetValue(actor);
+        }
+    }
 }

package/Implementation/ActorFocusPrepare.cs.meta

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

package/Implementation/ActorFocusResolve.cs

@@ -1,68 +1,68 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.Ending;
-using DREditor.EventObjects;
-using DREditor.Services;
-using System.Collections;
-using UnityEngine;
-
-namespace DREditor.Actors.Implementation
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(IResolvableDialogueComponent) +
-        "\n\n")]
-    public class ActorFocusResolve : DialogueComponent, IResolvableDialogueComponent
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float resolveOrder = 1;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
-
-
-        public float Order { get => resolveOrder; }
-
-
-        /// <inheritdoc/>
-        public virtual bool UseRoutineToResolve() => false;
-
-        /// <inheritdoc/>
-        public virtual IEnumerator ResolveRoutine()
-        {
-            Resolve();
-
-            yield break;
-        }
-
-        /// <inheritdoc/>
-        public virtual void Resolve()
-        {
-            SetActorToThreeDState((Actor)lastActor.Value);
-
-            if (ServiceLocator.GetService<DialogueObjectManager>().GetStartObject() is Actor actor)
-                SetActorToThreeDState(actor);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="actor"></param>
-        protected virtual void SetActorToThreeDState(Actor actor)
-        {
-            if (actor != null && !actor.GetComponentInChildren<MeshRenderer>().enabled)
-            {
-                actor.GetComponent<LayerHandler>().UnFocusActor();
-
-                actor.GetComponent<LayerHandler>().ToggleRender();
-            }
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.Ending;
+using DREditor.EventObjects;
+using DREditor.Services;
+using System.Collections;
+using UnityEngine;
+
+namespace DREditor.Actors.Implementation
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(IResolvableDialogueComponent) +
+        "\n\n")]
+    public class ActorFocusResolve : DialogueComponent, IResolvableDialogueComponent
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float resolveOrder = 1;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
+
+
+        public float Order { get => resolveOrder; }
+
+
+        /// <inheritdoc/>
+        public virtual bool UseRoutineToResolve() => false;
+
+        /// <inheritdoc/>
+        public virtual IEnumerator ResolveRoutine()
+        {
+            Resolve();
+
+            yield break;
+        }
+
+        /// <inheritdoc/>
+        public virtual void Resolve()
+        {
+            SetActorToThreeDState((Actor)lastActor.Value);
+
+            if (ServiceLocator.GetService<DialogueObjectManager>().GetStartObject() is Actor actor)
+                SetActorToThreeDState(actor);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="actor"></param>
+        protected virtual void SetActorToThreeDState(Actor actor)
+        {
+            if (actor != null && !actor.GetComponentInChildren<MeshRenderer>().enabled)
+            {
+                actor.GetComponent<LayerHandler>().UnFocusActor();
+
+                actor.GetComponent<LayerHandler>().ToggleRender();
+            }
+        }
+    }
 }

package/Implementation/ActorFocusResolve.cs.meta

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

package/Implementation/ActorSpriteChanger.cs

@@ -1,130 +1,130 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.Events;
-using DREditor.Dialogues.LineReading;
-using DREditor.Dialogues.Loading;
-using DREditor.EventObjects;
-using DREditor.Talkables;
-using System.Collections;
-using UnityEngine;
-
-namespace DREditor.Actors.Implementation
-{
-    /// <summary>
-    ///
-    /// </summary>
-    /// <remarks>
-    ///
-    /// </remarks>
-    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ILineProcessorRoutine) + ", " + nameof(ILoadToLineable) +
-        "\n\n")]
-    public class ActorSpriteChanger : DialogueComponent, ILineProcessorRoutine, ILoadToLineable
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected WorldSpriteChanger changer = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent currentActor = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inFastForwardMode = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent isProtagSpeaking = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent isLoadingFile = null;
-
-
-        /// <inheritdoc/>
-        public virtual bool ShouldProcess(Line currentLine)
-        {
-            bool lastActorPresent = currentLine.ContainsEventType<LastActorSprite>();
-
-            bool expressionValid = currentLine.Expression != null && currentLine.Expression.Sprite != null;
-
-            bool spriteShouldChange = expressionValid && !isProtagSpeaking.Value;
-
-            return lastActorPresent || spriteShouldChange;
-        }
-
-        /// <inheritdoc/>
-        public virtual IEnumerator LineProcessRoutine(Line currentLine) => ChangeLineSprites(currentLine);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="currentLine"></param>
-        protected virtual IEnumerator ChangeLineSprites(Line currentLine)
-        {
-            Talkable currentTalkable = (Talkable)currentActor.Value;
-
-            yield return WaitForSpriteChangeEventFinished<LastActorSprite>(currentLine, isProtagSpeaking.Value);
-
-            yield return ChangeWorldSprite(currentLine, currentTalkable);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="currentLine"></param>
-        /// <param name="additionalCondition"></param>
-        protected virtual IEnumerator WaitForSpriteChangeEventFinished<T>(Line currentLine, bool additionalCondition = true)
-        {
-            if (currentLine.ContainsEventType<T>() && !isLoadingFile.Value && additionalCondition)
-            {
-                var changers = FindObjectsByType<WorldSpriteChanger>();
-
-                foreach (var changer in changers)
-                    if (changer.IsActivelyChanging())
-                        yield return changer.WaitForSpriteToFinishChanging();
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="currentLine"></param>
-        /// <param name="currentActor"></param>
-        /// <param name="waitToFinish"></param>
-        protected virtual IEnumerator ChangeWorldSprite(Line currentLine, Talkable currentActor, bool waitToFinish = true)
-        {
-            bool expressionIsValid = currentLine.Expression != null && currentLine.Expression.Sprite != null;
-
-            if (!isProtagSpeaking.Value && expressionIsValid)
-            {
-                Material expressionMaterial = currentLine.Expression.Sprite;
-
-                Sprite expressionSprite = currentLine.Speaker.Sprites[currentLine.ExpressionNumber - 1].Sprite;
-
-                changer.WorldSpriteChange((Actor)currentActor, expressionMaterial, expressionSprite);
-
-                if (waitToFinish)
-                    yield return changer.WaitForSpriteToFinishChanging();
-            }
-        }
-
-        /// <inheritdoc/>
-        public virtual void OnLoadToLine(Line currentLine) 
-            => StartCoroutine(ChangeWorldSprite(currentLine, (Talkable)currentActor.Value, false));
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.Events;
+using DREditor.Dialogues.LineReading;
+using DREditor.Dialogues.Loading;
+using DREditor.EventObjects;
+using DREditor.Talkables;
+using System.Collections;
+using UnityEngine;
+
+namespace DREditor.Actors.Implementation
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    [ClassHeader(nameof(DialogueComponent) + ", " + nameof(ILineProcessorRoutine) + ", " + nameof(ILoadToLineable) +
+        "\n\n")]
+    public class ActorSpriteChanger : DialogueComponent, ILineProcessorRoutine, ILoadToLineable
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected WorldSpriteChanger changer = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent currentActor = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inFastForwardMode = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent isProtagSpeaking = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent isLoadingFile = null;
+
+
+        /// <inheritdoc/>
+        public virtual bool ShouldProcess(Line currentLine)
+        {
+            bool lastActorPresent = currentLine.ContainsEventType<LastActorSprite>();
+
+            bool expressionValid = currentLine.Expression != null && currentLine.Expression.Sprite != null;
+
+            bool spriteShouldChange = expressionValid && !isProtagSpeaking.Value;
+
+            return lastActorPresent || spriteShouldChange;
+        }
+
+        /// <inheritdoc/>
+        public virtual IEnumerator LineProcessRoutine(Line currentLine) => ChangeLineSprites(currentLine);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="currentLine"></param>
+        protected virtual IEnumerator ChangeLineSprites(Line currentLine)
+        {
+            Talkable currentTalkable = (Talkable)currentActor.Value;
+
+            yield return WaitForSpriteChangeEventFinished<LastActorSprite>(currentLine, isProtagSpeaking.Value);
+
+            yield return ChangeWorldSprite(currentLine, currentTalkable);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="currentLine"></param>
+        /// <param name="additionalCondition"></param>
+        protected virtual IEnumerator WaitForSpriteChangeEventFinished<T>(Line currentLine, bool additionalCondition = true)
+        {
+            if (currentLine.ContainsEventType<T>() && !isLoadingFile.Value && additionalCondition)
+            {
+                var changers = FindObjectsByType<WorldSpriteChanger>();
+
+                foreach (var changer in changers)
+                    if (changer.IsActivelyChanging())
+                        yield return changer.WaitForSpriteToFinishChanging();
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="currentLine"></param>
+        /// <param name="currentActor"></param>
+        /// <param name="waitToFinish"></param>
+        protected virtual IEnumerator ChangeWorldSprite(Line currentLine, Talkable currentActor, bool waitToFinish = true)
+        {
+            bool expressionIsValid = currentLine.Expression != null && currentLine.Expression.Sprite != null;
+
+            if (!isProtagSpeaking.Value && expressionIsValid)
+            {
+                Material expressionMaterial = currentLine.Expression.Sprite;
+
+                Sprite expressionSprite = currentLine.Speaker.Sprites[currentLine.ExpressionNumber - 1].Sprite;
+
+                changer.WorldSpriteChange((Actor)currentActor, expressionMaterial, expressionSprite);
+
+                if (waitToFinish)
+                    yield return changer.WaitForSpriteToFinishChanging();
+            }
+        }
+
+        /// <inheritdoc/>
+        public virtual void OnLoadToLine(Line currentLine) 
+            => StartCoroutine(ChangeWorldSprite(currentLine, (Talkable)currentActor.Value, false));
+    }
 }