LocalProgression: Fix premature completion bug

AuriRex · Mar 3, 2023 · 810926d · 810926d
1 parent 72634c8
commit 810926d
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 4 deletions.
diff --git a/TheArchive.IL2CPP/Managers/LocalVanityItemManager.cs b/TheArchive.IL2CPP/Managers/LocalVanityItemManager.cs
@@ -51,6 +51,9 @@ public void Init()
 
         public void OnExpeditionCompleted(ExpeditionCompletionData data)
         {
+            if (!data.Success)
+                return;
+
             CheckFirstTimeExpeditionCompletion(data);
             CheckTotalUniqueCompletionsRequirementMet(data);
         }
@@ -65,9 +68,21 @@ public void CheckTotalUniqueCompletionsRequirementMet(ExpeditionCompletionData d
                     return;
                 }
 
-                var vanityItemLayerDropDataBlockPersistentID = RundownDataBlock.GetBlock(data.RundownId).VanityItemLayerDropDataBlock;
+                var vanityItemLayerDropDataBlockPersistentID = RundownDataBlock.GetBlock(data.RundownId)?.VanityItemLayerDropDataBlock;
+
+                if (!vanityItemLayerDropDataBlockPersistentID.HasValue)
+                {
+                    Logger.Error($"[{nameof(CheckTotalUniqueCompletionsRequirementMet)}] {nameof(vanityItemLayerDropDataBlockPersistentID)} has no value!");
+                    return;
+                }
 
-                VanityItemsLayerDropsDataBlock vilddb = VanityItemsLayerDropsDataBlock.GetBlock(vanityItemLayerDropDataBlockPersistentID);
+                VanityItemsLayerDropsDataBlock vilddb = VanityItemsLayerDropsDataBlock.GetBlock(vanityItemLayerDropDataBlockPersistentID.Value);
+
+                if (vilddb == null)
+                {
+                    Logger.Error($"[{nameof(CheckTotalUniqueCompletionsRequirementMet)}] {nameof(VanityItemsLayerDropsDataBlock)} with persistent ID {vanityItemLayerDropDataBlockPersistentID} could not be found!");
+                    return;
+                }
 
                 bool anyDropped = false;
 

diff --git a/TheArchive.IL2CPP/Models/Progression/ExpeditionCompletionData.cs b/TheArchive.IL2CPP/Models/Progression/ExpeditionCompletionData.cs
@@ -4,6 +4,7 @@ namespace TheArchive.Models.Progression
 {
     public struct ExpeditionCompletionData
     {
+        public bool Success => RawSessionData.ExpeditionSurvived;
         public string RundownIdString => RawSessionData.RundownId;
         public uint RundownId { get; internal set; }
         public string ExpeditionId => RawSessionData.ExpeditionId;

diff --git a/TheArchive.IL2CPP/Models/Progression/LocalRundownProgression.cs b/TheArchive.IL2CPP/Models/Progression/LocalRundownProgression.cs
@@ -37,7 +37,7 @@ internal bool AddSessionResults(ExpeditionSession session, out ExpeditionComplet
 				return false;
 			}
 
-			if (Expeditions == null) Expeditions = new Dictionary<string, Expedition>();
+			Expeditions ??= new Dictionary<string, Expedition>();
 
 			Expedition expeditionEntry = GetOrAdd(Expeditions, session.ExpeditionId);
 
@@ -48,12 +48,18 @@ internal bool AddSessionResults(ExpeditionSession session, out ExpeditionComplet
 				Layers layer = stateKvp.Key;
 				LayerState state = stateKvp.Value;
 
+				if(!session.ExpeditionSurvived && state == LayerState.Completed)
+				{
+					// If expedition was failed, do not award completion
+					state = LayerState.Entered;
+				}
+
 				Expedition.Layer expeditionLayer = expeditionEntry.Layers.GetOrAddLayer(layer);
 
 				expeditionLayer.IncreaseStateAndCompletion(state);
 			}
 
-			if (session.PrisonerEfficiencyCompleted)
+			if (session.ExpeditionSurvived && session.PrisonerEfficiencyCompleted)
 			{
 				expeditionEntry.AllLayerCompletionCount++;
 			}