fr.jeanf.questsystem 0.0.65 → 0.0.67

package/{Runtime/Scripts/GraphEditor.meta → LICENSE.meta}

@@ -1,6 +1,5 @@
 fileFormatVersion: 2
-guid: 7b22fa752a8ac804aa1053eac644fb47
-folderAsset: yes
+guid: bd20a8962b0dd7047b383ce038428904
 DefaultImporter:
   externalObjects: {}
   userData: 

package/README.md

@@ -19,4 +19,8 @@ Credits:
 - I simply implemented this code in my package registry and tweaked it to my liking. Overtime I will add quite a lot of functionalities but for now I focus on making it work with my custom Event System.
 
 Contributors:
-[Code] Felix Cotes-Charlebois <a href="https://github.com/Percevent13">
+[Code] Felix Cotes-Charlebois <a href="https://github.com/Percevent13">
+
+LICENCE:
+
+<img src="https://licensebuttons.net/l/by-nc-sa/3.0/88x31.png"></img>

package/Runtime/Scripts/Core/Quest.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using GraphProcessor;
 using jeanf.EventSystem;
 using jeanf.propertyDrawer;
 using UnityEngine;

package/Runtime/Scripts/Core/QuestData.cs

@@ -1,6 +1,5 @@
 using System.Collections;
 using System.Collections.Generic;
-using GraphProcessor;
 using UnityEngine;
 
 namespace jeanf.questsystem
@@ -20,16 +19,5 @@ 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

@@ -25,21 +25,26 @@ namespace jeanf.questsystem
         #endregion
 
         #region Step Dictionaries
-        [Tooltip("Visual feedback for the quest state")] [Header("Quest")] 
-        [SerializeField] [Validation("A reference to a questSO is required")] 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 Dictionary<string, QuestStep> stepsInScene = new Dictionary<string, QuestStep>();   
         private List<QuestStep> rootSteps = new List<QuestStep>();
         #endregion
 
 
         #region main data
-        [SerializeField] [ReadOnly]
+        [SerializeField]
+        [ReadOnly]
         private bool clearToStart = false;
         private string questId;
         private QuestState currentQuestState;
-        [ReadOnly][Range(0, 1)][SerializeField]
+        [ReadOnly]
+        [Range(0, 1)]
+        [SerializeField]
         private float progress = 0.0f;
         #endregion
 
@@ -48,15 +53,19 @@ namespace jeanf.questsystem
         public static ValidateStep ValidateStepEvent;
         // these events are Located in Assets/Resources/Quests/Channels - it is searched for at Awake time.
         // 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 QuestInitialCheck SO is required")] private StringEventChannelSO QuestInitialCheck;
+        [Header("Listening on:")]
+        [SerializeField][Validation("A reference to the QuestProgress SO is required")] private StringFloatEventChannelSO QuestProgress;
+        [SerializeField][Validation("A reference to the QuestInitialCheck SO is required")] private StringEventChannelSO QuestInitialCheck;
         [SerializeField] private VoidEventChannelSO resetChannel;
 
-        [Header("Broadcasting on:")] [SerializeField] [Validation("A reference to the QuestRequirementCheck SO is required")]
+        [Header("Broadcasting on:")]
+        [SerializeField]
+        [Validation("A reference to the QuestRequirementCheck SO is required")]
         private StringEventChannelSO requirementCheck;
-        [SerializeField][Validation("A reference to the LoadRequiredScenesEventChannel SO is required")]  StringListEventChannelSO loadRequiredScenesEventChannel;
+        [SerializeField][Validation("A reference to the LoadRequiredScenesEventChannel SO is required")] StringListEventChannelSO loadRequiredScenesEventChannel;
         [SerializeField] IntEventChannelSO unlockDoorsEventChannel;
+        [SerializeField] StringEventChannelSO startStepChannel;
+        [SerializeField] StringEventChannelSO endStepChannel;
         #endregion
 
 
@@ -66,7 +75,7 @@ namespace jeanf.questsystem
             questId = questSO.id;
             for (int i = 0; i < questSO.rootSteps.Length; i++)
             {
-                if(isDebug) Debug.Log($"id on awake {questSO.rootSteps[i].StepId}, added to {this.name}'s dictionary", this);
+                if (isDebug) 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]);
             }
