Misc Comestible Fixes

data/json/itemgroups/Food/food.json

@@ -41,7 +41,7 @@
       { "item": "cornmeal", "prob": 40 },
       { "item": "dry_meat", "prob": 10 },
       { "item": "dry_fish", "prob": 10 },
-      { "item": "dry_lobster", "prob": 10 },
+      { "item": "dry_lobster", "prob": 10, "container-item": "wrapper" },
       { "item": "dry_veggy", "prob": 10 },
       { "item": "dry_corn", "prob": 1 },
       { "item": "dry_fruit", "prob": 10 },
@@ -251,7 +251,7 @@
         "charges-max": 9
       },
       { "item": "dry_meat", "prob": 10 },
-      { "item": "dry_fish", "prob": 10 },
+      { "item": "dry_fish", "prob": 10, "container-item": "wrapper" },
       { "item": "dry_lobster", "prob": 10 },
       { "item": "dry_veggy", "prob": 10 },
       { "item": "dry_corn", "prob": 1 },
@@ -384,8 +384,8 @@
     "entries": [
       { "item": "syrup", "prob": 20 },
       { "item": "molasses", "prob": 15 },
-      { "item": "cooking_oil", "prob": 20 },
-      { "item": "cooking_oil2", "prob": 20 },
+      { "item": "cooking_oil", "prob": 40 },
+      { "item": "cooking_oil2", "prob": 40 },
       { "item": "honey_bottled", "prob": 15 },
       { "item": "honey_glassed", "prob": 5 },
       { "item": "jar_glass_sealed", "prob": 20 },

data/json/itemgroups/food_service.json

@@ -1087,8 +1087,8 @@
       { "item": "flour", "charges": [ 1, 175 ], "prob": 13, "container-item": "bag_plastic" },
       [ "soysauce", 25 ],
       [ "hot_sauce", 25 ],
-      [ "cooking_oil", 20 ],
-      [ "cooking_oil2", 20 ],
+      [ "cooking_oil", 50 ],
+      [ "cooking_oil2", 50 ],
       [ "cookbook", 8 ],
       [ "cookbook_italian", 9 ],
       [ "cornmeal", 3 ],
@@ -1127,8 +1127,8 @@
       { "item": "flour", "charges": [ 1, 175 ], "prob": 13, "container-item": "bag_plastic" },
       [ "soysauce", 25 ],
       [ "hot_sauce", 25 ],
-      [ "cooking_oil", 20 ],
-      [ "cooking_oil2", 20 ],
+      [ "cooking_oil", 40 ],
+      [ "cooking_oil2", 40 ],
       [ "cookbook", 8 ],
       [ "cookbook_daintydishes", 9 ],
       [ "cornmeal", 3 ],

data/json/items/chemicals_and_resources.json

@@ -231,7 +231,7 @@
     "symbol": "*",
     "color": "light_gray",
     "description": "A handful of rock salt crystals.  Could be refined into table salt.",
-    "material": [ "stone" ],
+    "material": [ "salt", "stone" ],
     "volume": "3500 ml",
     "weight": "650 g",
     "bashing": 1
@@ -427,7 +427,7 @@
     "type": "COMESTIBLE",
     "id": "salt_water",
     "name": { "str_sp": "salt water" },
-    "material": [ "water" ],
+    "material": [ { "type": "water", "portion": 877 }, { "type": "salt", "portion": 123 } ],
     "weight": "260 g",
     "color": "light_cyan",
     "container": "bottle_plastic",

data/json/items/comestibles/drink.json

@@ -1312,7 +1312,7 @@
     "id": "sweet_water",
     "looks_like": "water",
     "name": { "str_sp": "sweet water" },
-    "weight": "260 g",
+    "weight": "300 g",
     "color": "light_cyan",
     "container": "bottle_plastic",
     "comestible_type": "DRINK",
@@ -1322,7 +1322,7 @@
     "description": "Water with sugar or honey added.  Tastes okay.",
     "price": 95,
     "price_postapoc": 10,
-    "material": [ "water" ],
+    "material": [ { "type": "water", "portion": 833 }, { "type": "junk", "portion": 167 } ],
     "volume": "250 ml",
     "phase": "liquid",
     "fun": 2,

data/json/items/comestibles/nuts.json

@@ -476,6 +476,7 @@
     "comestible_type": "DRINK",
     "container": "jar_glass_sealed",
     "primary_material": "junk",
+    "material": [ "nut", "junk" ],
     "quench": -2,
     "calories": 190,
     "charges": 8,

data/json/items/comestibles/spice.json

@@ -65,6 +65,7 @@
     "type": "COMESTIBLE",
     "name": { "str_sp": "salt" },
     "description": "Yuck!  You surely wouldn't want to eat this.  It's good for preserving meat and cooking, though.",
+    "material": [ "salt" ],
     "color": "white"
   },
   {
@@ -81,6 +82,7 @@
     "type": "COMESTIBLE",
     "name": { "str_sp": "seasoned salt" },
     "description": "Salt mixed with a fragrant blend of secret herbs and spices.",
+    "material": [ "salt" ],
     "color": "brown"
   },
   {

data/json/materials.json

@@ -1784,6 +1784,26 @@
     "bash_dmg_verb": "damaged",
     "cut_dmg_verb": "damaged"
   },
+  {
+    "type": "material",
+    "id": "salt",
+    "name": "Salt",
+    "density": 2.16,
+    "specific_heat_liquid": 0.88,
+    "specific_heat_solid": 0.92,
+    "//": "The specific heats are random numbers I found online.  I am not a native speaker and have no idea what I'm looking for.  If someone has better numbers please correct this.",
+    "latent_heat": 10,
+    "soft": false,
+    "bash_resist": 1,
+    "cut_resist": 1,
+    "bullet_resist": 1,
+    "acid_resist": 0,
+    "fire_resist": 20,
+    "chip_resist": 0,
+    "dmg_adj": [ "lightly damaged", "damaged", "very damaged", "thoroughly damaged" ],
+    "bash_dmg_verb": "damaged",
+    "cut_dmg_verb": "damaged"
+  },
   {
     "type": "material",
     "id": "mercury",

data/mods/TEST_DATA/known_bad_density.json

@@ -743,7 +743,6 @@
       "sheet_leather_patchwork",
       "cattail_jelly",
       "manual_swords",
-      "salt_water",
       "xl_k_gambeson",
       "manual_rifle",
       "meat_cooked",
@@ -831,7 +830,6 @@
       "porkbelly",
       "huge_atomic_battery_cell",
       "airhorn",
-      "spread_peanutbutter",
       "kevlar_chainmail_hauberk_xs",
       "corpse_scorched",
       "mortar_adobe",