net.dreditor.triggers 0.1.6 → 0.1.7

package/Actuator.cs

@@ -1,47 +1,47 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.Serialization;
-
-namespace DREditor.Triggers
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [Serializable]
-    public class Actuator : GenericActuator, IActuatorConvert
-    {
-        public Vector3 HitBoxSize;
-
-        [FormerlySerializedAs("stringList")]
-        public List<string> strings = new();
-
-        public bool boolValue;
-
-
-        /// <inheritdoc/>
-        public virtual bool CanConvert(GenericActuator genericActuator) => false;
-
-        /// <inheritdoc/>
-        public virtual void Convert(ref GenericActuator genericSubsequents, GenericActuator oldActuator) { }
-
-
-        // Kept for archival purposes, as this class will eventually be deleted.
-        ///// <summary></summary>
-        ///// <param name="a"></param>
-        ///// <param name="i"></param>
-        ///// <returns></returns>
-        //public static Actuator MergeInstance(Actuator a, Actuator i) // Use data of i to apply instance data
-        //{
-        //    Actuator act = new();
-        //    act.Type = a.Type;
-        //    act.Triggered = i.Triggered;
-        //    act.position = i.position;
-        //    act.HitBoxSize = i.HitBoxSize;
-        //    act.stringList = i.stringList;
-        //    act.boolValue = i.boolValue;
-        //    return null;
-        //}
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.Serialization;
+
+namespace DREditor.Triggers
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [Serializable]
+    public class Actuator : GenericActuator, IActuatorConvert
+    {
+        public Vector3 HitBoxSize;
+
+        [FormerlySerializedAs("stringList")]
+        public List<string> strings = new();
+
+        public bool boolValue;
+
+
+        /// <inheritdoc/>
+        public virtual bool CanConvert(GenericActuator genericActuator) => false;
+
+        /// <inheritdoc/>
+        public virtual void Convert(ref GenericActuator genericSubsequents, GenericActuator oldActuator) { }
+
+
+        // Kept for archival purposes, as this class will eventually be deleted.
+        ///// <summary></summary>
+        ///// <param name="a"></param>
+        ///// <param name="i"></param>
+        ///// <returns></returns>
+        //public static Actuator MergeInstance(Actuator a, Actuator i) // Use data of i to apply instance data
+        //{
+        //    Actuator act = new();
+        //    act.Type = a.Type;
+        //    act.Triggered = i.Triggered;
+        //    act.position = i.position;
+        //    act.HitBoxSize = i.HitBoxSize;
+        //    act.stringList = i.stringList;
+        //    act.boolValue = i.boolValue;
+        //    return null;
+        //}
+    }
 }

package/Actuator.cs.meta

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

package/ActuatorBehaviourBase.cs

