fr.jeanf.questsystem 0.0.59 → 0.0.61

package/Runtime/Scripts/Core/Editor/QuestItem_Editor.cs

@@ -0,0 +1,32 @@
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEngine;
+
+namespace jeanf.questsystem
+{
+    [CustomEditor(typeof(QuestItem), true)]
+    public class QuestItem_Editor : Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            GUILayout.Space(10);
+            var eventToSend = (QuestItem)target;
+            GUILayout.BeginHorizontal();
+            if(GUILayout.Button("Log active steps", GUILayout.Height(20))) {
+                eventToSend.LogActiveSteps(); // how do i call this?
+            }
+            var originalColor = GUI.backgroundColor;
+            GUI.backgroundColor = Color.green;
+            if (GUILayout.Button("Validate Currently Active Steps", GUILayout.Height(20)))
+            {
+                eventToSend.ValidateCurrentlyActiveSteps(); // how do i call this?
+            }
+            GUI.backgroundColor = originalColor;
+            GUILayout.EndHorizontal();
+            GUILayout.Space(10);
+
+            DrawDefaultInspector();
+        }
+    }
+}
+#endif

package/Runtime/Scripts/Core/Editor/QuestItem_Editor.cs.meta

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

package/Runtime/Scripts/Core/Editor/QuestStep_Editor.cs

@@ -11,10 +11,18 @@ namespace jeanf.questsystem
         {
             GUILayout.Space(10);
             var eventToSend = (QuestStep)target;
+            GUILayout.BeginHorizontal();
             if (GUILayout.Button("Regenerate questStep id", GUILayout.Height(20)))
             {
                 eventToSend.GenerateId(); // how do i call this?
             }
+            var originalColor = GUI.backgroundColor;
+            GUI.backgroundColor = Color.green;
+            if(GUILayout.Button("Validate step", GUILayout.Height(20))) {
+                eventToSend.FinishQuestStep(); // how do i call this?
+            }
+            GUI.backgroundColor = originalColor;
+            GUILayout.EndHorizontal();
             GUILayout.Space(10);
 
             DrawDefaultInspector();

package/Runtime/Scripts/Core/QuestItem.cs

@@ -1,12 +1,11 @@
 using System;
 using System.Collections.Generic;
+using System.Linq;
 using jeanf.EventSystem;
 using UnityEngine;
 using jeanf.propertyDrawer;
 using jeanf.validationTools;
 using UnityEditor;
-using System.Linq;
-
 
 namespace jeanf.questsystem
 {
@@ -29,6 +28,10 @@ namespace jeanf.questsystem
         private Dictionary<string, QuestStep> completedSteps = new Dictionary<string, QuestStep>();
         private List<QuestStep> rootSteps = new List<QuestStep>();
 
+        public delegate void ValidateStep(string stepId);
+
+        public static ValidateStep ValidateStepEvent;
+
 
         [ReadOnly] [Range(0, 1)] [SerializeField]
         private float progress = 0.0f;
@@ -44,11 +47,14 @@ namespace jeanf.questsystem
         [Header("Listening on:")] 
         [SerializeField] [Validation("A reference to the QuestProgress SO is required")] private StringFloatEventChannelSO QuestProgress;
         [SerializeField] [Validation("A reference to the QuestInitialCheck SO is required")] private StringEventChannelSO QuestInitialCheck;
+        [SerializeField] private VoidEventChannelSO resetChannel;
 
         [Header("Broadcasting on:")] [SerializeField] [Validation("A reference to the QuestRequirementCheck SO is required")]
         private StringEventChannelSO requirementCheck;
         [SerializeField][Validation("A reference to the LoadRequiredScenesEventChannel SO is required")]  StringListEventChannelSO loadRequiredScenesEventChannel;
         [SerializeField] IntEventChannelSO unlockDoorsEventChannel;
+        
+        
 
         #region Awake/Enable/Disable
         private void Awake()
@@ -73,25 +79,24 @@ namespace jeanf.questsystem
 
         private void Subscribe()
         {
+            resetChannel.OnEventRaised += Reset;
             QuestInitialCheck.OnEventRaised += Init;
             QuestProgress.OnEventRaised += UpdateProgress;
             GameEventsManager.instance.questEvents.onQuestStateChange += QuestStateChange;
             GameEventsManager.instance.inputEvents.onSubmitPressed += UpdateState;
             QuestStep.sendNextStepId += InstantiateQuestStep;
-            //QuestStep.stepCompleted += DestroyQuestStep;
             QuestStep.stepActive += UpdateStepStatus;
             QuestStep.childStep += AddStepToStepMap;
-
         }
 
         private void Unsubscribe()
         {
+            resetChannel.OnEventRaised -= Reset;
             QuestInitialCheck.OnEventRaised -= Init;
             QuestProgress.OnEventRaised -= UpdateProgress;
             GameEventsManager.instance.questEvents.onQuestStateChange -= QuestStateChange;
             GameEventsManager.instance.inputEvents.onSubmitPressed -= UpdateState;
             QuestStep.sendNextStepId -= InstantiateQuestStep;
-            //QuestStep.stepCompleted -= DestroyQuestStep;
             QuestStep.stepActive -= UpdateStepStatus;
             QuestStep.childStep -= AddStepToStepMap;
 
@@ -99,6 +104,11 @@ namespace jeanf.questsystem
         }
         #endregion
 
+        private void Reset()
+        {
+            Init(questId);
+        }
+
         #region Instantiations & Loading
         public void InstantiateQuestStep(string id)
         {
@@ -159,6 +169,14 @@ namespace jeanf.questsystem
         #region quest process
         private void Init(string id)
         {
+            if (transform.childCount > 0)
+            {
+                for (var i = transform.childCount - 1; i >= 0; i--)
+                {
+                    Destroy(transform.GetChild(i));
+                }
+            }
+
             activeSteps.Clear();
             activeSteps.TrimExcess();
             completedSteps.Clear();
@@ -233,6 +251,18 @@ namespace jeanf.questsystem
         }
         #endregion
 
+        public void ValidateCurrentlyActiveSteps()
+        {
+            var currentlyActiveSteps = activeSteps.Keys;
+
+            for (var i = 0; i < currentlyActiveSteps.Count; i++)
+            {
+                var activeStep = activeSteps.ElementAt(i);
+                var stepKey = activeStep.Key;
+                if(activeSteps.ContainsKey(stepKey)) ValidateStepEvent.Invoke(stepKey);
+            }
+        }
+
         #region validation tools
 
         #if UNITY_EDITOR
@@ -338,20 +368,4 @@ namespace jeanf.questsystem
         }
         #endregion
     }
-    
-    
-    #if UNITY_EDITOR
-    [CustomEditor(typeof(QuestItem))]
-    public class BoolEventOnClickEditor : Editor {
-        override public void  OnInspectorGUI () {
-            DrawDefaultInspector();
-            GUILayout.Space(10);
-            var eventToSend = (QuestItem) target;
-            if(GUILayout.Button("Log active steps", GUILayout.Height(30))) {
-                eventToSend.LogActiveSteps(); // how do i call this?
-            }
-            GUILayout.Space(10);
-        }
-    }
-    #endif
 }

