From e843ab2505938cd09d2051464833de015cfe58d7 Mon Sep 17 00:00:00 2001
From: Eddoursul <git@eddoursul.win>
Date: Wed, 19 Mar 2025 22:57:38 +0100
Subject: [PATCH] Use a container to store unique items instead of auxiliary
 variables

---
 mod/.gitignore                 |   1 +
 mod/Unfound Loot.esp           | Bin 132179 -> 133929 bytes
 src/EULxDelootifyCellItems.gek |   8 +++++---
 src/EULxDelootifyContainer.gek |   7 ++++---
 src/EULxDelootifyNPC.gek       |  18 +++++++++++++++---
 src/EULxOnSeen.gek             |  18 +++++++++++++++---
 6 files changed, 40 insertions(+), 12 deletions(-)
 create mode 100644 mod/.gitignore

diff --git a/mod/.gitignore b/mod/.gitignore
new file mode 100644
index 0000000..8a1034d
--- /dev/null
+++ b/mod/.gitignore
@@ -0,0 +1 @@
+meta.ini
\ No newline at end of file
diff --git a/mod/Unfound Loot.esp b/mod/Unfound Loot.esp
index fbafa3449b86ceafb138f11ac31880751e81d85b..a00fe745f6a947a43bacd4f6487780d4d2307e96 100644
GIT binary patch
delta 5346
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
M;MJ|~{|qYNzoXz@t^fc4

delta 3595
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
I4UKU4zi>J3<p2Nx

diff --git a/src/EULxDelootifyCellItems.gek b/src/EULxDelootifyCellItems.gek
index 6fdfe07..68f4f50 100644
--- a/src/EULxDelootifyCellItems.gek
+++ b/src/EULxDelootifyCellItems.gek
@@ -10,7 +10,9 @@ long iCount
 float fCount
 float fRemovalChance
 
-begin function { rCell }
+array_var aUniques
+
+begin function { rCell, aUniques }
 
 	DebugPrint "Scanning cell %n for removable items" rCell
 
@@ -156,9 +158,9 @@ begin function { rCell }
 			continue
 		endif
 
-		if AuxiliaryVariableGetFloat "S" 0 rBase == 0 ; the item is encountered for the first time
+		if eval (Ar_Find rBase aUniques) == Ar_BadNumericIndex ; the item is encountered for the first time
 			DebugPrint "Adding %n to ever scanned list, should only see this once" rBase
-			AuxiliaryVariableSetFloat "S" 1 0 rBase
+			UnfoundLootUniqueStorageRef.AddItem rBase 1 1
 			set rItem to getNextRef
 			continue
 		endif
diff --git a/src/EULxDelootifyContainer.gek b/src/EULxDelootifyContainer.gek
index 139e7b2..f6f44ca 100644
--- a/src/EULxDelootifyContainer.gek
+++ b/src/EULxDelootifyContainer.gek
@@ -14,8 +14,9 @@ float fCount
 float fRemovalChance
 array_var itemsToRemoveRefs
 array_var itemsToRemoveCounts
+array_var aUniques
 
-begin function { rCell, rContainer }
+begin function { rCell, rContainer, aUniques }
 
 	DebugPrint "Delootifying %n..." rContainer
 
@@ -111,9 +112,9 @@ begin function { rCell, rContainer }
 			continue
 		endif
 
-		if AuxiliaryVariableGetFloat "S" 0 rBase == 0 ; the item is encountered for the first time
+		if eval (Ar_Find rBase aUniques) == Ar_BadNumericIndex ; the item is encountered for the first time
 			DebugPrint "Adding %n to ever scanned list, should only see this once" rBase
-			AuxiliaryVariableSetFloat "S" 1 0 rBase
+			UnfoundLootUniqueStorageRef.AddItem rBase 1 1
 			continue
 		endif
 
diff --git a/src/EULxDelootifyNPC.gek b/src/EULxDelootifyNPC.gek
index 6c94c34..c243b19 100644
--- a/src/EULxDelootifyNPC.gek
+++ b/src/EULxDelootifyNPC.gek
@@ -20,6 +20,8 @@ int iCount
 
 int bDisintegrated
 
+array_var aUniques
+
 begin function { rNPC, bDisintegrated }
 
 	set fBasefRemovalChance to call EULxCalculateBaseRemovalChance rNPC
@@ -31,6 +33,8 @@ begin function { rNPC, bDisintegrated }
 
 	DebugPrint "Scanning %n's inventory." rNPC
 
+	let aUniques := UnfoundLootUniqueStorageRef.GetAllItems
+
 	let itemsToRemoveRefs := ar_construct "array"
 	let itemsToRemoveCounts := ar_construct "array"
 
@@ -122,6 +126,12 @@ begin function { rNPC, bDisintegrated }
 			continue
 		endif
 
+		if eval (Ar_Find rBase aUniques) == Ar_BadNumericIndex ; the item is encountered for the first time
+			DebugPrint "Adding %n to ever scanned list, should only see this once" rBase
+			UnfoundLootUniqueStorageRef.AddItem rBase 1 1
+			continue
+		endif
+
 		if ListGetFormIndex EULxDeathItems rBase != -1
 			DebugPrint "Skipping death item: %n" rBase
 			continue
@@ -236,17 +246,19 @@ begin function { rNPC, bDisintegrated }
 
 	printd "SCAN COMPLETE!"
 
+	let aUniques := ar_null
+
 	; NB: The game will CTD if we remove items in the main loop.
 
-	set i to 0
-	set iLimit to ar_size itemsToRemoveRefs
+	let i := 0
+	let iLimit := ar_size itemsToRemoveRefs
 
 	while i < iLimit
 		let rBase := itemsToRemoveRefs[i]
 		let iCount := itemsToRemoveCounts[i]
 		DebugPrint "Removing %g of %n from %n" iCount rBase rNPC
 		rNPC.removeItem rBase iCount 1
-		set i to i + 1
+		let i += 1
 	loop
 
 	let itemsToRemoveRefs := ar_null
diff --git a/src/EULxOnSeen.gek b/src/EULxOnSeen.gek
index 9fdc4d1..717c9dd 100644
--- a/src/EULxOnSeen.gek
+++ b/src/EULxOnSeen.gek
@@ -6,6 +6,9 @@ ref rItem
 int iTemp
 int iPrecalc
 int bSkip
+int bUniquesLoaded
+
+array_var aUniques
 
 begin function { rCell }
 
@@ -32,7 +35,9 @@ begin function { rCell }
 	if GetFirstRefInCell rCell 201 0 0
 		set iPrecalc to 1
 		call EULxPrecalculateRemovalChance
-		call EULxDelootifyCellItems rCell
+		let bUniquesLoaded := 1
+		let aUniques := UnfoundLootUniqueStorageRef.GetAllItems
+		call EULxDelootifyCellItems rCell aUniques
 	endif
 
 
@@ -41,7 +46,7 @@ begin function { rCell }
 	set iTemp to GetSourceModIndex rCell
 
 	set rTemp to GetFirstRefInCell rCell 27 0 0
-
+	
 	while rTemp
 
 		set bSkip to 0
@@ -97,10 +102,17 @@ begin function { rCell }
 			call EULxPrecalculateRemovalChance
 		endif
 
-		call EULxDelootifyContainer rCell rTemp
+		if bUniquesLoaded == 0
+			let bUniquesLoaded := 1
+			let aUniques := UnfoundLootUniqueStorageRef.GetAllItems
+		endif
+
+		call EULxDelootifyContainer rCell rTemp aUniques
 
 		set rTemp to GetNextRef
 
 	loop
 
+	let aUniques := ar_null
+	
 end