fr.jeanf.questsystem 0.0.29 → 0.0.30

package/Runtime/Quests/Quest_StethoscopeCheck.prefab

@@ -167,10 +167,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _isDebug: 1
   _startQuestOnEnable: 0
-  questInfoForPoint: {fileID: 11400000, guid: b7b6381ae7b9c2244862b31a1ce5b2f5, type: 2}
+  questSO: {fileID: 11400000, guid: b7b6381ae7b9c2244862b31a1ce5b2f5, type: 2}
   progress: 0
   clearToStart: 0
   QuestProgress: {fileID: 11400000, guid: d6b05e1957994c8449fb72e849a2a3d6, type: 2}
   StartQuestEventChannel: {fileID: 11400000, guid: c510c1e4d26428740b3e329cca98e5d1,
     type: 2}
+  QuestInitialCheck: {fileID: 11400000, guid: 4f5235d1ff779064cabee9ca65296d7f, type: 2}
   requirementCheck: {fileID: 11400000, guid: a4dae407f780f974abbf43c280515876, type: 2}

package/Runtime/Quests/Quest_VisitAllPlaces.prefab

@@ -167,10 +167,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _isDebug: 1
   _startQuestOnEnable: 0
-  questInfoForPoint: {fileID: 11400000, guid: ee924c4edf671a44b8585cc39cc20e7a, type: 2}
+  questSO: {fileID: 11400000, guid: ee924c4edf671a44b8585cc39cc20e7a, type: 2}
   progress: 0
   clearToStart: 0
   QuestProgress: {fileID: 11400000, guid: d6b05e1957994c8449fb72e849a2a3d6, type: 2}
   StartQuestEventChannel: {fileID: 11400000, guid: c510c1e4d26428740b3e329cca98e5d1,
     type: 2}
+  QuestInitialCheck: {fileID: 11400000, guid: 4f5235d1ff779064cabee9ca65296d7f, type: 2}
   requirementCheck: {fileID: 11400000, guid: a4dae407f780f974abbf43c280515876, type: 2}

package/Runtime/Quests/Quest_VisitPlaces.prefab

@@ -167,10 +167,11 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   _isDebug: 1
   _startQuestOnEnable: 0
-  questInfoForPoint: {fileID: 11400000, guid: a249a914e47bba041b17cb82c0fd3105, type: 2}
+  questSO: {fileID: 11400000, guid: a249a914e47bba041b17cb82c0fd3105, type: 2}
   progress: 0
   clearToStart: 0
   QuestProgress: {fileID: 11400000, guid: d6b05e1957994c8449fb72e849a2a3d6, type: 2}
   StartQuestEventChannel: {fileID: 11400000, guid: c510c1e4d26428740b3e329cca98e5d1,
     type: 2}
+  QuestInitialCheck: {fileID: 11400000, guid: 4f5235d1ff779064cabee9ca65296d7f, type: 2}
   requirementCheck: {fileID: 11400000, guid: a4dae407f780f974abbf43c280515876, type: 2}

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

