fr.jeanf.questsystem 0.0.4 → 0.0.6

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

@@ -0,0 +1,23 @@
+
+#if UNITY_EDITOR
+using jeanf.questsystem;
+using UnityEditor;
+using UnityEngine;
+
+public class QuestInfoSO_Editor : Editor
+{
+    [CustomEditor(typeof(QuestInfoSO))]
+    public class BoolEventOnClickEditor : Editor {
+        override public void  OnInspectorGUI () {
+            GUILayout.Space(10);
+            var eventToSend = (QuestInfoSO)target;
+            if(GUILayout.Button("Regenerate quest id", GUILayout.Height(20))) {
+                eventToSend.GenerateId(); // how do i call this?
+            }
+            GUILayout.Space(10);
+            
+            DrawDefaultInspector();
+        }
+    }
+}
+#endif

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

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

package/Runtime/Scripts/Core/Editor.meta

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

package/Runtime/Scripts/Core/Quest.cs

@@ -1,5 +1,7 @@
 using System.Collections;
 using System.Collections.Generic;
+using jeanf.EventSystem;
+using jeanf.propertyDrawer;
 using UnityEngine;
 
 namespace jeanf.questsystem
@@ -14,6 +16,11 @@ namespace jeanf.questsystem
         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)
         {
@@ -21,6 +28,13 @@ namespace jeanf.questsystem
             this.state = QuestState.REQUIREMENTS_NOT_MET;
             this.currentQuestStepIndex = currentStep = 0;
             this.questStepStates = new QuestStepState[info.questStepPrefabs.Length];
+            this.messageChannel = questInfo.messageChannel;
+            //init
+            this.sendMessageOnInitialization = questInfo.sendMessageOnInitialization;
+            this.messageToSendOnInit = questInfo.messageToSendOnInitialization;
+            //finish
+            this.sendMessageOnFinish = questInfo.sendMessageOnFinish;
+            this.messageToSendOnFinish = questInfo.messageToSendOnFinish;
             for (int i = 0; i < questStepStates.Length; i++)
             {
                 questStepStates[i] = new QuestStepState();
@@ -47,6 +61,7 @@ namespace jeanf.questsystem
             }
         }
 
+
         public void MoveToNextStep()
         {
             currentQuestStepIndex++;

package/Runtime/Scripts/Core/QuestInfoSO.cs

@@ -1,6 +1,6 @@
- using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
+ using System;
+ using jeanf.EventSystem;
+ using UnityEngine;
  using jeanf.propertyDrawer;
 
  namespace jeanf.questsystem
@@ -9,9 +9,16 @@ using UnityEngine;
      [ScriptableObjectDrawer]
      public class QuestInfoSO : ScriptableObject
      {
-         [field: SerializeField] public string id { get; private set; }
+         [field: Space(10)][field: ReadOnly] [field: SerializeField] public string id { get; private set; }
 
          [Header("General")] public string displayName;
+         
+         [Header("Custom messages init/finish")] 
+         [SerializeField] public StringEventChannelSO messageChannel;
+         [SerializeField] public bool sendMessageOnInitialization = false;
+         [SerializeField] public string messageToSendOnInitialization = "";
+         [SerializeField] public bool sendMessageOnFinish = false;
+         [SerializeField] public string messageToSendOnFinish = "";
 
          [Header("Requirements")] public int levelRequirement;
          public QuestInfoSO[] questPrerequisites;
@@ -19,5 +26,18 @@ using UnityEngine;
          [Header("Steps")] public GameObject[] questStepPrefabs;
 
          [Header("Rewards")] public string unlockedScenario;
+         
+         #if UNITY_EDITOR
+         private void OnValidate()
+         {
+             if (id == string.Empty || id == null) GenerateId();
+         }
+        #endif
+
+         public void GenerateId()
+         {
+             id = $"{System.Guid.NewGuid()}";
+             UnityEditor.EditorUtility.SetDirty(this);
+         }
      }
  }

package/Runtime/Scripts/Core/QuestManager.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections;
 using System.Collections.Generic;
 using jeanf.EventSystem;
@@ -21,8 +22,6 @@ namespace jeanf.questsystem
 
         [Header("Broadcasting on:")] [SerializeField]
         private StringEventChannelSO questStatusUpdateChannel;
-
-        [Header("Broadcasting on:")] [SerializeField]
         private StringFloatEventChannelSO questProgress;
 
         private Dictionary<string, Quest> questMap;
@@ -121,6 +120,9 @@ namespace jeanf.questsystem
             quest.InstantiateCurrentQuestStep(this.transform);
             ChangeQuestState(quest.info.id, QuestState.IN_PROGRESS);
             SaveQuest(quest);
