net.dreditor.trials 0.1.6 → 0.1.8

package/TrialSequencer.cs

@@ -1,230 +1,230 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues.Events;
-using DREditor.EventObjects;
-using System.Collections;
-using UnityEngine;
-
-namespace DREditor.Trials
-{
-    /// <summary>
-    ///
-    /// </summary>
-	[ClassHeader("")]
-    public class TrialSequencer : MonoBehaviour
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected StringWithEvent currentControlsKey = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected IntWithEvent skipTrialSequences = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SceneEvent hideTrialDialogueUI = null;
-        
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected MinigameType trialDiscussionType = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected TrialEnderBase trialEnder = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected bool onlyFirstSequence = false;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected int currentIndex = 0;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string endMinigameEvent = "EndMinigame";
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected bool sequenceFinished = false;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected int skip = 0;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected TrialBuilder trial;
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected TrialSequence currentSequence;
-
-
-        protected virtual void OnEnable()
-        {
-            DialogueEventSystem.StartListening(endMinigameEvent, EndTrialSequence);
-
-            if (skipTrialSequences != null)
-                skipTrialSequences.AddListener(SkipSequences);
-        }
-
-        protected virtual void OnDisable()
-        {
-            DialogueEventSystem.StopListening(endMinigameEvent, EndTrialSequence);
-
-            if (skipTrialSequences != null)
-                skipTrialSequences.RemoveListener(SkipSequences);
-        }
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="sequenceFinished"></param>
-        public virtual void SetTrialSequenceFinished(bool sequenceFinished) => this.sequenceFinished = sequenceFinished;
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="trial"></param>
-        /// <param name="startIndex"></param>
-        public virtual IEnumerator StartTrial(TrialBuilder trial, int startIndex = 0)
-        {
-            this.trial = trial;
-
-            UnityEngine.Debug.Log("Starting Trial: " + trial.name);
-
-            for (currentIndex = startIndex; currentIndex < trial.sequences.Count; currentIndex++)
-            {
-                CheckSkipSequences();
-
-                yield return InitializeSequence();
-
-                if (onlyFirstSequence && currentIndex == 0)
-                    break;
-            }
-
-            StartCoroutine(trialEnder.EndTrial(trial));
-
-            yield break;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void CheckSkipSequences()
-        {
-            if (!(skip + currentIndex < trial.sequences.Count))
-                UnityEngine.Debug.LogWarning("ALERT: You are skipping more sequences than are available. Skipping aborted.");
-            else if (skip > 0 && skip + currentIndex < trial.sequences.Count)
-            {
-                UnityEngine.Debug.Log("Skipping sequences at: " + currentIndex + " to: " + (skip + currentIndex));
-
-                currentIndex += skip;
-
-                skip = 0;
-            }
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual IEnumerator InitializeSequence()
-        {
-            currentSequence = trial.sequences[currentIndex];
-
-            InitializeMinigameManager();
-
-            SetMinigameControls();
-
-            while (!sequenceFinished)
-                yield return null;
-
-            ResolveDialogueUI();
-
-            EndTrialSequence();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void InitializeMinigameManager()
-        {
-            GameObject minigamePrefab = GameObject.Find(currentSequence.MinigameType.Prefab.name);
-
-            if (minigamePrefab == null)
-                Instantiate(currentSequence.MinigameType.Prefab);
-
-            currentSequence.MinigameType.manager.Invoke(currentSequence.MinigameAsset);
-
-            UnityEngine.Debug.Log("Started Minigame: " + currentSequence.MinigameType.TypeName);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void SetMinigameControls()
-        {
-            if (currentSequence.MinigameType.TypeName != trialDiscussionType.TypeName)
-                currentControlsKey.SetValue(currentSequence.MinigameType.ControlsKey);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void ResolveDialogueUI()
-        {
-            if (currentIndex + 1 >= trial.sequences.Count)
-                return;
-
-            bool currentSequenceIsDialogue = currentSequence.MinigameType.TypeName == trialDiscussionType.TypeName;
-
-            bool nextSequenceNotDialogue =
-                trial.sequences[currentIndex + 1].MinigameType.TypeName != trialDiscussionType.TypeName;
-
-            if (currentSequenceIsDialogue && nextSequenceNotDialogue)
-                hideTrialDialogueUI.Raise();
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        protected virtual void EndTrialSequence(object o = null) => sequenceFinished = !sequenceFinished;
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="skipNum"></param>
-        protected virtual void SkipSequences(int skipNum)
-        {
-            if (skipNum > 0)
-            {
-                skip = skipNum;
-
-                skipTrialSequences.SetValue(0);
-            }
-        }
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues.Events;
+using DREditor.EventObjects;
+using System.Collections;
+using UnityEngine;
+
+namespace DREditor.Trials
+{
+    /// <summary>
+    ///
+    /// </summary>
+	[ClassHeader("")]
+    public class TrialSequencer : MonoBehaviour
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected StringWithEvent currentControlsKey = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected IntWithEvent skipTrialSequences = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SceneEvent hideTrialDialogueUI = null;
+        
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected MinigameType trialDiscussionType = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected TrialEnderBase trialEnder = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected bool onlyFirstSequence = false;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected int currentIndex = 0;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string endMinigameEvent = "EndMinigame";
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected bool sequenceFinished = false;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected int skip = 0;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected TrialBuilder trial;
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected TrialSequence currentSequence;
+
+
+        protected virtual void OnEnable()
+        {
+            DialogueEventSystem.StartListening(endMinigameEvent, EndTrialSequence);
+
+            if (skipTrialSequences != null)
+                skipTrialSequences.AddListener(SkipSequences);
+        }
+
+        protected virtual void OnDisable()
+        {
+            DialogueEventSystem.StopListening(endMinigameEvent, EndTrialSequence);
+
+            if (skipTrialSequences != null)
+                skipTrialSequences.RemoveListener(SkipSequences);
+        }
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="sequenceFinished"></param>
+        public virtual void SetTrialSequenceFinished(bool sequenceFinished) => this.sequenceFinished = sequenceFinished;
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="trial"></param>
+        /// <param name="startIndex"></param>
+        public virtual IEnumerator StartTrial(TrialBuilder trial, int startIndex = 0)
+        {
+            this.trial = trial;
+
+            UnityEngine.Debug.Log("Starting Trial: " + trial.name);
+
+            for (currentIndex = startIndex; currentIndex < trial.sequences.Count; currentIndex++)
+            {
+                CheckSkipSequences();
+
+                yield return InitializeSequence();
+
+                if (onlyFirstSequence && currentIndex == 0)
+                    break;
+            }
+
+            StartCoroutine(trialEnder.EndTrial(trial));
+
+            yield break;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void CheckSkipSequences()
+        {
+            if (!(skip + currentIndex < trial.sequences.Count))
+                UnityEngine.Debug.LogWarning("ALERT: You are skipping more sequences than are available. Skipping aborted.");
+            else if (skip > 0 && skip + currentIndex < trial.sequences.Count)
+            {
+                UnityEngine.Debug.Log("Skipping sequences at: " + currentIndex + " to: " + (skip + currentIndex));
+
+                currentIndex += skip;
+
+                skip = 0;
+            }
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual IEnumerator InitializeSequence()
+        {
+            currentSequence = trial.sequences[currentIndex];
+
+            InitializeMinigameManager();
+
+            SetMinigameControls();
+
+            while (!sequenceFinished)
+                yield return null;
+
+            ResolveDialogueUI();
+
+            EndTrialSequence();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void InitializeMinigameManager()
+        {
+            GameObject minigamePrefab = GameObject.Find(currentSequence.MinigameType.Prefab.name);
+
+            if (minigamePrefab == null)
+                Instantiate(currentSequence.MinigameType.Prefab);
+
+            currentSequence.MinigameType.manager.Invoke(currentSequence.MinigameAsset);
+
+            UnityEngine.Debug.Log("Started Minigame: " + currentSequence.MinigameType.TypeName);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void SetMinigameControls()
+        {
+            if (currentSequence.MinigameType.TypeName != trialDiscussionType.TypeName)
+                currentControlsKey.SetValue(currentSequence.MinigameType.ControlsKey);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void ResolveDialogueUI()
+        {
+            if (currentIndex + 1 >= trial.sequences.Count)
+                return;
+
+            bool currentSequenceIsDialogue = currentSequence.MinigameType.TypeName == trialDiscussionType.TypeName;
+
+            bool nextSequenceNotDialogue =
+                trial.sequences[currentIndex + 1].MinigameType.TypeName != trialDiscussionType.TypeName;
+
+            if (currentSequenceIsDialogue && nextSequenceNotDialogue)
+                hideTrialDialogueUI.Raise();
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        protected virtual void EndTrialSequence(object o = null) => sequenceFinished = !sequenceFinished;
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="skipNum"></param>
+        protected virtual void SkipSequences(int skipNum)
+        {
+            if (skipNum > 0)
+            {
+                skip = skipNum;
+
+                skipTrialSequences.SetValue(0);
+            }
+        }
+    }
 }

package/TrialSequencer.cs.meta

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

package/package.json

@@ -1,42 +1,47 @@
-{
-  "name": "net.dreditor.trials",
-  "version": "0.1.6",
-  "displayName": "DREditor Trials",
-  "description": "The beta for DREditor. A tool to create death game style projects without having to code.",
-  "unity": "6000.4",
-  "dependencies": {
-    "com.unity.ugui": "2.0.0",
-    "com.unity.inputsystem": "1.19.0",
-    "net.dreditor.core": "0.1.6",
-    "net.dreditor.fading": "0.1.6",
-    "net.dreditor.audio": "0.1.6",
-    "net.dreditor.roomloading": "0.1.6",
-    "net.dreditor.ui": "0.1.6",
-    "net.dreditor.uihandling": "0.1.6",
-    "net.dreditor.minigames": "0.1.6"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "author": {
-    "name": "Benjamin \"Sweden\" Jillson",
-    "email": "dreditortool@gmail.com",
-    "url": "https://dreditor.net"
-  },
-  "keywords": [
-    "editor",
-    "tool",
-    "dreditor"
-  ],
-  "samples": [
-    {
-      "displayName": "Samples",
-      "description": "",
-      "path": "Samples~"
-    }
-  ],
-  "documentationUrl": "https://dreditor.net",
-  "license": "Apache-2.0",
-  "licensesUrl": "https://dreditor.net/docs/LICENSE.html",
-  "changelogUrl": "https://dreditor.net/docs/CHANGELOG.html"
-}
+{
+  "name": "net.dreditor.trials",
+  "version": "0.1.8",
+  "displayName": "DREditor Trials",
+  "description": "The beta for DREditor. A tool to create death game style projects without having to code.",
+  "unity": "6000.4",
+  "dependencies": {
+    "com.unity.ugui": "2.0.0",
+    "com.unity.inputsystem": "1.19.0",
+    "net.dreditor.core": "0.1.8",
+    "net.dreditor.fading": "0.1.8",
+    "net.dreditor.audio": "0.1.8",
+    "net.dreditor.roomloading": "0.1.8",
+    "net.dreditor.ui": "0.1.8",
+    "net.dreditor.uihandling": "0.1.8",
+    "net.dreditor.minigames": "0.1.8"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "author": {
+    "name": "Benjamin \"Sweden\" Jillson",
+    "email": "dreditortool@gmail.com",
+    "url": "https://dreditor.net"
+  },
+  "keywords": [
+    "editor",
+    "tool",
+    "dreditor"
+  ],
+  "samples": [
+    {
+      "displayName": "Samples",
+      "description": "",
+      "path": "Samples~"
+    }
+  ],
+  "documentationUrl": "https://dreditor.net",
+  "license": "Apache-2.0",
+  "licensesUrl": "https://dreditor.net/docs/LICENSE.html",
+  "changelogUrl": "https://dreditor.net/docs/CHANGELOG.html",
+  "repository": {
+    "url": "https://github.com/CertifiedSharp/DREditor",
+    "type": "git",
+    "revision": "416b18f937fb917bf3f595362a1082ed97457744"
+  }
+}

package/package.json.meta

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

package/Samples.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f315be0f82893fd4ca8ea8ada461a3e9
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: