improve reviving

Author: codengine

README.md

@@ -18,6 +18,7 @@ A savegame editor for "Sons of The Forest".
 - [Inventory](#inventory)
 - [Armor](#armor)
 - [Weather](#weather)
+- [Reviving](#reviving)
 - [Troubleshooting](#troubleshooting)
 - [Contributing](#contributing)
 - [Final Words](#final-words)
@@ -102,6 +103,15 @@ Here is a list of number of days per season per season length setting:
 - Long: 10 days
 - Realistic: 90 days
 
+# Reviving
+
+If you want to revive either or both followers, there are some things to consider:
+- If the body is completely missing, the follower will spawn at the players location
+- Make sure to be outside of buildings, else you might glitch into the building sometimes
+- The followers will be at maximum stats and should be friendly towards players
+- They will not have any items, but you can easily use the other Editors to change that after reviving
+- Virginia is shy as a lamb when she was revived. I haven't tested it thoroughly but to me it appears that you have to regain her trust, like in the beginning of a session. I'm still trying to figure out which setting determines her trust.
+
 # Troubleshooting
 
 One of the items in inventory is listed as "Unknown"?

SOTFEdit/Model/Savegame.cs

@@ -240,10 +240,18 @@ private static void CreateFollowerData(JObject vailWorldSim, JToken? npcItemInst
         }
 
         var rnd = new Random();
-        var spawnerId = rnd.Next();
-        while (allSpawnerIds.Contains(spawnerId))
+        int spawnerId;
+        if (typeId == KelvinTypeId)
+        {
+            spawnerId = 0;
+        }
+        else
         {
             spawnerId = rnd.Next();
+            while (allSpawnerIds.Contains(spawnerId))
+            {
+                spawnerId = rnd.Next();
+            }
         }
 
         var templatePath = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "data", "followerTemplate.txt");
@@ -259,7 +267,7 @@ private static void CreateFollowerData(JObject vailWorldSim, JToken? npcItemInst
             var playerPos = Ioc.Default.GetRequiredService<PlayerPageViewModel>().PlayerState.Pos;
             if (!playerPos.IsDefault())
             {
-                actorTemplate["Position"]?.Replace(JToken.FromObject(playerPos with { Y = playerPos.Y + 2 }));
+                actorTemplate["Position"]?.Replace(JToken.FromObject(playerPos));
             }
 
             if (typeId == VirginiaTypeId)
@@ -275,15 +283,19 @@ private static void CreateFollowerData(JObject vailWorldSim, JToken? npcItemInst
             influenceMemory.Add(influenceTemplate);
         }
 
-        if (template["actorItems"] is not { } actorItemTemplate || npcItemInstancesToken?.ToObject<string>() is not
-                { } npcItemInstancesJson ||
-            JsonConverter.DeserializeRaw(npcItemInstancesJson) is not JArray npcItemInstances)
+        if (template["actorItems"] is { } actorItemTemplate && npcItemInstancesToken?.ToObject<string>() is
+                { } npcItemInstancesJson &&
+            JsonConverter.DeserializeRaw(npcItemInstancesJson) is JArray npcItemInstances)
         {
-            return;
+            npcItemInstances.Add(actorItemTemplate);
+            npcItemInstancesToken.Replace(JsonConverter.Serialize(npcItemInstances));
         }
 
-        npcItemInstances.Add(actorItemTemplate);
-        npcItemInstancesToken.Replace(JsonConverter.Serialize(npcItemInstances));
+        if (typeId == VirginiaTypeId && template["spawner"] is { } spawnerTemplate &&
+            vailWorldSim["Spawners"] is JArray spawners)
+        {
+            spawners.Add(spawnerTemplate);
+        }
     }
 
     private static bool ModifyFollowerData(JToken vailWorldSim, int uniqueId)

SOTFEdit/View/FollowersPage.xaml

@@ -61,7 +61,7 @@
                             Move to Virginia
                         </Button>
                         <Button Style="{StaticResource ButtonStyle}" Command="{Binding ReviveCommand}"
-                                CommandParameter="{Binding KelvinState}">
+                                CommandParameter="{Binding KelvinState}" ToolTip="Make sure you do this outside of buildings when the body is missing, else you might glitch into the building">
                             Revive
                         </Button>
                     </StackPanel>
@@ -189,7 +189,7 @@
                             Move to Kelvin
                         </Button>
                         <Button Style="{StaticResource ButtonStyle}" Command="{Binding ReviveCommand}"
-                                CommandParameter="{Binding VirginiaState}">
+                                CommandParameter="{Binding VirginiaState}" ToolTip="Make sure you do this outside of buildings when the body is missing, else you might glitch into the building">
                             Revive
                         </Button>
                     </StackPanel>

SOTFEdit/ViewModel/FollowerPageViewModel.cs

@@ -275,8 +275,11 @@ public bool Update(Savegame? savegame, bool createBackup)
 
             if (npcItemInstances != null && actor["UniqueId"] is { } uniqueId)
             {
-                npcItemInstances["ActorItems"] ??= new JArray();
-
+                if (npcItemInstances["ActorItems"] == null)
+                {
+                    npcItemInstances["ActorItems"] = new JArray();
+                    hasChanges = true;
+                }
 
                 var actorItemsForActor = (npcItemInstances["ActorItems"]
                     ?.Children() ?? Enumerable.Empty<JToken>()).FirstOrDefault(token =>
@@ -297,6 +300,7 @@ public bool Update(Savegame? savegame, bool createBackup)
                     if (npcItemInstances["ActorItems"] is JArray actorItems)
                     {
                         actorItems.Add(actorItemsForActor);
+                        hasChanges = true;
                     }
                 }
 

SOTFEdit/data/followerTemplate.txt

@@ -38,7 +38,7 @@
       "Influences": [
         {
           "TypeId": "Player",
-          "Sentiment": -100.0,
+          "Sentiment": 100.0,
           "Anger": 0.0,
           "Fear": 0.0
         },
@@ -62,6 +62,12 @@
             "Version": "0.0.0",
             "ItemBlocks": []
         }
+    },
+    "spawner": {
+        "UniqueId": {spawnerId},
+        "Count": 1,
+        "SpawnedCount": 1,
+        "LastSpawnTime": 0.0
     }
   }