fr.jeanf.questsystem 0.0.2 → 0.0.4

package/Runtime/Scripts/Core/Quest.cs

@@ -2,100 +2,107 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-public class Quest
+namespace jeanf.questsystem
 {
-    // static info
-    public QuestInfoSO info;
-
-    // state info
-    public QuestState state;
-    private int currentQuestStepIndex;
-    public int currentStep;
-    private QuestStepState[] questStepStates;
-
-    public Quest(QuestInfoSO questInfo)
+    public class Quest
     {
-        this.info = questInfo;
-        this.state = QuestState.REQUIREMENTS_NOT_MET;
-        this.currentQuestStepIndex = currentStep = 0;
-        this.questStepStates = new QuestStepState[info.questStepPrefabs.Length];
-        for (int i = 0; i < questStepStates.Length; i++)
-        {
-            questStepStates[i] = new QuestStepState();
-        }
-    }
+        // static info
+        public QuestInfoSO info;
 
-    public Quest(QuestInfoSO questInfo, QuestState questState, int currentQuestStepIndex, QuestStepState[] questStepStates)
-    {
-        this.info = questInfo;
-        this.state = questState;
-        this.currentQuestStepIndex = currentQuestStepIndex;
-        currentStep = this.currentQuestStepIndex;
-        this.questStepStates = questStepStates;
+        // state info
+        public QuestState state;
+        private int currentQuestStepIndex;
+        public int currentStep;
+        private QuestStepState[] questStepStates;
 
-        // if the quest step states and prefabs are different lengths,
-        // something has changed during development and the saved data is out of sync.
-        if (this.questStepStates.Length != this.info.questStepPrefabs.Length)
+        public Quest(QuestInfoSO questInfo)
         {
-            Debug.LogWarning("Quest Step Prefabs and Quest Step States are "
-                + "of different lengths. This indicates something changed "
-                + "with the QuestInfo and the saved data is now out of sync. "
-                + "Reset your data - as this might cause issues. QuestId: " + this.info.id);
+            this.info = questInfo;
+            this.state = QuestState.REQUIREMENTS_NOT_MET;
+            this.currentQuestStepIndex = currentStep = 0;
+            this.questStepStates = new QuestStepState[info.questStepPrefabs.Length];
+            for (int i = 0; i < questStepStates.Length; i++)
+            {
+                questStepStates[i] = new QuestStepState();
+            }
         }
-    }
 
-    public void MoveToNextStep()
-    {
-        currentQuestStepIndex++;
-        currentStep = currentQuestStepIndex;
-    }
+        public Quest(QuestInfoSO questInfo, QuestState questState, int currentQuestStepIndex,
+            QuestStepState[] questStepStates)
+        {
+            this.info = questInfo;
+            this.state = questState;
+            this.currentQuestStepIndex = currentQuestStepIndex;
+            currentStep = this.currentQuestStepIndex;
+            this.questStepStates = questStepStates;
 
-    public bool CurrentStepExists()
-    {
-        return (currentQuestStepIndex < info.questStepPrefabs.Length);
-    }
+            // if the quest step states and prefabs are different lengths,
+            // something has changed during development and the saved data is out of sync.
+            if (this.questStepStates.Length != this.info.questStepPrefabs.Length)
+            {
+                Debug.LogWarning("Quest Step Prefabs and Quest Step States are "
+                                 + "of different lengths. This indicates something changed "
+                                 + "with the QuestInfo and the saved data is now out of sync. "
+                                 + "Reset your data - as this might cause issues. QuestId: " + this.info.id);
+            }
+        }
 
-    public void InstantiateCurrentQuestStep(Transform parentTransform)
-    {
-        GameObject questStepPrefab = GetCurrentQuestStepPrefab();
-        if (questStepPrefab != null)
+        public void MoveToNextStep()
         {
-            QuestStep questStep = Object.Instantiate<GameObject>(questStepPrefab, parentTransform)
-                .GetComponent<QuestStep>();
-            questStep.InitializeQuestStep(info.id, currentQuestStepIndex, questStepStates[currentQuestStepIndex].state);
+            currentQuestStepIndex++;
+            currentStep = currentQuestStepIndex;
         }
-    }
 
-    private GameObject GetCurrentQuestStepPrefab()
-    {
-        GameObject questStepPrefab = null;
-        if (CurrentStepExists())
+        public bool CurrentStepExists()
         {
-            questStepPrefab = info.questStepPrefabs[currentQuestStepIndex];
+            return (currentQuestStepIndex < info.questStepPrefabs.Length);
         }
-        else 
+
+        public void InstantiateCurrentQuestStep(Transform parentTransform)
         {
-            Debug.LogWarning("Tried to get quest step prefab, but stepIndex was out of range indicating that "
-                + "there's no current step: QuestId=" + info.id + ", stepIndex=" + currentQuestStepIndex);
+            GameObject questStepPrefab = GetCurrentQuestStepPrefab();
+            if (questStepPrefab != null)
+            {
+                QuestStep questStep = Object.Instantiate<GameObject>(questStepPrefab, parentTransform)
+                    .GetComponent<QuestStep>();
+                questStep.InitializeQuestStep(info.id, currentQuestStepIndex,
+                    questStepStates[currentQuestStepIndex].state);
+            }
         }
-        return questStepPrefab;
-    }
 
-    public void StoreQuestStepState(QuestStepState questStepState, int stepIndex)
-    {
-        if (stepIndex < questStepStates.Length)
+        private GameObject GetCurrentQuestStepPrefab()
         {
-            questStepStates[stepIndex].state = questStepState.state;
+            GameObject questStepPrefab = null;
+            if (CurrentStepExists())
+            {
+                questStepPrefab = info.questStepPrefabs[currentQuestStepIndex];
+            }
+            else
+            {
+                Debug.LogWarning("Tried to get quest step prefab, but stepIndex was out of range indicating that "
+                                 + "there's no current step: QuestId=" + info.id + ", stepIndex=" +
+                                 currentQuestStepIndex);
+            }
+
+            return questStepPrefab;
         }
-        else 
+
+        public void StoreQuestStepState(QuestStepState questStepState, int stepIndex)
         {
-            Debug.LogWarning("Tried to access quest step data, but stepIndex was out of range: "
-                + "Quest Id = " + info.id + ", Step Index = " + stepIndex);
+            if (stepIndex < questStepStates.Length)
+            {
+                questStepStates[stepIndex].state = questStepState.state;
+            }
+            else
+            {
+                Debug.LogWarning("Tried to access quest step data, but stepIndex was out of range: "
+                                 + "Quest Id = " + info.id + ", Step Index = " + stepIndex);
+            }
         }
-    }
 
-    public QuestData GetQuestData()
-    {
-        return new QuestData(state, currentQuestStepIndex, questStepStates);
+        public QuestData GetQuestData()
+        {
+            return new QuestData(state, currentQuestStepIndex, questStepStates);
+        }
     }
-}
+}

