Gave modular items a pseudo item definition id that can be used when serializing ItemBase or when persisting items to the database. ONLY ASSETS

assets/common/items/crafting_ing/modular/primary/axe/axe.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Axe Head"),
+    name: "Axe Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Axe",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/axe/battleaxe.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Battleaxe Head"),
+    name: "Battleaxe Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,6 +18,6 @@ ItemDef(
             weapon_name: "Battleaxe",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )

assets/common/items/crafting_ing/modular/primary/axe/greataxe.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Greataxe Head"),
+    name: "Greataxe Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,6 +18,6 @@ ItemDef(
             weapon_name: "Greataxe",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )

assets/common/items/crafting_ing/modular/primary/axe/jagged.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Jagged Axe Head"),
+    name: "Jagged Axe Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Jagged Axe",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/axe/labrys.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Labrys Head"),
+    name: "Labrys Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Labrys",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/axe/ornate.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Ornate Axe Head"),
+    name: "Ornate Axe Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,6 +18,6 @@ ItemDef(
             weapon_name: "Ornate Axe",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )

assets/common/items/crafting_ing/modular/primary/axe/poleaxe.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Poleaxe Head"),
+    name: "Poleaxe Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,6 +18,6 @@ ItemDef(
             weapon_name: "Poleaxe",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )

assets/common/items/crafting_ing/modular/primary/bow/bow.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Bow Limbs"),
+    name: "Bow Limbs",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Bow",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/bow/composite.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Composite Bow Limbs"),
+    name: "Composite Bow Limbs",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Composite Bow",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/bow/greatbow.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Greatbow Limbs"),
+    name: "Greatbow Limbs",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Greatbow",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/bow/longbow.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Longbow Limbs"),
+    name: "Longbow Limbs",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Longbow",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/bow/ornate.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Ornate Bow Limbs"),
+    name: "Ornate Bow Limbs",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Ornate Bow",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/bow/shortbow.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Shortbow Limbs"),
+    name: "Shortbow Limbs",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Shortbow",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/bow/warbow.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Warbow Limbs"),
+    name: "Warbow Limbs",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Warbow",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/hammer/greathammer.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Greathammer Head"),
+    name: "Greathammer Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,6 +18,6 @@ ItemDef(
             weapon_name: "Greathammer",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )

assets/common/items/crafting_ing/modular/primary/hammer/greatmace.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Great Mace Head"),
+    name: "Great Mace Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Great Mace",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/hammer/hammer.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Hammer Head"),
+    name: "Hammer Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Hammer",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/hammer/maul.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Maul Head"),
+    name: "Maul Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,6 +18,6 @@ ItemDef(
             weapon_name: "Maul",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )

assets/common/items/crafting_ing/modular/primary/hammer/ornate.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Ornate Hammer Head"),
+    name: "Ornate Hammer Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,6 +18,6 @@ ItemDef(
             weapon_name: "Ornate Hammer",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )

assets/common/items/crafting_ing/modular/primary/hammer/spikedmace.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Spiked Mace Head"),
+    name: "Spiked Mace Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Spiked Mace",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/hammer/warhammer.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Warhammer Head"),
+    name: "Warhammer Head",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Warhammer",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sceptre/arbor.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Arbor Shaft"),
+    name: "Arbor Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Arbor",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sceptre/cane.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Cane Shaft"),
+    name: "Cane Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Cane",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sceptre/crook.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Crook Shaft"),
+    name: "Crook Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Crook",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sceptre/crozier.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Crozier Shaft"),
+    name: "Crozier Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Crozier",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sceptre/grandsceptre.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Grandsceptre Shaft"),
+    name: "Grandsceptre Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Grandsceptre",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sceptre/ornate.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Ornate Sceptre Shaft"),
+    name: "Ornate Sceptre Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Ornate Sceptre",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sceptre/sceptre.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Sceptre Shaft"),
+    name: "Sceptre Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Sceptre",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/staff/brand.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Brand Shaft"),
+    name: "Brand Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Brand",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/staff/grandstaff.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Grandstaff Shaft"),
+    name: "Grandstaff Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Grandstaff",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/staff/longpole.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Long Pole Shaft"),
+    name: "Long Pole Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,6 +18,6 @@ ItemDef(
             weapon_name: "Long Pole",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )

