feat: Fixed Crashing when bringing new items to the safehouse

Burn-the-witch · Dec 28, 2024 · 3189ce4 · 3189ce4
1 parent de3ccb1
commit 3189ce4
Show file tree

Hide file tree

Showing 9 changed files with 418 additions and 599 deletions.
diff --git a/manifest.json b/manifest.json
@@ -4,47 +4,46 @@
 	"name": "Black Market Suppliers",
 	"description": "Adds Black Market Supplier Shops to the safehouse that can be unlocked via ranking up Prestige.",
 	"authors": ["Burn, the witch"],
-	"frameworkVersion": "2.33.23",
+	"frameworkVersion": "2.33.20",
 	"contentFolders": ["patches"],
 	"localisedLines": {
-		"00CF0E338E3A1289": "BROWSE_BLACKMARKET",
-		"0050529459E872DB": "BLACKMARKET_COMMON",
-		"00C202B1172FC78B": "BLACKMARKET_RARE",
-		"0059111D45579C42": "BLACKMARKET_EPIC",
-		"00DC198E60EF8AA4": "BLACKMARKET_LEGENDARY",
-		"009D1B238E8791A4": "BLACKMARKET_THEMATIC",
-		"00C2ADAD074B591E": "BLACKMARKET_TOOLS",
-		"005693C427F5E6AB": "BLACKMARKET_P1",
-		"009FC0B08534355E": "BLACKMARKET_P2",
-		"002E12F8F02195DA": "BLACKMARKET_P3",
-		"00657C79981E27D8": "BLACKMARKET_P4",
-		"0072796CEFE1CFE3": "BLACKMARKET_P5",
-		"00EA0D7423C1E5E6": "BLACKMARKET_P6"
-	},
-	"localisation": {
-		"english": {
-			"BROWSE_BLACKMARKET": "Access Black Market",
-			"BLACKMARKET_COMMON": "Common Items",
-			"BLACKMARKET_RARE": "Rare Items",
-			"BLACKMARKET_EPIC": "Epic Items",
-			"BLACKMARKET_LEGENDARY": "Legendary Items",
-			"BLACKMARKET_THEMATIC": "Thematic Items",
-			"BLACKMARKET_TOOLS": "Freelancer Tools",
-			"BLACKMARKET_P1": "Prestige Level One Required",
-			"BLACKMARKET_P2": "Prestige Level Two Required",
-			"BLACKMARKET_P3": "Prestige Level Three Required",
-			"BLACKMARKET_P4": "Prestige Level Four Required",
-			"BLACKMARKET_P5": "Prestige Level Five Required",
-			"BLACKMARKET_P6": "Prestige Level Six Required"
-		},
-		"french": {},
-		"italian": {},
-		"german": {},
-		"spanish": {},
-		"russian": {},
-		"chineseSimplified": {},
-		"chineseTraditional": {},
-		"japanese": {}
-	},
-	"updateCheck": "https://github.com/Burn-the-witch/Blackmarketsuppliers/releases/latest/download/updates.json"
+				"00CF0E338E3A1289": "BROWSE_BLACKMARKET",
+				"0050529459E872DB": "BLACKMARKET_COMMON",
+				"00C202B1172FC78B": "BLACKMARKET_RARE",
+				"0059111D45579C42": "BLACKMARKET_EPIC",
+				"00DC198E60EF8AA4": "BLACKMARKET_LEGENDARY",
+				"009D1B238E8791A4": "BLACKMARKET_THEMATIC",
+				"00C2ADAD074B591E": "BLACKMARKET_TOOLS",
+				"005693C427F5E6AB": "BLACKMARKET_P1",
+				"009FC0B08534355E": "BLACKMARKET_P2",
+				"002E12F8F02195DA": "BLACKMARKET_P3",
+				"00657C79981E27D8": "BLACKMARKET_P4",
+				"0072796CEFE1CFE3": "BLACKMARKET_P5",
+				"00EA0D7423C1E5E6": "BLACKMARKET_P6"
+			},
+			"localisation": {
+				"english": {
+					"BROWSE_BLACKMARKET": "Access Black Market",
+					"BLACKMARKET_COMMON": "Common Items",
+					"BLACKMARKET_RARE": "Rare Items",
+					"BLACKMARKET_EPIC": "Epic Items",
+					"BLACKMARKET_LEGENDARY": "Legendary Items",
+					"BLACKMARKET_THEMATIC": "Thematic Items",
+					"BLACKMARKET_TOOLS": "Freelancer Tools",
+					"BLACKMARKET_P1": "Prestige Level One Required",
+					"BLACKMARKET_P2": "Prestige Level Two Required",
+					"BLACKMARKET_P3": "Prestige Level Three Required",
+					"BLACKMARKET_P4": "Prestige Level Four Required",
+					"BLACKMARKET_P5": "Prestige Level Five Required",
+					"BLACKMARKET_P6": "Prestige Level Six Required"
+				},
+				"french": {},
+				"italian": {},
+				"german": {},
+				"spanish": {},
+				"russian": {},
+				"chineseSimplified": {},
+				"chineseTraditional": {},
+				"japanese": {}
+			}
 }
