fr.jeanf.questsystem 0.0.60 → 0.0.62

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/Quest.cs

@@ -47,37 +47,6 @@ namespace jeanf.questsystem
             this.questSO = questQuestSo;
             this.state = questState;
             this.questStepStates = questStepStates;
-
-            //if the quest step states and prefabs are different lengths,
-            //something has changed during development and the saved data is out of sync.
-            //if (this.questStepStates.Length != this.questSO.questSteps.Length)
-            //{
-            //    Debug.LogWarning("Quest Step Prefabs and Quest Step States are "
-            //                     + "of different lengths. This indicates something changed "
-            //                     + "with the QuestInfo and the saved data is now out of sync. "
-            //                     + "Reset your data - as this might cause issues. QuestId: " + this.questSO.id);
-            //}
         }
-
-
-
-        //public void StoreQuestStepState(QuestStepState questStepState, int stepIndex)
-        //{
-        //    if (stepIndex < questStepStates.Count)
-        //    {
-        //        questStepStates[stepIndex].state = questStepState.state;
-        //    }
-        //    else
-        //    {
-        //        Debug.LogWarning("Tried to access quest step data, but stepIndex was out of range: "
-        //                         + "Quest Id = " + questSO.id + ", Step Index = " + stepIndex);
-        //    }
-        //}
-
-        //public QuestData GetQuestData()
-        //{
-        //    return new QuestData(state, currentQuestStepIndex, questStepStates);
-        //}
-
     }
 }

package/Runtime/Scripts/Core/QuestItem.cs

@@ -1,18 +1,18 @@
 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;
-using Object = UnityEngine.Object;
-
 
 namespace jeanf.questsystem
 {
     public class QuestItem : MonoBehaviour, IDebugBehaviour, IValidatable
     {
+
+        #region interface variables
         public bool isDebug
         {
             get => _isDebug;
@@ -22,24 +22,30 @@ namespace jeanf.questsystem
 
         [SerializeField] private bool _isDebug = false;
         [SerializeField] private bool _startQuestOnEnable = false;
+        #endregion
 
+        #region Step Dictionaries
         [Tooltip("Visual feedback for the quest state")] [Header("Quest")] 
         [SerializeField] [Validation("A reference to a questSO is required")] private QuestSO questSO;
         private Dictionary<string, QuestStep> stepMap = new Dictionary<string, QuestStep>();
         private Dictionary<string, QuestStep> activeSteps = new Dictionary<string, QuestStep>();
         private Dictionary<string, QuestStep> completedSteps = new Dictionary<string, QuestStep>();
         private List<QuestStep> rootSteps = new List<QuestStep>();
+        #endregion
 
 
-        [ReadOnly] [Range(0, 1)] [SerializeField]
-        private float progress = 0.0f;
-
+        #region main data
         [SerializeField] [ReadOnly]
         private bool clearToStart = false;
-
         private string questId;
         private QuestState currentQuestState;
+        [ReadOnly][Range(0, 1)][SerializeField]
+        private float progress = 0.0f;
+        #endregion
 
+        #region events
+        public delegate void ValidateStep(string stepId);
+        public static ValidateStep ValidateStepEvent;
         // these events are Located in Assets/Resources/Quests/Channels - it is searched for at Awake time.
         // if they do not exist simply right click in the hierarchy and find >InitializeQuestSystem<
         [Header("Listening on:")] 
@@ -51,10 +57,10 @@ namespace jeanf.questsystem
         private StringEventChannelSO requirementCheck;
         [SerializeField][Validation("A reference to the LoadRequiredScenesEventChannel SO is required")]  StringListEventChannelSO loadRequiredScenesEventChannel;
         [SerializeField] IntEventChannelSO unlockDoorsEventChannel;
-        
-        
+        #endregion
 
-        #region Awake/Enable/Disable
+
+        #region Standard Unity Methods
         private void Awake()
         {
             questId = questSO.id;
@@ -65,7 +71,10 @@ namespace jeanf.questsystem
                 rootSteps.Add(questSO.rootSteps[i]);
             }
         }
-
+        private void Reset()
+        {
+            Init(questId);
+        }
         private void OnEnable()
         {
             Subscribe();
@@ -74,7 +83,6 @@ namespace jeanf.questsystem
         }
         private void OnDisable() => Unsubscribe();
         private void OnDestroy() => Unsubscribe();
-
         private void Subscribe()
         {
             resetChannel.OnEventRaised += Reset;
@@ -86,7 +94,6 @@ namespace jeanf.questsystem
             QuestStep.stepActive += UpdateStepStatus;
             QuestStep.childStep += AddStepToStepMap;
         }
-
         private void Unsubscribe()
         {
             resetChannel.OnEventRaised -= Reset;
@@ -102,11 +109,6 @@ namespace jeanf.questsystem
         }
         #endregion
 
-        private void Reset()
-        {
-            Init(questId);
-        }
-
         #region Instantiations & Loading
         public void InstantiateQuestStep(string id)
         {
@@ -114,10 +116,10 @@ namespace jeanf.questsystem
             if (stepMap[id].stepStatus != QuestStepStatus.Inactive) return;
             if (activeSteps.ContainsKey(id)) return;
 
+
             Instantiate(stepMap[id], this.transform, true);
-            //if(!activeSteps.ContainsKey(id)) activeSteps.Add(id,Instantiate(stepMap[id], this.transform, true));
-        }
 
+        }
         private void LoadDependencies()
         {
             loadRequiredScenesEventChannel.RaiseEvent(questSO.ScenesToLoad);
@@ -127,43 +129,22 @@ namespace jeanf.questsystem
                 unlockDoorsEventChannel.RaiseEvent(roomToUnlock);
             }
         }
