fr.jeanf.questsystem 0.0.20 → 0.0.22

package/Runtime/Scripts/Core/QuestInfoSO.cs

@@ -9,7 +9,7 @@
      [ScriptableObjectDrawer]
      public class QuestInfoSO : ScriptableObject
      {
-         [field: Space(10)][field: ReadOnly] [field: SerializeField] public string id { get; private set; }
+         [field: Space(10)] [field: ReadOnly] [SerializeField] public string id = string.Empty;
 
          [Header("General")] public string displayName;
          

package/Runtime/Scripts/Core/QuestItem.cs

@@ -2,7 +2,6 @@ using System;
 using System.Collections.Generic;
 using jeanf.EventSystem;
 using UnityEngine;
-using UnityEngine.Serialization;
 using jeanf.propertyDrawer;
 using jeanf.validationTools;
 
@@ -37,18 +36,22 @@ namespace jeanf.questsystem
         [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;
 
+        private void Awake()
+        {
+            questId = questInfoForPoint.id;
+        }
+
+        #if UNITY_EDITOR
         public void OnValidate()
         {
-            #if UNITY_EDITOR
             ValidityCheck();
-            #endif
-            
-            questId = questInfoForPoint.id;
         }
+        #endif
 
         private void ValidityCheck()
         {
@@ -62,6 +65,20 @@ namespace jeanf.questsystem
             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);
@@ -101,9 +118,10 @@ namespace jeanf.questsystem
             }
             
             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);
@@ -113,17 +131,30 @@ namespace jeanf.questsystem
         private void OnEnable()
         {
             Subscribe();
+    
+            Init(questId);
+        }
 
-            requirementCheck.RaiseEvent(questId);
+        private void Init(string id)
+        {
+            
+            Debug.Log($"Quest [{id}]: _startQuestOnEnable value is: [{_startQuestOnEnable}]");
             if (!_startQuestOnEnable) return;
             RequestQuestStart(questId);
         }
 
+        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 OnDisable() => Unsubscribe();
         private void OnDestroy() => Unsubscribe();
 
         private void Subscribe()
         {
+            QuestInitialCheck.OnEventRaised += InitialCheckFromQuestManager;
             StartQuestEventChannel.OnEventRaised += RequestQuestStart;
             QuestProgress.OnEventRaised += UpdateProgress;
             GameEventsManager.instance.questEvents.onQuestStateChange += QuestStateChange;
@@ -132,48 +163,54 @@ namespace jeanf.questsystem
 
         private void Unsubscribe()
         {
+            QuestInitialCheck.OnEventRaised -= InitialCheckFromQuestManager;
             StartQuestEventChannel.OnEventRaised -= RequestQuestStart;
             QuestProgress.OnEventRaised -= UpdateProgress;
             GameEventsManager.instance.questEvents.onQuestStateChange -= QuestStateChange;
             GameEventsManager.instance.inputEvents.onSubmitPressed -= UpdateState;
         }
 
-        public void UpdateState()
+        private void UpdateState()
         {
             if (isDebug) Debug.Log($"Updating State...");
-            if (!clearToStart)
-            {
-                return;
-            }
-
+            if (!clearToStart) return;
             if (isDebug) Debug.Log($"All is clear, continuing ...");
 
-            if (currentQuestState.Equals(QuestState.REQUIREMENTS_NOT_MET) && _startQuestOnEnable)
-            {
-                if(isDebug) Debug.Log($"forcing start of quest: {questId}");
-                GameEventsManager.instance.questEvents.StartQuest(questId);
-            }
-
-            // start or finish a quest
-            if (currentQuestState.Equals(QuestState.CAN_START))
-            {
-                if (isDebug) Debug.Log($"Starting quest: {questId}");
-                GameEventsManager.instance.questEvents.StartQuest(questId);
-            }
-            else if (currentQuestState.Equals(QuestState.CAN_FINISH))
+            switch (currentQuestState)
             {
-                if (isDebug) Debug.Log($"Finishing quest: {questId}");
-                GameEventsManager.instance.questEvents.FinishQuest(questId);
+                case QuestState.CAN_START:
+                {
+                    if (isDebug) Debug.Log($"Starting quest: {questId}");
+                    GameEventsManager.instance.questEvents.StartQuest(questId);
+                    break;
+                }
+                case QuestState.CAN_FINISH:
+                {
+                    if (isDebug) Debug.Log($"Finishing quest: {questId}");
+                    GameEventsManager.instance.questEvents.FinishQuest(questId);
+                    break;
+                }
+                case QuestState.REQUIREMENTS_NOT_MET:
+                    if(_startQuestOnEnable)
+                    {
+                        if(isDebug) Debug.Log($"forcing start of quest: {questId}");
+                        GameEventsManager.instance.questEvents.StartQuest(questId);
+                    }
+                    break;
+                case QuestState.IN_PROGRESS:
+                    break;
+                case QuestState.FINISHED:
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException();
             }
         }
 
         private void UpdateProgress(string id, float progress)
         {
-            if (id == questId)
-            {
-                this.progress = progress;
-                if (isDebug) Debug.Log($"questid [{id}] progress = {progress * 100}%");
-            }
+            if (id != questId) return;
+            this.progress = progress;
+            if (isDebug) Debug.Log($"questid [{id}] progress = {progress * 100}%");
         }
 
         private void QuestStateChange(Quest quest)
@@ -187,15 +224,18 @@ namespace jeanf.questsystem
 
         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();
         }
 
