Engram control uniqueness detection adjustments

thommcgrath · Jun 1, 2024 · 148d50d · 148d50d
1 parent 57aeb35
commit 148d50d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/Project/Modules/Game Support/Ark/Configs/EngramControl.xojo_code b/Project/Modules/Game Support/Ark/Configs/EngramControl.xojo_code
@@ -860,11 +860,17 @@ Inherits Ark.ConfigGroup
 		  End If
 
 		  Var Parts As New Dictionary
-		  Parts.Value(Self.KeyAutoUnlockLevel) = AutoUnlocks
-		  Parts.Value(Self.KeyHidden) = Hidden
-		  Parts.Value(Self.KeyPlayerLevel) = PlayerLevel
-		  Parts.Value(Self.KeyUnlockPoints) = RequiredPoints
-		  Parts.Value(Self.KeyRemovePrerequisites) = RemovePrerequisites
+		  If Hidden <> Self.mOnlyAllowSpecifiedEngrams Then
+		    Parts.Value(Self.KeyHidden) = Hidden
+		  End If
+		  If Hidden = False Then
+		    Parts.Value(Self.KeyAutoUnlockLevel) = AutoUnlocks
+		    Parts.Value(Self.KeyPlayerLevel) = PlayerLevel
+		    If AutoUnlocks = False Then
+		      Parts.Value(Self.KeyUnlockPoints) = RequiredPoints
+		      Parts.Value(Self.KeyRemovePrerequisites) = RemovePrerequisites
+		    End If
+		  End If
 
 		  Return Beacon.GenerateJson(Parts, False)
 		End Function

diff --git a/Project/Modules/Game Support/ArkSA/Configs/EngramControl.xojo_code b/Project/Modules/Game Support/ArkSA/Configs/EngramControl.xojo_code
@@ -883,11 +883,17 @@ Implements Beacon.BlueprintConsumer
 		  End If
 
 		  Var Parts As New Dictionary
-		  Parts.Value(Self.KeyAutoUnlockLevel) = AutoUnlocks
-		  Parts.Value(Self.KeyHidden) = Hidden
-		  Parts.Value(Self.KeyPlayerLevel) = PlayerLevel
-		  Parts.Value(Self.KeyUnlockPoints) = RequiredPoints
-		  Parts.Value(Self.KeyRemovePrerequisites) = RemovePrerequisites
+		  If Hidden <> Self.mOnlyAllowSpecifiedEngrams Then
+		    Parts.Value(Self.KeyHidden) = Hidden
+		  End If
+		  If Hidden = False Then
+		    Parts.Value(Self.KeyAutoUnlockLevel) = AutoUnlocks
+		    Parts.Value(Self.KeyPlayerLevel) = PlayerLevel
+		    If AutoUnlocks = False Then
+		      Parts.Value(Self.KeyUnlockPoints) = RequiredPoints
+		      Parts.Value(Self.KeyRemovePrerequisites) = RemovePrerequisites
+		    End If
+		  End If
 
 		  Return Beacon.GenerateJson(Parts, False)
 		End Function