@@ -6,11 +6,11 @@ using UnityEngine;
 
 public class QuestInfoSO_Editor : Editor
 {
-    [CustomEditor(typeof(QuestInfoSO))]
+    [CustomEditor(typeof(QuestSO))]
     public class BoolEventOnClickEditor : Editor {
         override public void  OnInspectorGUI () {
             GUILayout.Space(10);
-            var eventToSend = (QuestInfoSO)target;
+            var eventToSend = (QuestSO)target;
             if(GUILayout.Button("Regenerate quest id", GUILayout.Height(20))) {
                 eventToSend.GenerateId(); // how do i call this?
             }

package/Runtime/Scripts/Core/Quest.cs

@@ -1,105 +1,65 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
+using GraphProcessor;
 using jeanf.EventSystem;
 using jeanf.propertyDrawer;
 using UnityEngine;
+using Object = UnityEngine.Object;
 
 namespace jeanf.questsystem
 {
     public class Quest
     {
         // static info
-        public QuestInfoSO info;
+        public QuestSO questSO;
 
         // state info
         public QuestState state;
-        private int currentQuestStepIndex;
-        public int currentStep;
         private QuestStepState[] questStepStates;
         public StringEventChannelSO messageChannel;
         public bool sendMessageOnInitialization = false;
         public string messageToSendOnInit = "";
         public bool sendMessageOnFinish = false;
         public string messageToSendOnFinish = "";
-        public Quest(QuestInfoSO questInfo)
+
+        public Quest(QuestSO questSO)
         {
-            this.info = questInfo;
+            this.questSO = questSO;
             this.state = QuestState.REQUIREMENTS_NOT_MET;
-            this.currentQuestStepIndex = currentStep = 0;
-            this.questStepStates = new QuestStepState[info.questStepPrefabs.Length];
-            this.messageChannel = questInfo.messageChannel;
+            this.questStepStates = new QuestStepState[this.questSO.questSteps.Length];
+            this.messageChannel = questSO.messageChannel;
             //init
-            this.sendMessageOnInitialization = questInfo.sendMessageOnInitialization;
-            this.messageToSendOnInit = questInfo.messageToSendOnInitialization;
+            this.sendMessageOnInitialization = questSO.sendMessageOnInitialization;
+            this.messageToSendOnInit = questSO.messageToSendOnInitialization;
             //finish
-            this.sendMessageOnFinish = questInfo.sendMessageOnFinish;
-            this.messageToSendOnFinish = questInfo.messageToSendOnFinish;
+            this.sendMessageOnFinish = questSO.sendMessageOnFinish;
+            this.messageToSendOnFinish = questSO.messageToSendOnFinish;
             for (int i = 0; i < questStepStates.Length; i++)
             {
                 questStepStates[i] = new QuestStepState();
             }
         }
 
-        public Quest(QuestInfoSO questInfo, QuestState questState, int currentQuestStepIndex,
+        public Quest(QuestSO questQuestSo, QuestState questState, int currentQuestStepIndex,
             QuestStepState[] questStepStates)
         {
-            this.info = questInfo;
+            this.questSO = questQuestSo;
             this.state = questState;
-            this.currentQuestStepIndex = currentQuestStepIndex;
-            currentStep = this.currentQuestStepIndex;
             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.info.questStepPrefabs.Length)
+            //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.info.id);
+                                 + "Reset your data - as this might cause issues. QuestId: " + this.questSO.id);
             }
         }
 
 
-        public void MoveToNextStep()
-        {
-            currentQuestStepIndex++;
-            currentStep = currentQuestStepIndex;
-        }
-
-        public bool CurrentStepExists()
-        {
-            return (currentQuestStepIndex < info.questStepPrefabs.Length);
-        }
-
-        public void InstantiateCurrentQuestStep(Transform parentTransform)
-        {
-            GameObject questStepPrefab = GetCurrentQuestStepPrefab();
-            if (questStepPrefab != null)
-            {
-                QuestStep questStep = Object.Instantiate<GameObject>(questStepPrefab, parentTransform)
-                    .GetComponent<QuestStep>();
-                questStep.InitializeQuestStep(info.id, currentQuestStepIndex,
-                    questStepStates[currentQuestStepIndex].state);
-            }
-        }
-
-        private GameObject GetCurrentQuestStepPrefab()
-        {
-            GameObject questStepPrefab = null;
-            if (CurrentStepExists())
-            {
-                questStepPrefab = info.questStepPrefabs[currentQuestStepIndex];
-            }
-            else
-            {
-                Debug.LogWarning("Tried to get quest step prefab, but stepIndex was out of range indicating that "
-                                 + "there's no current step: QuestId=" + info.id + ", stepIndex=" +
-                                 currentQuestStepIndex);
-            }
-
-            return questStepPrefab;
-        }
 
         public void StoreQuestStepState(QuestStepState questStepState, int stepIndex)
         {
@@ -110,13 +70,14 @@ namespace jeanf.questsystem
             else
             {
                 Debug.LogWarning("Tried to access quest step data, but stepIndex was out of range: "
-                                 + "Quest Id = " + info.id + ", Step Index = " + stepIndex);
+                                 + "Quest Id = " + questSO.id + ", Step Index = " + stepIndex);
             }
         }
 
-        public QuestData GetQuestData()
-        {
-            return new QuestData(state, currentQuestStepIndex, questStepStates);
-        }
+        //public QuestData GetQuestData()
+        //{
+        //    return new QuestData(state, currentQuestStepIndex, questStepStates);
+        //}
+
     }
 }

package/Runtime/Scripts/Core/QuestData.cs

@@ -1,12 +1,15 @@
 using System.Collections;
 using System.Collections.Generic;
+using GraphProcessor;
 using UnityEngine;
 
 namespace jeanf.questsystem
 {
+    // this is the information needed to save the quest
     [System.Serializable]
     public class QuestData
     {
+        // old constructor (linear structure)
         public QuestState state;
         public int questStepIndex;
         public QuestStepState[] questStepStates;
@@ -17,5 +20,16 @@ namespace jeanf.questsystem
             this.questStepIndex = questStepIndex;
             this.questStepStates = questStepStates;
         }
+
+
+        // new constructor (tree structure)
+        public BaseGraph QuestTree;
+        public Dictionary<string, QuestStep> QuestStepDictionary;
+        
+        public QuestData(BaseGraph QuestTree, Dictionary<string, QuestStep> QuestStepDictionary)
+        {
+            this.QuestTree = QuestTree;
+            this.QuestStepDictionary = QuestStepDictionary;
+        }
     }
 }

package/Runtime/Scripts/Core/QuestItem.cs

