Merge branch '4.0.0-DEV' into file-system

# Conflicts: # project/src/tools/HideoutCustomisation/HideoutCustomisationGen.ts
sp-tarkov · Jan 9, 2025 · c02c977 · c02c977
2 parents 42a4b5c + 52aba88
commit c02c977
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 43 deletions.
diff --git a/project/package.json b/project/package.json
@@ -32,8 +32,7 @@
         "gen:types": "tsc -p tsconfig.types.json",
         "gen:docs": "typedoc --options ./typedoc.json --entryPointStrategy expand ./src",
         "gen:items": "tsx ./src/tools/ItemTplGenerator/ItemTplGeneratorProgram.ts",
-        "gen:productionquests": "tsx ./src/tools/ProductionQuestsGen/ProductionQuestsGenProgram.ts",
-        "gen:customisationstorage": "tsx ./src/tools/HideoutCustomisation/HideoutCustomisationProgram.ts"
+        "gen:productionquests": "tsx ./src/tools/ProductionQuestsGen/ProductionQuestsGenProgram.ts"
     },
     "dependencies": {
         "atomically": "2.0.3",

diff --git a/project/src/services/CircleOfCultistService.ts b/project/src/services/CircleOfCultistService.ts
@@ -661,7 +661,7 @@ export class CircleOfCultistService {
         // Get all items that match the blacklisted types and fold into item blacklist below
         const itemTypeBlacklist = this.itemFilterService.getItemRewardBaseTypeBlacklist();
         const itemsMatchingTypeBlacklist = Object.values(itemsDb)
-            .filter((templateItem) => this.itemHelper.isOfBaseclasses(templateItem._parent, itemTypeBlacklist))
+            .filter((templateItem) => this.itemHelper.isOfBaseclasses(templateItem._id, itemTypeBlacklist))
             .map((templateItem) => templateItem._id);
 
         // Create set of unique values to ignore

diff --git a/project/src/tools/HideoutCustomisation/HideoutCustomisationProgram.ts b/project/src/tools/HideoutCustomisation/HideoutCustomisationProgram.ts