+            if (!quest.sendMessageOnInitialization) return;
+            quest.messageChannel.RaiseEvent(quest.messageToSendOnInit);
+            if(isDebug) Debug.Log($"quest id:{id}  started, a message was attatched to the initialization: {quest.messageToSendOnInit}");
         }
 
         private void AdvanceQuest(string id)
@@ -135,13 +137,12 @@ namespace jeanf.questsystem
                     this);
             questStatusUpdateChannel.RaiseEvent(
                 $"[{quest.info.id}]quest state: {quest.state} - {quest.currentStep} over {quest.info.questStepPrefabs.Length} steps done");
-            var progress = (float)quest.currentStep / quest.info.questStepPrefabs.Length;
-            if (isDebug) Debug.Log($"[{quest.info.id}] progress: {progress * 100}%", this);
-            questProgress.RaiseEvent(quest.info.id, progress);
 
+            
             // if there are more steps, instantiate the next one
             if (quest.CurrentStepExists())
             {
+                UpdateProgress(quest);
                 quest.InstantiateCurrentQuestStep(this.transform);
             }
             // if there are no more steps, then we've finished all of them for this quest
@@ -153,14 +154,24 @@ namespace jeanf.questsystem
             SaveQuest(quest);
         }
 
+        private void UpdateProgress(Quest quest)
+        {
+            var progress = (float)quest.currentStep / quest.info.questStepPrefabs.Length;
+            if (quest.info.id == null) Debug.Log("C'est null");;
+            if (isDebug) Debug.Log($"[{quest.info.id}] progress: {progress * 100}%", this);
+            questProgress.RaiseEvent(quest.info.id, progress);
+        }
+
         private void FinishQuest(string id)
         {
             Quest quest = GetQuestById(id);
+            UpdateProgress(quest);
             ClaimRewards(quest);
             ChangeQuestState(quest.info.id, QuestState.FINISHED);
             questStatusUpdateChannel.RaiseEvent($"[{quest.info.id}] quest is finished.");
             questProgress.RaiseEvent(quest.info.id, 1);
             SaveQuest(quest);
+            if (!quest.sendMessageOnFinish) return;
         }
 
         private void ClaimRewards(Quest quest)

package/Runtime/Scripts/Core/QuestStep.cs

@@ -1,9 +1,7 @@
-using System.Collections;
-using System.Collections.Generic;
 using jeanf.EventSystem;
 using jeanf.propertyDrawer ;
 using UnityEngine;
-using jeanf.propertyDrawer;
+using UnityEngine.Playables;
 
 namespace jeanf.questsystem
 {
@@ -13,9 +11,15 @@ namespace jeanf.questsystem
         private string questId;
         private int stepIndex;
         private float questStepProgress = 0;
+        
+        [Tooltip("This boolean has to be enabled if the quest step has an intro timeline.")]
+        public bool isUsingIntroTimeline = false;
+
+        [DrawIf("isUsingIntroTimeline", true, ComparisonType.Equals, DisablingType.DontDraw)]
+        [SerializeField] private TimelineTriggerEventChannelSO _timelineTriggerEventChannelSo;
+        [DrawIf("isUsingIntroTimeline", true, ComparisonType.Equals, DisablingType.DontDraw)] 
+        [SerializeField] private PlayableAsset timeline;
 
-        [SerializeField] private bool sendEventOnInit = false;
-        //[DrawIf("sendEventOnInit", true, ComparisonType.Equals)] 
 
         public void InitializeQuestStep(string questId, int stepIndex, string questStepState)
         {
@@ -25,6 +29,11 @@ namespace jeanf.questsystem
             {
                 SetQuestStepState(questStepState);
             }
+
+            if (isUsingIntroTimeline && timeline)
+            {
+                _timelineTriggerEventChannelSo.RaiseEvent(timeline, true);
+            }
         }
 
         protected void FinishQuestStep()
@@ -34,6 +43,12 @@ namespace jeanf.questsystem
                 isFinished = true;
                 GameEventsManager.instance.questEvents.AdvanceQuest(questId);
                 Destroy(this.gameObject);
+                
+                
+                if (isUsingIntroTimeline && timeline)
+                {
+                    _timelineTriggerEventChannelSo.RaiseEvent(timeline, false);
+                }
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name":"fr.jeanf.questsystem",
-  "version":"0.0.4",
+  "version":"0.0.6",
   "displayName":"Quest system",
   "description":"This package uses Scriptable Objects to define quests.",
   "unity": "2021.3",
@@ -14,7 +14,7 @@
     "url":"https://jeanfrancoisrobin.art"
   },
   "dependencies": {
-    "fr.jeanf.propertydrawer": "1.1.1"
+    "fr.jeanf.propertydrawer": "1.1.6"
   },
   "samples": [