diff --git a/patches/chunk29/Setpiece_Evergreen_SupplierRoom_common.entity.json b/patches/chunk29/Setpiece_Evergreen_SupplierRoom_common.entity.json
@@ -231,22 +231,53 @@
 					"type": "ZCurve",
 					"value": {
 						"data": [
-							[-6, 0.02542644366621971, 0, 0, 0, 0, 0.008293857797980309, 0.02542644366621971],
-							[-5.28280782699585, 0.03372030332684517, 0, 0, 0, 0, -0.000168123995536007, 0.03372030332684517],
 							[
-								-2.042663335800171, 0.033552177250385284, 0, 0, 0, 0, 0.003516183467581868,
+								-6, 0.02542644366621971, 0, 0, 0, 0,
+								0.008293857797980309, 0.02542644366621971
+							],
+							[
+								-5.28280782699585, 0.03372030332684517, 0,
+								0, 0, 0, -0.000168123995536007,
+								0.03372030332684517
+							],
+							[
+								-2.042663335800171, 0.033552177250385284,
+								0, 0, 0, 0, 0.003516183467581868,
 								0.033552177250385284
 							],
 							[
-								-0.40257877111434937, 0.037068359553813934, 0, 0, 0, 0, 0.008647884242236614,
+								-0.40257877111434937, 0.037068359553813934,
+								0, 0, 0, 0, 0.008647884242236614,
 								0.037068359553813934
 							],
-							[0.10037359595298768, 0.04571624472737312, 0, 0, 0, 0, 0.02321554347872734, 0.04571624472737312],
-							[0.4202570915222168, 0.06893178820610046, 0, 0, 0, 0, 0.04111509770154953, 0.06893178820610046],
-							[0.6921137571334839, 0.11004688590765, 0, 0, 0, 0, 0.2098948359489441, 0.11004688590765],
-							[1.4594968557357788, 0.3199417293071747, 0, 0, 0, 0, 0.04563612118363381, 0.3199417293071747],
-							[1.751643419265747, 0.3655778467655182, 0, 0, 0, 0, 0.028978655114769936, 0.3655778467655182],
-							[2.237194299697876, 0.3945564925670624, 0, 0, 0, 0, 0, 0.3945564925670624]
+							[
+								0.10037359595298768, 0.04571624472737312,
+								0, 0, 0, 0, 0.02321554347872734,
+								0.04571624472737312
+							],
+							[
+								0.4202570915222168, 0.06893178820610046, 0,
+								0, 0, 0, 0.04111509770154953,
+								0.06893178820610046
+							],
+							[
+								0.6921137571334839, 0.11004688590765, 0, 0,
+								0, 0, 0.2098948359489441, 0.11004688590765
+							],
+							[
+								1.4594968557357788, 0.3199417293071747, 0,
+								0, 0, 0, 0.04563612118363381,
+								0.3199417293071747
+							],
+							[
+								1.751643419265747, 0.3655778467655182, 0,
+								0, 0, 0, 0.028978655114769936,
+								0.3655778467655182
+							],
+							[
+								2.237194299697876, 0.3945564925670624, 0,
+								0, 0, 0, 0, 0.3945564925670624
+							]
 						]
 					}
 				}
