improve archetype migration

close #298 close #297 close #293
moo-man · Jan 9, 2025 · be06b1e · be06b1e
1 parent e6d98a7
commit be06b1e
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/scripts/model/item/archetype.js b/scripts/model/item/archetype.js
@@ -40,7 +40,11 @@ export class ArchetypeModel extends BaseItemModel
             structure.type = ["or", "and"].includes(structure.type) ? structure.type : "option";
             if (!isNaN(structure.index))
             {
-                structure.id = wargear[structure.index].groupId || wargear[structure.index].id;
+                structure.id = wargear[structure.index].groupId || wargear[structure.index].id || structure.groupId;
+                if (wargear[structure.index])
+                {
+                    wargear[structure.index].groupId = structure.id;
+                }
             }
             else 
             {
@@ -87,6 +91,14 @@ export class ArchetypeModel extends BaseItemModel
                                 gt : ">",
                                 ge : ">="
                             }
+                            if (i.property.includes("hasKeyword"))
+                            {
+                                return {
+                                    path : "keywords",
+                                    value : i.property.split("\"")[1].split("").filter(i => i != "").join(""),
+                                    operation : "includes"
+                                }
+                            }
                             return {
                                 path : i.property,
                                 value : i.value,