A bunch of random item reworks: 12 (CleverRaven#72931)

* plastic tupperware * kettle * gallon jug * glass bottle * napkin
irwiss · Apr 10, 2024 · fd489a0 · fd489a0
1 parent 1b5c1bf
commit fd489a0
Show file tree

Hide file tree

Showing 7 changed files with 42 additions and 45 deletions.
diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json
@@ -649,15 +649,17 @@
     "id": "napkin",
     "name": { "str": "napkin" },
     "category": "spare_parts",
-    "weight": "3 g",
+    "weight": "1360 mg",
+    "//1": "Calculated from cocktail napkins with roughly average (13lb/500sheets) thickness. 100in^2 * 13lb / 864in^2 = 1.5lb => 1.5lb / 500 = 0.003lb per napkin.",
     "color": "white",
     "symbol": "`",
     "description": "A napkin.  Can be used for fires.",
     "price": 0,
     "price_postapoc": 0,
     "material": [ "paper" ],
-    "volume": "5 ml",
-    "flags": [ "TINDER" ]
+    "volume": "3 ml",
+    "flags": [ "TINDER" ],
+    "//2": "Based on https://www.sizes.com/home/napkins.htm"
   },
   {
     "type": "GENERIC",

diff --git a/data/json/items/containers/containers.json b/data/json/items/containers/containers.json
@@ -454,12 +454,13 @@
     "looks_like": "bottle_plastic",
     "description": "A watertight glass bottle, holds 750 ml of liquid.",
     "ascii_picture": "bottle_glass",
-    "weight": "450 g",
-    "volume": "953 ml",
-    "longest_side": "276 mm",
-    "price": 0,
+    "weight": "511 g",
+    "volume": "1082 ml",
+    "//1": "Calculated as a cylinder of 2.9in diameter and 10in height, to account for it getting thinner near the top.",
+    "longest_side": "29 cm",
+    "price": "2 USD",
     "price_postapoc": 10,
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "glass" ],
     "symbol": ")",
     "color": "cyan",
@@ -476,7 +477,8 @@
     ],
     "qualities": [ [ "BOIL", 1 ] ],
     "flags": [ "COLLAPSE_CONTENTS" ],
-    "melee_damage": { "bash": 2 }
+    "melee_damage": { "bash": 2 },
+    "//2": "Based on https://www.amazon.com/dp/B09K2VQLZV"
   },
   {
     "id": "bottle_plastic",
@@ -2197,12 +2199,13 @@
     "looks_like": "bottle_plastic",
     "description": "A standard plastic jug used for milk and household cleaning chemicals.  Some may be factory-sealed to increase shelf life.",
     "ascii_picture": "jug_plastic",
-    "weight": "190 g",
-    "volume": "3825 ml",
+    "weight": "160 g",
+    "volume": "4402 ml",
+    "//1": "Calculated as a cylinder of 6in diameter and 9.5in height, to account for it getting thinner near the top.",
     "longest_side": "28 cm",
-    "price": 0,
+    "price": "10 USD",
     "price_postapoc": 10,
-    "to_hit": 1,
+    "to_hit": { "grip": "none", "length": "hand", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic" ],
     "symbol": ")",
     "color": "light_cyan",
@@ -2217,7 +2220,8 @@
         "sealed_data": { "spoil_multiplier": 0.5 }
       }
     ],
