Food rebalance: Revenge of the soup

data/json/itemgroups/food.json

@@ -53,7 +53,7 @@
     "type": "item_group",
     "items": [
       [ "birdfood", 10 ],
-      { "item": "dogfood", "prob": 45, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 45, "container-item": "can_medium" },
       { "item": "catfood", "prob": 45, "container-item": "can_food" }
     ]
   },

data/json/itemgroups/item_groups.json

@@ -381,7 +381,7 @@
       [ "atomic_lamp", 1 ],
       [ "dog_whistle", 5 ],
       [ "pet_carrier", 2 ],
-      { "item": "dogfood", "prob": 10, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 10, "container-item": "can_medium" },
       { "item": "catfood", "prob": 10, "container-item": "can_food" },
       [ "nic_gum", 2 ],
       [ "oxygen_tank", 2 ],
@@ -627,7 +627,7 @@
       [ "coffeemaker", 10 ],
       [ "atomic_coffeepot", 2 ],
       [ "dog_whistle", 5 ],
-      { "item": "dogfood", "prob": 20, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 20, "container-item": "can_medium" },
       { "item": "catfood", "prob": 20, "container-item": "can_food" },
       [ "salted_fish", 15 ],
       [ "charcoal", 5 ],
@@ -1765,7 +1765,7 @@
       [ "jar_sauerkraut_pickled", 5 ],
       [ "sports_drink", 10 ],
       [ "protein_shake", 10 ],
-      { "item": "dogfood", "prob": 5, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 5, "container-item": "can_medium" },
       { "item": "catfood", "prob": 5, "container-item": "can_food" },
       { "item": "fish_pickled", "prob": 8, "charges": 2, "container-item": "jar_glass_sealed" },
       [ "lutefisk", 1 ],
@@ -1794,7 +1794,7 @@
       { "item": "can_beans", "prob": 4, "charges": 12, "container-item": "can_food_big" },
       { "item": "can_tomato", "prob": 4, "charges": 24, "container-item": "can_food_big" },
       { "item": "can_pineapple", "prob": 4, "charges": 12, "container-item": "can_food_big" },
-      { "item": "can_corn", "prob": 4, "charges": 4, "container-item": "can_food_big" },
+      { "item": "can_corn", "prob": 4, "charges": 6, "container-item": "can_food_big" },
       { "item": "sauce_red", "prob": 3, "charges": 96, "container-item": "can_food_big" }
     ]
   },