@@ -5,6 +5,7 @@ using UnityEngine;
 using jeanf.propertyDrawer;
 using jeanf.validationTools;
 
+
 namespace jeanf.questsystem
 {
     public class QuestItem : MonoBehaviour, IDebugBehaviour, IValidatable
@@ -20,7 +21,10 @@ namespace jeanf.questsystem
         [SerializeField] private bool _startQuestOnEnable = false;
 
         [Tooltip("Visual feedback for the quest state")] [Header("Quest")] [SerializeField]
-        private QuestInfoSO questInfoForPoint;
+        private QuestSO questSO;
+        private Dictionary<string, QuestStep> stepMap = new Dictionary<string, QuestStep>();
+        private Dictionary<string, QuestStep> activeSteps = new Dictionary<string, QuestStep>();
+
 
         [ReadOnly] [Range(0, 1)] [SerializeField]
         private float progress = 0.0f;
@@ -41,114 +45,34 @@ namespace jeanf.questsystem
         [Header("Broadcasting on:")] [SerializeField] [Validation("A reference to the QuestRequirementCheck SO is required")]
         private StringEventChannelSO requirementCheck;
 
+        #region Awake/Enable/Disable
         private void Awake()
         {
-            questId = questInfoForPoint.id;
-        }
-
-        #if UNITY_EDITOR
-        public void OnValidate()
-        {
-            ValidityCheck();
-        }
-        #endif
-
-        private void ValidityCheck()
-        {
-            const string searching = "attempting to find";
-            const string _ = "Quests/Channels"; // search target
-            const string searchLocation = "the resources folder";
-            const string readInstructions = "please read the package instruction for further help";
-            
-            
-            var validityCheck = true;
-            var invalidObjects = new List<object>();
-            var errorMessages = new List<string>();
-            
-            
-            if (QuestInitialCheck == null)
-            {
-                if (isDebug) Debug.Log($"{searching} {_}/QuestInitialCheck in {searchLocation} ", this);
-                QuestInitialCheck = Resources.Load<StringEventChannelSO>($"{_}/QuestInitialCheck");
-                if (QuestProgress == null)
-                {
-                    errorMessages.Add($"{_}/QuestInitialCheck is not in {searchLocation} {readInstructions}");
-                    validityCheck = false;
-                    invalidObjects.Add(QuestProgress);
-                }
-
-            }
-            
-            if (QuestProgress == null)
-            {
-                if (isDebug) Debug.Log($"{searching} {_}/QuestsProgressChannel in {searchLocation} ", this);
-                QuestProgress = Resources.Load<StringFloatEventChannelSO>($"{_}/QuestsProgressChannel");
-                if (QuestProgress == null)
-                {
-                    errorMessages.Add($"{_}/QuestsProgressChannel is not in {searchLocation} {readInstructions}");
-                    validityCheck = false;
-                    invalidObjects.Add(QuestProgress);
-                }
-
-            }
-
-            if (StartQuestEventChannel == null)
+            questId = questSO.id;
+            for (int i = 0; i < questSO.questSteps.Length; i++)
             {
-                if (isDebug) Debug.Log($"{searching} {_}/StartQuestEventChannel in {searchLocation}", this);
-                StartQuestEventChannel = Resources.Load<StringEventChannelSO>($"{_}/StartQuestEventChannel");
-                if (StartQuestEventChannel == null)
+                if (!stepMap.ContainsKey(questSO.questSteps[i].StepId))
                 {
-                    errorMessages.Add($"{_}/StartQuestEventChannel is not {searchLocation} {readInstructions}");
-                    validityCheck = false;
-                    invalidObjects.Add(StartQuestEventChannel);
+                    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]);
                 }
             }
 
-
-            if (requirementCheck == null)
+            foreach (QuestStep step in stepMap.Values)
             {
-                if (isDebug) Debug.Log($"{searching} {_}/QuestRequirementCheck in {searchLocation}", this);
-                requirementCheck = Resources.Load<StringEventChannelSO>($"{_}/QuestRequirementCheck");
-                if (requirementCheck == null)
+                if (step.isRootStep)
                 {
-                    errorMessages.Add($"{_}/QuestRequirementCheck is not {searchLocation} {readInstructions}");
-                    validityCheck = false;
-                    invalidObjects.Add(requirementCheck);
+                    InstantiateQuestStep(step.StepId);
                 }
             }
-            
-            IsValid = validityCheck;
-            
-            if(!IsValid) return;
-            if (IsValid && !Application.isPlaying) return;
-            
-            for(var i = 0 ; i < invalidObjects.Count ; i++)
-            {
-                Debug.LogError($"Error: {errorMessages[i]} " , this.gameObject);
-            }
         }
 
         private void OnEnable()
         {
             Subscribe();
-    
-            Init(questId);
-        }
 
