Improved a few comments and changed when mod scene change callback tr…

…iggers (#3842) * Improved a few comments and switched when mod scene change callback is triggered * Updated common module
Revolutionary-Games · Nov 1, 2022 · 61fe92f · 61fe92f
1 parent 7d48312
commit 61fe92f
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 4 deletions.
diff --git a/RevolutionaryGamesCommon b/RevolutionaryGamesCommon
diff --git a/Thrive.sln.DotSettings b/Thrive.sln.DotSettings
@@ -471,6 +471,7 @@
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CO/@EntryIndexedValue">CO</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CP/@EntryIndexedValue">CP</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=CPU/@EntryIndexedValue">CPU</s:String>
+	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=DTO/@EntryIndexedValue">DTO</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=FPS/@EntryIndexedValue">FPS</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GLES/@EntryIndexedValue">GLES</s:String>
 	<s:String x:Key="/Default/CodeStyle/Naming/CSharpNaming/Abbreviations/=GUI/@EntryIndexedValue">GUI</s:String>
@@ -516,6 +517,7 @@
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=bathypelagic/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Biome/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=biomes/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=botd/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=carbondioxide/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=cellulase/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Chemereception/@EntryIndexedValue">True</s:Boolean>

diff --git a/src/engine/SceneManager.cs b/src/engine/SceneManager.cs
@@ -50,15 +50,14 @@ public void SwitchToScene(string scenePath)
 
         internalRootNode.AddChild(newSceneRoot);
         GetTree().CurrentScene = newSceneRoot;
+        ModLoader.ModInterface.TriggerOnSceneChanged(newSceneRoot);
 
         if (!keepOldRoot)
         {
             oldRoot?.QueueFree();
             return null;
         }
 
-        ModLoader.ModInterface.TriggerOnSceneChanged(newSceneRoot);
-
         return oldRoot;
     }
 

diff --git a/src/engine/UnhandledExceptionLogger.cs b/src/engine/UnhandledExceptionLogger.cs
@@ -11,6 +11,9 @@ public static class UnhandledExceptionLogger
     public static void OnUnhandledException(object sender, UnhandledExceptionArgs args)
     {
         var builder = new StringBuilder(500);
+
+        // Don't change this as the launcher depends on this, in fact it would be nice to move this to a shared
+        // constants file
         builder.Append("------------ Begin of Unhandled Exception Log ------------\n");
 
         if (modsEnabled)

diff --git a/src/saving/serializers/ThriveJsonConverter.cs b/src/saving/serializers/ThriveJsonConverter.cs
@@ -91,7 +91,10 @@ public string SerializeObject(object @object, Type? type = null)
     }
 
     /// <summary>
-    ///   Deserializes a fully dynamic object from json (object type is defined only in the json)
+    ///   Deserializes a fully dynamic object from json (object type is defined only in the json).
+    ///   Note that this uses the deserializer type for <see cref="object"/> which means that no custom deserializer
+    ///   logic works! That means this is only usable for basic types. Other types must have an interface or other
+    ///   base type and be used through <see cref="DeserializeObject{T}"/>.
     /// </summary>
     /// <param name="json">JSON text to parse</param>
     /// <returns>The created object</returns>