fr.jeanf.questsystem 0.0.31 → 0.0.33

package/Runtime/Scripts/Core/QuestItem.cs

@@ -4,6 +4,9 @@ using jeanf.EventSystem;
 using UnityEngine;
 using jeanf.propertyDrawer;
 using jeanf.validationTools;
+using Unity.VisualScripting.YamlDotNet.Core.Tokens;
+using UnityEngine.SceneManagement;
+using UnityEditor;
 
 
 namespace jeanf.questsystem
@@ -24,6 +27,7 @@ namespace jeanf.questsystem
         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>();
 
 
         [ReadOnly] [Range(0, 1)] [SerializeField]
@@ -39,11 +43,12 @@ namespace jeanf.questsystem
         // if they do not exist simply right click in the hierarchy and find >InitializeQuestSystem<
         [Header("Listening on:")] 
         [SerializeField] [Validation("A reference to the QuestProgress SO is required")] private StringFloatEventChannelSO QuestProgress;
-        [SerializeField] [Validation("A reference to the StartQuestEventChannel SO is required")] private StringEventChannelSO StartQuestEventChannel;
         [SerializeField] [Validation("A reference to the QuestInitialCheck SO is required")] private StringEventChannelSO QuestInitialCheck;
 
         [Header("Broadcasting on:")] [SerializeField] [Validation("A reference to the QuestRequirementCheck SO is required")]
         private StringEventChannelSO requirementCheck;
+        [SerializeField] StringEventChannelSO loadRequiredScenesEventChannel;
+        [SerializeField] IntEventChannelSO unlockDoorsEventChannel;
 
         #region Awake/Enable/Disable
         private void Awake()
@@ -65,6 +70,9 @@ namespace jeanf.questsystem
                     InstantiateQuestStep(step.StepId);
                 }
             }
+
+            LoadDependencies();
+            
         }
 
         private void OnEnable()
@@ -78,37 +86,41 @@ namespace jeanf.questsystem
 
         private void Subscribe()
         {
-            QuestInitialCheck.OnEventRaised += InitialCheckFromQuestManager;
-            StartQuestEventChannel.OnEventRaised += RequestQuestStart;
+            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;
 
         }
 
         private void Unsubscribe()
         {
-            QuestInitialCheck.OnEventRaised -= InitialCheckFromQuestManager;
-            StartQuestEventChannel.OnEventRaised -= RequestQuestStart;
+            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;
 
         }
         #endregion
        
-        #region Step Instantiation & Destroy
+        #region Instantiations & Loading
         public void InstantiateQuestStep(string id)
         {
-            if (activeSteps.ContainsKey(id)) return;
+            if (activeSteps.ContainsKey(id))
+            {
+                Debug.Log($"Step with id:[{id}] is already in the list of active steps");
+                return;
+            }
 
             if (stepMap.ContainsKey(id))
             {
-                activeSteps.Add(id, Instantiate(stepMap[id]));
+                activeSteps.Add(id,Instantiate(stepMap[id], this.transform, true));
             }
         }
 
@@ -120,26 +132,59 @@ namespace jeanf.questsystem
                 activeSteps.Remove(id);
             }
         }
+
+        private void LoadDependencies()
+        {
+            foreach (string SceneToLoad in questSO.ScenesToLoad)
+            {
+                loadRequiredScenesEventChannel.RaiseEvent(SceneToLoad);
+            }
+
+            foreach (int roomToUnlock in questSO.roomsToUnlock)
+            {
+                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;
+            }
+        }
 
         #region quest process
         private void Init(string id)
         {
+            activeSteps.Clear();
+            activeSteps.TrimExcess();
+            completedSteps.Clear();
+            completedSteps.TrimExcess();
             
             Debug.Log($"Quest [{id}]: _startQuestOnEnable value is: [{_startQuestOnEnable}]");
             if (!_startQuestOnEnable) return;
-            RequestQuestStart(id);
-        }
-
-        private void InitialCheckFromQuestManager( string id)
-        {
-            Debug.Log($"Initial check for quest with id: [{id}], it is in the following state: [{currentQuestState}]");
-            Init(id);
+            if (!_startQuestOnEnable || id != questId) return;
+            clearToStart = true;
+            currentQuestState = QuestState.CAN_START;
+            requirementCheck.RaiseEvent(questId);
+            UpdateState();
         }
 
-
-
         private void UpdateState()
         {
             if (isDebug) Debug.Log($"Updating State...");
@@ -192,34 +237,28 @@ namespace jeanf.questsystem
                 UpdateState();
             }
         }
-
-        public void AllClear(bool value)
-        {
-            Debug.Log($"All clear for quest [{questId}], sending an update to the QuestManager");
-            clearToStart = value;
-            currentQuestState = QuestState.CAN_START;
-            requirementCheck.RaiseEvent(questId);
-            UpdateState();
-        }
-
-        private void RequestQuestStart(string id)
-        {
-            if(id!= questId) return;
-            
-            Debug.Log($"Requesting start for quest [{id}]");
-            AllClear(true);
-            if(isDebug) Debug.Log($"Quest start was requested for quest {id}.", this);
-        }
         #endregion
 
         #region validation tools
 
-#if UNITY_EDITOR
+        #if UNITY_EDITOR
         public void OnValidate()
         {
             ValidityCheck();
         }
-#endif
+        #endif
+
+        
+        #if UNITY_EDITOR
+        public void LogActiveSteps()
+        {
+            Debug.Log($"There is {activeSteps.Count} active steps at the moment.");
+            foreach (var step in activeSteps.Keys)
+            {
+                Debug.Log($"active step: {step}");
+            }
+        }
+        #endif
 
         private void ValidityCheck()
         {
@@ -260,19 +299,6 @@ namespace jeanf.questsystem
 
             }
 