-        private void Init(string id)
-        {
-            
-            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);
+            Init(questId);
         }
-
         private void OnDisable() => Unsubscribe();
         private void OnDestroy() => Unsubscribe();
 
@@ -159,6 +83,9 @@ namespace jeanf.questsystem
             QuestProgress.OnEventRaised += UpdateProgress;
             GameEventsManager.instance.questEvents.onQuestStateChange += QuestStateChange;
             GameEventsManager.instance.inputEvents.onSubmitPressed += UpdateState;
+            QuestStep.sendNextStepId += InstantiateQuestStep;
+            QuestStep.stepCompleted += DestroyQuestStep;
+
         }
 
         private void Unsubscribe()
@@ -168,8 +95,50 @@ namespace jeanf.questsystem
             QuestProgress.OnEventRaised -= UpdateProgress;
             GameEventsManager.instance.questEvents.onQuestStateChange -= QuestStateChange;
             GameEventsManager.instance.inputEvents.onSubmitPressed -= UpdateState;
+            QuestStep.sendNextStepId -= InstantiateQuestStep;
+            QuestStep.stepCompleted -= DestroyQuestStep;
+
+        }
+        #endregion
+       
+        #region Step Instantiation & Destroy
+        public void InstantiateQuestStep(string id)
+        {
+
+            if (stepMap.ContainsKey(id))
+            {
+                activeSteps.Add(id, Instantiate(stepMap[id]));
+            }
+        }
+
+        public void DestroyQuestStep(string id)
+        {
+            if (activeSteps.ContainsKey(id))
+            {
+                Destroy(activeSteps[id].gameObject);
+                activeSteps.Remove(id);
+            }
+        }
+        #endregion
+
+
+        #region quest process
+        private void Init(string id)
+        {
+            
+            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);
         }
 
+
+
         private void UpdateState()
         {
             if (isDebug) Debug.Log($"Updating State...");
@@ -216,7 +185,7 @@ namespace jeanf.questsystem
         private void QuestStateChange(Quest quest)
         {
             // only update the quest state if this point has the corresponding quest
-            if (quest.info.id.Equals(questId))
+            if (quest.questSO.id.Equals(questId))
             {
                 currentQuestState = quest.state;
                 UpdateState();
@@ -240,6 +209,91 @@ namespace jeanf.questsystem
             AllClear(true);
             if(isDebug) Debug.Log($"Quest start was requested for quest {id}.", this);
         }
+        #endregion
+
+        #region validation tools
+
+#if UNITY_EDITOR
+        public void OnValidate()
+        {
+            ValidityCheck();
+        }
+#endif
+
+        private void ValidityCheck()
+        {
+            const string searching = "attempting to find";
+            const string _ = "Quests/Channels"; // search target
+            const string searchLocation = "the resources folder";
+            const string readInstructions = "please read the package instruction for further help";
+
+
+            var validityCheck = true;
+            var invalidObjects = new List<object>();
+            var errorMessages = new List<string>();
+
+
+            if (QuestInitialCheck == null)
+            {
+                if (isDebug) Debug.Log($"{searching} {_}/QuestInitialCheck in {searchLocation} ", this);
+                QuestInitialCheck = Resources.Load<StringEventChannelSO>($"{_}/QuestInitialCheck");
+                if (QuestProgress == null)
+                {
+                    errorMessages.Add($"{_}/QuestInitialCheck is not in {searchLocation} {readInstructions}");
+                    validityCheck = false;
+                    invalidObjects.Add(QuestProgress);
+                }
+
+            }
+
+            if (QuestProgress == null)
+            {
+                if (isDebug) Debug.Log($"{searching} {_}/QuestsProgressChannel in {searchLocation} ", this);
+                QuestProgress = Resources.Load<StringFloatEventChannelSO>($"{_}/QuestsProgressChannel");
+                if (QuestProgress == null)
+                {
+                    errorMessages.Add($"{_}/QuestsProgressChannel is not in {searchLocation} {readInstructions}");
+                    validityCheck = false;
+                    invalidObjects.Add(QuestProgress);
+                }
+
+            }
+
+            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);
+                requirementCheck = Resources.Load<StringEventChannelSO>($"{_}/QuestRequirementCheck");
+                if (requirementCheck == null)
+                {
+                    errorMessages.Add($"{_}/QuestRequirementCheck is not {searchLocation} {readInstructions}");
+                    validityCheck = false;
+                    invalidObjects.Add(requirementCheck);
+                }
+            }
+
+            IsValid = validityCheck;
+
+            if (!IsValid) return;
+            if (IsValid && !Application.isPlaying) return;
 
+            for (var i = 0; i < invalidObjects.Count; i++)
+            {
+                Debug.LogError($"Error: {errorMessages[i]} ", this.gameObject);
+            }
+        }
+        #endregion
     }
 }