Add new appliance, the glassblower's crucible (#76936)

* Update recipe_others.json * Update appliances.json Added item version of Glassblower's Crucible * Update appliances.json * Update appliances.json * Added placed glassblower's crucible appliance * Add glassblower's crucible * Update appliances.json * Fix stray ']' * Formatting * Fixes to glassblower's crucible recipe removed duplicate welding tool requirement * Add glassblower's crucible pseudo tool * Revert change here because it was incorrect location for pseudo tool * Add glassblower's crucible pseudo tool Adding this in the correct location * Apply bot reccomendation * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * Update appliances.json * Fixing descriptions with double spaces Previous commit is fixing same issue in different file * Update appliances.json with new item description * Update appliances.json with new item description * Add proof of concept recipe for the glassblower's crucible * Apply suggestions from code review Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
CleverRaven · Oct 24, 2024 · e19f8b3 · e19f8b3
1 parent acf7a34
commit e19f8b3
Show file tree

Hide file tree

Showing 7 changed files with 128 additions and 0 deletions.
diff --git a/data/json/construction/appliances.json b/data/json/construction/appliances.json
@@ -289,6 +289,18 @@
     "post_special": "done_appliance",
     "activity_level": "BRISK_EXERCISE"
   },
+  {
+    "type": "construction",
+    "id": "app_glassblowers_crucible",
+    "group": "place_glassblowers_crucible",
+    "category": "APPLIANCE",
+    "required_skills": [ [ "fabrication", 0 ] ],
+    "time": "5 m",
+    "components": [ [ [ "glassblowers_crucible", 1 ] ] ],
+    "pre_special": "check_empty",
+    "post_special": "done_appliance",
+    "activity_level": "BRISK_EXERCISE"
+  },
   {
     "type": "construction",
     "id": "app_forge",

diff --git a/data/json/construction_group.json b/data/json/construction_group.json
@@ -1315,6 +1315,11 @@
     "id": "place_kiln",
     "name": "Place Kiln"
   },
+  {
+    "type": "construction_group",
+    "id": "place_glassblowers_crucible",
+    "name": "Place Glassblower's Crucible"
+  },
   {
     "type": "construction_group",
     "id": "place_drill_press",

diff --git a/data/json/furniture_and_terrain/appliances.json b/data/json/furniture_and_terrain/appliances.json
@@ -1059,5 +1059,28 @@
     ],
     "damage_reduction": { "all": 50 },
     "variants": [ { "symbols": "&", "symbols_broken": "#" } ]
+  },
+  {
+    "type": "vehicle_part",
+    "id": "ap_glassblowers_crucible",
+    "name": { "str": "glassblower's crucible" },
+    "color": "brown",
+    "categories": [ "utility" ],
+    "description": "An electric crucible, powered by your electric grid.  Designed for melting large quantities of glass for batch crafting and production of large items, it needs to be placed and plugged into a power source.",
+    "broken_color": "yellow_red",
+    "damage_modifier": 10,
+    "damage_reduction": { "all": 30 },
+    "durability": 80,
+    "flags": [ "OBSTACLE", "APPLIANCE" ],
+    "pseudo_tools": [ { "id": "glassblowers_crucible_tool" } ],
+    "item": "glassblowers_crucible",
+    "breaks_into": [
+      { "item": "cable", "charges": [ 0, 4 ] },
+      { "item": "scrap", "count": [ 8, 12 ] },
+      { "item": "steel_chunk", "count": [ 2, 4 ] },
+      { "item": "ceramic_shard", "count": [ 21, 42 ] },
+      { "item": "rock", "count": [ 6, 12 ] }
+    ],
+    "variants": [ { "symbols": "o", "symbols_broken": "x" } ]
   }
 ]
diff --git a/data/json/items/appliances.json b/data/json/items/appliances.json
@@ -403,5 +403,21 @@
     "price_postapoc": "20 USD",
     "symbol": "&",
     "color": "light_gray"
