fr.jeanf.questsystem 0.0.33 → 0.0.35

package/Runtime/Scripts/Core/Editor/{QuestInfoSO_Editor.cs → QuestSO_Editor.cs}

@@ -4,7 +4,7 @@ using jeanf.questsystem;
 using UnityEditor;
 using UnityEngine;
 
-public class QuestInfoSO_Editor : Editor
+public class QuestSO_Editor : Editor
 {
     [CustomEditor(typeof(QuestSO))]
     public class BoolEventOnClickEditor : Editor {

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

@@ -0,0 +1,24 @@
+#if UNITY_EDITOR
+using UnityEditor;
+using UnityEngine;
+
+namespace jeanf.questsystem
+{
+    [CustomEditor(typeof(QuestStep), true)]
+    public class QuestStep_Editor : Editor
+    {
+        public override void OnInspectorGUI()
+        {
+            GUILayout.Space(10);
+            var eventToSend = (QuestStep)target;
+            if (GUILayout.Button("Regenerate questStep id", GUILayout.Height(20)))
+            {
+                eventToSend.GenerateId(); // how do i call this?
+            }
+            GUILayout.Space(10);
+
+            DrawDefaultInspector();
+        }
+    }
+}
+#endif

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

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

package/Runtime/Scripts/Core/QuestItem.cs

@@ -62,17 +62,6 @@ namespace jeanf.questsystem
                     stepMap.Add(questSO.questSteps[i].StepId, questSO.questSteps[i]);
                 }
             }
-
-            foreach (QuestStep step in stepMap.Values)
-            {
-                if (step.isRootStep)
-                {
-                    InstantiateQuestStep(step.StepId);
-                }
-            }
-
-            LoadDependencies();
-            
         }
 
         private void OnEnable()
@@ -125,11 +114,10 @@ namespace jeanf.questsystem
         }
 
         public void DestroyQuestStep(string id)
-        {
+      {
             if (activeSteps.ContainsKey(id))
             {
                 Destroy(activeSteps[id].gameObject);
-                activeSteps.Remove(id);
             }
         }
 
@@ -175,14 +163,23 @@ namespace jeanf.questsystem
             activeSteps.TrimExcess();
             completedSteps.Clear();
             completedSteps.TrimExcess();
-            
+
             Debug.Log($"Quest [{id}]: _startQuestOnEnable value is: [{_startQuestOnEnable}]");
-            if (!_startQuestOnEnable) return;
             if (!_startQuestOnEnable || id != questId) return;
             clearToStart = true;
             currentQuestState = QuestState.CAN_START;
             requirementCheck.RaiseEvent(questId);
             UpdateState();
+
+            foreach (QuestStep step in stepMap.Values)
+            {
+                if (step.isRootStep)
+                {
+                    InstantiateQuestStep(step.StepId);
+                }
+            }
+
+            LoadDependencies();
         }
 
         private void UpdateState()

package/Runtime/Scripts/Core/QuestStep.cs

@@ -100,9 +100,9 @@ namespace jeanf.questsystem
             {
                 sendNextStepId?.Invoke(questStep.stepId);
             }
-
-            stepActive?.Invoke(stepId, stepStatus);
             stepCompleted?.Invoke(stepId);
+            stepActive?.Invoke(stepId, stepStatus);
+
 
             if (!isUsingIntroTimeline || !timeline) return;
             //if(isDebug) Debug.Log($"sending trigger to timeline: {timeline.name}, triggerValue: false");

package/package.json

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