fr.jeanf.questsystem 0.0.7 → 0.0.9

package/Runtime/Scripts/Core/QuestItem.cs

@@ -1,3 +1,4 @@
+using System;
 using jeanf.EventSystem;
 using UnityEngine;
 using UnityEngine.Serialization;
@@ -14,6 +15,7 @@ namespace jeanf.questsystem
         }
 
         [SerializeField] private bool _isDebug = false;
+        [SerializeField] private bool _startQuestOnEnable = false;
 
         [Tooltip("Visual feedback for the quest state")] [Header("Quest")] [SerializeField]
         private QuestInfoSO questInfoForPoint;
@@ -21,7 +23,7 @@ namespace jeanf.questsystem
         [ReadOnly] [Range(0, 1)] [SerializeField]
         private float progress = 0.0f;
 
-        [FormerlySerializedAs("playerIsNear")] [SerializeField] [ReadOnly]
+        [SerializeField] [ReadOnly]
         private bool clearToStart = false;
 
         private string questId;
@@ -32,6 +34,9 @@ namespace jeanf.questsystem
         private StringFloatEventChannelSO QuestProgress;
         private StringEventChannelSO StartQuestEventChannel;
 
+        [Header("Broadcasting on:")] [SerializeField]
+        private StringEventChannelSO requirementCheck;
+
         public void OnValidate()
         {
             const string searching = "attempting to find";
@@ -59,6 +64,18 @@ namespace jeanf.questsystem
         }
 
         private void OnEnable()
+        {
+            Subscribe();
+
+            requirementCheck.RaiseEvent(questId);
+            if (!_startQuestOnEnable) return;
+            RequestQuestStart(questId);
+        }
+
+        private void OnDisable() => Unsubscribe();
+        private void OnDestroy() => Unsubscribe();
+
+        private void Subscribe()
         {
             StartQuestEventChannel.OnEventRaised += RequestQuestStart;
             QuestProgress.OnEventRaised += UpdateProgress;
@@ -66,9 +83,6 @@ namespace jeanf.questsystem
             GameEventsManager.instance.inputEvents.onSubmitPressed += UpdateState;
         }
 
-        private void OnDisable() => Unsubscribe();
-        private void OnDestroy() => Unsubscribe();
-
         private void Unsubscribe()
         {
             StartQuestEventChannel.OnEventRaised -= RequestQuestStart;
@@ -87,6 +101,12 @@ namespace jeanf.questsystem
 
             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))
             {
@@ -121,6 +141,8 @@ namespace jeanf.questsystem
         public void AllClear(bool value)
         {
             clearToStart = value;
+            currentQuestState = QuestState.CAN_START;
+            requirementCheck.RaiseEvent(questId);
             UpdateState();
         }
 
@@ -128,6 +150,7 @@ namespace jeanf.questsystem
         {
             if(id!= questId) return;
             AllClear(true);
+            if(isDebug) Debug.Log($"Quest start was requested for quest {id}.", this);
         }
     }
 }

package/Runtime/Scripts/Core/QuestManager.cs

@@ -24,6 +24,8 @@ namespace jeanf.questsystem
         private StringEventChannelSO questStatusUpdateChannel;
         private StringFloatEventChannelSO questProgress;
 
+        [Header("Listening on:")] [SerializeField] private StringEventChannelSO questStatusUpdateRequested;
+
         private Dictionary<string, Quest> questMap;
 
         // quest start requirements
@@ -43,6 +45,8 @@ namespace jeanf.questsystem
             GameEventsManager.instance.questEvents.onQuestStepStateChange += QuestStepStateChange;
 
             GameEventsManager.instance.playerEvents.onPlayerLevelChange += PlayerLevelChange;
+
+            questStatusUpdateRequested.OnEventRaised += ctx => CheckRequirementsMet(questMap[ctx]);
         }
 
         private void OnDisable()
@@ -97,6 +101,8 @@ namespace jeanf.questsystem
                     meetsRequirements = false;
                 }
             }
+            
+            if(isDebug) Debug.Log($"checking requirements for quest: {quest.info.name}, [{quest.info.id}], meetsRequirements: {meetsRequirements}");
 
             return meetsRequirements;
         }

package/Runtime/Scripts/Events/QuestEvents.cs

@@ -1,4 +1,7 @@
 using System;
+using jeanf.EventSystem;
+using UnityEditor;
+using UnityEngine;
 
 namespace jeanf.questsystem
 {
@@ -10,6 +13,7 @@ namespace jeanf.questsystem
         {
             if (onStartQuest != null)
             {
+                Debug.Log($"starting quest: {id}");
                 onStartQuest(id);
             }
         }
@@ -20,6 +24,7 @@ namespace jeanf.questsystem
         {
             if (onAdvanceQuest != null)
             {
+                Debug.Log($"advancing quest: {id}");
                 onAdvanceQuest(id);
             }
         }
@@ -30,6 +35,7 @@ namespace jeanf.questsystem
         {
             if (onFinishQuest != null)
             {
+                Debug.Log($"finishing quest: {id}");
                 onFinishQuest(id);
             }
         }
@@ -40,6 +46,7 @@ namespace jeanf.questsystem
         {
             if (onQuestStateChange != null)
             {
+                Debug.Log($"quest state change: {quest.info.id} -- state: {quest.state}");
                 onQuestStateChange(quest);
             }
         }
@@ -50,8 +57,10 @@ namespace jeanf.questsystem
         {
             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.7",
+  "version":"0.0.9",
   "displayName":"Quest system",
   "description":"This package uses Scriptable Objects to define quests.",
   "unity": "2021.3",