Rework and sanity-check harvesting of tin (#3197)

cataclysmbnteam · Sep 23, 2023 · 7772cab · 7772cab
1 parent d2b1d2f
commit 7772cab
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/data/json/obsoletion/recipes.json b/data/json/obsoletion/recipes.json
@@ -778,11 +778,6 @@
     "result": "boots_winterknitting",
     "obsolete": true
   },
-  {
-    "type": "recipe",
-    "result": "bowl_pewteruncraft",
-    "obsolete": true
-  },
   {
     "type": "recipe",
     "result": "brew_bum_wine",
@@ -2023,11 +2018,6 @@
     "result": "tieclipuncraft",
     "obsolete": true
   },
-  {
-    "type": "recipe",
-    "result": "tin_plateuncraft",
-    "obsolete": true
-  },
   {
     "type": "recipe",
     "result": "toaster",

diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json
@@ -1221,13 +1221,14 @@
     "difficulty": 4,
     "autolearn": [ [ "cooking", 6 ] ],
     "book_learn": [ [ "textbook_chemistry", 3 ], [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ],
-    "time": "30 m",
+    "time": "10 m",
+    "charges": 10,
     "batch_time_factors": [ 50, 2 ],
     "tools": [ [ [ "electrolysis_kit", 100 ] ], [ [ "jar_glass", -1 ], [ "jar_3l_glass", -1 ] ] ],
     "components": [
-      [ [ "acid", 1 ] ],
+      [ [ "acid", 1 ], [ "chem_sulphuric_acid", 1 ] ],
       [ [ "water", 3 ], [ "water_clean", 3 ] ],
-      [ [ "tin_plate", 1 ], [ "tin_cup", 1 ], [ "bowl_pewter", 1 ] ]
+      [ [ "can_food_big_unsealed", 1 ], [ "can_medium_unsealed", 5 ], [ "can_food_unsealed", 10 ] ]
     ]
   },
   {

diff --git a/data/json/uncraft/generic.json b/data/json/uncraft/generic.json
@@ -1596,6 +1596,27 @@
     "time": "1 m",
     "components": [ [ [ "ceramic_shard", 1 ] ] ]
   },
+  {
+    "result": "bowl_pewter",
+    "type": "uncraft",
+    "time": "30 s",
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "tin", 125 ] ] ]
+  },
+  {
+    "result": "tin_plate",
+    "type": "uncraft",
+    "time": "1 m",
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "tin", 125 ] ] ]
+  },
+  {
+    "result": "tin_cup",
+    "type": "uncraft",
+    "time": "30 s",
+    "qualities": [ { "id": "HAMMER", "level": 1 } ],
+    "components": [ [ [ "tin", 100 ] ] ]
+  },
   {
     "result": "char_purifier",
     "type": "uncraft",