diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 6bc9f9bfea849..3a256a3d8dc01 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -476,22 +476,6 @@ "explosion_data": { "chance_hot": 2, "chance_cold": 2, "factor": 1, "fiery": true, "size_factor": 0.15 } } }, - { - "type": "AMMO", - "id": "22_casing_new", - "category": "spare_parts", - "price": 100, - "name": { "str": "unused .22 casing" }, - "symbol": "=", - "color": "yellow", - "description": "An unfired, like-new .22 round casing, with the primer still intact.", - "material": [ "powder", "brass" ], - "volume": "250 ml", - "weight": "1 g", - "ammo_type": "components", - "count": 200, - "effects": [ "COOKOFF" ] - }, { "type": "AMMO", "id": "gunpowder", diff --git a/data/json/items/generic/casing.json b/data/json/items/generic/casing.json index 71b72402c0bb1..d98503d4c3b81 100644 --- a/data/json/items/generic/casing.json +++ b/data/json/items/generic/casing.json @@ -29,6 +29,19 @@ "weight": "2 g", "volume": "3ml" }, + { + "id": "22_casing_new", + "type": "GENERIC", + "category": "spare_parts", + "price": 100, + "name": { "str": "unused .22 casing" }, + "symbol": "=", + "color": "yellow", + "description": "An unfired, like-new .22 round casing, with the primer still intact.", + "material": [ "powder", "brass" ], + "volume": "250 ml", + "weight": "1 g" + }, { "id": "3006_casing", "copy-from": "casing",