fr.jeanf.questsystem 0.0.36 → 0.0.38

package/Runtime/Scripts/Core/QuestManager.cs

@@ -169,13 +169,6 @@ namespace jeanf.questsystem
             GameEventsManager.instance.scenarioEvents.ScenarioUnlocked(quest.questSO.unlockedScenario);
         }
 
-        //private void QuestStepStateChange(string id, int stepIndex, QuestStepState questStepState)
-        //{
-        //    Quest quest = GetQuestById(id);
-        //    quest.StoreQuestStepState(questStepState, stepIndex);
-        //    ChangeQuestState(id, quest.state);
-        //}
-
         private Dictionary<string, Quest> CreateQuestMap()
         {
             // loads all QuestInfoSO Scriptable Objects under the Assets/Resources/Quests folder
@@ -240,25 +233,28 @@ namespace jeanf.questsystem
 
         private Quest LoadQuest(QuestSO questSO)
         {
-            Quest quest = null;
+            Debug.Log($"attempting to load quest with id: [{questSO.id}]");
+            var quest = new Quest(questSO);
             try
             {
                 // load quest from saved data
                 if (PlayerPrefs.HasKey(questSO.id) && loadSavedQuestState)
                 {
-                    string serializedData = PlayerPrefs.GetString(questSO.id);
-                    QuestData questData = JsonUtility.FromJson<QuestData>(serializedData);
+                    var serializedData = PlayerPrefs.GetString(questSO.id);
+                    var questData = JsonUtility.FromJson<QuestData>(serializedData);
                     quest = new Quest(questSO, questData.state, questData.questStepIndex, questData.questStepStates); 
+                    Debug.Log($"loaded previously saved quest with id: [{quest.questSO.id}]");
                 }
                 // otherwise, initialize a new quest
                 else
                 {
                     quest = new Quest(questSO);
+                    Debug.Log($"loaded a fresh instance of quest with id: [{quest.questSO.id}]");
                 }
             }
             catch (System.Exception e)
             {
-                Debug.LogError("Failed to load quest with id " + quest.questSO.id + ": " + e);
+                Debug.LogError($"Failed to load quest with id: [{quest.questSO.id}] - exception: {e}");
             }
 
             return quest;

package/Runtime/Scripts/Core/QuestStep.cs

@@ -1,13 +1,9 @@
 using jeanf.EventSystem;
-using jeanf.propertyDrawer ;
-using jeanf.tooltip;
+using jeanf.propertyDrawer;
 using UnityEngine;
 using UnityEngine.Playables;
-using System;
 using System.Collections.Generic;
-using System.Linq;
 using GraphProcessor;
-using NodeGraphProcessor.Examples;
 
 namespace jeanf.questsystem
 {
@@ -99,13 +95,10 @@ namespace jeanf.questsystem
                 sendNextStepId?.Invoke(questStep.stepId);
             }
             stepCompleted?.Invoke(stepId);
-            stepActive?.Invoke(stepId, stepStatus);
-
-
-            if (!isUsingIntroTimeline || !timeline) return;
-            //if(isDebug) Debug.Log($"sending trigger to timeline: {timeline.name}, triggerValue: false");
-            //_timelineTriggerEventChannelSo.RaiseEvent(timeline, false);
-
+            stepActive?.Invoke(stepId, stepStatus); 
+            
+            //stops the timeline in case it were playing
+            _timelineTriggerEventChannelSo.RaiseEvent(timeline, false);
         }
 
 

package/package.json

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

package/Runtime/Scripts/NodeGraph/ConditionalGraph/Comparison.cs

@@ -1,39 +0,0 @@
-using GraphProcessor;
-using UnityEngine.Rendering;
-
-namespace NodeGraphProcessor.Examples
-{
-	[System.Serializable, NodeMenuItem("Conditional/Comparison")]
-	public class Comparison : BaseNode
-	{
-		[Input(name = "In A")]
-		public float    inA;
-	
-		[Input(name = "In B")]
-		public float    inB;
-
-		[Output(name = "Out")]
-		public bool		compared;
-
-		public CompareFunction		compareFunction = CompareFunction.LessEqual;
-
-		public override string		name => "Comparison";
-
-		protected override void Process()
-		{
-			switch (compareFunction)
-			{
-				default:
-				case CompareFunction.Disabled:
-				case CompareFunction.Never: compared = false; break;
-				case CompareFunction.Always: compared = true; break;
-				case CompareFunction.Equal: compared = inA == inB; break;
-				case CompareFunction.Greater: compared = inA > inB; break;
-				case CompareFunction.GreaterEqual: compared = inA >= inB; break;
-				case CompareFunction.Less: compared = inA < inB; break;
-				case CompareFunction.LessEqual: compared = inA <= inB; break;
-				case CompareFunction.NotEqual: compared = inA != inB; break;
-			}
-		}
-	}
-}

package/Runtime/Scripts/NodeGraph/ConditionalGraph/Comparison.cs.meta

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

package/Runtime/Scripts/NodeGraph/ConditionalGraph/ConditionalLink.cs

@@ -1,4 +0,0 @@
-namespace NodeGraphProcessor.Examples
-{
-    public struct ConditionalLink {}
-}

package/Runtime/Scripts/NodeGraph/ConditionalGraph/ConditionalLink.cs.meta

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

package/Runtime/Scripts/NodeGraph/ConditionalGraph/ConditionalNode.cs

@@ -1,72 +0,0 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using GraphProcessor;
-using UnityEngine;
-
-namespace NodeGraphProcessor.Examples
-{
-	[System.Serializable]
-	/// <summary>
-	/// This is the base class for every node that is executed by the conditional processor, it takes an executed bool as input to 
-	/// </summary>
-	public abstract class ConditionalNode : BaseNode, IConditionalNode
-	{
-		// These booleans will controls wether or not the execution of the folowing nodes will be done or discarded.
-		[Input(name = "Executed", allowMultiple = true)]
-		public ConditionalLink	executed;
-
-		public abstract IEnumerable< ConditionalNode >	GetExecutedNodes();
-
-		// Assure that the executed field is always at the top of the node port section
-		public override FieldInfo[] GetNodeFields()
-		{
-			var fields = base.GetNodeFields();
-			Array.Sort(fields, (f1, f2) => f1.Name == nameof(executed) ? -1 : 1);
-			return fields;
-		}
-	}
-
-	[System.Serializable]
-	/// <summary>
-	/// This class represent a simple node which takes one event in parameter and pass it to the next node
-	/// </summary>
-	public abstract class LinearConditionalNode : ConditionalNode, IConditionalNode
-	{
-		[Output(name = "Executes")]
-		public ConditionalLink	executes;
-
-		public override IEnumerable< ConditionalNode >	GetExecutedNodes()
-		{
-			// Return all the nodes connected to the executes port
-			return outputPorts.FirstOrDefault(n => n.fieldName == nameof(executes))
-				.GetEdges().Select(e => e.inputNode as ConditionalNode);
-		}
-	}
-	
-	[System.Serializable]
-	/// <summary>
-	/// This class represent a waitable node which invokes another node after a time/frame
-	/// </summary>
-	public abstract class WaitableNode : LinearConditionalNode
-	{
-		[Output(name = "Execute After")]
-		public ConditionalLink executeAfter;
-
-		protected void ProcessFinished()
-		{
-			onProcessFinished.Invoke(this);
-		}
-
-		[HideInInspector]
-		public Action<WaitableNode> onProcessFinished;
-
-		public IEnumerable< ConditionalNode > GetExecuteAfterNodes()
-		{
-			return outputPorts.FirstOrDefault(n => n.fieldName == nameof(executeAfter))
-			                  .GetEdges().Select(e => e.inputNode as ConditionalNode);
-		}
-	}
-}

package/Runtime/Scripts/NodeGraph/ConditionalGraph/ConditionalNode.cs.meta

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

package/Runtime/Scripts/NodeGraph/ConditionalGraph/ConditionalProcessor.cs

@@ -1,200 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using GraphProcessor;
-using Debug = UnityEngine.Debug;
-
-namespace NodeGraphProcessor.Examples
-{
-    public class ConditionalProcessor : BaseGraphProcessor
-    {
-        List< BaseNode >		processList;
-        List< StartNode >		startNodeList;
-
-        Dictionary<BaseNode, List<BaseNode>>    nonConditionalDependenciesCache = new Dictionary<BaseNode, List<BaseNode>>();
-
-        public bool             pause;
-
-        public IEnumerator<BaseNode> currentGraphExecution { get; private set; } = null;
-
-        // static readonly float   maxExecutionTimeMS = 100; // 100 ms max execution time to avoid infinite loops
-
-        /// <summary>
-        /// Manage graph scheduling and processing
-        /// </summary>
-        /// <param name="graph">Graph to be processed</param>
-        public ConditionalProcessor(BaseGraph graph) : base(graph) {}
-
-        public override void UpdateComputeOrder()
-        {
-            // Gather start nodes:
-            startNodeList = graph.nodes.Where(n => n is StartNode).Select(n => n as StartNode).ToList();
-
-            // In case there is no start node, we process the graph like usual
-            if (startNodeList.Count == 0)
-            {
-                processList = graph.nodes.OrderBy(n => n.computeOrder).ToList();
-            }
-            else
-            {
-                nonConditionalDependenciesCache.Clear();
-                // Prepare the cache of non-conditional node execution
-            }
-        }
-
-        public override void Run()
-        {
-            IEnumerator<BaseNode> enumerator;
-
-            if(startNodeList.Count == 0)
-            {
-                enumerator = RunTheGraph();
-            }
-            else
-            {
-                Stack<BaseNode> nodeToExecute = new Stack<BaseNode>();
-                // Add all the start nodes to the execution stack
-                startNodeList.ForEach(s => nodeToExecute.Push(s));
-                // Execute the whole graph:
-                enumerator = RunTheGraph(nodeToExecute);
-            }
-
-            while(enumerator.MoveNext());
-        }
-        
-        private void WaitedRun(Stack<BaseNode> nodesToRun)
-        {
-            // Execute the waitable node:
-            var enumerator = RunTheGraph(nodesToRun);
-
-            while(enumerator.MoveNext())
-                ;
-        }
-
-        IEnumerable<BaseNode> GatherNonConditionalDependencies(BaseNode node)
-        {
-            Stack<BaseNode> dependencies = new Stack<BaseNode>();
-
-            dependencies.Push(node);
-        
-            while (dependencies.Count > 0)
-            {
-                var dependency = dependencies.Pop();
-
-                foreach (var d in dependency.GetInputNodes().Where(n => !(n is IConditionalNode)))
-                    dependencies.Push(d);
-
-                if (dependency != node)
-                    yield return dependency;
-            }
-        }
-        
-        private IEnumerator<BaseNode> RunTheGraph()
-        {
-            int count = processList.Count;
-
-            for(int i = 0; i < count; i++)
-            {
-                processList[i].OnProcess();
-                yield return processList[i];
-            }
-        }
-        
-	    private IEnumerator<BaseNode> RunTheGraph(Stack<BaseNode> nodeToExecute)
-		{
-			HashSet<BaseNode> nodeDependenciesGathered = new HashSet<BaseNode>();
-			HashSet<BaseNode> skipConditionalHandling  = new HashSet<BaseNode>();
-	
-			while(nodeToExecute.Count > 0)
-			{
-				var node = nodeToExecute.Pop();
-				// TODO: maxExecutionTimeMS
-	
-				// In case the node is conditional, then we need to execute it's non-conditional dependencies first
-				if(node is IConditionalNode && !skipConditionalHandling.Contains(node))
-				{
-					// Gather non-conditional deps: TODO, move to the cache:
-					if(nodeDependenciesGathered.Contains(node))
-					{
-						// Execute the conditional node:
-						node.OnProcess();
-						yield return node;
-	
-						// And select the next nodes to execute:
-						switch(node)
-						{
-							// special code path for the loop node as it will execute multiple times the same nodes
-							case ForLoopNode forLoopNode:
-								forLoopNode.index = forLoopNode.start - 1; // Initialize the start index
-								foreach(var n in forLoopNode.GetExecutedNodesLoopCompleted())
-									nodeToExecute.Push(n);
-								for(int i = forLoopNode.start; i < forLoopNode.end; i++)
-								{
-									foreach(var n in forLoopNode.GetExecutedNodesLoopBody())
-										nodeToExecute.Push(n);
-	
-									nodeToExecute.Push(node); // Increment the counter
-								}
-	
-								skipConditionalHandling.Add(node);
-								break;
-							// another special case for waitable nodes, like "wait for a coroutine", wait x seconds", etc.
-							case WaitableNode waitableNode:
-								foreach(var n in waitableNode.GetExecutedNodes())
-									nodeToExecute.Push(n);
-	
-								waitableNode.onProcessFinished += (waitedNode) =>
-								{
-									Stack<BaseNode> waitedNodes = new Stack<BaseNode>();
-									foreach(var n in waitedNode.GetExecuteAfterNodes())
-										waitedNodes.Push(n);
-									WaitedRun(waitedNodes);
-									waitableNode.onProcessFinished = null;
-								};
-								break;
-							case IConditionalNode cNode:
-								foreach(var n in cNode.GetExecutedNodes())
-									nodeToExecute.Push(n);
-								break;
-							default:
-								Debug.LogError($"Conditional node {node} not handled");
-								break;
-						}
-	
-						nodeDependenciesGathered.Remove(node);
-					}
-					else
-					{
-						nodeToExecute.Push(node);
-						nodeDependenciesGathered.Add(node);
-						foreach(var nonConditionalNode in GatherNonConditionalDependencies(node))
-						{
-							nodeToExecute.Push(nonConditionalNode);
-						}
-					}
-				}
-				else
-				{
-					node.OnProcess();
-					yield return node;
-				}
-			}
-		}
-
-        // Advance the execution of the graph of one node, mostly for debug. Doesn't work for WaitableNode's executeAfter port.
-        public void Step()
-        {
-            if (currentGraphExecution == null)
-            {
-	            Stack<BaseNode> nodeToExecute = new Stack<BaseNode>();
-	            if(startNodeList.Count > 0)
-		            startNodeList.ForEach(s => nodeToExecute.Push(s));
-
-	            currentGraphExecution = startNodeList.Count == 0 ? RunTheGraph() : RunTheGraph(nodeToExecute);
-	            currentGraphExecution.MoveNext(); // Advance to the first node
-            }
-            else
-            if (!currentGraphExecution.MoveNext())
-                currentGraphExecution = null;
-        }
-    }
-}

package/Runtime/Scripts/NodeGraph/ConditionalGraph/ConditionalProcessor.cs.meta

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

package/Runtime/Scripts/NodeGraph/ConditionalGraph/Editor/ComparisonView.cs

@@ -1,49 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor;
-using UnityEditor.UIElements;
-using UnityEditor.Experimental.GraphView;
-using UnityEngine.UIElements;
-using GraphProcessor;
-using NodeGraphProcessor.Examples;
-
-[NodeCustomEditor(typeof(Comparison))]
-public class ComparisonView : BaseNodeView
-{
-	public override void Enable()
-	{
-		Comparison comparisonNode = nodeTarget as Comparison;
-		DrawDefaultInspector();
-		
-		var inputA = new FloatField("In A") { value = comparisonNode.inA };
-		var inputB = new FloatField("In B") { value = comparisonNode.inB };
-		inputA.RegisterValueChangedCallback(v => {
-			owner.RegisterCompleteObjectUndo("Change InA value");
-			comparisonNode.inA = v.newValue;
-		});
-		inputB.RegisterValueChangedCallback(v => {
-			owner.RegisterCompleteObjectUndo("Change InB value");
-			comparisonNode.inB = v.newValue;
-		});
-
-		nodeTarget.onAfterEdgeConnected += UpdateVisibleFields;
-		nodeTarget.onAfterEdgeDisconnected += UpdateVisibleFields;
-
-		UpdateVisibleFields(null);
-
-		void UpdateVisibleFields(SerializableEdge _)
-		{
-			var inA = nodeTarget.GetPort(nameof(comparisonNode.inA), null);
-			var inB = nodeTarget.GetPort(nameof(comparisonNode.inB), null);
-
-			controlsContainer.Add(inputA);
-			controlsContainer.Add(inputB);
-
-			if (inA.GetEdges().Count > 0)
-				controlsContainer.Remove(inputA);
-			if (inB.GetEdges().Count > 0)
-				controlsContainer.Remove(inputB);
-		}
-	}
-}

package/Runtime/Scripts/NodeGraph/ConditionalGraph/Editor/ComparisonView.cs.meta

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

package/Runtime/Scripts/NodeGraph/ConditionalGraph/Editor/ConditionalProcessorView.cs

@@ -1,53 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEditor.Experimental.GraphView;
-using UnityEditor.UIElements;
-using UnityEngine.UIElements;
-using GraphProcessor;
-using NodeGraphProcessor.Examples;
-
-public class ConditionalProcessorView : PinnedElementView
-{
-    ConditionalProcessor	processor;
-    BaseGraphView           graphView;
-
-    public ConditionalProcessorView() => title = "Conditional Processor";
-
-    protected override void Initialize(BaseGraphView graphView)
-    {
-        processor = new ConditionalProcessor(graphView.graph);
-        this.graphView = graphView;
-
-        graphView.computeOrderUpdated += processor.UpdateComputeOrder;
-
-        Button runButton = new Button(OnPlay) { name = "ActionButton", text = "Run" };
-        Button stepButton = new Button(OnStep) { name = "ActionButton", text = "Step" };
-
-        content.Add(runButton);
-        content.Add(stepButton);
-    }
-
-    void OnPlay() => processor.Run();
-
-    void OnStep()
-    {
-        BaseNodeView view;
-
-        if (processor.currentGraphExecution != null)
-        {
-            // Unhighlight the last executed node
-            view = graphView.nodeViews.Find(v => v.nodeTarget == processor.currentGraphExecution.Current);
-            view.UnHighlight();
-        }
-
-        processor.Step();
-
-        // Display debug infos, currentGraphExecution is modified in the Step() function above
-        if (processor.currentGraphExecution != null)
-        {
-            view = graphView.nodeViews.Find(v => v.nodeTarget == processor.currentGraphExecution.Current);
-            view.Highlight();
-        }
-    }
-}

package/Runtime/Scripts/NodeGraph/ConditionalGraph/Editor/ConditionalProcessorView.cs.meta

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

package/Runtime/Scripts/NodeGraph/ConditionalGraph/Editor.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f0efae76c43e94793ab9a0af85ea06cb
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

package/Runtime/Scripts/NodeGraph/ConditionalGraph/IConditionalNode.cs

@@ -1,12 +0,0 @@
-using System.Collections.Generic;
-using System.Reflection;
-
-namespace NodeGraphProcessor.Examples
-{
-	interface IConditionalNode
-	{
-		IEnumerable< ConditionalNode >	GetExecutedNodes();
-
-		FieldInfo[] GetNodeFields(); // Provide a custom order for fields (so conditional links are always at the top of the node)
-	}
-}

package/Runtime/Scripts/NodeGraph/ConditionalGraph/IConditionalNode.cs.meta

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

package/Runtime/Scripts/NodeGraph/ConditionalGraph/RuntimeConditionalGraph.cs

@@ -1,19 +0,0 @@
-using UnityEngine;
-using GraphProcessor;
-using NodeGraphProcessor.Examples;
-
-public class RuntimeConditionalGraph : MonoBehaviour
-{
-	[Header("Graph to Run on Start")]
-	public BaseGraph graph;
-
-	private ConditionalProcessor processor;
-
-	private void Start()
-	{
-		if(graph != null)
-			processor = new ConditionalProcessor(graph);
-
-		processor.Run();
-	}
-}

package/Runtime/Scripts/NodeGraph/ConditionalGraph/RuntimeConditionalGraph.cs.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 412c3d6849a64ff687f9971b4a7da12b
-timeCreated: 1612049543

package/Runtime/Scripts/NodeGraph/ConditionalGraph/StartNode.cs

@@ -1,24 +0,0 @@
-using System.Collections.Generic;
-using System.Linq;
-using System.Reflection;
-using GraphProcessor;
-
-namespace NodeGraphProcessor.Examples
-{
-	[System.Serializable, NodeMenuItem("Conditional/Start")]
-	public class StartNode : BaseNode, IConditionalNode
-	{
-		[Output(name = "Executes")]
-		public ConditionalLink		executes;
-
-		public override string		name => "Start";
-
-		public IEnumerable< ConditionalNode >	GetExecutedNodes()
-		{
-			// Return all the nodes connected to the executes port
-			return GetOutputNodes().Where(n => n is ConditionalNode).Select(n => n as ConditionalNode);
-		}
-
-		public override FieldInfo[] GetNodeFields() => base.GetNodeFields();
-	}
-}