@@ -1,62 +1,62 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Services;
-using System.Linq;
-using UnityEngine;
-
-namespace DREditor.Triggers
-{
-    /// <summary>
-    ///
-    /// </summary>
-    /// <remarks>
-    ///
-    /// </remarks>
-    public abstract class ActuatorBehaviourBase : MonoBehaviour, IActuatorBehaviour
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void Awake()
-        {
-            if (ServiceLocator.HasService<TransitionFinishedSubscriber>())
-                ServiceLocator.GetService<TransitionFinishedSubscriber>().SubscribeToRoomTransitionsFinished(InitializeActuator);
-            else
-                UnityEngine.Debug.LogWarning(gameObject.name + " Actuator: ALERT: The service for when the room transition finishes" +
-                    " could not be found, therefore, this actuator will not initialize.");
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void OnDestroy()
-        {
-            if (ServiceLocator.HasService<TransitionFinishedSubscriber>())
-                ServiceLocator.GetService<TransitionFinishedSubscriber>().UnsubscribeToRoomTransitionsFinished(InitializeActuator);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected abstract void InitializeActuator();
-
-
-        /// <inheritdoc/>
-        public abstract object Save();
-
-        /// <inheritdoc/>
-        public abstract void Load(object ob);
-
-        /// <inheritdoc/>
-        public virtual void Call()
-        {
-            var subsequents = GetSubsequents();
-
-            foreach (ISubsequentBehaviour subsequent in subsequents)
-                subsequent.Call();
-        }
-
-        /// <inheritdoc/>
-        public virtual ISubsequentBehaviour[] GetSubsequents() =>
-            GetComponents<MonoBehaviour>().OfType<ISubsequentBehaviour>().ToArray();
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Services;
+using System.Linq;
+using UnityEngine;
+
+namespace DREditor.Triggers
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <remarks>
+    ///
+    /// </remarks>
+    public abstract class ActuatorBehaviourBase : MonoBehaviour, IActuatorBehaviour
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void Awake()
+        {
+            if (ServiceLocator.HasService<TransitionFinishedSubscriber>())
+                ServiceLocator.GetService<TransitionFinishedSubscriber>().SubscribeToRoomTransitionsFinished(InitializeActuator);
+            else
+                UnityEngine.Debug.LogWarning(gameObject.name + " Actuator: ALERT: The service for when the room transition finishes" +
+                    " could not be found, therefore, this actuator will not initialize.");
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void OnDestroy()
+        {
+            if (ServiceLocator.HasService<TransitionFinishedSubscriber>())
+                ServiceLocator.GetService<TransitionFinishedSubscriber>().UnsubscribeToRoomTransitionsFinished(InitializeActuator);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected abstract void InitializeActuator();
+
+
+        /// <inheritdoc/>
+        public abstract object Save();
+
+        /// <inheritdoc/>
+        public abstract void Load(object ob);
+
+        /// <inheritdoc/>
+        public virtual void Call()
+        {
+            var subsequents = GetSubsequents();
+
+            foreach (ISubsequentBehaviour subsequent in subsequents)
+                subsequent.Call();
+        }
+
+        /// <inheritdoc/>
+        public virtual ISubsequentBehaviour[] GetSubsequents() =>
+            GetComponents<MonoBehaviour>().OfType<ISubsequentBehaviour>().ToArray();
+    }
 }

package/ActuatorBehaviourBase.cs.meta

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

package/DREditor.Triggers.asmdef

@@ -1,18 +1,18 @@
-{
-    "name": "DREditor.Triggers",
-    "rootNamespace": "",
-    "references": [
-        "DREditor",
-        "DREditor.LocalDialogues",
-        "DREditor.Progressing.Handling"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
+{
+    "name": "DREditor.Triggers",
+    "rootNamespace": "",
+    "references": [
+        "DREditor",
+        "DREditor.LocalDialogues",
+        "DREditor.Progressing.Handling"
+    ],
+    "includePlatforms": [],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
 }

package/DREditor.Triggers.asmdef.meta

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

package/DialogueSubsequent.cs

@@ -1,113 +1,113 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using DREditor.Dialogues.Loading;
-using DREditor.EventObjects;
-using DREditor.Services;
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace DREditor.Triggers
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [ClassHeader(nameof(ISubsequentBehaviour) + ", " + nameof(IDialogueHolder) +
-        "\n\n")]
-    public class DialogueSubsequent : MonoBehaviour, ISubsequentBehaviour, IDialogueHolder
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected List<Dialogue> dialogues = new();
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected ScriptableObjectsSubsequentData data = new();
-
-
-        /// <inheritdoc/>
-        public virtual void Call()
-        {
-            GameObject tryActor = null;
-
-            try
-            {
-                tryActor = GameObject.Find(dialogues[0].Lines[0].Speaker.FirstName);
-            }
-            catch (NullReferenceException)
-            {
-                UnityEngine.Debug.Log("REPORT: First Speaker on dialogue is null.");
-            }
-            catch (Exception e)
-            {
-                UnityEngine.Debug.Log("REPORT: Trouble getting first speaker: " + e.ToString());
-            }
-
-            SelectableObject actor = null;
-
-            if (tryActor)
-                tryActor.GetComponent<SelectableObject>();
-
-            UnityEngine.Debug.Log("REPORT: Calling StartDialogue from Subsequent");
-
-            ServiceLocator.GetService<IDialogueManager>().StartDialogue(actor, dialogues.ToArray());
-        }
-
-        /// <inheritdoc/>
-        public virtual bool CheckIfSaveDialogue()
-        {
-            if (data.scriptableObject is Dialogue dia)
-                if (ServiceLocator.GetService<IDialogueManager>()
-                    .GetManagerComponent<DialogueLoadIdentifier>()
-                    .CheckDialogue<Line>(dia))
-                    return true;
-
-            foreach (var dialogue in data.scriptableObjects)
-                if (ServiceLocator.GetService<IDialogueManager>()
-                    .GetManagerComponent<DialogueLoadIdentifier>()
-                    .CheckDialogue<Line>((Dialogue)dialogue))
-                    return true;
-
-            return false;
-        }
-
-        /// <inheritdoc/>
-        public virtual object Save()
-        {
-            ScriptableObjectsSubsequentData newData = (ScriptableObjectsSubsequentData)data.Clone();
-
-            newData.SetType(GetType().Name);
-
-            newData.SetScriptableObject(data.scriptableObject);
-
-            foreach(var dialogue in dialogues)
-                if (!newData.scriptableObjects.Contains(dialogue))
-                    newData.scriptableObjects.Add(dialogue);
-
-            return newData;
-        }
-
-        /// <inheritdoc/>
-        public virtual void Load(object ob)
-        {
-            data = (ScriptableObjectsSubsequentData)Convert.ChangeType(ob, typeof(ScriptableObjectsSubsequentData));
-
-            foreach (var dialogue in data.scriptableObjects)
-                dialogues.Add((Dialogue)dialogue);
-
-            if (dialogues.Count == 0 && data.scriptableObject != null)
-                dialogues.Add((Dialogue)data.scriptableObject);
-        }
-
-
-        /// <summary>
-        /// 
-        /// </summary>
-        [ContextMenu("Call")]
-        public void DebugCall() => Call();
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using DREditor.Dialogues.Loading;
+using DREditor.EventObjects;
+using DREditor.Services;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace DREditor.Triggers
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [ClassHeader(nameof(ISubsequentBehaviour) + ", " + nameof(IDialogueHolder) +
+        "\n\n")]
+    public class DialogueSubsequent : MonoBehaviour, ISubsequentBehaviour, IDialogueHolder
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected List<Dialogue> dialogues = new();
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected ScriptableObjectsSubsequentData data = new();
+
+
+        /// <inheritdoc/>
+        public virtual void Call()
+        {
+            GameObject tryActor = null;
+
+            try
+            {
+                tryActor = GameObject.Find(dialogues[0].Lines[0].Speaker.FirstName);
+            }
+            catch (NullReferenceException)
+            {
+                UnityEngine.Debug.Log("REPORT: First Speaker on dialogue is null.");
+            }
+            catch (Exception e)
+            {
+                UnityEngine.Debug.Log("REPORT: Trouble getting first speaker: " + e.ToString());
+            }
+
+            SelectableObject actor = null;
+
+            if (tryActor)
+                tryActor.GetComponent<SelectableObject>();
+
+            UnityEngine.Debug.Log("REPORT: Calling StartDialogue from Subsequent");
+
+            ServiceLocator.GetService<IDialogueManager>().StartDialogue(actor, dialogues.ToArray());
+        }
+
+        /// <inheritdoc/>
+        public virtual bool CheckIfSaveDialogue()
+        {
+            if (data.scriptableObject is Dialogue dia)
+                if (ServiceLocator.GetService<IDialogueManager>()
+                    .GetManagerComponent<DialogueLoadIdentifier>()
+                    .CheckDialogue<Line>(dia))
+                    return true;
+
+            foreach (var dialogue in data.scriptableObjects)
+                if (ServiceLocator.GetService<IDialogueManager>()
+                    .GetManagerComponent<DialogueLoadIdentifier>()
+                    .CheckDialogue<Line>((Dialogue)dialogue))
+                    return true;
+
+            return false;
+        }
+
+        /// <inheritdoc/>
+        public virtual object Save()
+        {
+            ScriptableObjectsSubsequentData newData = (ScriptableObjectsSubsequentData)data.Clone();
+
+            newData.SetType(GetType().Name);
+
+            newData.SetScriptableObject(data.scriptableObject);
+
+            foreach(var dialogue in dialogues)
+                if (!newData.scriptableObjects.Contains(dialogue))
+                    newData.scriptableObjects.Add(dialogue);
+
+            return newData;
+        }
+
+        /// <inheritdoc/>
+        public virtual void Load(object ob)
+        {
+            data = (ScriptableObjectsSubsequentData)Convert.ChangeType(ob, typeof(ScriptableObjectsSubsequentData));
+
+            foreach (var dialogue in data.scriptableObjects)
+                dialogues.Add((Dialogue)dialogue);
+
+            if (dialogues.Count == 0 && data.scriptableObject != null)
+                dialogues.Add((Dialogue)data.scriptableObject);
+        }
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [ContextMenu("Call")]
+        public void DebugCall() => Call();
+    }
 }

package/DialogueSubsequent.cs.meta

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

package/EventTrigger.cs

@@ -1,49 +1,49 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace DREditor.Triggers
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [Serializable]
-    public class EventTrigger
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeReference]
-        public GenericActuator GenericActuator;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeReference]
-        public List<GenericSubsequent> GenericSubsequents = new();
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        public Actuator Actuator;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        public List<Subsequent> Subsequents = new();
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="GenericActuator"></param>
-        public virtual void SetActuator(GenericActuator GenericActuator) => this.GenericActuator = GenericActuator;
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace DREditor.Triggers
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [Serializable]
+    public class EventTrigger
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeReference]
+        public GenericActuator GenericActuator;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeReference]
+        public List<GenericSubsequent> GenericSubsequents = new();
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        public Actuator Actuator;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        public List<Subsequent> Subsequents = new();
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="GenericActuator"></param>
+        public virtual void SetActuator(GenericActuator GenericActuator) => this.GenericActuator = GenericActuator;
+    }
 }