-        public void RequestQuestStart(string id)
+        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);
         }

package/Runtime/Scripts/Core/QuestManager.cs

@@ -25,6 +25,7 @@ namespace jeanf.questsystem
         [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;
 
@@ -36,6 +37,11 @@ namespace jeanf.questsystem
         private void Awake()
         {
             questMap = CreateQuestMap();
+
+            foreach (var quest in questMap)
+            {
+                CheckIfQuestIsAlreadyLoaded(quest.Key);
+            }
         }
 
         private void OnEnable()
@@ -78,6 +84,11 @@ namespace jeanf.questsystem
             }
         }
 
+        private void CheckIfQuestIsAlreadyLoaded(string id)
+        {
+            QuestInitialCheck.RaiseEvent(id);
+        }
+
         private void ChangeQuestState(string id, QuestState state)
         {
             Quest quest = GetQuestById(id);
@@ -199,19 +210,22 @@ namespace jeanf.questsystem
             // loads all QuestInfoSO Scriptable Objects under the Assets/Resources/Quests folder
             QuestInfoSO[] allQuests = Resources.LoadAll<QuestInfoSO>("Quests");
             // Create the quest map
-            Dictionary<string, Quest> idToQuestMap = new Dictionary<string, Quest>();
+            Dictionary<string, Quest> questMap = new Dictionary<string, Quest>();
             foreach (QuestInfoSO questInfo in allQuests)
             {
-                if (idToQuestMap.ContainsKey(questInfo.id))
+                var id = questInfo.id;
+                if (questMap.ContainsKey(id))
                 {
                     Debug.LogWarning("Duplicate ID found when creating quest map: " + questInfo.id);
                 }
-
-                idToQuestMap.Add(questInfo.id, LoadQuest(questInfo));
+                else
+                {
+                    questMap.Add(id, LoadQuest(questInfo));
+                }
                 if(isDebug) Debug.Log($"Adding {questInfo.name} to the questmap, its id is: {questInfo.id}");
             }
 
-            return idToQuestMap;
+            return questMap;
         }
 
         private Quest GetQuestById(string id)
@@ -289,6 +303,18 @@ namespace jeanf.questsystem
             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 (QuestInitialCheck == null)
+                {
+                    errorMessages.Add($"{_}/QuestInitialCheck is not {searchLocation} {readInstructions}");
+                    validityCheck = false;
+                    invalidObjects.Add(QuestInitialCheck);
+                }
+            }
+            
             if (questStatusUpdateChannel == null)
             {
                 if (isDebug) Debug.Log($"{searching} {_}/QuestStatusUpdate in {searchLocation}", this);

package/Runtime/Scripts/Core/QuestStep.cs

@@ -50,19 +50,15 @@ namespace jeanf.questsystem
 
         protected void FinishQuestStep()
         {
-            if (!isFinished)
-            {
-                isFinished = true;
-                GameEventsManager.instance.questEvents.AdvanceQuest(questId);
-                Destroy(this.gameObject);
-                
-                
-                if (isUsingIntroTimeline && timeline)
-                {
-                    if(isDebug) Debug.Log($"sending trigger to timeline: {timeline.name}, triggerValue: false");
-                    //_timelineTriggerEventChannelSo.RaiseEvent(timeline, false);
-                }
-            }
+            if (isFinished) return;
+            isFinished = true;
+            if(questId != null) GameEventsManager.instance.questEvents.AdvanceQuest(questId);
+            if(this.gameObject) Destroy(this.gameObject);
+
+
+            if (!isUsingIntroTimeline || !timeline) return;
+            //if(isDebug) Debug.Log($"sending trigger to timeline: {timeline.name}, triggerValue: false");
+            //_timelineTriggerEventChannelSo.RaiseEvent(timeline, false);
         }
 
         protected void ChangeState(string newState)

package/package.json

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