Add respawn here option (#486)

Resolves #485
Outer-Wilds-New-Horizons · Jan 14, 2023 · 88b7236 · 88b7236
2 parents e292e5e + dc0816b
commit 88b7236
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 7 deletions.
diff --git a/NewHorizons/External/Configs/StarSystemConfig.cs b/NewHorizons/External/Configs/StarSystemConfig.cs
@@ -56,11 +56,15 @@ public class StarSystemConfig
         public SkyboxModule Skybox;
 
         /// <summary>
-        /// Set to `true` if you want to spawn here after dying, not Timber Hearth. You can still warp back to the main star
-        /// system.
+        /// Set to `true` if you want to spawn here after dying, not Timber Hearth. You can still warp back to the main star system.
         /// </summary>
         public bool startHere;
 
+        /// <summary>
+        /// Set to `true` if you want the player to stay in this star system if they die in it.
+        /// </summary>
+        public bool respawnHere;
+
         [Obsolete("travelAudioClip is deprecated, please use travelAudio instead")]
         public string travelAudioClip;
 
@@ -238,7 +242,7 @@ public void Merge(StarSystemConfig otherConfig)
 
             // False by default so if one is true go true
             mapRestricted = mapRestricted || otherConfig.mapRestricted;
-            mapRestricted = mapRestricted || otherConfig.mapRestricted;
+            respawnHere = respawnHere || otherConfig.respawnHere;
             startHere = startHere || otherConfig.startHere;
 
             Vessel = Vessel == null ? otherConfig.Vessel : Vessel;

diff --git a/NewHorizons/Main.cs b/NewHorizons/Main.cs
@@ -819,18 +819,17 @@ void OnDeath(DeathType _)
             // We reset the solar system on death
             if (!IsChangingStarSystem)
             {
+                if (SystemDict[_currentStarSystem].Config.respawnHere) return;
+
                 // If the override is a valid system then we go there
                 if (SystemDict.ContainsKey(_defaultSystemOverride))
                 {
                     _currentStarSystem = _defaultSystemOverride;
-                    IsWarpingFromShip = true; // always do this else sometimes the spawn gets messed up
                 }
                 else
                 {
                     _currentStarSystem = _defaultStarSystem;
                 }
-
-                IsWarpingFromShip = false;
             }
         }
         #endregion Change star system

diff --git a/NewHorizons/Schemas/star_system_schema.json b/NewHorizons/Schemas/star_system_schema.json
@@ -45,7 +45,11 @@
     },
     "startHere": {
       "type": "boolean",
-      "description": "Set to `true` if you want to spawn here after dying, not Timber Hearth. You can still warp back to the main star\nsystem."
+      "description": "Set to `true` if you want to spawn here after dying, not Timber Hearth. You can still warp back to the main star system."
+    },
+    "respawnHere": {
+      "type": "boolean",
+      "description": "Set to `true` if you want the player to stay in this star system if they die in it."
     },
     "travelAudio": {
       "type": "string",