Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New recipe for tin (from empty tin can) #23767

Merged
merged 7 commits into from
Jul 6, 2018
Merged

New recipe for tin (from empty tin can) #23767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a65d663
added electrolysis kit item: allows usage of charge from vehicle batt…
May 19, 2018
2bb925d
added recipe for disassembly of tin can into raw tin and steel
May 19, 2018
1df2db0
fixed formatting and weight value for electrolysis kit
May 19, 2018
76885a4
allow jumper cables as substitute for copper wire in electrolysis kit…
May 19, 2018
3f9f734
modified tin recipe according to feedback given
May 19, 2018
9340198
added new recipe for copper pot, using electrolysis kit rather than h…
May 20, 2018
98f0afe
modified new copper pot recipe to have similar requirements to tin-st…
May 20, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion data/json/items/ammo.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -591,7 +591,8 @@
"volume" : 0,
"weight" : 3,
"ammo_type" : "components",
"count" : 200
"count" : 10,
"charges" : 200
},
{ "type" : "AMMO",
"id" : "medical_tape",
Expand Down
14 changes: 14 additions & 0 deletions data/json/items/tools.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8316,5 +8316,19 @@
"symbol": ",",
"color": "light_gray",
"flags": [ "NO_SALVAGE" ]
},
{
"id": "electrolysis_kit",
"type": "TOOL",
"name": "electrolysis kit",
"description": "A set of wiring and electrodes for applying a direct current, usually to a liquid. Useful for crafting. Load with a storage battery or 12V vehicle battery to use.",
"weight": 250,
"volume": 1,
"price": 1000,
"material": [ "steel", "copper", "plastic" ],
"symbol": ";",
"ammo": "battery",
"magazines": [ [ "battery", [ "battery_car", "battery_motorbike", "small_storage_battery", "medium_storage_battery", "storage_battery" ] ] ],
"magazine_well" : 0
}
]
14 changes: 14 additions & 0 deletions data/json/recipes/other/materials.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,5 +27,19 @@
"autolearn": true,
"using": [ [ "forging_standard", 4 ], [ "steel_tiny", 4 ] ],
"tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ]
},
{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would you format it using http://dev.narc.ro/cataclysm/format.html please?

"result": "tin",
"type": "recipe",
"byproducts": [ [ "steel_chunk" ] ],
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_MATERIALS",
"skill_used": "cooking",
"difficulty": 4,
"book_learn": [["textbook_chemistry", 4], ["textbook_fabrication", 4], ["welding_book", 4]],
"time": 30000,
"batch_time_factors": [ 50, 2 ],
"tools": [ [ [ "electrolysis_kit", 100 ] ], [ [ "jar_glass", 1 ], [ "jar_3l_glass", 1 ] ] ],
"components": [ [ [ "acid", 1 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "can_food_unsealed", 1 ] ] ]
}
]
16 changes: 16 additions & 0 deletions data/json/recipes/recipe_electronics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1983,5 +1983,21 @@
[ [ "amplifier", 1 ] ],
[ [ "cable", 2 ] ]
]
},{
"type" : "recipe",
"result": "electrolysis_kit",
"category": "CC_ELECTRONIC",
"subcategory": "CSC_ELECTRONIC_TOOLS",
"skill_used": "electronics",
"using": [ [ "soldering_standard", 10 ] ],
"difficulty": 2,
"time": 10000,
"reversible": true,
"autolearn": true,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe it's better to add this recipe to some book? I feel the electrolysis is rather complicated process to figure it on its own.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Electrolysis kit" in this case is just a fancy name for a couple copper wires hooked up to improvised steel electrodes. Not your typical complex lab setup, any dabbling electrician could figure it out. I think the other recipe might warrant that though, stripping tin by combination of acid + electrolysis is pretty obscure knowledge. Any suggestion for which book?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The tin stripping recipe is more of a chemistry, or of an electronics?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmm... more chemistry for sure. It would fit right in the chemistry textbook. But the rarity would sorta defeat the purpose, this should often be available fairly early on if it's to be useful. But the recipe could also be spun as fabrication as well, and put in 101 crafts for beginners, engineering 301, and/or DIY compendium. What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

DIY compendium sounds OK.

"qualities" : [ {"id":"CUT","level":1} ],
"components": [
[ [ "cable", 50 ], [ "jumper_cable", 1 ] ],
[ [ "scrap", 2 ] ]
]
}
]
15 changes: 15 additions & 0 deletions data/json/recipes/recipe_others.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2205,6 +2205,21 @@
"tools": [ [ [ "press", -1 ] ], [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [ [ [ "scrap_copper", 5 ], [ "copper", 500 ] ], [ [ "tin", 30 ] ] ]
},
{
"type": "recipe",
"//": "Alternative to the press explained above: this electroplates the tin using an electrolysis kit.",
"result": "pot_copper",
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_TOOLS",
"skill_used": "cooking",
"difficulty": 4,
"book_learn": [["textbook_chemistry", 4], ["textbook_fabrication", 4], ["welding_book", 4]],
"time": 90000,
"autolearn": true,
"qualities": [ { "id": "HAMMER", "level": 3 } ],
"tools": [ [ [ "electrolysis_kit", 10 ] ], [ [ "surface_heat", 10, "LIST" ] ] ],
"components": [ [ [ "scrap_copper", 5 ], [ "copper", 500 ] ], [ [ "tin", 30 ] ], [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "acid", 1 ] ] ]
},
{
"type": "recipe",
"result": "pot",
Expand Down