net.dreditor.freetime 0.1.6 → 0.1.8

package/IFTEDataHandler.cs

@@ -1,38 +1,38 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Saving;
-
-namespace DREditor.FreeTime
-{
-    /// <summary>
-    ///
-    /// </summary>
-    public interface IFTEDataHandler : IPlayerDataClearer
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="name"></param>
-        void AddCharacter(string name);
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        int GetLevelOfCharacter(string name);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="name"></param>
-        void LevelUpCharacter(string name);
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="name"></param>
-        /// <returns></returns>
-        int GetAffinity(string name);
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Saving;
+
+namespace DREditor.FreeTime
+{
+    /// <summary>
+    ///
+    /// </summary>
+    public interface IFTEDataHandler : IPlayerDataClearer
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="name"></param>
+        void AddCharacter(string name);
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        int GetLevelOfCharacter(string name);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="name"></param>
+        void LevelUpCharacter(string name);
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="name"></param>
+        /// <returns></returns>
+        int GetAffinity(string name);
+    }
 }

package/IFTEDataHandler.cs.meta

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

package/MoveToNextDayEvent.cs

@@ -1,214 +1,214 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.DialogueEventHandling;
-using DREditor.Dialogues;
-using DREditor.Dialogues.Events;
-using DREditor.EventObjects;
-using DREditor.Fading;
-using DREditor.RoomLoading;
-using DREditor.Services;
-using System.Collections;
-using UnityEngine;
-using UnityEngine.SceneManagement;
-
-namespace DREditor.FreeTime
-{
-    /// <summary>
-    ///
-    /// </summary>
-    /// <remarks></remarks>
-    [ClassHeader(nameof(DialogueEventHandler) + ", " + nameof(IToTitleScreen) +
-        "\n\n")]
-    public class MoveToNextDayEvent : DialogueEventHandler, IToTitleScreen
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Divider]
-        [Header("")]
-        [Divider]
-        [Space]
-        [Header("")]
-        [Divider]
-        [Space]
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent inLoading = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SceneEvent cleanUpDialogueReader = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected BoolWithEvent toSkipHideCG = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        [SerializeField] protected SceneTransition transition = new();
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string moveOnEndEventString = "MoveEndOnDialogueFinish";
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected string fadeOutEventString = "FadeOutOnLoadSubscribe";
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected SceneEvent moveToNextNaturalObjective = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected StringWithEvent moveToObjective = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected IntWithEvent currentAddState = null;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected int additionalStateIndex = 0;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected float fadeToDarkDuration = 0.5f;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        [SerializeField] protected ReturnToMenuHandler returnToMenuHandler = null;
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="o"></param>
-        protected override void OnDialogueEventTriggered(object o = null)
-        {
-            UnityEngine.Debug.Log($"{ToString()}: MOVING TO NEXT DAY.");
-
-            if (o is SceneTransition sentTransition)
-                CallSceneTransition(sentTransition);
-            else
-                CallSceneTransition(transition);
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="sceneTransition"></param>
-        protected virtual void CallSceneTransition(SceneTransition sceneTransition) 
-            => StartCoroutine(SceneTransitionRoutine(sceneTransition));
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="sceneTransition"></param>
-        /// <returns></returns>
-        protected virtual IEnumerator SceneTransitionRoutine(SceneTransition sceneTransition)
-        {
-            currentAddState.SetValue(additionalStateIndex);
-
-            if (sceneTransition.ToDark)
-                yield return ServiceLocator.GetService<GlobalFade>().FadeToRoutine(fadeToDarkDuration);
-
-            EvaluateSceneTransitionOptions(sceneTransition);
-
-            if (!sceneTransition.AtEnd && !sceneTransition.ToMenu)
-                yield return MoveToScene(sceneTransition.Scene);
-            else if (sceneTransition.AtEnd)
-                DialogueEventSystem.TriggerEvent(moveOnEndEventString, sceneTransition.AtEnd);
-
-            cleanUpDialogueReader.Raise();
-
-            if (sceneTransition.ToMenu)
-            {
-                returnToMenuHandler.ReturnToMenu(sceneTransition.Scene);
-
-                yield break;
-            }
-
-            toSkipHideCG.SetValue(true);
-
-            ServiceLocator.GetService<IDialogueManager>().GetEnder().StopDialogue();
-
-            yield break;
-        }
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="sceneTransition"></param>
-        protected virtual void EvaluateSceneTransitionOptions(SceneTransition sceneTransition)
-        {
-            if (!string.IsNullOrEmpty(sceneTransition.MoveToObjective))
-                moveToObjective.SetValue(sceneTransition.MoveToObjective);
-
-            if (sceneTransition.MoveToNextNaturalObjective)
-                moveToNextNaturalObjective.Raise();
-
-            if (sceneTransition.OnLoadNoDark)
-                DialogueEventSystem.TriggerEvent(fadeOutEventString);
-
-            if (!sceneTransition.ToMenu)
-                ServiceLocator.GetService<TPFDRoomLoader>().SetMovingToTPFDMode();
-        }
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <param name="scene"></param>
-        /// <returns></returns>
-        protected virtual IEnumerator MoveToScene(string scene)
-        {
-            UnityEngine.Debug.Log($"{ToString()}: CHANGING SCENE");
-
-            AsyncOperation asyncLoadOperation = SceneManager.LoadSceneAsync(scene);
-
-            asyncLoadOperation.allowSceneActivation = false;
-
-            yield return new WaitUntil(() => asyncLoadOperation.progress >= 0.9f);
-
-            asyncLoadOperation.allowSceneActivation = true;
-
-            yield return new WaitUntil(() => !inLoading.Value);
-
-            yield break;
-        }
-
-
-        [ContextMenu("Set Default Event")]
-        public void SetDefaultEvent() => SetDefaultEventString("NextDay");
-
-        protected virtual void Reset() => SetDefaultEventString("NextDay");
-
-
-        /// <inheritdoc/>
-        public virtual void ToTitleScreen() => moveToObjective.SetValue(string.Empty);
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.DialogueEventHandling;
+using DREditor.Dialogues;
+using DREditor.Dialogues.Events;
+using DREditor.EventObjects;
+using DREditor.Fading;
+using DREditor.RoomLoading;
+using DREditor.Services;
+using System.Collections;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+
+namespace DREditor.FreeTime
+{
+    /// <summary>
+    ///
+    /// </summary>
+    /// <remarks></remarks>
+    [ClassHeader(nameof(DialogueEventHandler) + ", " + nameof(IToTitleScreen) +
+        "\n\n")]
+    public class MoveToNextDayEvent : DialogueEventHandler, IToTitleScreen
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Divider]
+        [Header("")]
+        [Divider]
+        [Space]
+        [Header("")]
+        [Divider]
+        [Space]
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent inLoading = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SceneEvent cleanUpDialogueReader = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected BoolWithEvent toSkipHideCG = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        [SerializeField] protected SceneTransition transition = new();
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string moveOnEndEventString = "MoveEndOnDialogueFinish";
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected string fadeOutEventString = "FadeOutOnLoadSubscribe";
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected SceneEvent moveToNextNaturalObjective = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected StringWithEvent moveToObjective = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected IntWithEvent currentAddState = null;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected int additionalStateIndex = 0;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected float fadeToDarkDuration = 0.5f;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        [SerializeField] protected ReturnToMenuHandler returnToMenuHandler = null;
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="o"></param>
+        protected override void OnDialogueEventTriggered(object o = null)
+        {
+            UnityEngine.Debug.Log($"{ToString()}: MOVING TO NEXT DAY.");
+
+            if (o is SceneTransition sentTransition)
+                CallSceneTransition(sentTransition);
+            else
+                CallSceneTransition(transition);
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="sceneTransition"></param>
+        protected virtual void CallSceneTransition(SceneTransition sceneTransition) 
+            => StartCoroutine(SceneTransitionRoutine(sceneTransition));
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="sceneTransition"></param>
+        /// <returns></returns>
+        protected virtual IEnumerator SceneTransitionRoutine(SceneTransition sceneTransition)
+        {
+            currentAddState.SetValue(additionalStateIndex);
+
+            if (sceneTransition.ToDark)
+                yield return ServiceLocator.GetService<GlobalFade>().FadeToRoutine(fadeToDarkDuration);
+
+            EvaluateSceneTransitionOptions(sceneTransition);
+
+            if (!sceneTransition.AtEnd && !sceneTransition.ToMenu)
+                yield return MoveToScene(sceneTransition.Scene);
+            else if (sceneTransition.AtEnd)
+                DialogueEventSystem.TriggerEvent(moveOnEndEventString, sceneTransition.AtEnd);
+
+            cleanUpDialogueReader.Raise();
+
+            if (sceneTransition.ToMenu)
+            {
+                returnToMenuHandler.ReturnToMenu(sceneTransition.Scene);
+
+                yield break;
+            }
+
+            toSkipHideCG.SetValue(true);
+
+            ServiceLocator.GetService<IDialogueManager>().GetEnder().StopDialogue();
+
+            yield break;
+        }
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="sceneTransition"></param>
+        protected virtual void EvaluateSceneTransitionOptions(SceneTransition sceneTransition)
+        {
+            if (!string.IsNullOrEmpty(sceneTransition.MoveToObjective))
+                moveToObjective.SetValue(sceneTransition.MoveToObjective);
+
+            if (sceneTransition.MoveToNextNaturalObjective)
+                moveToNextNaturalObjective.Raise();
+
+            if (sceneTransition.OnLoadNoDark)
+                DialogueEventSystem.TriggerEvent(fadeOutEventString);
+
+            if (!sceneTransition.ToMenu)
+                ServiceLocator.GetService<TPFDRoomLoader>().SetMovingToTPFDMode();
+        }
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <param name="scene"></param>
+        /// <returns></returns>
+        protected virtual IEnumerator MoveToScene(string scene)
+        {
+            UnityEngine.Debug.Log($"{ToString()}: CHANGING SCENE");
+
+            AsyncOperation asyncLoadOperation = SceneManager.LoadSceneAsync(scene);
+
+            asyncLoadOperation.allowSceneActivation = false;
+
+            yield return new WaitUntil(() => asyncLoadOperation.progress >= 0.9f);
+
+            asyncLoadOperation.allowSceneActivation = true;
+
+            yield return new WaitUntil(() => !inLoading.Value);
+
+            yield break;
+        }
+
+
+        [ContextMenu("Set Default Event")]
+        public void SetDefaultEvent() => SetDefaultEventString("NextDay");
+
+        protected virtual void Reset() => SetDefaultEventString("NextDay");
+
+
+        /// <inheritdoc/>
+        public virtual void ToTitleScreen() => moveToObjective.SetValue(string.Empty);
+    }
 }