-        #endregion
-
-        public void UpdateStepStatus(string id, QuestStepStatus status)
-        {
-            switch (status)
-            {
-                case QuestStepStatus.Completed when activeSteps.ContainsKey(id):
-                    // put step in completed list
-                    activeSteps.Remove(id);
-                    completedSteps.Add(id, stepMap[id]);
-                    break;
-                case QuestStepStatus.Active when !activeSteps.ContainsKey(id):
-                    // put step in active list
-                    activeSteps.Add(id, stepMap[id]);
-                    break;
-                case QuestStepStatus.Inactive:
-                    // do nothing
-                default:
-                    // do nothing
-                    return;
-            }
-        }
-
         private void AddStepToStepMap(QuestStep step)
         {
-            if(isDebug) Debug.Log($"--- Received request to add step {step.name} with id: {step.StepId} to stepMap.");
+            if (isDebug) Debug.Log($"--- Received request to add step {step.name} with id: {step.StepId} to stepMap.");
             if (!stepMap.ContainsKey(step.StepId))
             {
-                if(isDebug) Debug.Log($"--- Step [{step.StepId}] not found in stepMap, adding it.");
+                if (isDebug) Debug.Log($"--- Step [{step.StepId}] not found in stepMap, adding it.");
                 stepMap.Add(step.StepId, step);
             }
             if (completedSteps.ContainsKey(step.StepId))
             {
-                if(isDebug) Debug.Log($"--- Step [{step.StepId}] already completed removing it from completeSteps so that we can go through it again.");
+                if (isDebug) Debug.Log($"--- Step [{step.StepId}] already completed removing it from completeSteps so that we can go through it again.");
                 completedSteps.Remove(step.StepId);
             }
         }
+        #endregion
+
         #region quest process
         private void Init(string id)
         {
@@ -194,7 +175,26 @@ namespace jeanf.questsystem
 
             LoadDependencies();
         }
-
+        public void UpdateStepStatus(string id, QuestStepStatus status)
+        {
+            switch (status)
+            {
+                case QuestStepStatus.Completed when activeSteps.ContainsKey(id):
+                    // put step in completed list
+                    activeSteps.Remove(id);
+                    completedSteps.Add(id, stepMap[id]);
+                    break;
+                case QuestStepStatus.Active when !activeSteps.ContainsKey(id):
+                    // put step in active list
+                    activeSteps.Add(id, stepMap[id]);
+                    break;
+                case QuestStepStatus.Inactive:
+                // do nothing
+                default:
+                    // do nothing
+                    return;
+            }
+        }
         private void UpdateState()
         {
             if (isDebug) Debug.Log($"Updating State...");
@@ -230,14 +230,12 @@ namespace jeanf.questsystem
                     throw new ArgumentOutOfRangeException();
             }
         }
-
         private void UpdateProgress(string id, float progress)
         {
             if (id != questId) return;
             this.progress = progress;
             if (isDebug) Debug.Log($"questid [{id}] progress = {progress * 100}%");
         }
-
         private void QuestStateChange(Quest quest)
         {
             // only update the quest state if this point has the corresponding quest
@@ -249,17 +247,27 @@ namespace jeanf.questsystem
         }
         #endregion
 
+        #region Complete all Steps
+        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);
+            }
+        }
+        #endregion
+
         #region validation tools
 