assets/common/items/crafting_ing/modular/primary/staff/ornate.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Ornate Staff Shaft"),
+    name: "Ornate Staff Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Ornate Staff",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/staff/pole.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Pole Shaft"),
+    name: "Pole Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Pole",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/staff/rod.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Rod Shaft"),
+    name: "Rod Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Rod",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/staff/staff.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Staff Shaft"),
+    name: "Staff Shaft",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Staff",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sword/greatsword.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Greatsword Blade"),
+    name: "Greatsword Blade",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Greatsword",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sword/katana.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Katana Blade"),
+    name: "Katana Blade",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Katana",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sword/longsword.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Longsword Blade"),
+    name: "Longsword Blade",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Longsword",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sword/ornate.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Ornate Sword Blade"),
+    name: "Ornate Sword Blade",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Ornate Sword",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sword/sabre.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Sabre Blade"),
+    name: "Sabre Blade",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Sabre",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sword/sawblade.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Sawblade"),
+    name: "Sawblade",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Sawblade",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/primary/sword/zweihander.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Zweihander Blade"),
+    name: "Zweihander Blade",
     description: "",
     kind: ModularComponent(
         ToolPrimaryComponent(
@@ -18,7 +18,7 @@ ItemDef(
             weapon_name: "Zweihander",
         )
     ),
-    quality: Modular,
+    quality: Low,
     tags: [],
 )
 

assets/common/items/crafting_ing/modular/secondary/axe/long.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Long Axe Haft"),
+    name: "Long Axe Haft",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/axe/medium.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Medium Axe Haft"),
+    name: "Medium Axe Haft",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/axe/short.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Short Axe Haft"),
+    name: "Short Axe Haft",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/bow/large.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Large Bow Grip"),
+    name: "Large Bow Grip",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/bow/medium.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Medium Bow Limbs"),
+    name: "Medium Bow Limbs",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/bow/small.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Small Bow Grip"),
+    name: "Small Bow Grip",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/hammer/long.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Long Hammer Haft"),
+    name: "Long Hammer Haft",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/hammer/medium.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Medium Hammer Haft"),
+    name: "Medium Hammer Haft",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/hammer/short.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Short Hammer Haft"),
+    name: "Short Hammer Haft",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/sceptre/large.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Large Nature Core"),
+    name: "Large Nature Core",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/sceptre/medium.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Medium Nature Core"),
+    name: "Medium Nature Core",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/sceptre/small.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Small Nature Core"),
+    name: "Small Nature Core",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/staff/large.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Large Fire Core"),
+    name: "Large Fire Core",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/staff/medium.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Medium Fire Core"),
+    name: "Medium Fire Core",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/staff/small.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Samll Fire Core"),
+    name: "Samll Fire Core",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/sword/hand-and-half.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Hand-and-a-Half Sword Hilt"),
+    name: "Hand-and-a-Half Sword Hilt",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/sword/one-handed.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("One-Handed Sword Hilt"),
+    name: "One-Handed Sword Hilt",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/items/crafting_ing/modular/secondary/sword/two-handed.ron