@@ -3342,7 +3373,11 @@
 				},
 				"m_Choices": {
 					"type": "TArray<SEntityTemplateReference>",
-					"value": ["cafe529b2f9a31c0", "cafe6886708c8622", "cafe030db060b970"]
+					"value": [
+						"cafe529b2f9a31c0",
+						"cafe6886708c8622",
+						"cafe030db060b970"
+					]
 				},
 				"m_mTransform": {
 					"type": "SMatrix43",

diff --git a/patches/chunk29/Setpiece_Evergreen_SupplierRoom_epic.entity.json b/patches/chunk29/Setpiece_Evergreen_SupplierRoom_epic.entity.json
@@ -231,22 +231,53 @@
 					"type": "ZCurve",
 					"value": {
 						"data": [
-							[-6, 0.02542644366621971, 0, 0, 0, 0, 0.008293857797980309, 0.02542644366621971],
-							[-5.28280782699585, 0.03372030332684517, 0, 0, 0, 0, -0.000168123995536007, 0.03372030332684517],
 							[
-								-2.042663335800171, 0.033552177250385284, 0, 0, 0, 0, 0.003516183467581868,
+								-6, 0.02542644366621971, 0, 0, 0, 0,
+								0.008293857797980309, 0.02542644366621971
+							],
+							[
+								-5.28280782699585, 0.03372030332684517, 0,
+								0, 0, 0, -0.000168123995536007,
+								0.03372030332684517
+							],
+							[
+								-2.042663335800171, 0.033552177250385284,
+								0, 0, 0, 0, 0.003516183467581868,
 								0.033552177250385284
 							],
 							[
-								-0.40257877111434937, 0.037068359553813934, 0, 0, 0, 0, 0.008647884242236614,
+								-0.40257877111434937, 0.037068359553813934,
+								0, 0, 0, 0, 0.008647884242236614,
 								0.037068359553813934
 							],
-							[0.10037359595298768, 0.04571624472737312, 0, 0, 0, 0, 0.02321554347872734, 0.04571624472737312],
-							[0.4202570915222168, 0.06893178820610046, 0, 0, 0, 0, 0.04111509770154953, 0.06893178820610046],
-							[0.6921137571334839, 0.11004688590765, 0, 0, 0, 0, 0.2098948359489441, 0.11004688590765],
-							[1.4594968557357788, 0.3199417293071747, 0, 0, 0, 0, 0.04563612118363381, 0.3199417293071747],
-							[1.751643419265747, 0.3655778467655182, 0, 0, 0, 0, 0.028978655114769936, 0.3655778467655182],
-							[2.237194299697876, 0.3945564925670624, 0, 0, 0, 0, 0, 0.3945564925670624]
+							[
+								0.10037359595298768, 0.04571624472737312,
+								0, 0, 0, 0, 0.02321554347872734,
+								0.04571624472737312
+							],
+							[
+								0.4202570915222168, 0.06893178820610046, 0,
+								0, 0, 0, 0.04111509770154953,
+								0.06893178820610046
+							],
+							[
+								0.6921137571334839, 0.11004688590765, 0, 0,
+								0, 0, 0.2098948359489441, 0.11004688590765
+							],
+							[
+								1.4594968557357788, 0.3199417293071747, 0,
+								0, 0, 0, 0.04563612118363381,
+								0.3199417293071747
+							],
+							[
+								1.751643419265747, 0.3655778467655182, 0,
+								0, 0, 0, 0.028978655114769936,
+								0.3655778467655182
+							],
+							[
+								2.237194299697876, 0.3945564925670624, 0,
+								0, 0, 0, 0, 0.3945564925670624
+							]
 						]
 					}
 				}