@@ -93,6 +102,8 @@ namespace jeanf.questsystem
             QuestStep.sendNextStepId += InstantiateQuestStep;
             QuestStep.stepActive += UpdateStepStatus;
             QuestStep.childStep += AddStepToStepMap;
+            if (startStepChannel != null) startStepChannel.OnEventRaised += InstantiateQuestStep;
+            if (endStepChannel != null) endStepChannel.OnEventRaised += UnloadQuestStep;
         }
         private void Unsubscribe()
         {
@@ -104,7 +115,8 @@ namespace jeanf.questsystem
             QuestStep.sendNextStepId -= InstantiateQuestStep;
             QuestStep.stepActive -= UpdateStepStatus;
             QuestStep.childStep -= AddStepToStepMap;
-
+            if (startStepChannel != null) startStepChannel.OnEventRaised -= InstantiateQuestStep;
+            if (endStepChannel != null) endStepChannel.OnEventRaised -= UnloadQuestStep;
 
         }
         #endregion
@@ -116,9 +128,21 @@ namespace jeanf.questsystem
             if (stepMap[id].stepStatus != QuestStepStatus.Inactive) return;
             if (activeSteps.ContainsKey(id)) return;
 
+            
+            QuestStep instantiatedStep = Instantiate(stepMap[id], this.transform, true);
+            stepsInScene.Add(id, instantiatedStep);
+        }
 
-            Instantiate(stepMap[id], this.transform, true);
+        public void UnloadQuestStep(string id)
+        {
+            if (!stepMap.ContainsKey(id)) return;
+            if (stepMap[id].stepStatus != QuestStepStatus.Inactive) return;
+            if (!activeSteps.ContainsKey(id)) return;
 
+            activeSteps.Remove(id);
+            stepMap[id].stepStatus = QuestStepStatus.Inactive;
+            Destroy(stepsInScene[id].gameObject);
+            stepsInScene.Remove(id);
         }
         private void LoadDependencies()
         {
@@ -161,7 +185,7 @@ namespace jeanf.questsystem
             completedSteps.Clear();
             completedSteps.TrimExcess();
 
-            if(isDebug) Debug.Log($"Quest [{id}]: _startQuestOnEnable value is: [{_startQuestOnEnable}]");
+            if (isDebug) Debug.Log($"Quest [{id}]: _startQuestOnEnable value is: [{_startQuestOnEnable}]");
             if (!_startQuestOnEnable || id != questId) return;
             clearToStart = true;
             currentQuestState = QuestState.CAN_START;
@@ -204,21 +228,21 @@ namespace jeanf.questsystem
             switch (currentQuestState)
             {
                 case QuestState.CAN_START:
-                {
-                    if (isDebug) Debug.Log($"Starting quest: {questId}");
-                    GameEventsManager.instance.questEvents.StartQuest(questId);
-                    break;
-                }
+                    {
+                        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;
-                }
+                    {
+                        if (isDebug) Debug.Log($"Finishing quest: {questId}");
+                        GameEventsManager.instance.questEvents.FinishQuest(questId);
+                        break;
+                    }
                 case QuestState.REQUIREMENTS_NOT_MET:
-                    if(_startQuestOnEnable)
+                    if (_startQuestOnEnable)
                     {
-                        if(isDebug) Debug.Log($"forcing start of quest: {questId}");
+                        if (isDebug) Debug.Log($"forcing start of quest: {questId}");
                         GameEventsManager.instance.questEvents.StartQuest(questId);
                     }
                     break;
@@ -256,7 +280,7 @@ namespace jeanf.questsystem
             {
                 var activeStep = activeSteps.ElementAt(i);
                 var stepKey = activeStep.Key;
-                if(activeSteps.ContainsKey(stepKey)) ValidateStepEvent.Invoke(stepKey);
+                if (activeSteps.ContainsKey(stepKey)) ValidateStepEvent.Invoke(stepKey);
             }
         }
         #endregion
@@ -276,7 +300,7 @@ namespace jeanf.questsystem
                 Debug.Log($"active step: {step}");
             }
         }
