kitchen item group revamp

called other item groups; deleted redundant item entries
CleverRaven · Feb 6, 2020 · 868f833 · 868f833
1 parent f45a15f
commit 868f833
Showing 1 changed file with 5 additions and 59 deletions.
diff --git a/data/json/itemgroups/item_groups.json b/data/json/itemgroups/item_groups.json
@@ -211,10 +211,7 @@
       [ "cereal", 50 ],
       [ "cereal2", 60 ],
       [ "cereal3", 45 ],
-      [ "toaster", 20 ],
-      [ "microwave", 20 ],
-      [ "multi_cooker", 1 ],
-      [ "clock", 10 ],
+      { "group": "kitchen_appliances", "prob": 253 },
       [ "hat_chef", 2 ],
       [ "jacket_chef", 2 ],
       [ "pot", 25 ],
@@ -223,39 +220,21 @@
       [ "pot_canning", 15 ],
       [ "pressure_cooker", 5 ],
       [ "thermometer", 5 ],
-      [ "teapot", 15 ],
       [ "pan", 25 ],
-      [ "waffleiron", 25 ],
-      [ "pastaextruder", 10 ],
-      [ "can_sealer", 5 ],
-      [ "knife_butter", 90 ],
-      [ "knife_steak", 85 ],
-      [ "fork", 90 ],
-      [ "spoon", 90 ],
-      [ "glass", 20 ],
-      [ "glass_plate", 20 ],
-      [ "glass_bowl", 20 ],
-      [ "ceramic_plate", 10 ],
-      [ "ceramic_bowl", 10 ],
-      [ "ceramic_cup", 10 ],
+      { "group": "dishes_dining", "prob": 460 },
+      { "group": "condiments", "prob": 425 },
+      { "group": "pantry_liquids", "prob": 160 },
       [ "knife_butcher", 10 ],
       [ "cookbook", 35 ],
       [ "rag", 1 ],
-      [ "hotplate", 10 ],
       [ "popcan_stove", 5 ],
-      [ "flashlight", 40 ],
-      [ "extinguisher", 20 ],
       { "group": "alcohol", "prob": 101 },
       [ "sweet_sausage", 2 ],
       [ "roasted_coffee_bean", 10 ],
       [ "bacon", 25 ],
       { "item": "bleach", "prob": 20, "charges-min": 1 },
       { "item": "ammonia", "prob": 24, "charges-min": 1 },
-      [ "flour", 60 ],
-      [ "yeast", 50 ],
-      [ "molasses", 15 ],
       [ "milk_powder", 15 ],
-      [ "cornmeal", 40 ],
       [ "powder_eggs", 20 ],
       {
         "item": "protein_powder",
@@ -264,33 +243,21 @@
         "charges-min": 1,
         "charges-max": 9
       },
-      [ "dry_meat", 10 ],
-      [ "dry_fish", 10 ],
-      [ "dry_veggy", 10 ],
-      [ "dry_fruit", 10 ],
+      { "group": "dry_goods", "prob": 365 },
       [ "fchicken", 25 ],
       [ "lunchmeat", 10 ],
       [ "bologna", 10 ],
       [ "nachosc", 10 ],
       [ "nachosm", 10 ],
       [ "nachosmc", 2 ],
-      [ "oatmeal", 50 ],
       [ "toastem", 30 ],
       [ "toastem2", 30 ],
       [ "toastem3", 35 ],
       [ "toasterpastryfrozen", 20 ],
       [ "brownie", 30 ],
-      [ "cooking_oil", 20 ],
-      [ "cooking_oil2", 20 ],
-      [ "sugar", 40 ],
       [ "lemonade_powder", 15 ],
-      [ "salt", 40 ],
-      [ "pepper", 30 ],
-      [ "cinnamon", 15 ],
       [ "funnel", 50 ],
       [ "vac_sealer", 10 ],
-      [ "seasoning_italian", 25 ],
-      [ "seasoning_salt", 25 ],
       [ "cookbook_italian", 10 ],
       [ "cookbook_liverforkids", 10 ],
       [ "cookbook_foodfashions", 7 ],
@@ -352,54 +319,33 @@
       [ "marshmallow", 20 ],
       [ "biscuit", 12 ],
       [ "hardtack", 2 ],
-      [ "mayonnaise", 35 ],
-      [ "ketchup", 35 ],
-      [ "mustard", 35 ],
-      [ "soysauce", 25 ],
-      [ "horseradish", 15 ],
-      [ "honey_bottled", 35 ],
-      [ "honey_glassed", 35 ],
-      [ "peanutbutter", 35 ],
-      [ "jar_glass", 50 ],
-      [ "jar_3l_glass", 40 ],
       [ "cheese", 40 ],
       [ "cheese_hard", 5 ],
       [ "can_cheese", 8 ],
       [ "yoghurt", 8 ],
       [ "pudding", 10 ],
-      [ "vinegar", 15 ],
       { "item": "veggy_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
       [ "jar_sauerkraut_pickled", 5 ],
       { "item": "meat_pickled", "prob": 4, "charges": 2, "container-item": "jar_glass_sealed" },
       { "item": "fish_pickled", "prob": 6, "charges": 2, "container-item": "jar_glass_sealed" },
       [ "ghee", 5 ],
       [ "lutefisk", 1 ],
       [ "tongs", 25 ],
-      [ "char_smoker", 25 ],
       [ "lawn_dart", 10 ],
-      [ "dehydrator", 15 ],
       [ "flask_hip", 5 ],
       [ "lye_powder", 5 ],
-      [ "sm_extinguisher", 10 ],
       [ "atomic_light", 1 ],
       [ "atomic_lamp", 1 ],
       [ "smart_lamp", 2 ],
-      [ "coffeemaker", 10 ],
-      [ "atomic_coffeepot", 2 ],
       [ "dog_whistle", 5 ],
       { "item": "dogfood", "prob": 20, "container-item": "can_medium" },
       { "item": "catfood", "prob": 20, "container-item": "can_food" },
-      [ "salted_fish", 15 ],
       [ "charcoal", 5 ],
       [ "soap", 70 ],
       [ "detergent", 50 ],
-      [ "dry_beans", 40 ],
-      [ "dry_lentils", 30 ],
-      [ "dry_rice", 40 ],
       [ "survnote", 1 ],
       [ "cookbook_sushi", 5 ],
       [ "scots_cookbook", 6 ],
-      [ "food_processor", 30 ],
       [ "balloon", 5 ],
       [ "eclipse_glasses", 1 ],
       [ "thermos", 15 ],