-    "flags": [ "COLLAPSE_CONTENTS" ]
+    "flags": [ "COLLAPSE_CONTENTS" ],
+    "//2": "Based on https://www.amazon.com/dp/B07GC1VJ9T"
   },
   {
     "id": "fuel_tin",

diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json
@@ -565,8 +565,10 @@
     "symbol": "u",
     "description": "A piece of plastic tupperware with a matching watertight lid.  Holds 750 ml of liquid.",
     "copy-from": "base_plastic_dish",
-    "volume": "787 ml",
-    "longest_side": "17 cm",
+    "volume": "1463 ml",
+    "weight": "57 g",
+    "longest_side": "20 cm",
+    "price": "132 cent",
     "pocket_data": [
       {
         "pocket_type": "CONTAINER",
@@ -576,7 +578,9 @@
         "max_contains_weight": "1 kg"
       }
     ],
-    "qualities": [ [ "CONTAIN", 1 ] ]
+    "qualities": [ [ "CONTAIN", 1 ] ],
+    "to_hit": { "grip": "bad", "length": "hand", "surface": "any", "balance": "clumsy" },
+    "//": "Based on https://www.amazon.co.uk/dp/B097HTDRNZ"
   },
   {
     "id": "plastic_bowl_kids",
@@ -1308,12 +1312,15 @@
     "copy-from": "base_cookpot",
     "material": [ "steel" ],
     "color": "light_gray",
-    "weight": "728 g",
-    "volume": "1575 ml",
-    "longest_side": "21 cm",
+    "weight": "508 g",
+    "volume": "3205 ml",
+    "//1": "Calculated as a cylinder of 7.44in diameter and 4.5in height. Calculating it from package dimensions of the amazon listing would give ridiculous volume.",
+    "longest_side": "19 cm",
+    "price": "13 USD",
     "pocket_data": [ { "max_contains_volume": "1500 ml", "max_contains_weight": "2 kg", "watertight": true, "rigid": true } ],
     "delete": { "qualities": [ "COOK" ] },
-    "melee_damage": { "bash": 5 }
+    "melee_damage": { "bash": 5 },
+    "//2": "Based on https://www.amazon.com/dp/B0858VCYTB"
   },
   {
     "type": "GENERIC",

diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -453,7 +453,6 @@
         [ "bag_plastic", 10 ],
         [ "plastic_sheet_small", 10 ],
         [ "tumbler_plastic", 4 ],
-        [ "bowl_plastic", 4 ],
         [ "plastic_bowl_kids", 8 ],
         [ "sippy_cup", 4 ],
         [ "gasket_plastic", 1 ]

diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json
@@ -2668,7 +2668,7 @@
     "type": "uncraft",
     "activity_level": "LIGHT_EXERCISE",
     "time": "1 s",
-    "components": [ [ [ "glass_shard", 3 ] ] ]
+    "components": [ [ [ "glass_shard", 6 ] ] ]
   },
   {
     "result": "flask_glass",
@@ -3052,11 +3052,9 @@
     "result": "kettle",
     "type": "uncraft",
     "activity_level": "MODERATE_EXERCISE",
-    "skill_used": "fabrication",
-    "difficulty": 1,
     "time": "2 m",
-    "qualities": [ { "id": "SAW_M", "level": 1 } ],
-    "components": [ [ [ "sheet_metal_small", 3 ] ] ]
+    "qualities": [ { "id": "SAW_M", "level": 2 } ],
+    "components": [ [ [ "sheet_metal_small", 2 ] ] ]
   },
   {
     "result": "kiln_done",

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1703,7 +1703,7 @@
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ],
       [ [ "forge", 25 ] ]
     ],
-    "components": [ [ [ "glass_shard", 3 ], [ "bottle_glass", 1 ], [ "flask_glass", 3 ], [ "test_tube", 6 ], [ "marble", 75 ] ] ]
+    "components": [ [ [ "glass_shard", 3 ], [ "flask_glass", 3 ], [ "test_tube", 6 ], [ "marble", 75 ] ] ]
   },
   {
     "type": "recipe",

diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json
@@ -80,19 +80,6 @@
     "qualities": [ { "id": "HAMMER", "level": 2 } ],
     "components": [ [ [ "sheet_metal_small", 4 ] ] ]
   },
-  {
-    "type": "recipe",
-    "activity_level": "LIGHT_EXERCISE",
-    "result": "jug_plastic",
-    "category": "CC_OTHER",
-    "subcategory": "CSC_OTHER_CONTAINERS",
-    "skill_used": "fabrication",
-    "difficulty": 1,
-    "time": "30 m",
-    "autolearn": true,
-    "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "duct_tape", 10 ] ], [ [ "bottle_plastic", 8 ], [ "bottle_bathroom", 8 ], [ "bottle_plastic_small", 16 ] ] ]
-  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",
@@ -160,7 +147,7 @@
     "autolearn": true,
     "proficiencies": [ { "proficiency": "prof_plasticworking" } ],
     "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ],
-    "components": [ [ [ "plastic_chunk", 3 ] ] ]
+    "components": [ [ [ "plastic_chunk", 2 ] ] ]
   },
   {
     "type": "recipe",
@@ -445,7 +432,7 @@
       [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ],
       [ [ "forge", 75 ] ]
     ],
-    "components": [ [ [ "glass_shard", 3 ], [ "pipe_glass", 1 ], [ "flask_glass", 3 ], [ "test_tube", 6 ], [ "marble", 75 ] ] ]
+    "components": [ [ [ "glass_shard", 7 ], [ "pipe_glass", 4 ], [ "flask_glass", 11 ], [ "test_tube", 47 ], [ "marble", 171 ] ] ]
   },
   {
     "type": "recipe",
@@ -683,9 +670,9 @@
     "autolearn": true,
     "book_learn": [ [ "plastics_book", 2 ] ],
     "proficiencies": [ { "proficiency": "prof_plasticworking" } ],
-    "tools": [ [ [ "surface_heat", 15, "LIST" ] ] ],
+    "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ],
     "using": [ [ "plastic_molding", 1 ] ],
-    "components": [ [ [ "plastic_chunk", 15 ] ] ]
+    "components": [ [ [ "plastic_chunk", 4 ] ] ]
   },
   {
     "type": "recipe",