+  },
+  {
+    "type": "GENERIC",
+    "category": "other",
+    "id": "glassblowers_crucible",
+    "name": { "str": "disconnected glassblower's crucible" },
+    "description": "An electric crucible, powered by your electric grid.  Designed for melting large quantities of glass for batch crafting and production of large items, it needs to be placed and plugged into a power source.",
+    "//": "Loosely based off Jen-Ken Kiln - Crucible 1813, but homemade",
+    "weight": "50 kg",
+    "material": [ "steel", "clay" ],
+    "volume": "62500 ml",
+    "longest_side": "100 cm",
+    "price": "2179 USD",
+    "price_postapoc": "25 USD",
+    "symbol": "o",
+    "color": "brown"
   }
 ]
diff --git a/data/json/items/fake.json b/data/json/items/fake.json
@@ -275,6 +275,15 @@
     "charges_per_use": 25,
     "charged_qualities": [ [ "DRILL", 3 ] ]
   },
+  {
+    "id": "glassblowers_crucible_tool",
+    "type": "TOOL",
+    "name": { "str": "glassblower's crucible" },
+    "copy-from": "fake_appliance_tool",
+    "symbol": "o",
+    "color": "brown",
+    "extend": { "flags": [ "ALLOWS_REMOTE_USE" ] }
+  },
   {
     "id": "tablesaw_tool",
     "type": "TOOL",

diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json
@@ -1204,6 +1204,42 @@
       [ [ "fire_brick", 8 ] ]
     ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "glassblowers_crucible",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 4,
+    "time": "3 h",
+    "reversible": true,
+    "decomp_learn": 4,
+    "autolearn": false,
+    "book_learn": [ [ "glassblowing_book", 5 ] ],
+    "using": [ [ "welding_standard", 100 ] ],
+    "qualities": [
+      { "id": "HAMMER", "level": 2 },
+      { "id": "SAW_M", "level": 1 },
+      { "id": "SCREW", "level": 1 },
+      { "id": "WRENCH", "level": 1 }
+    ],
+    "proficiencies": [ { "proficiency": "prof_metalworking" }, { "proficiency": "prof_pottery" } ],
+    "components": [
+      [ [ "element", 8 ], [ "crude_heating_element", 12 ] ],
+      [ [ "pot_canning_clay", 1 ] ],
+      [ [ "cable", 4 ] ],
+      [ [ "power_supply", 1 ] ],
+      [ [ "fire_brick", 25 ] ],
+      [ [ "clay_lump", 10 ] ],
+      [ [ "pipe", 8 ] ],
+      [ [ "pipe_fittings", 4 ] ],
+      [ [ "sheet_metal_small", 4 ] ],
+      [ [ "small_lcd_screen", 1 ] ],
+      [ [ "processor", 1 ] ],
+      [ [ "thermostat", 1 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

diff --git a/data/json/recipes/tools/containers.json b/data/json/recipes/tools/containers.json
@@ -410,6 +410,33 @@
     ],
     "components": [ [ [ "glass_shard", 13 ], [ "flask_glass", 20 ], [ "test_tube", 27 ], [ "marble", 318 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
+    "result": "jar_3l_glass_sealed",
+    "id_suffix": "glassblowers_crucible",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_CONTAINERS",
+    "skill_used": "fabrication",
+    "difficulty": 7,
+    "time": "2 h 30 m",
+    "batch_time_factors": [ 80, 1 ],
+    "book_learn": [ [ "glassblowing_book", 5 ] ],
+    "proficiencies": [ { "proficiency": "prof_glassblowing" } ],
+    "qualities": [ { "id": "CHISEL", "level": 2 } ],
+    "tools": [
+      [ [ "metalworking_tongs_any", 1, "LIST" ] ],
+      [ [ "pipe", -1 ] ],
+      [ [ "glassblowers_crucible_tool", 4800 ] ],
+      [ [ "forge", 150 ] ],
+      [ [ "casting_mold_small", -1 ] ]
+    ],
+    "components": [
+      [ [ "glass_shard", 13 ], [ "flask_glass", 20 ], [ "test_tube", 27 ], [ "marble", 318 ] ],
+      [ [ "scrap", 1 ] ],
+      [ [ "chunk_rubber", 1 ] ]
+    ]
+  },
   {
     "type": "recipe",
     "activity_level": "MODERATE_EXERCISE",