diff --git a/assets/common/items/crafting_tools/craftsman_hammer.ron b/assets/common/items/crafting_tools/craftsman_hammer.ron deleted file mode 100644 index 24b5822c37..0000000000 --- a/assets/common/items/crafting_tools/craftsman_hammer.ron +++ /dev/null @@ -1,9 +0,0 @@ -ItemDef( - name: "Old Hammer", - description: "You don't quite remember where you got this from...", - kind: Ingredient( - kind: "CraftsmanHammer", - ), - quality: Low, - tags: [CraftingTool], -) diff --git a/assets/voxygen/item_image_manifest.ron b/assets/voxygen/item_image_manifest.ron index 1a90921bbb..94c348a731 100644 --- a/assets/voxygen/item_image_manifest.ron +++ b/assets/voxygen/item_image_manifest.ron @@ -1941,11 +1941,7 @@ Tool("common.items.tool.craftsman_hammer"): VoxTrans( "voxel.weapon.hammer.craftsman", (1.0, -1.0, 0.0), (-135.0, 90.0, 0.0), 0.9, - ), - Ingredient("CraftsmanHammer"): VoxTrans( - "voxel.weapon.hammer.craftsman", - (1.0, 1.0, 0.0), (-135.0, 90.0, 0.0), 0.8, - ), + ), Ingredient("SewingSet"): Png( "element.items.sewing_set", ), diff --git a/server/src/migrations/V35__rename_craftsman_hammer.sql b/server/src/migrations/V35__rename_craftsman_hammer.sql new file mode 100644 index 0000000000..773436b601 --- /dev/null +++ b/server/src/migrations/V35__rename_craftsman_hammer.sql @@ -0,0 +1,3 @@ +-- Replace old crafting hammer ingredient with functional 1h-hammer variant + +UPDATE item SET item_definition_id = 'common.items.tool.craftsman_hammer' WHERE item_definition_id = 'common.items.crafting_tools.craftsman_hammer'; \ No newline at end of file