feat: clean up item categories more

data/json/items/ammo.json

@@ -37,7 +37,7 @@
   {
     "type": "AMMO",
     "id": "aluminum_foil",
-    "category": "spare_parts",
+    "category": "scrap_metal",
     "price": "648 cent",
     "price_postapoc": "10 cent",
     "name": { "str": "aluminum foil" },
@@ -225,7 +225,7 @@
   {
     "type": "AMMO",
     "id": "plut_slurry_dense",
-    "category": "spare_parts",
+    "category": "other",
     "price": "250 cent",
     "price_postapoc": "0 cent",
     "name": { "str_sp": "plutonium slurry" },
@@ -243,7 +243,7 @@
   {
     "type": "AMMO",
     "id": "plut_slurry",
-    "category": "spare_parts",
+    "category": "other",
     "price": "250 cent",
     "price_postapoc": "0 cent",
     "name": { "str_sp": "watery plutonium slurry" },
@@ -290,6 +290,7 @@
     "symbol": "=",
     "color": "light_gray",
     "description": "A handful of pebbles, useful as ammunition for slings or slingshots.",
+    "category": "rocks",
     "material": "stone",
     "volume": "250 ml",
     "weight": "5 g",
@@ -333,6 +334,7 @@
     "color": "light_gray",
     "looks_like": "pebble",
     "description": "A handful of glass marbles, useful as ammunition for slings or slingshots.",
+    "category": "scrap_glass",
     "material": "glass",
     "volume": "250 ml",
     "weight": "3 g",
@@ -354,6 +356,7 @@
     "color": "dark_gray",
     "looks_like": "pebble",
     "description": "A box of ball bearings, useful as ammunition for slings or slingshots.",
+    "category": "scrap_metal",
     "material": "steel",
     "volume": "250 ml",
     "weight": "10 g",
@@ -659,7 +662,7 @@
   {
     "type": "AMMO",
     "id": "chunk_rubber",
-    "category": "spare_parts",
+    "category": "scrap_plastic",
     "price": "75 cent",
     "name": { "str": "chunk of rubber", "str_pl": "chunks of rubber" },
     "symbol": "*",
@@ -718,7 +721,7 @@
   {
     "type": "AMMO",
     "id": "charcoal",
-    "category": "spare_parts",
+    "category": "fuel",
     "price": "2 USD",
     "price_postapoc": "50 cent",
     "name": { "str_sp": "charcoal" },
@@ -757,7 +760,7 @@
   {
     "type": "AMMO",
     "id": "coal_lump",
-    "category": "spare_parts",
+    "category": "fuel",
     "price": "2 USD",
     "price_postapoc": "1 USD",
     "name": { "str": "coal" },
@@ -889,7 +892,7 @@
   {
     "id": "fish_bait",
     "type": "AMMO",
-    "category": "spare_parts",
+    "category": "tools_farming",
     "name": { "str": "fish bait" },
     "description": "A bait used in traps to lure fish.",
     "weight": "1 g",
@@ -963,7 +966,7 @@
   {
     "type": "AMMO",
     "id": "unfinished_charcoal",
-    "category": "spare_parts",
+    "category": "scrap_wood",
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "name": { "str_sp": "unfinished charcoal" },
@@ -978,7 +981,7 @@
   {
     "type": "AMMO",
     "id": "unfinished_cac2",
-    "category": "spare_parts",
+    "category": "rocks",
     "price": "0 cent",
     "price_postapoc": "0 cent",
     "name": { "str_sp": "unfinished calcium carbide" },

data/json/items/chemicals_and_resources.json

@@ -154,7 +154,7 @@
     "symbol": ",",
     "color": "light_gray",
     "name": { "str": "limestone shard" },
-    "category": "spare_parts",
+    "category": "rocks",
     "description": "A small shard of limestone.  Pretty flimsy and not much of a weapon, but its alkaline properties may yet find some use.",
     "price": "5 USD",
     "price_postapoc": "10 cent",

data/json/items/classes/comestible.json

@@ -10,6 +10,7 @@
     "volume": "250 ml",
     "price": "250 cent",
     "container": "bag_plastic",
+    "category": "cooking_ingredients",
     "material": "powder",
     "symbol": "%",
     "charges": 100

data/json/items/comestibles/carnivore.json

@@ -651,7 +651,7 @@
   {
     "type": "COMESTIBLE",
     "id": "bone",
-    "category": "spare_parts",
+    "category": "other",
     "name": { "str": "bone" },
     "weight": "225 g",
     "color": "white",

data/json/items/comestibles/med.json

@@ -462,7 +462,7 @@
     "comestible_type": "MED",
     "name": { "str_sp": "cotton balls" },
     "description": "Fluffy balls of clean white cotton.  Can serve as makeshift bandages in an emergency.",
-    "category": "spare_parts",
+    "category": "scrap_fabric",
     "weight": "2 g",
     "volume": "50 ml",
     "price": "5 USD",

data/json/items/comestibles/raw_veggy.json

@@ -253,7 +253,7 @@
     "type": "COMESTIBLE",
     "id": "cotton_boll",
     "name": { "str": "cotton boll" },
-    "category": "other",
+    "category": "scrap_fabric",
     "weight": "26 g",
     "color": "light_green",
     "comestible_type": "FOOD",

data/json/items/comestibles/seed.json

@@ -662,7 +662,7 @@
     "type": "COMESTIBLE",
     "id": "coffee_pod",
     "name": { "str": "Kentucky coffee pod" },
-    "category": "other",
+    "category": "cooking_ingredients",
     "weight": "26 g",
     "color": "light_green",
     "comestible_type": "FOOD",
@@ -710,7 +710,7 @@
     "type": "COMESTIBLE",
     "id": "roasted_coffee_bean",
     "copy-from": "coffee_bean",
-    "category": "other",
+    "category": "cooking_ingredients",
     "container": "bag_plastic",
     "name": { "str_sp": "roasted coffee beans" },
     "description": "Some roasted coffee beans, can be ground into powder.",

data/json/items/comestibles/spice.json

@@ -72,6 +72,7 @@
     "volume": "250 ml",
     "calories": 19,
     "flags": [ "NUTRIENT_OVERRIDE" ],
+    "category": "cooking_ingredients",
     "//": "a tbsp is 4.2g of sugar, meaning the volume needed to be adjusted.",
     "charges": 71,
     "vitamins": [ [ "junk_allergen", 1 ] ]
@@ -106,6 +107,7 @@
     "volume": "250 ml",
     "charges": 20,
     "flags": [ "RAW" ],
+    "category": "cooking_ingredients",
     "stack_size": 100,
     "fun": -15,
     "vitamins": [ [ "veggy_allergen", 1 ] ]
@@ -125,6 +127,7 @@
     "comestible_type": "DRINK",
     "container": "bottle_glass",
     "primary_material": "water",
+    "category": "cooking_ingredients",
     "quench": -20,
     "charges": 10,
     "healthy": -1,
@@ -147,6 +150,7 @@
     "volume": "250 ml",
     "price": "0 cent",
     "price_postapoc": "10 cent",
+    "category": "cooking_ingredients",
     "vitamins": [ [ "veggy_allergen", 1 ] ]
   },
   {

data/json/items/containers.json

@@ -1288,7 +1288,7 @@
   {
     "id": "balloon",
     "type": "CONTAINER",
-    "category": "other",
+    "category": "scrap_plastic",
     "looks_like": "condom",
     "name": { "str": "balloon" },
     "description": "A child's balloon.  This could be used as a makeshift water container.",

data/json/items/generic.json

@@ -162,7 +162,7 @@
   {
     "type": "GENERIC",
     "id": "fp_loyalty_card",
-    "category": "other",
+    "category": "scrap_plastic",
     "symbol": "-",
     "color": "pink",
     "name": { "str": "foodplace loyalty card" },
@@ -302,7 +302,7 @@
     "type": "AMMO",
     "//": "Ammo instead of generic as it sees use in makeshift repair kit.",
     "id": "pitch_wood",
-    "category": "spare_parts",
+    "category": "chems",
     "symbol": ",",
     "color": "brown",
     "looks_like": "bone_glue",
@@ -760,7 +760,7 @@
     "color": "white",
     "name": { "str": "bone skewer" },
     "description": "A thin skewer carved from bone.  Can be used to cook food over a fire or as a terrible lockpick.",
-    "category": "other",
+    "category": "tools_cooking",
     "material": [ "bone" ],
     "flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
     "weight": "10 g",
@@ -775,7 +775,7 @@
     "color": "brown",
     "name": { "str": "burnt out torch", "str_pl": "burnt out torches" },
     "description": "A torch that has consumed all its fuel; it can be recrafted into another torch.",
-    "category": "other",
+    "category": "scrap_wood",
     "material": "wood",
     "weight": "751 g",
     "volume": "750 ml",
@@ -785,7 +785,7 @@
   {
     "type": "GENERIC",
     "id": "handflare_dead",
-    "category": "other",
+    "category": "scrap_plastic",
     "symbol": ";",
     "color": "red",
     "name": { "str": "dead flare" },
@@ -817,7 +817,7 @@
     "color": "green",
     "name": { "str": "lawnmower" },
     "description": "A motorized pushmower that seems to be broken.  You could take it apart if you had a wrench.",
-    "category": "other",
+    "category": "scrap_metal",
     "price": "100 USD",
     "price_postapoc": "50 cent",
     "material": [ "steel", "iron" ],
@@ -833,6 +833,7 @@
     "color": "green",
     "name": { "str": "damaged tent" },
     "description": "A small tent, just big enough to fit a person comfortably.  This tent is broken and cannot be deployed.",
+    "category": "scrap_fabric",
     "price": "65 USD",
     "price_postapoc": "1 USD",
     "material": [ "plastic", "aluminum" ],
@@ -849,6 +850,7 @@
     "color": "green",
     "name": { "str": "large damaged tent" },
     "description": "A family sized tent, very bulky but with plenty of space.  This tent is broken and can not be deployed.",
+    "category": "scrap_fabric",
     "price": "100 USD",
     "price_postapoc": "150 cent",
     "material": [ "plastic", "aluminum" ],
@@ -1410,7 +1412,7 @@
     "symbol": ",",
     "color": "light_blue",
     "name": { "str": "broken dissector" },
-    "category": "other",
+    "category": "scrap_electronics",
     "description": "Some kind of automated medical laser cutting system.  It has suffered some damage and doesn't seem to work any more, but it could be gutted for parts.",
     "price": "20 kUSD",
     "price_postapoc": "50 cent",
@@ -1425,7 +1427,7 @@
     "symbol": "-",
     "color": "light_gray",
     "name": { "str": "industrial laser" },
-    "category": "spare_parts",
+    "category": "scrap_electronics",
     "description": "A high-power laser source, salvaged from some industrial machinery.  Doesn't do anything on its own, but could probably be useful in electronics crafting.",
     "price": "2000 USD",
     "price_postapoc": "2 USD",
@@ -1834,7 +1836,7 @@
   {
     "type": "GENERIC",
     "id": "clockworks",
-    "category": "spare_parts",
+    "category": "scrap_metal",
     "symbol": ";",
     "color": "light_gray",
     "name": { "str_sp": "clockworks" },
@@ -2358,7 +2360,7 @@
     "symbol": ",",
     "color": "light_gray",
     "name": { "str": "pile of straw", "str_pl": "piles of straw" },
-    "category": "spare_parts",
+    "category": "scrap_wood",
     "description": "A pile of dry grass.  Can be used to craft a straw bed if there is nothing else to sleep on.",
     "material": [ "dry_plant" ],
     "flags": [ "TRADER_AVOID", "TINDER" ],
@@ -2473,7 +2475,7 @@
     "id": "pouch_autoclave",
     "type": "AMMO",
     "ammo_type": "NULL",
-    "category": "other",
+    "category": "scrap_plastic",
     "name": { "str": "autoclave pouch", "str_pl": "autoclave pouches" },
     "description": "This is a medical device that bears the approval of the FDA (Food and Drug Administration).  If used properly, these pouches can keep things sterile indefinitely.",
     "weight": "2 g",
@@ -2679,7 +2681,7 @@
     "color": "yellow",
     "name": { "str": "prototype I/O recorder" },
     "description": "This small transparent card was attached to the prototype robot's CPU.  It might contain the data the intercom spoke of.",
-    "category": "other",
+    "category": "valuables",
     "price": "5 USD",
     "price_postapoc": "0 cent",
     "material": "plastic",
@@ -3248,7 +3250,7 @@
   {
     "id": "kevlar_plate",
     "type": "GENERIC",
-    "category": "spare_parts",
+    "category": "scrap_fabric",
     "name": { "str": "Kevlar plate" },
     "description": "This is a plate of reinforced Kevlar.  It could be used to repair items made of Kevlar.",
     "weight": "300 g",
@@ -3264,7 +3266,7 @@
   {
     "type": "GENERIC",
     "id": "scute_piece",
-    "category": "spare_parts",
+    "category": "other",
     "name": { "str": "scute" },
     "weight": "225 g",
     "color": "green",
@@ -3280,7 +3282,7 @@
   {
     "type": "GENERIC",
     "id": "bone_heavy",
-    "category": "spare_parts",
+    "category": "other",
     "name": { "str": "heavy bone" },
     "weight": "450 g",
     "color": "white",
@@ -3296,7 +3298,7 @@
   {
     "type": "GENERIC",
     "id": "teeth_serrated",
-    "category": "spare_parts",
+    "category": "other",
     "name": { "str": "sharp teeth" },
     "weight": "450 g",
     "color": "white",

data/json/items/generic/string.json

@@ -127,7 +127,7 @@
   {
     "id": "stick_fiber",
     "type": "COMESTIBLE",
-    "category": "spare_parts",
+    "category": "other",
     "name": "fibrous stalk",
     "symbol": "=",
     "material": "dry_plant",