Merge branch 'S1P4_Develop' into main

Author: Kersoph

Lessons/1/User/Diagram.sfc

@@ -14,7 +14,7 @@ public class LessonEntity
         public const string DescriptionFilePath = "/Description.json";
         public const string UserResultDirectory = "/User";
         public const string UserResultFilePath = UserResultDirectory + "/Results.json";
-        public const string UserDiagramDirectory = UserResultDirectory + "/Diagram.sfc";
+        public const string TemporaryDiagram = UserResultDirectory + "/Temp.sfc";
 
         /// <summary>
         /// The lesson title as a BBCode.
@@ -37,9 +37,15 @@ public class LessonEntity
         public string FolderPath { get; private set; }
 
         /// <summary>
-        /// The complete path where the sfc file is stored for this lesson.
+        /// The complete path where the temporary sfc file is stored for this lesson.
+        /// Used for test / scene communication and immediate saves.
         /// </summary>
-        public string DiagramFilePath { get { return FolderPath + UserDiagramDirectory; } }
+        public string TemporaryDiagramFilePath { get { return FolderPath + TemporaryDiagram; } }
+        
+        /// <summary>
+        /// The complete path where the custom sfc file is stored for this lesson.
+        /// </summary>
+        public string CustomDiagramFilePath { get; set; }
 
         /// <summary>
         /// The data path of the simulation.

Lessons/2/User/Diagram.sfc

@@ -60,11 +60,14 @@ public void LoadDiagramOrDefault(string filepath)
         {
             if (!System.IO.File.Exists(filepath))
             {
-                PatchEntity entity = new PatchEntity(1, 0)
+                if (Data.SfcEntity.Lookup(1, 0) == null)
                 {
-                    SfcStepType = StepType.StartingStep
-                };
-                Data.SfcEntity.AddPatch(entity);
+                    PatchEntity entity = new PatchEntity(1, 0)
+                    {
+                        SfcStepType = StepType.StartingStep
+                    };
+                    Data.SfcEntity.AddPatch(entity);
+                }
             }
             else
             {

Lessons/2/User/Flicker.sfc

@@ -0,0 +1,13 @@
+using Godot;
+
+
+namespace Osls.SfcEditor
+{
+    public class EditorControls : Control
+    {
+        #region ==================== Fields / Properties ====================
+        [Export] private NodePath SfcEditorNodePath = "../..";
+        public SfcEditorNode SfcEditorNode { get { return GetNode<SfcEditorNode>(SfcEditorNodePath); } }
+        #endregion
+    }
+}

Lessons/3/User/Diagram.sfc

@@ -13,15 +13,7 @@ public override void _Ready()
 
         public void OnButtonPressed()
         {
-            GetNode<SfcEditorNode>("../../..").TryLoadDiagram();
-        }
-        
-        public override void _UnhandledKeyInput(InputEventKey @event)
-        {
-            if (@event.IsActionPressed("main_load"))
-            {
-                GetNode<SfcEditorNode>("../../..").TryLoadDiagram();
-            }
+            GetNode<FileDialog>("../FileDialog").LoadFile();
         }
         #endregion
     }

data/core/lesson/LessonEntity.cs

@@ -0,0 +1,28 @@
+using Godot;
+
+
+namespace Osls.SfcEditor
+{
+    public class EditorReload : Button
+    {
+        #region ==================== Public Methods ====================
+        public override void _Ready()
+        {
+            Connect("pressed", this, nameof(OnButtonPressed));
+        }
+        
+        public void OnButtonPressed()
+        {
+            GetNode<SfcEditorNode>("../../..").TryLoadDiagram();
+        }
+        
+        public override void _UnhandledKeyInput(InputEventKey @event)
+        {
+            if (@event.IsActionPressed("main_load"))
+            {
+                GetNode<SfcEditorNode>("../../..").TryLoadDiagram();
+            }
+        }
+        #endregion
+    }
+}