@@ -8436,6 +8436,8 @@
     "items": [
       [ "can_food", 65 ],
       [ "can_food_unsealed", 65 ],
+      [ "can_medium", 65 ],
+      [ "can_medium_unsealed", 65 ],
       { "item": "scrap", "prob": 50, "charges-min": 1, "charges-max": 3 },
       { "item": "steel_chunk", "prob": 50, "charges-min": 1, "charges-max": 2 },
       { "item": "steel_lump", "prob": 50, "charges-min": 1, "charges-max": 2 },

data/json/itemgroups/locations.json

@@ -212,7 +212,7 @@
     "id": "petstore_misc",
     "type": "item_group",
     "items": [
-      { "item": "dogfood", "prob": 35, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 35, "container-item": "can_medium" },
       { "item": "catfood", "prob": 35, "container-item": "can_food" },
       [ "birdfood", 15 ],
       [ "dog_whistle", 15 ],
@@ -223,7 +223,7 @@
     "id": "petstore_shelves",
     "type": "item_group",
     "items": [
-      { "item": "dogfood", "prob": 30, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 30, "container-item": "can_medium" },
       { "item": "catfood", "prob": 30, "container-item": "can_food" },
       [ "birdfood", 15 ],
       [ "can_tuna", 15 ],
@@ -852,7 +852,7 @@
       [ "dog_whistle", 10 ],
       [ "pet_carrier", 30 ],
       [ "petpack", 3 ],
-      { "item": "dogfood", "prob": 30, "container-item": "can_food" },
+      { "item": "dogfood", "prob": 30, "container-item": "can_medium" },
       { "item": "catfood", "prob": 30, "container-item": "can_food" },
       [ "birdfood", 10 ],
       [ "towel", 20 ],

data/json/items/comestibles/dairy.json

@@ -26,21 +26,22 @@
     "id": "milk_evap",
     "name": "evaporated milk",
     "name_plural": "evaporated milk",
-    "weight": "20 g",
+    "weight": "266 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 25,
     "healthy": 1,
-    "calories": 132,
+    "calories": 207,
     "description": "Milk that's had about 60% of its water removed prior to canning.",
     "price": 38,
     "material": [ "milk" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
     "flags": [ "EATEN_COLD" ],
+    "charges": 2,
     "vitamins": [ [ "vitA", 10 ], [ "vitC", 4 ], [ "calcium", 25 ] ],
     "fun": 1
   },
@@ -256,7 +257,7 @@
     "weight": "32 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 12,
@@ -265,9 +266,9 @@
     "price": 70,
     "material": [ "milk", "junk" ],
     "primary_material": "milk",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
-    "charges": 10,
+    "charges": 20,
     "vitamins": [ [ "vitA", 2 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
     "fun": 3
   }

data/json/items/comestibles/drink.json

@@ -108,16 +108,17 @@
     "weight": "238 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
     "calories": 470,
     "description": "A dense, sweet creamy sauce, often used in curries.",
     "price": 350,
     "material": "fruit",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "phase": "liquid",
+    "charges": 2,
     "vitamins": [ [ "vitC", 4 ], [ "calcium", 3 ], [ "iron", 43 ] ],
     "fun": 1
   },
@@ -295,29 +296,6 @@
     "flags": [ "EATEN_COLD" ],
     "fun": 5
   },
-  {
-    "type": "COMESTIBLE",
-    "id": "con_milk",
-    "name": "condensed milk",
-    "name_plural": "condensed milk",
-    "weight": "32 g",
-    "color": "white",
-    "spoils_in": "1 day",
-    "container": "can_food",
-    "comestible_type": "DRINK",
-    "symbol": "~",
-    "quench": 12,
-    "calories": 103,
-    "description": "Cow's milk that has been partly dehydrated, and also sweetened.  A key ingredient in many sweets.",
-    "price": 70,
-    "material": [ "milk", "junk" ],
-    "primary_material": "milk",
-    "volume": "250 ml",
-    "phase": "liquid",
-    "charges": 10,
-    "vitamins": [ [ "vitA", 2 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
-    "fun": 3
-  },
   {
     "type": "COMESTIBLE",
     "id": "creamsoda",

data/json/items/comestibles/drink_other.json

@@ -6,7 +6,7 @@
     "weight": "64 g",
     "color": "red",
     "spoils_in": "3 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
@@ -15,8 +15,8 @@
     "price": 4,
     "//": "Small cans--needs upsized after the string freeze.",
     "material": "tomato",
-    "volume": "250 ml",
-    "charges": 4,
+    "volume": "500 ml",
+    "charges": 8,
     "phase": "liquid",
     "flags": [ "EATEN_HOT" ],
     "fun": 1

data/json/items/comestibles/fruit_dishes.json

@@ -84,17 +84,18 @@
     "weight": "268 g",
     "color": "yellow",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 5,
     "healthy": 1,
-    "calories": 209,
+    "calories": 104,
     "description": "Canned pineapple rings in water.  Quite tasty.",
     "price": 400,
     "material": "fruit",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "fun": 7,
+    "charges": 2,
     "vitamins": [ [ "vitC", 26 ], [ "calcium", 4 ], [ "iron", 6 ] ]
   },
   {

data/json/items/comestibles/meat_dishes.json

@@ -383,19 +383,20 @@
     "type": "COMESTIBLE",
     "id": "can_spam",
     "name": "SPAM",
-    "weight": "84 g",
+    "//": "SPAM comes in cans of six 2 oz slices.  Each charge is one slice.",
+    "weight": "56 g",
     "color": "pink",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -3,
-    "calories": 270,
+    "calories": 180,
     "description": "A canned pork product that is unnaturally pink, oddly rubbery, and not very tasty, this SPAM remains quite filling.  Completely unappetizing, but quite filling.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
-    "charges": 2,
+    "volume": "500 ml",
+    "charges": 6,
     "flags": [ "EATEN_HOT" ],
     "fun": -8,
     "vitamins": [ [ "iron", 3 ] ]
@@ -487,15 +488,16 @@
     "weight": "170 g",
     "color": "light_red",
     "spoils_in": "2 days",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 393,
     "description": "Meat encased in little dough satchels.  Tastes fine raw.",
     "price": 250,
     "material": [ "flesh", "wheat" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "flags": [ "EATEN_HOT" ],
+    "charges": 2,
     "vitamins": [ [ "vitA", 6 ], [ "calcium", 16 ], [ "iron", 9 ] ]
   },
   {
@@ -506,17 +508,18 @@
     "weight": "253 g",
     "color": "red",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
     "calories": 299,
     "description": "A spicy stew containing chili peppers, meat, tomatoes and beans.",
     "price": 290,
     "material": [ "flesh", "veggy", "bean", "tomato" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
     "flags": [ "EATEN_HOT" ],
     "fun": 5,
+    "charges": 2,
     "vitamins": [ [ "vitA", 14 ], [ "vitC", 7 ], [ "calcium", 6 ], [ "iron", 27 ] ]
   },
   {
@@ -527,15 +530,16 @@
     "weight": "267 g",
     "color": "brown",
     "spoils_in": "1 day 12 hours",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": -8,
     "calories": 283,
     "description": "Greasy Prospector improved pork and beans with hickory smoked pig fat chunks.",
     "price": 200,
     "material": [ "flesh", "bean" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 5,
     "vitamins": [ [ "vitC", 6 ], [ "calcium", 14 ], [ "iron", 25 ] ]
@@ -581,20 +585,20 @@
     "type": "COMESTIBLE",
     "id": "can_chicken",
     "name": "canned chicken",
-    "weight": "54 g",
+    "weight": "217 g",
     "color": "pink",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "calories": 100,
+    "calories": 400,
     "description": "Bright white chicken-paste.",
     "price": 400,
     "material": "flesh",
-    "volume": "250 ml",
-    "charges": 4,
+    "volume": "500 ml",
+    "charges": 2,
     "fun": 1,
-    "vitamins": [ [ "vitA", 3 ], [ "calcium", 1 ], [ "iron", 4 ], [ "vitB", 23 ] ]
+    "vitamins": [ [ "vitA", 18 ], [ "calcium", 3 ], [ "iron", 18 ], [ "vitB", 34 ] ]
   },
   {
     "type": "COMESTIBLE",
@@ -603,16 +607,16 @@
     "weight": "232 g",
     "color": "white",
     "spoils_in": "4 days",
-    "container": "can_food",
-    "//": "Small cans--needs properly Jarred after the string freeze.",
+    "container": "jar_glass",
     "comestible_type": "FOOD",
     "symbol": "%",
     "calories": 465,
     "description": "Fish fillets pickled in some sort of tangy white sauce.",
     "price": 310,
     "material": "flesh",
-    "volume": "250 ml",
+    "volume": "500 ml",
     "fun": 3,
+    "charges": 2,
     "vitamins": [ [ "calcium", 34 ], [ "iron", 34 ] ]
   },
   {
@@ -642,15 +646,16 @@
     "weight": "253 g",
     "color": "white",
     "spoils_in": "1 day",
-    "container": "can_food",
+    "container": "can_medium",
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 2,
     "calories": 142,
     "description": "Delicious, lumpy, white soup made of clams and potatoes.  A taste of the lost glory of New England.",
     "price": 400,
     "material": [ "flesh", "milk" ],
-    "volume": "250 ml",
+    "volume": "500 ml",
+    "charges": 2,
     "flags": [ "EATEN_HOT" ],
     "fun": 6,
     "vitamins": [ [ "vitA", 20 ], [ "vitC", 14 ], [ "calcium", 7 ], [ "iron", 16 ], [ "vitB", 348 ] ]