-        #if UNITY_EDITOR
+#if UNITY_EDITOR
         public void OnValidate()
         {
             ValidityCheck();
         }
-
-
-        
-
         public void LogActiveSteps()
         {
             Debug.Log($"There is {activeSteps.Count} active steps at the moment.");
@@ -269,7 +277,6 @@ namespace jeanf.questsystem
             }
         }
         #endif
-
         private void ValidityCheck()
         {
             const string searching = "attempting to find";
@@ -354,20 +361,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/QuestManager.cs

@@ -11,6 +11,8 @@ namespace jeanf.questsystem
 {
     public class QuestManager : MonoBehaviour, IDebugBehaviour, IValidatable
     {
+        #region variables
+        #region interface variables
         public bool isDebug
         {
             get => _isDebug;
@@ -19,23 +21,26 @@ namespace jeanf.questsystem
         public bool IsValid { get; private set; }
 
         [SerializeField] private bool _isDebug = false;
+        #endregion
 
-        [FormerlySerializedAs("loadQuestState")] [Header("Config")] [SerializeField]
-        private bool loadSavedQuestState = true;
-
+        #region event channels
         [Header("Broadcasting on:")]
         [SerializeField] [Validation("A reference to the questStatusUpdateChannel is required.")] private StringEventChannelSO questStatusUpdateChannel;
         [SerializeField] [Validation("A reference to the questProgress is required.")] private StringFloatEventChannelSO questProgress;
         [SerializeField] [Validation("A reference to the questInitialCheck channel is required.")] private StringEventChannelSO QuestInitialCheck;
-
         [Header("Listening on:")] [SerializeField] [Validation("A reference to the questStatusUpdateRequested is required.")] private StringEventChannelSO questStatusUpdateRequested;
+        #endregion
 
+        #region other variables
+        [FormerlySerializedAs("loadQuestState")] [Header("Config")] [SerializeField]
+        private bool loadSavedQuestState = true;
         private Dictionary<string, Quest> questMap;
-
-
-        // quest start requirements
         private int currentPlayerLevel;
+        #endregion
+        #endregion
 
+        #region Methods
+        #region Standard Unity Methods
         private void Awake()
         {
             questMap = CreateQuestMap();
@@ -45,25 +50,16 @@ namespace jeanf.questsystem
                 CheckIfQuestIsAlreadyLoaded(quest.Key);
             }
         }
-
         private void OnEnable()
         {
             GameEventsManager.instance.questEvents.onStartQuest += StartQuest;
-            GameEventsManager.instance.questEvents.onFinishQuest += FinishQuest;
-            
+            GameEventsManager.instance.questEvents.onFinishQuest += FinishQuest;       
             //GameEventsManager.instance.questEvents.onQuestStepStateChange += QuestStepStateChange;
-
             GameEventsManager.instance.playerEvents.onPlayerLevelChange += PlayerLevelChange;
-
             questStatusUpdateRequested.OnEventRaised += ctx => CheckRequirementsMet(questMap[ctx]);
-
-
         }
-
-
         private void OnDisable() => Unsubscribe();
         private void OnDestroy() => Unsubscribe();
-
         private void Unsubscribe()
         {
             GameEventsManager.instance.questEvents.onStartQuest -= StartQuest;
@@ -74,7 +70,6 @@ namespace jeanf.questsystem
             GameEventsManager.instance.playerEvents.onPlayerLevelChange -= PlayerLevelChange;
 
         }
-
         private void Start()
         {
             foreach (Quest quest in questMap.Values)
@@ -83,25 +78,63 @@ namespace jeanf.questsystem
                 GameEventsManager.instance.questEvents.QuestStateChange(quest);
             }
         }
-
-
-        private void CheckIfQuestIsAlreadyLoaded(string id)
+        private void Update()
         {
-            QuestInitialCheck.RaiseEvent(id);
+            // loop through ALL quests
+            foreach (Quest quest in questMap.Values)
+            {
+                // if we're now meeting the requirements, switch over to the CAN_START state
+                if (quest.state == QuestState.REQUIREMENTS_NOT_MET && CheckRequirementsMet(quest))
+                {
+                    ChangeQuestState(quest.questSO.id, QuestState.CAN_START);
+                }
+            }
         }
-
-        private void ChangeQuestState(string id, QuestState state)
+        private void OnApplicationQuit()
         {
-            Quest quest = GetQuestById(id);
-            quest.state = state;
-            GameEventsManager.instance.questEvents.QuestStateChange(quest);
+            foreach (Quest quest in questMap.Values)
+            {
+                SaveQuest(quest);
+            }
         }
+        #endregion
 
-        private void PlayerLevelChange(int level)
+        #region Quest Checks and getters
+        private Dictionary<string, Quest> CreateQuestMap()
         {
-            currentPlayerLevel = level;
+            // loads all QuestInfoSO Scriptable Objects under the Assets/Resources/Quests folder
+            QuestSO[] allQuests = Resources.LoadAll<QuestSO>("Quests");
+            // Create the quest map
+            Dictionary<string, Quest> questMap = new Dictionary<string, Quest>();
+            foreach (QuestSO questSO in allQuests)
+            {
+                var id = questSO.id;
+                if (questMap.ContainsKey(id))
+                {
+                    Debug.LogWarning("Duplicate ID found when creating quest map: " + questSO.id);
+                }
+                else
+                {
+                    questMap.Add(id, LoadQuest(questSO));
+                }
+                if (isDebug) Debug.Log($"Adding {questSO.name} to the questmap, its id is: {questSO.id}");
+            }
+            return questMap;
+        }
+        private void CheckIfQuestIsAlreadyLoaded(string id)
+        {
+            QuestInitialCheck.RaiseEvent(id);
         }
+        public Quest GetQuestById(string id)
+        {
+            Quest quest = questMap[id];
+            if (quest == null)
+            {
+                Debug.LogError("ID not found in the Quest Map: " + id);
+            }
 
+            return quest;
+        }
         private bool CheckRequirementsMet(Quest quest)
         {
             // check player level requirements
@@ -115,25 +148,20 @@ namespace jeanf.questsystem
                     meetsRequirements = false;
                 }
             }
-            
-            if(isDebug) Debug.Log($"checking requirements for quest: {quest.questSO.name}, [{quest.questSO.id}], meetsRequirements: {meetsRequirements}");
+
+            if (isDebug) Debug.Log($"checking requirements for quest: {quest.questSO.name}, [{quest.questSO.id}], meetsRequirements: {meetsRequirements}");
 
             return meetsRequirements;
         }