-            if (StartQuestEventChannel == null)
-            {
-                if (isDebug) Debug.Log($"{searching} {_}/StartQuestEventChannel in {searchLocation}", this);
-                StartQuestEventChannel = Resources.Load<StringEventChannelSO>($"{_}/StartQuestEventChannel");
-                if (StartQuestEventChannel == null)
-                {
-                    errorMessages.Add($"{_}/StartQuestEventChannel is not {searchLocation} {readInstructions}");
-                    validityCheck = false;
-                    invalidObjects.Add(StartQuestEventChannel);
-                }
-            }
-
-
             if (requirementCheck == null)
             {
                 if (isDebug) Debug.Log($"{searching} {_}/QuestRequirementCheck in {searchLocation}", this);
@@ -297,4 +323,20 @@ 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

@@ -238,22 +238,22 @@ namespace jeanf.questsystem
             }
         }
 
-        private Quest LoadQuest(QuestSO questInfo)
+        private Quest LoadQuest(QuestSO questSO)
         {
             Quest quest = null;
             try
             {
                 // load quest from saved data
-                if (PlayerPrefs.HasKey(questInfo.id) && loadSavedQuestState)
+                if (PlayerPrefs.HasKey(questSO.id) && loadSavedQuestState)
                 {
-                    string serializedData = PlayerPrefs.GetString(questInfo.id);
+                    string serializedData = PlayerPrefs.GetString(questSO.id);
                     QuestData questData = JsonUtility.FromJson<QuestData>(serializedData);
-                    quest = new Quest(questInfo, questData.state, questData.questStepIndex, questData.questStepStates); 
+                    quest = new Quest(questSO, questData.state, questData.questStepIndex, questData.questStepStates); 
                 }
                 // otherwise, initialize a new quest
                 else
                 {
-                    quest = new Quest(questInfo);
+                    quest = new Quest(questSO);
                 }
             }
             catch (System.Exception e)

package/Runtime/Scripts/Core/QuestSO.cs

@@ -5,6 +5,7 @@ using UnityEngine;
 using jeanf.propertyDrawer;
 using jeanf.validationTools;
 using System.Collections.Generic;
+using UnityEngine.SceneManagement;
 
 namespace jeanf.questsystem
 {
@@ -17,8 +18,6 @@ namespace jeanf.questsystem
         public bool IsValid { get; private set; }
 
         [Header("General")] public string displayName;
-        [SerializeField][Validation("A reference to a BaseGraph is required.")] public BaseGraph QuestTree;
-        [SerializeField] public QuestStep startingStep;
         
         [Header("Custom messages init/finish")] 
         [SerializeField] public StringEventChannelSO messageChannel; //change to delegate?
@@ -29,6 +28,8 @@ namespace jeanf.questsystem
 
         [Header("Requirements")] public int levelRequirement;
         public QuestSO[] questPrerequisites;
+        public List<string> ScenesToLoad = new List<string>();
+        public List<int> roomsToUnlock = new List<int>();
 
         [Header("Steps")] public QuestStep[] questSteps;
 
@@ -42,12 +43,6 @@ namespace jeanf.questsystem
             var invalidObjects = new List<object>();
             var errorMessages = new List<string>();
 
-            if (QuestTree == null)
-            {
-                validityCheck = false;
-                invalidObjects.Add(QuestTree);
-            }
-
             IsValid = validityCheck;
             if (!IsValid) return;
 
@@ -72,4 +67,4 @@ namespace jeanf.questsystem
         }
     #endif
     }
-}
+}

package/Runtime/Scripts/Core/QuestStep.cs

@@ -23,8 +23,6 @@ namespace jeanf.questsystem
         public string QuestId { get { return questId; } }
 
         
-        private float questStepProgress = 0;
-        
         [field: ReadOnly] [SerializeField] public QuestStepStatus stepStatus;
 
         [Tooltip("This boolean has to be enabled if the quest step has an intro timeline.")]
@@ -42,6 +40,10 @@ namespace jeanf.questsystem
         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;
+        
+        
         [Header("Quest Tooltip")]
         [SerializeField] private QuestTooltipSO questTooltipSO;
 
@@ -64,6 +66,7 @@ namespace jeanf.questsystem
             Debug.Log($"Initializing quest with questId: {questId}");
 
             stepStatus = QuestStepStatus.Active;
+            stepActive?.Invoke(stepId, stepStatus);
 
 
             if (sendQuestStepTooltip != null)
@@ -98,6 +101,7 @@ namespace jeanf.questsystem
                 sendNextStepId?.Invoke(questStep.stepId);
             }
 
+            stepActive?.Invoke(stepId, stepStatus);
             stepCompleted?.Invoke(stepId);
 
             if (!isUsingIntroTimeline || !timeline) return;

package/Runtime/Scripts/Events/QuestEvents.cs

@@ -39,17 +39,5 @@ namespace jeanf.questsystem
                 onQuestStateChange(quest);
             }
         }
-
-        //public event Action<string, int, QuestStepState> onQuestStepStateChange;
-
-        //public void QuestStepStateChange(string id, int stepIndex, QuestStepState questStepState)
-        //{
-        //    if (onQuestStepStateChange != null)
-        //    {
-        //        Debug.Log($"quest step state change: {id} -- stepstate: {questStepState}");
-        //        onQuestStepStateChange(id, stepIndex, questStepState);
-        //    }
-        //}
-
     }
 }

package/package.json

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