@@ -1,5 +1,5 @@
 ItemDef(
-    name: Component("Two-Handed Sword Hilt"),
+    name: "Two-Handed Sword Hilt",
     description: "",
     kind: ModularComponent(
         ToolSecondaryComponent(

assets/common/recipe_book.ron

@@ -1856,25 +1856,25 @@
     "merchant turban": (
         output: ("common.items.armor.merchant.turban", 1),
         inputs: [
-            (Item("common.items.crafting_ing.cloth.linen_red"), 20),
+            (Item("common.items.crafting_ing.cloth.linen_red"), 20, false),
-            (Item("common.items.mineral.gem.diamond"), 4),
+            (Item("common.items.mineral.gem.diamond"), 4, false),
-            (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1),
+            (Item("common.items.crafting_ing.mindflayer_bag_damaged"), 1, false),
-            (Item("common.items.crafting_tools.sewing_set"), 0),
+            (Item("common.items.crafting_tools.sewing_set"), 0, false),
         ],
         craft_sprite: Some(CraftingBench),
     ),
     "winged coronet": (
-        output: ("common.items.armor.misc.head.winged_coronet", 1),
+        output: ("common.items.armor.misc.head.winged_coronet", 1, false),
         inputs: [
-            (Item("common.items.mineral.gem.emerald"), 1),
+            (Item("common.items.mineral.gem.emerald"), 1, false),
-            (Item("common.items.mineral.ingot.gold"), 4),
+            (Item("common.items.mineral.ingot.gold"), 4, false),
-            (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 2),
+            (Item("common.items.crafting_ing.animal_misc.raptor_feather"), 2, false),
         ],
         craft_sprite: Some(CraftingBench),
     ),
-/// MODULAR WEAPONS/SWORDS/DAMAGE COMPONENTS
+/// MODULAR WEAPONS/SWORDS/PRIMARY COMPONENTS
     "longsword blade": (
-        output: ("common.items.crafting_ing.modular.damage.sword.longsword", 1),
+        output: ("common.items.crafting_ing.modular.primary.sword.longsword", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.tool.craftsman_hammer"), 0, false),
@@ -1883,7 +1883,7 @@
         is_recycling: false,
     ),
     "sawblade": (
-        output: ("common.items.crafting_ing.modular.damage.sword.sawblade", 1),
+        output: ("common.items.crafting_ing.modular.primary.sword.sawblade", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
@@ -1893,7 +1893,7 @@
         is_recycling: false,
     ),
     "katana blade": (
-        output: ("common.items.crafting_ing.modular.damage.sword.katana", 1),
+        output: ("common.items.crafting_ing.modular.primary.sword.katana", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
@@ -1903,7 +1903,7 @@
         is_recycling: false,
     ),
     "zweihander blade": (
-        output: ("common.items.crafting_ing.modular.damage.sword.zweihander", 1),
+        output: ("common.items.crafting_ing.modular.primary.sword.zweihander", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
@@ -1913,7 +1913,7 @@
         is_recycling: false,
     ),
     "sabre blade": (
-        output: ("common.items.crafting_ing.modular.damage.sword.sabre", 1),
+        output: ("common.items.crafting_ing.modular.primary.sword.sabre", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
@@ -1923,7 +1923,7 @@
         is_recycling: false,
     ),
     "greatsword blade": (
-        output: ("common.items.crafting_ing.modular.damage.sword.greatsword", 1),
+        output: ("common.items.crafting_ing.modular.primary.sword.greatsword", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
@@ -1933,7 +1933,7 @@
         is_recycling: false,
     ),
     "ornate sword blade": (
-        output: ("common.items.crafting_ing.modular.damage.sword.ornate", 1),
+        output: ("common.items.crafting_ing.modular.primary.sword.ornate", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
@@ -1942,9 +1942,9 @@
         craft_sprite: Some(Anvil),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/SWORDS/HELD COMPONENTS
+/// MODULAR WEAPONS/SWORDS/SECONDARY COMPONENTS
     "one-handed hilt": (
-        output: ("common.items.crafting_ing.modular.held.sword.one-handed", 1),
+        output: ("common.items.crafting_ing.modular.secondary.sword.one-handed", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
@@ -1953,7 +1953,7 @@
         is_recycling: false,
     ),
     "two-handed hilt": (
-        output: ("common.items.crafting_ing.modular.held.sword.two-handed", 1),
+        output: ("common.items.crafting_ing.modular.secondary.sword.two-handed", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
@@ -1962,7 +1962,7 @@
         is_recycling: false,
     ),
     "hand-and-a-half hilt": (
-        output: ("common.items.crafting_ing.modular.held.sword.hand-and-half", 1),
+        output: ("common.items.crafting_ing.modular.secondary.sword.hand-and-half", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
@@ -1970,9 +1970,9 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/HAMMERS/DAMAGE COMPONENTS
+/// MODULAR WEAPONS/HAMMERS/PRIMARY COMPONENTS
     "hammer head": (
-        output: ("common.items.crafting_ing.modular.damage.hammer.hammer", 1),
+        output: ("common.items.crafting_ing.modular.primary.hammer.hammer", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.tool.craftsman_hammer"), 0, false),
@@ -1981,7 +1981,7 @@
         is_recycling: false,
     ),
     "spiked mace head": (
-        output: ("common.items.crafting_ing.modular.damage.hammer.spikedmace", 1),
+        output: ("common.items.crafting_ing.modular.primary.hammer.spikedmace", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
@@ -1991,7 +1991,7 @@
         is_recycling: false,
     ),
     "warhammer head": (
-        output: ("common.items.crafting_ing.modular.damage.hammer.warhammer", 1),
+        output: ("common.items.crafting_ing.modular.primary.hammer.warhammer", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
@@ -2001,7 +2001,7 @@
         is_recycling: false,
     ),
     "maul head": (
-        output: ("common.items.crafting_ing.modular.damage.hammer.maul", 1),
+        output: ("common.items.crafting_ing.modular.primary.hammer.maul", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
@@ -2011,7 +2011,7 @@
         is_recycling: false,
     ),
     "great mace head": (
-        output: ("common.items.crafting_ing.modular.damage.hammer.greatmace", 1),
+        output: ("common.items.crafting_ing.modular.primary.hammer.greatmace", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
@@ -2021,7 +2021,7 @@
         is_recycling: false,
     ),
     "greathammer head": (
-        output: ("common.items.crafting_ing.modular.damage.hammer.greathammer", 1),
+        output: ("common.items.crafting_ing.modular.primary.hammer.greathammer", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
@@ -2031,7 +2031,7 @@
         is_recycling: false,
     ),
     "ornate hammer head": (
-        output: ("common.items.crafting_ing.modular.damage.hammer.ornate", 1),
+        output: ("common.items.crafting_ing.modular.primary.hammer.ornate", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
@@ -2040,9 +2040,9 @@
         craft_sprite: Some(Anvil),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/HAMMERS/HELD COMPONENTS
+/// MODULAR WEAPONS/HAMMERS/SECONDARY COMPONENTS
     "short hammer haft": (
-        output: ("common.items.crafting_ing.modular.held.hammer.short", 1),
+        output: ("common.items.crafting_ing.modular.secondary.hammer.short", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
@@ -2051,7 +2051,7 @@
         is_recycling: false,
     ),
     "long hammer haft": (
-        output: ("common.items.crafting_ing.modular.held.hammer.long", 1),
+        output: ("common.items.crafting_ing.modular.secondary.hammer.long", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
@@ -2060,7 +2060,7 @@
         is_recycling: false,
     ),
     "medium hammer haft": (
-        output: ("common.items.crafting_ing.modular.held.hammer.medium", 1),
+        output: ("common.items.crafting_ing.modular.secondary.hammer.medium", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
@@ -2068,9 +2068,9 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/AXES/DAMAGE COMPONENTS
+/// MODULAR WEAPONS/AXES/PRIMARY COMPONENTS
     "axe head": (
-        output: ("common.items.crafting_ing.modular.damage.axe.axe", 1),
+        output: ("common.items.crafting_ing.modular.primary.axe.axe", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
@@ -2080,7 +2080,7 @@
         is_recycling: false,
     ),
     "jagged axe head": (
-        output: ("common.items.crafting_ing.modular.damage.axe.jagged", 1),
+        output: ("common.items.crafting_ing.modular.primary.axe.jagged", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.tool.craftsman_hammer"), 0, false),
@@ -2089,7 +2089,7 @@
         is_recycling: false,
     ),
     "battleaxe head": (
-        output: ("common.items.crafting_ing.modular.damage.axe.battleaxe", 1),
+        output: ("common.items.crafting_ing.modular.primary.axe.battleaxe", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
@@ -2099,7 +2099,7 @@
         is_recycling: false,
     ),
     "poleaxe head": (
-        output: ("common.items.crafting_ing.modular.damage.axe.poleaxe", 1),
+        output: ("common.items.crafting_ing.modular.primary.axe.poleaxe", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
@@ -2109,7 +2109,7 @@
         is_recycling: false,
     ),
     "labrys axe head": (
-        output: ("common.items.crafting_ing.modular.damage.axe.labrys", 1),
+        output: ("common.items.crafting_ing.modular.primary.axe.labrys", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
@@ -2119,7 +2119,7 @@
         is_recycling: false,
     ),
     "greataxe head": (
-        output: ("common.items.crafting_ing.modular.damage.axe.greataxe", 1),
+        output: ("common.items.crafting_ing.modular.primary.axe.greataxe", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
@@ -2129,7 +2129,7 @@
         is_recycling: false,
     ),
     "ornate axe head": (
-        output: ("common.items.crafting_ing.modular.damage.axe.ornate", 1),
+        output: ("common.items.crafting_ing.modular.primary.axe.ornate", 1),
         inputs: [
             (ListSameItem("common.crafting.metal_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
@@ -2138,9 +2138,9 @@
         craft_sprite: Some(Anvil),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/AXES/HELD COMPONENTS
+/// MODULAR WEAPONS/AXES/SECONDARY COMPONENTS
     "short axe haft": (
-        output: ("common.items.crafting_ing.modular.held.axe.short", 1),
+        output: ("common.items.crafting_ing.modular.secondary.axe.short", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
@@ -2149,7 +2149,7 @@
         is_recycling: false,
     ),
     "long axe haft": (
-        output: ("common.items.crafting_ing.modular.held.axe.long", 1),
+        output: ("common.items.crafting_ing.modular.secondary.axe.long", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
@@ -2158,7 +2158,7 @@
         is_recycling: false,
     ),
     "medium axe haft": (
-        output: ("common.items.crafting_ing.modular.held.axe.medium", 1),
+        output: ("common.items.crafting_ing.modular.secondary.axe.medium", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
@@ -2166,9 +2166,9 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/BOWS/DAMAGE COMPONENTS
+/// MODULAR WEAPONS/BOWS/PRIMARY COMPONENTS
     "bow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.bow", 1),
+        output: ("common.items.crafting_ing.modular.primary.bow.bow", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.sticky_thread"), 3, false),
@@ -2177,7 +2177,7 @@
         is_recycling: false,
     ),
     "composite bow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.composite", 1),
+        output: ("common.items.crafting_ing.modular.primary.bow.composite", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
@@ -2187,7 +2187,7 @@
         is_recycling: false,
     ),
     "greatbow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.greatbow", 1),
+        output: ("common.items.crafting_ing.modular.primary.bow.greatbow", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
@@ -2197,7 +2197,7 @@
         is_recycling: false,
     ),
     "longbow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.longbow", 1),
+        output: ("common.items.crafting_ing.modular.primary.bow.longbow", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
@@ -2207,7 +2207,7 @@
         is_recycling: false,
     ),
     "ornate bow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.ornate", 1),
+        output: ("common.items.crafting_ing.modular.primary.bow.ornate", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
@@ -2217,7 +2217,7 @@
         is_recycling: false,
     ),
     "shortbow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.shortbow", 1),
+        output: ("common.items.crafting_ing.modular.primary.bow.shortbow", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
@@ -2227,7 +2227,7 @@
         is_recycling: false,
     ),
     "warbow limbs": (
-        output: ("common.items.crafting_ing.modular.damage.bow.warbow", 1),
+        output: ("common.items.crafting_ing.modular.primary.bow.warbow", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
@@ -2236,9 +2236,9 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/BOWS/HELD COMPONENTS
+/// MODULAR WEAPONS/BOWS/SECONDARY COMPONENTS
     "medium bow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.medium", 1),
+        output: ("common.items.crafting_ing.modular.secondary.bow.medium", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
@@ -2247,7 +2247,7 @@
         is_recycling: false,
     ),
     "small bow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.small", 1),
+        output: ("common.items.crafting_ing.modular.secondary.bow.small", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
@@ -2256,7 +2256,7 @@
         is_recycling: false,
     ),
     "large bow grip": (
-        output: ("common.items.crafting_ing.modular.held.bow.large", 1),
+        output: ("common.items.crafting_ing.modular.secondary.bow.large", 1),
         inputs: [
             (Item("common.items.log.wood"), 1, false),
             (Item("common.items.crafting_ing.leather.leather_strips"), 1, false),
@@ -2264,9 +2264,9 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/FIRE STAFFS/HELD COMPONENTS
+/// MODULAR WEAPONS/FIRE STAFFS/PRIMARY COMPONENTS
     "brand shaft": (
-        output: ("common.items.crafting_ing.modular.held.staff.brand", 1),
+        output: ("common.items.crafting_ing.modular.primary.staff.brand", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
@@ -2276,7 +2276,7 @@
         is_recycling: false,
     ),
     "grandstaff shaft": (
-        output: ("common.items.crafting_ing.modular.held.staff.grandstaff", 1),
+        output: ("common.items.crafting_ing.modular.primary.staff.grandstaff", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
@@ -2286,7 +2286,7 @@
         is_recycling: false,
     ),
     "longpole shaft": (
-        output: ("common.items.crafting_ing.modular.held.staff.longpole", 1),
+        output: ("common.items.crafting_ing.modular.primary.staff.longpole", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
@@ -2296,7 +2296,7 @@
         is_recycling: false,
     ),
     "ornate staff shaft": (
-        output: ("common.items.crafting_ing.modular.held.staff.ornate", 1),
+        output: ("common.items.crafting_ing.modular.primary.staff.ornate", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
@@ -2306,7 +2306,7 @@
         is_recycling: false,
     ),
     "pole shaft": (
-        output: ("common.items.crafting_ing.modular.held.staff.pole", 1),
+        output: ("common.items.crafting_ing.modular.primary.staff.pole", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
@@ -2316,7 +2316,7 @@
         is_recycling: false,
     ),
     "rod shaft": (
-        output: ("common.items.crafting_ing.modular.held.staff.rod", 1),
+        output: ("common.items.crafting_ing.modular.primary.staff.rod", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
@@ -2326,7 +2326,7 @@
         is_recycling: false,
     ),
     "staff shaft": (
-        output: ("common.items.crafting_ing.modular.held.staff.staff", 1),
+        output: ("common.items.crafting_ing.modular.primary.staff.staff", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
@@ -2334,9 +2334,9 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/FIRE STAFFS/DAMAGE COMPONENTS
+/// MODULAR WEAPONS/FIRE STAFFS/SECONDARY COMPONENTS
     "large fire core": (
-        output: ("common.items.crafting_ing.modular.damage.staff.large", 1),
+        output: ("common.items.crafting_ing.modular.secondary.staff.large", 1),
         inputs: [
             (Item("common.items.mineral.gem.ruby"), 1, false),
             (Item("common.items.mineral.ore.veloritefrag"), 3, false),
@@ -2345,7 +2345,7 @@
         is_recycling: false,
     ),
     "medium fire core": (
-        output: ("common.items.crafting_ing.modular.damage.staff.medium", 1),
+        output: ("common.items.crafting_ing.modular.secondary.staff.medium", 1),
         inputs: [
             (Item("common.items.mineral.gem.ruby"), 1, false),
             (Item("common.items.mineral.ore.veloritefrag"), 3, false),
@@ -2354,7 +2354,7 @@
         is_recycling: false,
     ),
     "small fire core": (
-        output: ("common.items.crafting_ing.modular.damage.staff.small", 1),
+        output: ("common.items.crafting_ing.modular.secondary.staff.small", 1),
         inputs: [
             (Item("common.items.mineral.gem.ruby"), 1, false),
             (Item("common.items.mineral.ore.veloritefrag"), 3, false),
@@ -2362,9 +2362,9 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/NATURE SCEPTRES/HELD COMPONENTS
+/// MODULAR WEAPONS/NATURE SCEPTRES/PRIMARY COMPONENTS
     "arbor shaft": (
-        output: ("common.items.crafting_ing.modular.held.sceptre.arbor", 1),
+        output: ("common.items.crafting_ing.modular.primary.sceptre.arbor", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.long_tusk"), 1, false),
@@ -2374,7 +2374,7 @@
         is_recycling: false,
     ),
     "cane shaft": (
-        output: ("common.items.crafting_ing.modular.held.sceptre.cane", 1),
+        output: ("common.items.crafting_ing.modular.primary.sceptre.cane", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.strong_pincer"), 1, false),
@@ -2384,7 +2384,7 @@
         is_recycling: false,
     ),
     "crook shaft": (
-        output: ("common.items.crafting_ing.modular.held.sceptre.crook", 1),
+        output: ("common.items.crafting_ing.modular.primary.sceptre.crook", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.sharp_fang"), 1, false),
@@ -2394,7 +2394,7 @@
         is_recycling: false,
     ),
     "crozier shaft": (
-        output: ("common.items.crafting_ing.modular.held.sceptre.crozier", 1),
+        output: ("common.items.crafting_ing.modular.primary.sceptre.crozier", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.claw"), 1, false),
@@ -2404,7 +2404,7 @@
         is_recycling: false,
     ),
     "grandsceptre shaft": (
-        output: ("common.items.crafting_ing.modular.held.sceptre.grandsceptre", 1),
+        output: ("common.items.crafting_ing.modular.primary.sceptre.grandsceptre", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.large_horn"), 1, false),
@@ -2414,7 +2414,7 @@
         is_recycling: false,
     ),
     "ornate sceptre shaft": (
-        output: ("common.items.crafting_ing.modular.held.sceptre.ornate", 1),
+        output: ("common.items.crafting_ing.modular.primary.sceptre.ornate", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.animal_misc.elegant_crest"), 1, false),
@@ -2424,7 +2424,7 @@
         is_recycling: false,
     ),
     "sceptre shaft": (
-        output: ("common.items.crafting_ing.modular.held.sceptre.sceptre", 1),
+        output: ("common.items.crafting_ing.modular.primary.sceptre.sceptre", 1),
         inputs: [
             (ListSameItem("common.crafting.wood_weapon_materials"), 5, true),
             (Item("common.items.crafting_ing.leather.leather_strips"), 2, false),
@@ -2432,9 +2432,9 @@
         craft_sprite: Some(CraftingBench),
         is_recycling: false,
     ),
-/// MODULAR WEAPONS/NATURE SCEPTRES/DAMAGE COMPONENTS
+/// MODULAR WEAPONS/NATURE SCEPTRES/SECONDARY COMPONENTS
     "large nature core": (
-        output: ("common.items.crafting_ing.modular.damage.sceptre.large", 1),
+        output: ("common.items.crafting_ing.modular.secondary.sceptre.large", 1),
         inputs: [
             (Item("common.items.mineral.gem.emerald"), 1, false),
             (Item("common.items.mineral.ore.veloritefrag"), 3, false),
@@ -2443,7 +2443,7 @@
         is_recycling: false,
     ),
     "medium nature core": (
-        output: ("common.items.crafting_ing.modular.damage.sceptre.medium", 1),
+        output: ("common.items.crafting_ing.modular.secondary.sceptre.medium", 1),
         inputs: [
             (Item("common.items.mineral.gem.emerald"), 1, false),
             (Item("common.items.mineral.ore.veloritefrag"), 3, false),
@@ -2452,7 +2452,7 @@
         is_recycling: false,
     ),
     "small nature core": (
-        output: ("common.items.crafting_ing.modular.damage.sceptre.small", 1),
+        output: ("common.items.crafting_ing.modular.secondary.sceptre.small", 1),
         inputs: [
             (Item("common.items.mineral.gem.emerald"), 1, false),
             (Item("common.items.mineral.ore.veloritefrag"), 3, false),

server/src/events/trade.rs

@@ -498,6 +498,9 @@ mod tests {
 
     #[test]
     fn commit_trade_with_stackable_item_test() {
+        use common::{assets::AssetExt, comp::item::ItemDef};
+        use std::sync::Arc;
+
         let (mockworld, player, merchant) = create_mock_trading_world(1, 20);
 
         prepare_merchant_inventory(&mockworld, merchant);
@@ -513,8 +516,11 @@ mod tests {
             ))
             .expect(capmsg);
 
-        let potion =
+        let potion_asset = "common.items.consumable.potion_minor";
-            common::comp::Item::new_from_asset_expect("common.items.consumable.potion_minor");
+
+        let potion = common::comp::Item::new_from_asset_expect(potion_asset);
+        let potion_def = Arc::<ItemDef>::load_expect_cloned(potion_asset);
+
         let merchantinv = inventories.get_mut(merchant).expect(invmsg);
 
         let potioninvid = merchantinv
@@ -546,7 +552,7 @@ mod tests {
 
         let mut inventories = mockworld.write_component::<Inventory>();
         let playerinv = inventories.get_mut(player).expect(invmsg);
-        let potioncount = playerinv.item_count(&(*potion));
+        let potioncount = playerinv.item_count(&potion_def);
         assert_eq!(potioncount, 2);
     }