@@ -2967,7 +2998,12 @@
 				},
 				"m_Choices": {
 					"type": "TArray<SEntityTemplateReference>",
-					"value": ["cafe529b2f9a31c0", "cafe6886708c8622", "cafeb5da199d86fb", "cafe48b9564b716e"]
+					"value": [
+						"cafe529b2f9a31c0",
+						"cafe6886708c8622",
+						"cafeb5da199d86fb",
+						"cafe48b9564b716e"
+					]
 				},
 				"m_mTransform": {
 					"type": "SMatrix43",

diff --git a/patches/chunk29/Setpiece_Evergreen_SupplierRoom_items.entity.json b/patches/chunk29/Setpiece_Evergreen_SupplierRoom_items.entity.json
@@ -208,22 +208,53 @@
 					"type": "ZCurve",
 					"value": {
 						"data": [
-							[-6, 0.02542644366621971, 0, 0, 0, 0, 0.008293857797980309, 0.02542644366621971],
-							[-5.28280782699585, 0.03372030332684517, 0, 0, 0, 0, -0.000168123995536007, 0.03372030332684517],
 							[
-								-2.042663335800171, 0.033552177250385284, 0, 0, 0, 0, 0.003516183467581868,
+								-6, 0.02542644366621971, 0, 0, 0, 0,
+								0.008293857797980309, 0.02542644366621971
+							],
+							[
+								-5.28280782699585, 0.03372030332684517, 0,
+								0, 0, 0, -0.000168123995536007,
+								0.03372030332684517
+							],
+							[
+								-2.042663335800171, 0.033552177250385284,
+								0, 0, 0, 0, 0.003516183467581868,
 								0.033552177250385284
 							],
 							[
-								-0.40257877111434937, 0.037068359553813934, 0, 0, 0, 0, 0.008647884242236614,
+								-0.40257877111434937, 0.037068359553813934,
+								0, 0, 0, 0, 0.008647884242236614,
 								0.037068359553813934
 							],
-							[0.10037359595298768, 0.04571624472737312, 0, 0, 0, 0, 0.02321554347872734, 0.04571624472737312],
-							[0.4202570915222168, 0.06893178820610046, 0, 0, 0, 0, 0.04111509770154953, 0.06893178820610046],
-							[0.6921137571334839, 0.11004688590765, 0, 0, 0, 0, 0.2098948359489441, 0.11004688590765],
-							[1.4594968557357788, 0.3199417293071747, 0, 0, 0, 0, 0.04563612118363381, 0.3199417293071747],
-							[1.751643419265747, 0.3655778467655182, 0, 0, 0, 0, 0.028978655114769936, 0.3655778467655182],
-							[2.237194299697876, 0.3945564925670624, 0, 0, 0, 0, 0, 0.3945564925670624]
+							[
+								0.10037359595298768, 0.04571624472737312,
+								0, 0, 0, 0, 0.02321554347872734,
+								0.04571624472737312
+							],
+							[
+								0.4202570915222168, 0.06893178820610046, 0,
+								0, 0, 0, 0.04111509770154953,
+								0.06893178820610046
+							],
+							[
+								0.6921137571334839, 0.11004688590765, 0, 0,
+								0, 0, 0.2098948359489441, 0.11004688590765
+							],
+							[
+								1.4594968557357788, 0.3199417293071747, 0,
+								0, 0, 0, 0.04563612118363381,
+								0.3199417293071747
+							],
+							[
+								1.751643419265747, 0.3655778467655182, 0,
+								0, 0, 0, 0.028978655114769936,
+								0.3655778467655182
+							],
+							[
+								2.237194299697876, 0.3945564925670624, 0,
+								0, 0, 0, 0, 0.3945564925670624
+							]
 						]
 					}
 				}

