maybe fix updating

Razzmatazzz · Jul 29, 2023 · d41a46b · d41a46b
1 parent 67ed80f
commit d41a46b
Show file tree

Hide file tree

Showing 3 changed files with 83 additions and 16 deletions.
diff --git a/RemnantSaveGuardian/RemnantWorldEvent.cs b/RemnantSaveGuardian/RemnantWorldEvent.cs
@@ -324,7 +324,12 @@ static public void ProcessEvents(RemnantCharacter character, string eventsText,
                 }
             }
 
-            List<RemnantWorldEvent> orderedEvents = new List<RemnantWorldEvent>();
+            List<RemnantWorldEvent> eventList = character.CampaignEvents;
+            if (mode == ProcessMode.Adventure)
+            {
+                eventList = character.AdventureEvents;
+            }
+            eventList.Clear();
 
             /*bool churchAdded = false;
             bool queenAdded = false;
@@ -426,19 +431,10 @@ static public void ProcessEvents(RemnantCharacter character, string eventsText,
             {
                 foreach(var worldEvent in zoneEvents[zone])
                 {
-                    orderedEvents.Add(worldEvent);
+                    eventList.Add(worldEvent);
                 }
             }
 
-            if (mode == ProcessMode.Campaign)
-            {
-                character.CampaignEvents = orderedEvents;
-            }
-            else
-            {
-                character.AdventureEvents = orderedEvents;
-            }
-
             /*for (int i = 0; i < orderedEvents.Count; i++)
             {
                 if (mode == ProcessMode.Campaign || mode == ProcessMode.Subject2923)

diff --git a/RemnantSaveGuardian/RenmantCharacter.cs b/RemnantSaveGuardian/RenmantCharacter.cs
@@ -14,8 +14,8 @@ public class RemnantCharacter
         public List<string> Archetypes { get; set; }
         public string SecondArchetype { get; set; }
         public List<string> Inventory { get; set; }
-        public List<RemnantWorldEvent> CampaignEvents { get; set; }
-        public List<RemnantWorldEvent> AdventureEvents { get; set; }
+        public List<RemnantWorldEvent> CampaignEvents { get; }
+        public List<RemnantWorldEvent> AdventureEvents { get; }
 
         public int Progression
         {
@@ -177,10 +177,10 @@ public void LoadWorldData()
             {
                 return;
             }
-            if (this.CampaignEvents.Count != 0)
+            /*if (this.CampaignEvents.Count != 0)
             {
                 return;
-            }
+            }*/
             if (this.worldIndex >= save.WorldSaves.Length)
             {
                 return;

diff --git a/RemnantSaveGuardian/game.json b/RemnantSaveGuardian/game.json
@@ -1,6 +1,11 @@
 {
-  "version": 2,
+  "version": 3,
   "events": {
+    "Abomination": {
+      "items": [
+        "Bore"
+      ]
+    },
     "Amulet_ChainsOfAmplification": {
       "items": [
         "ChainsOfAmplification"
@@ -32,12 +37,32 @@
         "ModTimeLapse"
       ]
     },
+    "CustodianEye": {
+      "items": [
+        "PrismaticDriver"
+      ]
+    },
+    "DranOracle": {
+      "items": [
+        "QuiltedHeart"
+      ]
+    },
+    "Extraction": {
+      "items": [
+        "NavigatorsHelm"
+      ]
+    },
     "FaelinFaerlin_POI": {
       "items": [
         "Deceit",
         "Godsplitter"
       ]
     },
+    "MotherMind": {
+      "items": [
+        "Tremor"
+      ]
+    },
     "NimueDream": {
       "items": [
         "OneTrueKingSigil",
@@ -48,6 +73,12 @@
         "HexWard"
       ]
     },
+    "Raenous": {
+      "items": [
+        "NeckboneNecklace",
+        "RunePistol"
+      ]
+    },
     "Ring_BoosterRing": {
       "items": [
         "BoosterRing"
@@ -58,6 +89,21 @@
         "CelerityStone"
       ]
     },
+    "Ring_ConservationSeal": {
+      "items": [
+        "ConservationSeal"
+      ]
+    },
+    "Ring_DeepPocketRing": {
+      "items": [
+        "DeepPocketRing"
+      ]
+    },
+    "Ring_DefensiveActionLoop": {
+      "items": [
+        "DefensiveActionLoop"
+      ]
+    },
     "Ring_FaeShamanRing": {
       "items": [
         "FaeShamanRing"
@@ -68,11 +114,21 @@
         "FaeWarriorRing"
       ]
     },
+    "Ring_GuardiansRing": {
+      "items": [
+        "GuardiansRing"
+      ]
+    },
     "Ring_HeartOfTheWolf": {
       "items": [
         "HeartOfTheWolf"
       ]
     },
+    "Ring_PointFocusRing": {
+      "items": [
+        "PointFocusRing"
+      ]
+    },
     "Ring_ReserveBoostingGem": {
       "items": [
         "ReserveBoostingGem"
@@ -83,6 +139,21 @@
         "RingOfRestocking"
       ]
     },
+    "Ring_RingOfTheForestSpirit": {
+      "items": [
+        "RingOfTheForestSpirit"
+      ]
+    },
+    "Ring_RingOfTheRobust": {
+      "items": [
+        "RingOfTheRobust"
+      ]
+    },
+    "Ring_RingSagestone": {
+      "items": [
+        "RingSagestone"
+      ]
+    },
     "Ring_SoulLink": {
       "items": [
         "SoulLink"