From 427fc8a19118098e94357148fbf4c9e394b3ea95 Mon Sep 17 00:00:00 2001
From: Karol1223 <karlos.alex.c@gmail.com>
Date: Thu, 27 Jul 2023 09:43:17 +0200
Subject: [PATCH] plastic barrel rework

---
 data/json/items/containers.json         | 14 ++++++++------
 data/json/recipes/recipe_others.json    | 18 ++++--------------
 data/json/recipes/tools/containers.json | 10 +++++-----
 3 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/data/json/items/containers.json b/data/json/items/containers.json
index cc60b1db1c1d8..8fc097418e801 100644
--- a/data/json/items/containers.json
+++ b/data/json/items/containers.json
@@ -42,14 +42,15 @@
     "id": "30gal_barrel",
     "type": "GENERIC",
     "category": "container",
-    "name": { "str": "30 gallon barrel" },
+    "name": { "str": "30 gallon plastic barrel" },
     "looks_like": "55gal_drum",
     "description": "A huge plastic barrel with a watertight lid.",
     "weight": "6800 g",
-    "volume": "118125 ml",
-    "price": 5000,
+    "volume": "165640 ml",
+    "longest_side": "72 cm",
+    "price": "71 USD",
     "price_postapoc": 250,
-    "to_hit": -5,
+    "to_hit": { "grip": "bad", "length": "long", "surface": "any", "balance": "clumsy" },
     "material": [ "plastic" ],
     "symbol": "0",
     "color": "light_blue",
@@ -58,13 +59,14 @@
         "pocket_type": "CONTAINER",
         "watertight": true,
         "rigid": true,
-        "max_contains_volume": "112500 ml",
+        "max_contains_volume": "113560 ml",
         "max_contains_weight": "255 kg"
       }
     ],
     "qualities": [ [ "CONTAIN", 1 ] ],
     "flags": [ "COLLAPSE_CONTENTS" ],
-    "melee_damage": { "bash": 8 }
+    "melee_damage": { "bash": 8 },
+    "//": "Based on https://www.amazon.com/dp/B0025QI4XC"
   },
   {
     "id": "30gal_drum",
diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
index c2063449bfcf6..2f0bfa340ed19 100644
--- a/data/json/recipes/recipe_others.json
+++ b/data/json/recipes/recipe_others.json
@@ -1567,25 +1567,15 @@
     "autolearn": true,
     "//": "80 cm weld",
     "book_learn": [ [ "textbook_fabrication", 7 ], [ "manual_fabrication", 7 ] ],
-    "using": [ [ "soldering_standard", 25 ], [ "welding_standard", 80 ], [ "plastic_molding", 456 ] ],
-    "proficiencies": [
-      { "proficiency": "prof_plasticworking" },
-      { "proficiency": "prof_welding_basic", "skill_penalty": 0.5 },
-      { "proficiency": "prof_welding" }
-    ],
+    "using": [ [ "soldering_standard", 25 ], [ "welding_standard", 80 ] ],
+    "proficiencies": [ { "proficiency": "prof_welding_basic", "skill_penalty": 0.5 }, { "proficiency": "prof_welding" } ],
     "qualities": [
-      { "id": "HAMMER", "level": 2 },
+      { "id": "HAMMER", "level": 3 },
       { "id": "SAW_M", "level": 1 },
       { "id": "SCREW", "level": 1 },
       { "id": "WRENCH", "level": 1 }
     ],
-    "components": [
-      [ [ "pipe", 8 ] ],
-      [ [ "motor_tiny", 1 ] ],
-      [ [ "wheel_small", 2 ] ],
-      [ [ "cable", 16 ] ],
-      [ [ "plastic_chunk", 638 ] ]
-    ]
+    "components": [ [ [ "pipe", 8 ] ], [ [ "motor_tiny", 1 ] ], [ [ "wheel_small", 2 ] ], [ [ "cable", 16 ] ], [ [ "30gal_barrel", 1 ] ] ]
   },
   {
     "type": "recipe",
diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json
index 3640fd6ee3c9f..4ae347e39d5ad 100644
--- a/data/json/recipes/tools/containers.json
+++ b/data/json/recipes/tools/containers.json
@@ -348,12 +348,12 @@
     "category": "CC_OTHER",
     "subcategory": "CSC_OTHER_CONTAINERS",
     "skill_used": "fabrication",
-    "difficulty": 8,
-    "time": "30 m",
+    "difficulty": 6,
+    "time": "1 h",
     "autolearn": true,
-    "using": [ [ "soldering_standard", 40 ] ],
-    "qualities": [ { "id": "CUT", "level": 2 } ],
-    "components": [ [ [ "duct_tape", 200 ], [ "superglue", 4 ] ], [ [ "jerrycan", 12 ] ] ]
+    "proficiencies": [ { "proficiency": "prof_plasticworking" } ],
+    "using": [ [ "plastic_molding", 98 ] ],
+    "components": [ [ [ "plastic_chunk", 136 ] ] ]
   },
   {
     "type": "recipe",