net.dreditor.actors 0.1.6 → 0.1.7

package/ActorManager.cs

@@ -1,150 +1,150 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Services;
-using DREditor.Talkables;
-using System.Collections.Generic;
-using System.Linq;
-using UnityEngine;
-
-namespace DREditor.Actors
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(DialogueObjectManager) + ", " + nameof(IObjectPooler<Talkable>) +
-        "\n\n")]
-    public class ActorManager : DialogueObjectManager, IObjectPooler<Talkable>
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string tutorialCharacterFirstName = "Tutorial";
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected bool logActorsNotFound = false;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected List<Talkable> actors = new();
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected IDialogueManager dialogueManager = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void OnEnable()
-        {
-            if (gameObject != null)
-            {
-                RegisterService<DialogueObjectManager>(this);
-
-                RegisterService<IObjectPooler<Talkable>>(this);
-            }
-
-            dialogueManager = ServiceLocator.GetService<IDialogueManager>();
-
-            if (dialogueManager != null)
-                dialogueManager.GetEnder().OnDialogueResolving += SetStartObjectNull;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="service"></param>
-        protected virtual void RegisterService<T>(T service) where T : class
-        {
-            if (!ServiceLocator.HasService<T>())
-                ServiceLocator.Register(service);
-            else
-                Destroy(gameObject);
-        }
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void OnDisable()
-        {
-            if (dialogueManager != null)
-                dialogueManager.GetEnder().OnDialogueResolving -= SetStartObjectNull;
-        }
-
-
-        /// <inheritdoc/>
-        public virtual void RegisterObject(Talkable obj)
-        {
-            if (obj is Talkable talkable)
-            {
-                if (actors.Contains(talkable))
-                    return;
-
-                actors.Add(talkable);
-
-                talkable.SubscribeToStartConversation(Evaluate);
-            }
-            else
-                UnityEngine.Debug.LogWarning("Object Tried To register to a Pooler that doesn't use it's type");
-        }
-
-        /// <inheritdoc/>
-        public virtual void UnregisterObject(Talkable obj)
-        {
-            actors.Remove(obj);
-
-            obj.UnsubscribeToStartConversation(Evaluate);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="talkable"></param>
-        /// <param name="Conversation"></param>
-        protected virtual void Evaluate(Talkable talkable, Dialogue[] Conversation)
-        {
-            startObject = talkable;
-
-            if (ServiceLocator.HasService<IDialogueManager>())
-            {
-                if (Conversation[0] != null)
-                    ServiceLocator.GetService<IDialogueManager>().StartDialogue(talkable, Conversation);
-                else
-                    ServiceLocator.GetService<IDialogueManager>().DebugNoCharacterDialogueCall(talkable);
-            }
-            else
-                UnityEngine.Debug.LogWarning($"ALERT: {ToString()}: ActorManager could not get {nameof(IDialogueManager)}!");
-        }
-
-
-        /// <inheritdoc/>
-        public virtual Talkable GetObjectByName(string name)
-        {
-            var actors = GetRegisteredObjects().OfType<Talkable>()
-                .Where(talkable => talkable.gameObject.name == name);
-
-            if (actors.Any())
-                return actors.First();
-            else if (name != tutorialCharacterFirstName && logActorsNotFound)
-                UnityEngine.Debug.Log($"REPORT: {ToString()}: Couldn't find actor: {name}.");
-
-            return null;
-        }
-
-        /// <inheritdoc/>
-        public virtual List<Talkable> GetRegisteredObjects() => actors;
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Services;
+using DREditor.Talkables;
+using System.Collections.Generic;
+using System.Linq;
+using UnityEngine;
+
+namespace DREditor.Actors
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(DialogueObjectManager) + ", " + nameof(IObjectPooler<Talkable>) +
+        "\n\n")]
+    public class ActorManager : DialogueObjectManager, IObjectPooler<Talkable>
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string tutorialCharacterFirstName = "Tutorial";
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected bool logActorsNotFound = false;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected List<Talkable> actors = new();
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected IDialogueManager dialogueManager = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void OnEnable()
+        {
+            if (gameObject != null)
+            {
+                RegisterService<DialogueObjectManager>(this);
+
+                RegisterService<IObjectPooler<Talkable>>(this);
+            }
+
+            dialogueManager = ServiceLocator.GetService<IDialogueManager>();
+
+            if (dialogueManager != null)
+                dialogueManager.GetEnder().OnDialogueResolving += SetStartObjectNull;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <typeparam name="T"></typeparam>
+        /// <param name="service"></param>
+        protected virtual void RegisterService<T>(T service) where T : class
+        {
+            if (!ServiceLocator.HasService<T>())
+                ServiceLocator.Register(service);
+            else
+                Destroy(gameObject);
+        }
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void OnDisable()
+        {
+            if (dialogueManager != null)
+                dialogueManager.GetEnder().OnDialogueResolving -= SetStartObjectNull;
+        }
+
+
+        /// <inheritdoc/>
+        public virtual void RegisterObject(Talkable obj)
+        {
+            if (obj is Talkable talkable)
+            {
+                if (actors.Contains(talkable))
+                    return;
+
+                actors.Add(talkable);
+
+                talkable.SubscribeToStartConversation(Evaluate);
+            }
+            else
+                UnityEngine.Debug.LogWarning("Object Tried To register to a Pooler that doesn't use it's type");
+        }
+
+        /// <inheritdoc/>
+        public virtual void UnregisterObject(Talkable obj)
+        {
+            actors.Remove(obj);
+
+            obj.UnsubscribeToStartConversation(Evaluate);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="talkable"></param>
+        /// <param name="Conversation"></param>
+        protected virtual void Evaluate(Talkable talkable, Dialogue[] Conversation)
+        {
+            startObject = talkable;
+
+            if (ServiceLocator.HasService<IDialogueManager>())
+            {
+                if (Conversation[0] != null)
+                    ServiceLocator.GetService<IDialogueManager>().StartDialogue(talkable, Conversation);
+                else
+                    ServiceLocator.GetService<IDialogueManager>().DebugNoCharacterDialogueCall(talkable);
+            }
+            else
+                UnityEngine.Debug.LogWarning($"ALERT: {ToString()}: ActorManager could not get {nameof(IDialogueManager)}!");
+        }
+
+
+        /// <inheritdoc/>
+        public virtual Talkable GetObjectByName(string name)
+        {
+            var actors = GetRegisteredObjects().OfType<Talkable>()
+                .Where(talkable => talkable.gameObject.name == name);
+
+            if (actors.Any())
+                return actors.First();
+            else if (name != tutorialCharacterFirstName && logActorsNotFound)
+                UnityEngine.Debug.Log($"REPORT: {ToString()}: Couldn't find actor: {name}.");
+
+            return null;
+        }
+
+        /// <inheritdoc/>
+        public virtual List<Talkable> GetRegisteredObjects() => actors;
+    }
 }