-
-        private void Update()
+        private void ChangeQuestState(string id, QuestState state)
         {
-            // loop through ALL quests
-            foreach (Quest quest in questMap.Values)
-            {
-                // if we're now meeting the requirements, switch over to the CAN_START state
-                if (quest.state == QuestState.REQUIREMENTS_NOT_MET && CheckRequirementsMet(quest))
-                {
-                    ChangeQuestState(quest.questSO.id, QuestState.CAN_START);
-                }
-            }
+            Quest quest = GetQuestById(id);
+            quest.state = state;
+            GameEventsManager.instance.questEvents.QuestStateChange(quest);
         }
+        #endregion
 
+        #region main process
         private void StartQuest(string id)
         {
             Quest quest = GetQuestById(id);
@@ -143,7 +171,6 @@ namespace jeanf.questsystem
             quest.messageChannel.RaiseEvent(quest.messageToSendOnInit);
             if(isDebug) Debug.Log($"quest id:{id}  started, a message was attatched to the initialization: {quest.messageToSendOnInit}");
         }
-
         private void UpdateProgress(Quest quest)
         {
             var progress = 0;
@@ -151,7 +178,6 @@ namespace jeanf.questsystem
             if (isDebug) Debug.Log($"[{quest.questSO.id}] progress: {progress * 100}%", this);
             questProgress.RaiseEvent(quest.questSO.id, progress);
         }
-
         private void FinishQuest(string id)
         {
             Quest quest = GetQuestById(id);
@@ -163,58 +189,26 @@ namespace jeanf.questsystem
             SaveQuest(quest);
             if (!quest.sendMessageOnFinish) return;
         }
+        #endregion
 
+        #region rewards and progress
         private void ClaimRewards(Quest quest)
         {
             GameEventsManager.instance.scenarioEvents.ScenarioUnlocked(quest.questSO.unlockedScenario);
         }
 
-        private Dictionary<string, Quest> CreateQuestMap()
-        {
-            // loads all QuestInfoSO Scriptable Objects under the Assets/Resources/Quests folder
-            QuestSO[] allQuests = Resources.LoadAll<QuestSO>("Quests");
-            // Create the quest map
-            Dictionary<string, Quest> questMap = new Dictionary<string, Quest>();
-            foreach (QuestSO questSO in allQuests)
-            {
-                var id = questSO.id;
-                if (questMap.ContainsKey(id))
-                {
-                    Debug.LogWarning("Duplicate ID found when creating quest map: " + questSO.id);
-                }
-                else
-                {
-                    questMap.Add(id, LoadQuest(questSO));
-                }
-                if(isDebug) Debug.Log($"Adding {questSO.name} to the questmap, its id is: {questSO.id}");
-            }
-
-            return questMap;
-        }
-
-        public Quest GetQuestById(string id)
-        {
-            Quest quest = questMap[id];
-            if (quest == null)
-            {
-                Debug.LogError("ID not found in the Quest Map: " + id);
-            }
-
-            return quest;
-        }
-
-        private void OnApplicationQuit()
+        private void PlayerLevelChange(int level)
         {
-            foreach (Quest quest in questMap.Values)
-            {
-                SaveQuest(quest);
-            }
+            currentPlayerLevel = level;
         }
+        #endregion
 
+        #region saving and loading
         private void SaveQuest(Quest quest)
         {
             try
             {
+                //Save; active steps + quest step status for each, completed steps, quest status, progress/playerLevel/?
                 QuestData questData = null;
                 //quest.GetQuestData();
                 // serialize using JsonUtility, but use whatever you want here (like JSON.NET)
@@ -230,7 +224,6 @@ namespace jeanf.questsystem
                 Debug.LogError("Failed to save quest with id " + quest.questSO.id + ": " + e);
             }
         }
-
         private Quest LoadQuest(QuestSO questSO)
         {
             Debug.Log($"attempting to load quest with id: [{questSO.id}]");
@@ -259,6 +252,9 @@ namespace jeanf.questsystem
 
             return quest;
         }
+        #endregion
+
+        #region Validation Tools
         private void ValidityCheck()
         {
             const string searching = "attempting to find";
@@ -334,5 +330,7 @@ namespace jeanf.questsystem
             ValidityCheck();
             #endif
         }
+        #endregion
+        #endregion
     }
 }

package/Runtime/Scripts/Core/QuestStep.cs

@@ -1,3 +1,4 @@
+using System;
 using jeanf.EventSystem;
 using jeanf.propertyDrawer;
 using UnityEngine;
@@ -5,21 +6,24 @@ using UnityEngine.Playables;
 using System.Collections.Generic;
 using GraphProcessor;
 using jeanf.validationTools;