diff --git a/patches/chunk29/Setpiece_Evergreen_SupplierRoom_legendary.entity.json b/patches/chunk29/Setpiece_Evergreen_SupplierRoom_legendary.entity.json
@@ -208,22 +208,53 @@
 					"type": "ZCurve",
 					"value": {
 						"data": [
-							[-6, 0.02542644366621971, 0, 0, 0, 0, 0.008293857797980309, 0.02542644366621971],
-							[-5.28280782699585, 0.03372030332684517, 0, 0, 0, 0, -0.000168123995536007, 0.03372030332684517],
 							[
-								-2.042663335800171, 0.033552177250385284, 0, 0, 0, 0, 0.003516183467581868,
+								-6, 0.02542644366621971, 0, 0, 0, 0,
+								0.008293857797980309, 0.02542644366621971
+							],
+							[
+								-5.28280782699585, 0.03372030332684517, 0,
+								0, 0, 0, -0.000168123995536007,
+								0.03372030332684517
+							],
+							[
+								-2.042663335800171, 0.033552177250385284,
+								0, 0, 0, 0, 0.003516183467581868,
 								0.033552177250385284
 							],
 							[
-								-0.40257877111434937, 0.037068359553813934, 0, 0, 0, 0, 0.008647884242236614,
+								-0.40257877111434937, 0.037068359553813934,
+								0, 0, 0, 0, 0.008647884242236614,
 								0.037068359553813934
 							],
-							[0.10037359595298768, 0.04571624472737312, 0, 0, 0, 0, 0.02321554347872734, 0.04571624472737312],
-							[0.4202570915222168, 0.06893178820610046, 0, 0, 0, 0, 0.04111509770154953, 0.06893178820610046],
-							[0.6921137571334839, 0.11004688590765, 0, 0, 0, 0, 0.2098948359489441, 0.11004688590765],
-							[1.4594968557357788, 0.3199417293071747, 0, 0, 0, 0, 0.04563612118363381, 0.3199417293071747],
-							[1.751643419265747, 0.3655778467655182, 0, 0, 0, 0, 0.028978655114769936, 0.3655778467655182],
-							[2.237194299697876, 0.3945564925670624, 0, 0, 0, 0, 0, 0.3945564925670624]
+							[
+								0.10037359595298768, 0.04571624472737312,
+								0, 0, 0, 0, 0.02321554347872734,
+								0.04571624472737312
+							],
+							[
+								0.4202570915222168, 0.06893178820610046, 0,
+								0, 0, 0, 0.04111509770154953,
+								0.06893178820610046
+							],
+							[
+								0.6921137571334839, 0.11004688590765, 0, 0,
+								0, 0, 0.2098948359489441, 0.11004688590765
+							],
+							[
+								1.4594968557357788, 0.3199417293071747, 0,
+								0, 0, 0, 0.04563612118363381,
+								0.3199417293071747
+							],
+							[
+								1.751643419265747, 0.3655778467655182, 0,
+								0, 0, 0, 0.028978655114769936,
+								0.3655778467655182
+							],
+							[
+								2.237194299697876, 0.3945564925670624, 0,
+								0, 0, 0, 0, 0.3945564925670624
+							]
 						]
 					}
 				}
@@ -2640,7 +2671,11 @@
 				},
 				"m_Choices": {
 					"type": "TArray<SEntityTemplateReference>",
-					"value": ["cafe6886708c8622", "cafe2e3beb88a776", "cafe48b9564b716e"]
+					"value": [
+						"cafe6886708c8622",
+						"cafe2e3beb88a776",
+						"cafe48b9564b716e"
+					]
 				},
 				"m_mTransform": {
 					"type": "SMatrix43",
@@ -2673,7 +2708,11 @@
 				},
 				"m_Choices": {
 					"type": "TArray<SEntityTemplateReference>",
-					"value": ["cafe96c7a7121712", "cafebb6cdc089a89", "cafeb5cf64f8c3d2"]
+					"value": [
+						"cafe96c7a7121712",
+						"cafebb6cdc089a89",
+						"cafeb5cf64f8c3d2"
+					]
 				},
 				"m_mTransform": {
 					"type": "SMatrix43",