-        #endif
+#endif
         private void ValidityCheck()
         {
             const string searching = "attempting to find";
@@ -302,7 +326,7 @@ namespace jeanf.questsystem
                 }
 
             }
-            
+
             if (questSO == null)
             {
                 if (isDebug) Debug.Log($"There is no questSO in the questItem");

package/Runtime/Scripts/Core/QuestManager.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using GraphProcessor;
 using jeanf.EventSystem;
 using jeanf.validationTools;
 using UnityEngine;

package/Runtime/Scripts/Core/QuestSO.cs

@@ -1,5 +1,4 @@
 using System;
-using GraphProcessor;
 using jeanf.EventSystem;
 using UnityEngine;
 using jeanf.propertyDrawer;

package/Runtime/Scripts/Core/QuestStep.cs

@@ -4,13 +4,12 @@ using jeanf.propertyDrawer;
 using UnityEngine;
 using UnityEngine.Playables;
 using System.Collections.Generic;
-using GraphProcessor;
 using jeanf.validationTools;
 using UnityEditor;
 
 namespace jeanf.questsystem
 {
-    [System.Serializable, NodeMenuItem("questSystem/QuestStep"), DefaultExecutionOrder(1)]
+    [System.Serializable, DefaultExecutionOrder(1)]
     public class QuestStep : MonoBehaviour, IDebugBehaviour
     {
         #region Ids and status
@@ -117,6 +116,10 @@ namespace jeanf.questsystem
             FinishQuestStep();
         }
 
+        public void AbortStep()
+        {
+            Destroy(this.gameObject);
+        }
         public void FinishQuestStep()
         {
             if(isDebug) Debug.Log($" ---- Step with id: {stepId} finished. Changing status to completed", this);

package/Runtime/Scripts/jeanf.QuestSystem.asmdef

@@ -5,11 +5,7 @@
         "GUID:75469ad4d38634e559750d17036d5f7c",
         "GUID:e134609276952144282613c65d798616",
         "GUID:e8958e6939af7314a97769de4be4ce25",
-        "GUID:db1b0a3157155ad47996061dbcc07bbb",
-        "GUID:ca937d03ee5dd4d699091438dc0f3ae6",
-        "GUID:a432eb0a70c5c4a37ab50d59671586f8",
-        "GUID:b8e24fd1eb19b4226afebb2810e3c19b",
-        "GUID:002c1bbed08fa44d282ef34fd5edb138"
+        "GUID:db1b0a3157155ad47996061dbcc07bbb"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

package/package.json

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

package/Runtime/Scripts/GraphEditor/QuestGraphWindow.cs

@@ -1,30 +0,0 @@
-#if UNITY_EDITOR
-using UnityEngine;
-using UnityEditor;
-using GraphProcessor;
-
-public class QuestGraphWindow : BaseGraphWindow
-{
-    [MenuItem("QuestGraph/01_DefaultGraph")]
-    public static BaseGraphWindow Open()
-    {
-        var graphWindow = GetWindow<QuestGraphWindow>();
-
-        graphWindow.Show();
-
-        return graphWindow;
-    }
-
-    protected override void InitializeWindow(BaseGraph graph)
-    {
-        // Set the window title
-        titleContent = new GUIContent("Default Graph");
-
-        // Here you can use the default BaseGraphView or a custom one (see section below)
-        var graphView = new BaseGraphView(this);
-
-        rootView.Add(graphView);
-    }
-    
-}
-#endif

package/Runtime/Scripts/GraphEditor/QuestGraphWindow.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 4783b98f3c3c6da49b8d8a1dc5b2bd52
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Runtime/Scripts/GraphEditor/QuestStepNode.cs

@@ -1,11 +0,0 @@
-using UnityEngine;
-using GraphProcessor;
-using jeanf.questsystem;
-
-public class QuestStepNode : BaseNode
-{
-    [Input(name = "A")] 
-    private QuestStep StepsRequiredForCompletion;
-    [Output(name = "Out")]
-    private QuestStep StepsTriggeredOnCompletion;
-}

package/Runtime/Scripts/GraphEditor/QuestStepNode.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: feb5db492d0ac36459e73370531d6f8c
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: