fr.jeanf.questsystem 0.0.47 → 0.0.49

package/Runtime/Scripts/Core/Quest.cs

@@ -16,7 +16,7 @@ namespace jeanf.questsystem
 
         // state info
         public QuestState state;
-        private QuestStepState[] questStepStates;
+        private List<QuestStepState> questStepStates;
         public StringEventChannelSO messageChannel;
         public bool sendMessageOnInitialization = false;
         public string messageToSendOnInit = "";
@@ -27,7 +27,7 @@ namespace jeanf.questsystem
         {
             this.questSO = questSO;
             this.state = QuestState.REQUIREMENTS_NOT_MET;
-            this.questStepStates = new QuestStepState[this.questSO.questSteps.Length];
+            this.questStepStates = new List<QuestStepState>();
             this.messageChannel = questSO.messageChannel;
             //init
             this.sendMessageOnInitialization = questSO.sendMessageOnInitialization;
@@ -35,14 +35,14 @@ namespace jeanf.questsystem
             //finish
             this.sendMessageOnFinish = questSO.sendMessageOnFinish;
             this.messageToSendOnFinish = questSO.messageToSendOnFinish;
-            for (int i = 0; i < questStepStates.Length; i++)
+            for (int i = 0; i < questStepStates.Count; i++)
             {
                 questStepStates[i] = new QuestStepState();
             }
         }
 
         public Quest(QuestSO questQuestSo, QuestState questState, int currentQuestStepIndex,
-            QuestStepState[] questStepStates)
+            List<QuestStepState> questStepStates)
         {
             this.questSO = questQuestSo;
             this.state = questState;
@@ -50,29 +50,29 @@ namespace jeanf.questsystem
 
             //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);
-            }
+            //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.Length)
-            {
-                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 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()
         //{

package/Runtime/Scripts/Core/QuestData.cs

@@ -12,9 +12,9 @@ namespace jeanf.questsystem
         // old constructor (linear structure)
         public QuestState state;
         public int questStepIndex;
-        public QuestStepState[] questStepStates;
+        public List<QuestStepState> questStepStates;
 
-        public QuestData(QuestState state, int questStepIndex, QuestStepState[] questStepStates)
+        public QuestData(QuestState state, int questStepIndex, List<QuestStepState> questStepStates)
         {
             this.state = state;
             this.questStepIndex = questStepIndex;

package/Runtime/Scripts/Core/QuestItem.cs

@@ -5,6 +5,7 @@ using UnityEngine;
 using jeanf.propertyDrawer;
 using jeanf.validationTools;
 using UnityEditor;
+using System.Linq;
 
 
 namespace jeanf.questsystem
@@ -21,11 +22,12 @@ namespace jeanf.questsystem
         [SerializeField] private bool _isDebug = false;
         [SerializeField] private bool _startQuestOnEnable = false;
 
-        [Tooltip("Visual feedback for the quest state")] [Header("Quest")] [SerializeField]
-        private QuestSO questSO;
+        [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>();
 
 
         [ReadOnly] [Range(0, 1)] [SerializeField]
@@ -45,20 +47,18 @@ namespace jeanf.questsystem
 
         [Header("Broadcasting on:")] [SerializeField] [Validation("A reference to the QuestRequirementCheck SO is required")]
         private StringEventChannelSO requirementCheck;
-        [SerializeField] StringEventChannelSO loadRequiredScenesEventChannel;
+        [SerializeField][Validation("A reference to the LoadRequiredScenesEventChannel SO is required")]  StringListEventChannelSO loadRequiredScenesEventChannel;
         [SerializeField] IntEventChannelSO unlockDoorsEventChannel;
 
         #region Awake/Enable/Disable
         private void Awake()
         {
             questId = questSO.id;
-            for (int i = 0; i < questSO.questSteps.Length; i++)
+            for (int i = 0; i < questSO.rootSteps.Length; i++)
             {
-                if (!stepMap.ContainsKey(questSO.questSteps[i].StepId))
-                {
-                    Debug.Log($"id on awake {questSO.questSteps[i].StepId}, added to {this.name}'s dictionary", this);
-                    stepMap.Add(questSO.questSteps[i].StepId, questSO.questSteps[i]);
-                }
+                Debug.Log($"id on awake {questSO.rootSteps[i].StepId}, added to {this.name}'s dictionary", this);
+                AddStepToStepMap(questSO.rootSteps[i]);
+                rootSteps.Add(questSO.rootSteps[i]);
             }
         }
 
@@ -80,6 +80,7 @@ namespace jeanf.questsystem
             QuestStep.sendNextStepId += InstantiateQuestStep;
             //QuestStep.stepCompleted += DestroyQuestStep;
             QuestStep.stepActive += UpdateStepStatus;
+            QuestStep.childStep += AddStepToStepMap;
 
         }
 
@@ -92,10 +93,12 @@ namespace jeanf.questsystem
             QuestStep.sendNextStepId -= InstantiateQuestStep;
             //QuestStep.stepCompleted -= DestroyQuestStep;
             QuestStep.stepActive -= UpdateStepStatus;
+            QuestStep.childStep -= AddStepToStepMap;
+
 
         }
         #endregion
-       
+
         #region Instantiations & Loading
         public void InstantiateQuestStep(string id)
         {
@@ -109,10 +112,7 @@ namespace jeanf.questsystem
 
         private void LoadDependencies()
         {
-            foreach (string SceneToLoad in questSO.ScenesToLoad)
-            {
-                loadRequiredScenesEventChannel.RaiseEvent(SceneToLoad);
-            }
+            loadRequiredScenesEventChannel.RaiseEvent(questSO.ScenesToLoad);
 
             foreach (int roomToUnlock in questSO.roomsToUnlock)
             {
@@ -142,6 +142,17 @@ namespace jeanf.questsystem
             }
         }
 
+        private void AddStepToStepMap(QuestStep step)
+        {
+            if (!stepMap.ContainsKey(step.StepId))
+            {
+                stepMap.Add(step.StepId, step);
+            }
+            if (completedSteps.ContainsKey(step.StepId))
+            {
+                completedSteps.Remove(step.StepId);
+            }
+        }
         #region quest process
         private void Init(string id)
         {
@@ -157,12 +168,9 @@ namespace jeanf.questsystem
             requirementCheck.RaiseEvent(questId);
             UpdateState();
 
-            foreach (QuestStep step in stepMap.Values)
+            foreach (QuestStep step in rootSteps)
             {
-                if (step.isRootStep)
-                {
-                    InstantiateQuestStep(step.StepId);
-                }
+                InstantiateQuestStep(step.StepId);
             }
 
             LoadDependencies();
@@ -229,10 +237,10 @@ namespace jeanf.questsystem
         {
             ValidityCheck();
         }
-        #endif
+
 
         
-        #if UNITY_EDITOR
+
         public void LogActiveSteps()
         {
             Debug.Log($"There is {activeSteps.Count} active steps at the moment.");
@@ -260,14 +268,22 @@ namespace jeanf.questsystem
             {
                 if (isDebug) Debug.Log($"{searching} {_}/QuestInitialCheck in {searchLocation} ", this);
                 QuestInitialCheck = Resources.Load<StringEventChannelSO>($"{_}/QuestInitialCheck");
-                if (QuestProgress == null)
+                if (QuestInitialCheck == null)
                 {
                     errorMessages.Add($"{_}/QuestInitialCheck is not in {searchLocation} {readInstructions}");
                     validityCheck = false;
-                    invalidObjects.Add(QuestProgress);
+                    invalidObjects.Add(QuestInitialCheck);
                 }
 
             }
+            
+            if (questSO == null)
+            {
+                if (isDebug) Debug.Log($"There is no questSO in the questItem");
+                validityCheck = false;
+                invalidObjects.Add(questSO);
+            }
+
 
             if (QuestProgress == null)
             {
@@ -282,6 +298,19 @@ namespace jeanf.questsystem
 
             }
 
+            if (loadRequiredScenesEventChannel == null)
+            {
+                if (isDebug) Debug.Log($"{searching} {_}/loadRequiredScenesEventChannel in {searchLocation} ", this);
+                loadRequiredScenesEventChannel = Resources.Load<StringListEventChannelSO>($"{_}/LoadRequiredScenesEventChannel");
+                if (loadRequiredScenesEventChannel == null)
+                {
+                    errorMessages.Add($"{_}/loadRequiredScenesEventChannel is not in {searchLocation} {readInstructions}");
+                    validityCheck = false;
+                    invalidObjects.Add(loadRequiredScenesEventChannel);
+                }
+
+            }
+
             if (requirementCheck == null)
             {
                 if (isDebug) Debug.Log($"{searching} {_}/QuestRequirementCheck in {searchLocation}", this);

package/Runtime/Scripts/Core/QuestManager.cs

@@ -50,7 +50,7 @@ namespace jeanf.questsystem
         {
             GameEventsManager.instance.questEvents.onStartQuest += StartQuest;
             GameEventsManager.instance.questEvents.onFinishQuest += FinishQuest;
-
+            
             //GameEventsManager.instance.questEvents.onQuestStepStateChange += QuestStepStateChange;
 
             GameEventsManager.instance.playerEvents.onPlayerLevelChange += PlayerLevelChange;

package/Runtime/Scripts/Core/QuestSO.cs

@@ -20,7 +20,7 @@ namespace jeanf.questsystem
         [Header("General")] public string displayName;
         
         [Header("Custom messages init/finish")] 
-        [SerializeField] public StringEventChannelSO messageChannel; //change to delegate?
+        [SerializeField] public StringEventChannelSO messageChannel; 
         [SerializeField] public bool sendMessageOnInitialization = false;
         [SerializeField] public string messageToSendOnInitialization = "";
         [SerializeField] public bool sendMessageOnFinish = false;
@@ -31,7 +31,7 @@ namespace jeanf.questsystem
         public List<string> ScenesToLoad = new List<string>();
         public List<int> roomsToUnlock = new List<int>();
 
-        [Header("Steps")] public QuestStep[] questSteps;
+        [Header("Steps")] public QuestStep[] rootSteps;
 
         [Header("Rewards")] public string unlockedScenario;
 

package/Runtime/Scripts/Core/QuestStep.cs

@@ -4,6 +4,7 @@ using UnityEngine;
 using UnityEngine.Playables;
 using System.Collections.Generic;
 using GraphProcessor;
+using jeanf.validationTools;
 
 namespace jeanf.questsystem
 {
@@ -31,12 +32,13 @@ namespace jeanf.questsystem
         public List<QuestStep> questStepsToTrigger = new List<QuestStep>();
         public delegate void SendNextStepId(string id);
         public static SendNextStepId sendNextStepId;
-        public bool isRootStep;
+
         public delegate void StepCompleted(string id);
         public static StepCompleted stepCompleted;
         public delegate void StepActive(string id, QuestStepStatus stepStatus);
         public static StepActive stepActive;
-        
+        public delegate void ChildStep(QuestStep step);
+        public static ChildStep childStep;
         
         [Header("Quest Tooltip")]
         [SerializeField] private QuestTooltipSO questTooltipSO;
@@ -62,7 +64,7 @@ namespace jeanf.questsystem
             stepStatus = QuestStepStatus.Active;
             stepActive?.Invoke(stepId, stepStatus);
 
-
+            
             if (sendQuestStepTooltip != null)
             {
                 DisplayActiveQuestStep();
@@ -72,6 +74,11 @@ namespace jeanf.questsystem
                 if (isDebug) Debug.Log($"sending trigger to timeline: {timeline.name}, triggerValue: true");
                 _timelineTriggerEventChannelSo.RaiseEvent(timeline, true);
             }
+
+            foreach(QuestStep questStep in questStepsToTrigger)
+            {
+                childStep?.Invoke(questStep);
+            }
         }
 
 
@@ -122,8 +129,10 @@ namespace jeanf.questsystem
             stepId = $"{System.Guid.NewGuid()}";
             UnityEditor.EditorUtility.SetDirty(this);
         }
+
         #endif
 
+
         public bool isDebug { get; set; }
 
         public QuestStepStatus GetStatus()

package/package.json

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