package/Runtime/Scripts/Core/QuestStep.cs

@@ -1,3 +1,4 @@
+using System;
 using jeanf.EventSystem;
 using jeanf.propertyDrawer;
 using UnityEngine;
@@ -5,6 +6,7 @@ using UnityEngine.Playables;
 using System.Collections.Generic;
 using GraphProcessor;
 using jeanf.validationTools;
+using UnityEditor;
 
 namespace jeanf.questsystem
 {
@@ -45,13 +47,28 @@ namespace jeanf.questsystem
 
         [Header("Event Channels")]
         [SerializeField] private StringEventChannelSO sendQuestStepTooltip;
+        [SerializeField] private StringEventChannelSO stepValidationOverride;
+        
+        public void OnEnable()
+        {
+            Subscribe();
+            InitializeQuestStep();
+        }
 
+        public void OnDisable() => Unsubscribe();
 
+        public void OnDestroy() => Unsubscribe();
 
+        private void Subscribe()
+        {
+            QuestItem.ValidateStepEvent += ValidateCurrentStep;
+            if(stepValidationOverride) stepValidationOverride.OnEventRaised += ValidateCurrentStep;
+        }
 
-        public void OnEnable()
+        private void Unsubscribe()
         {
-            InitializeQuestStep();
+            QuestItem.ValidateStepEvent -= ValidateCurrentStep;
+            if(stepValidationOverride) stepValidationOverride.OnEventRaised -= ValidateCurrentStep;
         }
 
 
@@ -84,9 +101,14 @@ namespace jeanf.questsystem
             }
         }
 
+        public void ValidateCurrentStep(string stepId)
+        {
+            if(stepId != this.stepId)return;
+            FinishQuestStep();
+        }
 
 
-        protected void FinishQuestStep()
+        public void FinishQuestStep()
         {
             if(isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Changing status to completed", this);
             stepStatus = QuestStepStatus.Completed;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name":"fr.jeanf.questsystem",
-  "version":"0.0.59",
+  "version":"0.0.61",
   "displayName":"Quest system",
   "description":"This package uses Scriptable Objects to define quests.",
   "unity": "2021.3",