package/MoveToNextDayEvent.cs.meta

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

package/PresentReaction.cs

@@ -1,37 +1,37 @@
-//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
-using DREditor.Dialogues;
-using System;
-using System.Collections.Generic;
-using UnityEngine;
-
-namespace DREditor.FreeTime
-{
-    /// <summary>
-    ///
-    /// </summary>
-    [Serializable]
-    [CreateAssetMenu(menuName = "DREditor/FTE/Present Reaction", fileName = "Present Reaction")]
-    public class PresentReaction : ScriptableObject
-    {
-        /// <summary>
-        ///
-        /// </summary>
-        [Header("")]
-        [Divider]
-        [Tooltip("")]
-        public int reactionKeyIndex = 0;
-
-        /// <summary>
-        ///
-        /// </summary>
-        [Tooltip("")]
-        public List<Dialogue> reactions = new();
-
-
-        /// <summary>
-        ///
-        /// </summary>
-        /// <returns></returns>
-        public List<DialogueBase<Line>> GetReactions() => new(reactions);
-    }
+//Author: Benjamin "Sweden" Jillson : Discord: sweden_gaming For Project Eden's Garden
+using DREditor.Dialogues;
+using System;
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace DREditor.FreeTime
+{
+    /// <summary>
+    ///
+    /// </summary>
+    [Serializable]
+    [CreateAssetMenu(menuName = "DREditor/FTE/Present Reaction", fileName = "Present Reaction")]
+    public class PresentReaction : ScriptableObject
+    {
+        /// <summary>
+        ///
+        /// </summary>
+        [Header("")]
+        [Divider]
+        [Tooltip("")]
+        public int reactionKeyIndex = 0;
+
+        /// <summary>
+        ///
+        /// </summary>
+        [Tooltip("")]
+        public List<Dialogue> reactions = new();
+
+
+        /// <summary>
+        ///
+        /// </summary>
+        /// <returns></returns>
+        public List<DialogueBase<Line>> GetReactions() => new(reactions);
+    }
 }

package/PresentReaction.cs.meta

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