package/Runtime/Scripts/Core/QuestData.cs

@@ -2,17 +2,20 @@ using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
 
-[System.Serializable]
-public class QuestData
+namespace jeanf.questsystem
 {
-    public QuestState state;
-    public int questStepIndex;
-    public QuestStepState[] questStepStates;
-
-    public QuestData(QuestState state, int questStepIndex, QuestStepState[] questStepStates)
+    [System.Serializable]
+    public class QuestData
     {
-        this.state = state;
-        this.questStepIndex = questStepIndex;
-        this.questStepStates = questStepStates;
+        public QuestState state;
+        public int questStepIndex;
+        public QuestStepState[] questStepStates;
+
+        public QuestData(QuestState state, int questStepIndex, QuestStepState[] questStepStates)
+        {
+            this.state = state;
+            this.questStepIndex = questStepIndex;
+            this.questStepStates = questStepStates;
+        }
     }
-}
+}

package/Runtime/Scripts/Core/QuestInfoSO.cs

@@ -1,34 +1,23 @@
  using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+ using jeanf.propertyDrawer;
 
-[CreateAssetMenu(fileName = "QuestInfoSO", menuName = "Quests/QuestInfoSO", order = 1)]
-[ScriptableObjectDrawer]
-public class QuestInfoSO : ScriptableObject
-{
-    [field: SerializeField] public string id { get; private set; }
+ namespace jeanf.questsystem
+ {
+     [CreateAssetMenu(fileName = "QuestInfoSO", menuName = "Quests/QuestInfoSO", order = 1)]
+     [ScriptableObjectDrawer]
+     public class QuestInfoSO : ScriptableObject
+     {
+         [field: SerializeField] public string id { get; private set; }
 
-    [Header("General")]
-    public string displayName;
+         [Header("General")] public string displayName;
 
-    [Header("Requirements")]
-    public int levelRequirement;
-    public QuestInfoSO[] questPrerequisites;
+         [Header("Requirements")] public int levelRequirement;
+         public QuestInfoSO[] questPrerequisites;
 
-    [Header("Steps")]
-    public GameObject[] questStepPrefabs;
+         [Header("Steps")] public GameObject[] questStepPrefabs;
 
-    [Header("Rewards")]
-    public string unlockedScenario;
-
-    // ensure the id is always the name of the Scriptable Object asset
-    private void OnValidate()
-    {
-        /*
-        #if UNITY_EDITOR
-        if (id == string.Empty) id = this.name;
-        if (this != null) UnityEditor.EditorUtility.SetDirty(this);
-        #endif
-        */
-    }
-}
+         [Header("Rewards")] public string unlockedScenario;
+     }
+ }

package/Runtime/Scripts/Core/QuestItem.cs

@@ -1,6 +1,7 @@
 using jeanf.EventSystem;
 using UnityEngine;
 using UnityEngine.Serialization;
+using jeanf.propertyDrawer;
 
 namespace jeanf.questsystem
 {