package/ActorManager.cs.meta

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

package/ActorOrganizer.cs

@@ -1,94 +1,94 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.LineReading;
-using DREditor.Dialogues.Loading;
-using DREditor.EventObjects;
-using DREditor.Services;
-using DREditor.Talkables;
-using UnityEngine;
-
-namespace DREditor.Actors
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader("" + nameof(ILineProcessor) + ", " + nameof(ILineEndProcess) + ", " + 
-        nameof(ILoadToLineable) + ", " + nameof(ILoadToLineEnd) + ", " + nameof(IDialogueReaderCleanUp) + ", " + 
-        nameof(IToTitleScreen) +
-        "\n\n")]
-    public class ActorOrganizer : DialogueComponent, ILineProcessor, ILineEndProcess, 
-        ILoadToLineable, ILoadToLineEnd, IDialogueReaderCleanUp, IToTitleScreen
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent isProtagSpeaking = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent currentActor = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="name"></param>
-        protected virtual void SetCurrentActorByName(string name)
-        {
-            currentActor.SetValue((Actor)ServiceLocator.GetService<IObjectPooler<Talkable>>().GetObjectByName(name));
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="currentLine"></param>
-        protected virtual void SetLastActorFromLineData(Line currentLine = null)
-        {
-            if (!isProtagSpeaking.Value && !currentLine.DontPan)
-                lastActor.SetValue((Actor)currentActor.Value);
-        }
-
-
-        /// <inheritdoc/>
-        public virtual void LineProcess(Line currentLine)
-        {
-            if (currentLine.Speaker != null && !isProtagSpeaking.Value)
-                SetCurrentActorByName(currentLine.Speaker.FirstName);
-        }
-
-        /// <inheritdoc/>
-        public virtual void LineEndProcess(Line currentLine = null) => SetLastActorFromLineData(currentLine);
-
-        /// <inheritdoc/>
-        public virtual void OnLoadToLine(Line currentLine)
-        {
-            if (currentLine.Speaker != null)
-                SetCurrentActorByName(currentLine.Speaker.FirstName);
-        }
-
-        /// <inheritdoc/>
-        public virtual void OnLoadToLineEnd(Line currentLine) => SetLastActorFromLineData(currentLine);
-
-        /// <inheritdoc/>
-        public virtual void OnDialogueReaderCleanUp()
-        {
-            lastActor.SetValue(null);
-
-            ToTitleScreen();
-        }
-
-        /// <inheritdoc/>
-        public virtual void ToTitleScreen() => isProtagSpeaking.SetValue(false);
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.LineReading;
+using DREditor.Dialogues.Loading;
+using DREditor.EventObjects;
+using DREditor.Services;
+using DREditor.Talkables;
+using UnityEngine;
+
+namespace DREditor.Actors
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader("" + nameof(ILineProcessor) + ", " + nameof(ILineEndProcess) + ", " + 
+        nameof(ILoadToLineable) + ", " + nameof(ILoadToLineEnd) + ", " + nameof(IDialogueReaderCleanUp) + ", " + 
+        nameof(IToTitleScreen) +
+        "\n\n")]
+    public class ActorOrganizer : DialogueComponent, ILineProcessor, ILineEndProcess, 
+        ILoadToLineable, ILoadToLineEnd, IDialogueReaderCleanUp, IToTitleScreen
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent isProtagSpeaking = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent currentActor = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SelectableObjectWithEvent lastActor = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="name"></param>
+        protected virtual void SetCurrentActorByName(string name)
+        {
+            currentActor.SetValue((Actor)ServiceLocator.GetService<IObjectPooler<Talkable>>().GetObjectByName(name));
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="currentLine"></param>
+        protected virtual void SetLastActorFromLineData(Line currentLine = null)
+        {
+            if (!isProtagSpeaking.Value && !currentLine.DontPan)
+                lastActor.SetValue((Actor)currentActor.Value);
+        }
+
+
+        /// <inheritdoc/>
+        public virtual void LineProcess(Line currentLine)
+        {
+            if (currentLine.Speaker != null && !isProtagSpeaking.Value)
+                SetCurrentActorByName(currentLine.Speaker.FirstName);
+        }
+
+        /// <inheritdoc/>
+        public virtual void LineEndProcess(Line currentLine = null) => SetLastActorFromLineData(currentLine);
+
+        /// <inheritdoc/>
+        public virtual void OnLoadToLine(Line currentLine)
+        {
+            if (currentLine.Speaker != null)
+                SetCurrentActorByName(currentLine.Speaker.FirstName);
+        }
+
+        /// <inheritdoc/>
+        public virtual void OnLoadToLineEnd(Line currentLine) => SetLastActorFromLineData(currentLine);
+
+        /// <inheritdoc/>
+        public virtual void OnDialogueReaderCleanUp()
+        {
+            lastActor.SetValue(null);
+
+            ToTitleScreen();
+        }
+
+        /// <inheritdoc/>
+        public virtual void ToTitleScreen() => isProtagSpeaking.SetValue(false);
+    }
 }

package/ActorOrganizer.cs.meta

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