+using UnityEditor;
 
 namespace jeanf.questsystem
 {
     [System.Serializable, NodeMenuItem("questSystem/QuestStep"), DefaultExecutionOrder(1)]
     public class QuestStep : MonoBehaviour, IDebugBehaviour
     {
+        #region Ids and status
         [field: Space(10)][field: ReadOnly][SerializeField] string stepId;
         public string StepId { get { return stepId; } }
 
         string questId;
         public string QuestId { get { return questId; } }
+        [field: ReadOnly][SerializeField] public QuestStepStatus stepStatus;
+        #endregion
 
-        
-        [field: ReadOnly] [SerializeField] public QuestStepStatus stepStatus;
 
+        #region timeline 
         [Tooltip("This boolean has to be enabled if the quest step has an intro timeline.")]
         public bool isUsingIntroTimeline = false;
 
@@ -27,7 +31,9 @@ namespace jeanf.questsystem
         [SerializeField] private TimelineTriggerEventChannelSO _timelineTriggerEventChannelSo;
         [DrawIf("isUsingIntroTimeline", true, ComparisonType.Equals, DisablingType.DontDraw)] 
         public PlayableAsset timeline;
+        #endregion
 
+        #region step trigger and completion
         [Header("Quest Step Progression events & Variables")]
         public List<QuestStep> questStepsToTrigger = new List<QuestStep>();
         public delegate void SendNextStepId(string id);
@@ -39,22 +45,42 @@ namespace jeanf.questsystem
         public static StepActive stepActive;
         public delegate void ChildStep(QuestStep step);
         public static ChildStep childStep;
-        
+        #endregion
+
+        #region events
         [Header("Quest Tooltip")]
         [SerializeField] private QuestTooltipSO questTooltipSO;
 
         [Header("Event Channels")]
         [SerializeField] private StringEventChannelSO sendQuestStepTooltip;
+        [SerializeField] private StringEventChannelSO stepValidationOverride;
+        #endregion
 
+        #region standard unity methods
+        public void OnEnable()
+        {
+            Subscribe();
+            InitializeQuestStep();
+        }
 
+        public void OnDisable() => Unsubscribe();
 
+        public void OnDestroy() => Unsubscribe();
 
-        public void OnEnable()
+        private void Subscribe()
         {
-            InitializeQuestStep();
+            QuestItem.ValidateStepEvent += ValidateCurrentStep;
+            if(stepValidationOverride) stepValidationOverride.OnEventRaised += ValidateCurrentStep;
         }
 
+        protected virtual void Unsubscribe()
+        {
+            QuestItem.ValidateStepEvent -= ValidateCurrentStep;
+            if(stepValidationOverride) stepValidationOverride.OnEventRaised -= ValidateCurrentStep;
+        }
+        #endregion
 
+        #region step progress
         public void InitializeQuestStep()
         {
             // failsafe to avoid lauching the same step more than once at a time.
@@ -74,6 +100,7 @@ namespace jeanf.questsystem
             {
                 if(isDebug) Debug.Log($"sending trigger to timeline: {timeline.name}, triggerValue: true");
                 _timelineTriggerEventChannelSo.RaiseEvent(timeline, true);
+                
             }
 
             if(isDebug) Debug.Log($"Step with id [{stepId}] has {questStepsToTrigger.Count} childSteps");
@@ -84,9 +111,13 @@ 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;
@@ -96,23 +127,28 @@ namespace jeanf.questsystem
                 if(isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Sending tooltip", this);
                 sendQuestStepTooltip.RaiseEvent(string.Empty);
             }
-;
 
-            foreach(QuestStep questStep in questStepsToTrigger)
-            {
-                if(isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Requesting to start next step: {questStep.stepId}", this);
-                sendNextStepId?.Invoke(questStep.stepId);
-            }
+
             if(isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Sending stepCompleted Event (delegate) with argument: {stepId}", this);
             stepCompleted?.Invoke(stepId);
-            if(isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Sending stepActive Event (delegate) with arguments: {stepId}, {stepStatus} ", this);
+            if (isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Sending stepActive Event (delegate) with arguments: {stepId}, {stepStatus} ", this);
             stepActive?.Invoke(stepId, stepStatus);
 
+            foreach (QuestStep questStep in questStepsToTrigger)
+            {
+                if (isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Requesting to start next step: {questStep.stepId}", this);
+
+                //Si questStep.prerequisitesStep are in QuestItem.stepsCompleted
+                sendNextStepId?.Invoke(questStep.stepId);
+            }
+
+
             if(isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Destroying the gameobject with name {this.name}", this);
             Destroy(this.gameObject);
         }
+        #endregion
 
-
+        #region tooltip
         protected void DisplayActiveQuestStep()
         {
             if (questTooltipSO != null)
@@ -120,8 +156,10 @@ namespace jeanf.questsystem
                 sendQuestStepTooltip.RaiseEvent(questTooltipSO.Tooltip);
             }
         }
+        #endregion
 
-        #if UNITY_EDITOR
+        #region validation
+#if UNITY_EDITOR
         private void OnValidate()
         {
             if (stepId == string.Empty || stepId == null) GenerateId();
@@ -133,16 +171,20 @@ namespace jeanf.questsystem
             UnityEditor.EditorUtility.SetDirty(this);
         }
 
-        #endif
-
+#endif
+        #endregion
 
+        #region debug
         public bool isDebug { get => _isDebug; set => _isDebug = value; }
         private bool _isDebug = true;
+        #endregion
 
+        #region Status
         public QuestStepStatus GetStatus()
         {
             return stepStatus;
         }
+        #endregion
     }
 
     public enum QuestStepStatus

package/package.json

@@ -1,22 +1,20 @@
 {
-  "name":"fr.jeanf.questsystem",
-  "version":"0.0.60",
-  "displayName":"Quest system",
-  "description":"This package uses Scriptable Objects to define quests.",
+  "name": "fr.jeanf.questsystem",
+  "version": "0.0.62",
+  "displayName": "Quest system",
+  "description": "This package uses Scriptable Objects to define quests.",
   "unity": "2021.3",
   "keywords": [
     "jeanf",
     "quest system"
   ],
-  "author":{
-    "name":"Jean-François Robin",
-    "email":"robin.jeanfrancois@gmail.com",
-    "url":"https://jeanfrancoisrobin.art"
+  "author": {
+    "name": "Jean-François Robin",
+    "email": "robin.jeanfrancois@gmail.com",
+    "url": "https://jeanfrancoisrobin.art"
   },
   "dependencies": {
     "fr.jeanf.propertydrawer": "1.1.6"
   },
-  "samples": [ 
-    
-  ]
-}
+  "samples": []
+}