diff --git a/data/json/itemgroups/SUS/library.json b/data/json/itemgroups/SUS/library.json index 1010f28122b25..90009eb43023c 100644 --- a/data/json/itemgroups/SUS/library.json +++ b/data/json/itemgroups/SUS/library.json @@ -107,7 +107,8 @@ { "item": "textbook_gaswarfare", "count": [ 1, 2 ], "prob": 40 }, { "item": "textbook_chemistry", "count": [ 1, 4 ], "prob": 90 }, { "item": "textbook_extraction", "count": [ 1, 2 ], "prob": 60 }, - { "item": "adv_chemistry", "count": [ 1, 4 ], "prob": 70 } + { "item": "adv_chemistry", "count": [ 1, 4 ], "prob": 70 }, + { "item": "basic_chemistry", "count": [ 1, 3 ], "prob": 70 } ] }, { diff --git a/data/json/itemgroups/books.json b/data/json/itemgroups/books.json index 40b9d812200fd..0a57994ba99b6 100644 --- a/data/json/itemgroups/books.json +++ b/data/json/itemgroups/books.json @@ -232,7 +232,8 @@ { "item": "child_book", "prob": 50 }, { "item": "manual_dodge_kid", "prob": 20 }, { "item": "book_nonf_soft_wedding_coolring", "prob": 1 }, - { "item": "mag_comic", "prob": 20 } + { "item": "mag_comic", "prob": 20 }, + { "item": "basic_chemistry", "prob": 10 } ] }, { @@ -353,6 +354,7 @@ { "item": "reference_fabrication1", "prob": 1 }, { "item": "reference_firstaid1", "prob": 1 }, { "item": "reference_firstaid2", "prob": 1 }, + { "item": "basic_chemistry", "prob": 10 }, { "item": "survnote", "prob": 3 } ] }, @@ -421,7 +423,8 @@ { "item": "textbook_armwest", "prob": 3 }, { "item": "textbook_armeast", "prob": 3 }, { "item": "survnote", "prob": 2 }, - { "item": "book_lockpick", "prob": 2 } + { "item": "book_lockpick", "prob": 2 }, + { "item": "basic_chemistry", "prob": 5 } ] }, { diff --git a/data/json/items/book/chemistry.json b/data/json/items/book/chemistry.json new file mode 100644 index 0000000000000..fa29d746e9ecb --- /dev/null +++ b/data/json/items/book/chemistry.json @@ -0,0 +1,331 @@ +[ + { + "id": "adv_chemistry", + "type": "BOOK", + "name": { "str": "Advanced Physical Chemistry", "str_pl": "copies of Advanced Physical Chemistry" }, + "description": "A university-level textbook on advanced principles of physical chemistry and all its branches: thermochemistry, electrochemistry, solid-state chemistry, photochemistry, quantum chemistry et cetera.", + "weight": "1712 g", + "volume": "2 L", + "price": 7950, + "price_postapoc": 750, + "bashing": 5, + "material": [ "paper" ], + "symbol": "?", + "color": "blue", + "skill": "chemistry", + "required_level": 5, + "max_level": 7, + "intelligence": 12, + "time": "35 m", + "fun": -1 + }, + { + "id": "modern_tanner", + "type": "BOOK", + "name": { "str": "The Modern Tanner", "str_pl": "copies of The Modern Tanner" }, + "description": "An in-depth and easy to read guide that details a very modern take on the ancient art of leather tanning.", + "weight": "568 g", + "volume": "750 ml", + "price": 2000, + "price_postapoc": 1250, + "material": [ "paper", "leather" ], + "symbol": "?", + "color": "brown", + "skill": "chemistry", + "required_level": 3, + "max_level": 4, + "intelligence": 4, + "time": "18 m" + }, + { + "id": "recipe_alpha", + "type": "BOOK", + "name": { "str": "PE050 \"Alpha\": Preliminary Report", "str_pl": "copies of PE050 \"Alpha\": Preliminary Report" }, + "description": "This sheaf of papers--dated two weeks before all this started--describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"…", + "weight": "50 g", + "volume": "500 ml", + "price": 125000, + "price_postapoc": 2000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 6, + "max_level": 7, + "intelligence": 12, + "time": "45 m", + "fun": -2 + }, + { + "id": "recipe_animal", + "type": "BOOK", + "name": { "str": "lab journal-Dionne", "str_pl": "lab journals-Dionne" }, + "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from various Earth fauna. The team seems quite enthusiastic--if not eager--about their results.", + "weight": "1700 g", + "volume": "500 ml", + "price": 50000, + "price_postapoc": 2000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 6, + "max_level": 7, + "intelligence": 12, + "time": "45 m", + "fun": -2 + }, + { + "id": "recipe_chimera", + "type": "BOOK", + "name": { "str": "PE065 \"Chimera\": Best Practices", "str_pl": "copies of PE065 \"Chimera\": Best Practices" }, + "description": "This sheaf of papers describes a new chemical formula in detail and supplies instructions for its use as some sort of… crowd-control catalyst? That can't be right…", + "weight": "50 g", + "volume": "500 ml", + "price": 125000, + "price_postapoc": 2000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 6, + "max_level": 7, + "intelligence": 12, + "time": "45 m", + "fun": -2 + }, + { + "id": "recipe_creepy", + "type": "BOOK", + "name": { "str": "lab journal-Smythe", "str_pl": "lab journals-Smythe" }, + "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from flesh contaminated with XE037. The results look promising but the procurement methods seem awfully vague…", + "weight": "1700 g", + "volume": "500 ml", + "price": 50000, + "price_postapoc": 2000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 6, + "max_level": 7, + "intelligence": 12, + "time": "45 m", + "fun": -4 + }, + { + "id": "recipe_elfa", + "type": "BOOK", + "name": { "str": "standpipe maintenance log" }, + "description": "This binder details the scheduled maintenance for several plumbing systems throughout the facility. However, some of the log sheets seem to be filled with… a chemical formula?", + "weight": "400 g", + "volume": "750 ml", + "price": 400, + "price_postapoc": 2000, + "material": [ "paper", "plastic" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 7, + "max_level": 7, + "intelligence": 12, + "time": "45 m", + "fun": -2 + }, + { + "id": "recipe_labchem", + "type": "BOOK", + "name": { "str": "chemical reference-CLASSIFIED", "str_pl": "chemical references-CLASSIFIED" }, + "description": "This somewhat technical binder has several intimidating security warnings on the cover, yet guarantees unauthorized readers \"permanent employment, for life\". It contains useful information on \"basic\" chemical projects like methamphetamine and heroin, along with briefing on things called \"XE037\" and \"PE012\".", + "weight": "2000 g", + "volume": "500 ml", + "price": 64000, + "price_postapoc": 2000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 6, + "max_level": 7, + "intelligence": 11, + "time": "35 m", + "fun": -1 + }, + { + "id": "recipe_maiar", + "type": "BOOK", + "name": { "str": "lab journal-x-|xp", "str_pl": "lab journals-x-|xp" }, + "description": "This damaged team logbook lacks (deliberately?) any identifying information, but still contains useful information on several types of mutagen and their development.", + "weight": "1700 g", + "volume": "500 ml", + "price": 50000, + "price_postapoc": 2000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 6, + "max_level": 7, + "intelligence": 12, + "time": "45 m", + "fun": -3 + }, + { + "id": "recipe_medicalmut", + "type": "BOOK", + "name": { + "str": "PE023 \"Medical\": Application and Findings", + "str_pl": "copies of PE023 \"Medical\": Application and Findings" + }, + "description": "This binder of highly technical papers describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"…", + "weight": "1934 g", + "volume": "1750 ml", + "price": 62000, + "price_postapoc": 2000, + "bashing": 5, + "material": [ "paper", "plastic" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 6, + "max_level": 7, + "intelligence": 12, + "time": "35 m", + "fun": -2 + }, + { + "id": "recipe_raptor", + "type": "BOOK", + "name": { "str": "PE070 \"Raptor\": Proposal", "str_pl": "copies of PE070 \"Raptor\": Proposal" }, + "description": "This sheaf of papers is a highly speculative proposal for focusing \"PE065\". Scribbled notes throughout seem to think that it might work, but that there's no time.", + "weight": "50 g", + "volume": "500 ml", + "price": 125000, + "price_postapoc": 2000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 8, + "max_level": 8, + "intelligence": 12, + "time": "45 m", + "fun": -2 + }, + { + "id": "recipe_serum", + "type": "BOOK", + "name": { "str": "Best Practices for Compound Delivery", "str_pl": "copies of Best Practices for Compound Delivery" }, + "description": "This internal manual details several varieties of mutagenic experiments, as well as describing the protocols used to concentrate mutagens for quicker results. The authors recommend that researchers ensure that their subjects are well-fed and in good health, as the concentrated serums draw heavily on subjects' bodies.", + "weight": "1700 g", + "volume": "500 ml", + "price": 50000, + "price_postapoc": 2000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 6, + "max_level": 8, + "intelligence": 12, + "time": "45 m", + "fun": -4 + }, + { + "id": "reference_cooking", + "type": "BOOK", + "name": { "str": "CRC-Merck Handbook, 4th edition", "str_pl": "copies of CRC-Merck Handbook, 4th edition" }, + "description": "This huge hardbound book is a collection of reference data and formulae pertinent to many technical disciplines. If poring over tables of chemical and physical data is your thing, this is the book for you.", + "weight": "5790 g", + "volume": "1750 ml", + "price": 9000, + "price_postapoc": 2000, + "bashing": 7, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "intelligence": 4, + "time": "30 m", + "fun": -2 + }, + { + "id": "textbook_chemistry", + "type": "BOOK", + "name": { "str": "chemistry textbook" }, + "description": "A college textbook on chemistry.", + "weight": "1587 g", + "volume": "2 L", + "price": 7950, + "price_postapoc": 2000, + "bashing": 5, + "material": [ "paper" ], + "symbol": "?", + "color": "blue", + "skill": "chemistry", + "required_level": 4, + "max_level": 6, + "intelligence": 12, + "time": "35 m", + "fun": -1 + }, + { + "id": "textbook_extraction", + "type": "BOOK", + "name": { "str": "The Essential Oil Enthusiasts Handbook", "str_pl": "copies of The Essential Oil Enthusiasts Handbook" }, + "description": "A heavy hardback book explaining the process of essential oil making, with schematics for the equipment to do it. Good luck, and don't blow yourself up!", + "looks_like": "textbook_chemistry", + "weight": "1420 g", + "volume": "1 L", + "price": 6000, + "price_postapoc": 10000, + "bashing": 4, + "material": [ "paper" ], + "symbol": "?", + "color": "blue", + "skill": "chemistry", + "required_level": 4, + "max_level": 6, + "intelligence": 10, + "time": "60 m" + }, + { + "id": "textbook_gaswarfare", + "type": "BOOK", + "name": { "str": "Art and Science of Chemical Warfare", "str_pl": "copies of Art and Science of Chemical Warfare" }, + "description": "This in-depth and technical text covers the design, development, dissemination of, and defenses against various chemical weapons throughout the centuries. The photographs the author chose make it a difficult read at times, though the information is top-notch.", + "weight": "854 g", + "volume": "1500 ml", + "price": 400, + "price_postapoc": 1000, + "material": [ "paper" ], + "symbol": "?", + "color": "blue", + "skill": "chemistry", + "required_level": 4, + "max_level": 6, + "intelligence": 9, + "time": "20 m", + "fun": -2 + }, + { + "id": "basic_chemistry", + "type": "BOOK", + "name": { + "str": "Chemistry for Kids: Awesome Science Experiments that Really Work", + "str_pl": "copies of Chemistry for Kids: Awesome Science Experiments that Really Work" + }, + "description": "A book with comprehensive and accurate step-by-step illustrated instructions for many scientific experiments for young researchers and anyone else who want to delve into an amazing world of chemistry.", + "weight": "362 g", + "volume": "500 ml", + "price": 550, + "price_postapoc": 1900, + "material": [ "paper" ], + "symbol": "?", + "color": "light_cyan", + "skill": "chemistry", + "max_level": 3, + "intelligence": 6, + "time": "15 m", + "fun": 2 + } +] diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index 326bd3ec2b5ec..4bb946af49c7d 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -1,24 +1,4 @@ [ - { - "id": "adv_chemistry", - "type": "BOOK", - "name": { "str": "Advanced Physical Chemistry", "str_pl": "copies of Advanced Physical Chemistry" }, - "description": "A university-level textbook on advanced principles of chemistry, both organic and inorganic.", - "weight": "1712 g", - "volume": "2 L", - "price": 7950, - "price_postapoc": 750, - "bashing": 5, - "material": [ "paper" ], - "symbol": "?", - "color": "blue", - "skill": "cooking", - "required_level": 5, - "max_level": 8, - "intelligence": 12, - "time": "35 m", - "fun": -1 - }, { "id": "brewing_cookbook", "type": "BOOK", @@ -169,235 +149,6 @@ "time": "24 m", "fun": 1 }, - { - "id": "modern_tanner", - "type": "BOOK", - "name": { "str": "The Modern Tanner", "str_pl": "copies of The Modern Tanner" }, - "description": "An in-depth and easy to read guide that details a very modern take on the ancient art of leather tanning.", - "weight": "568 g", - "volume": "750 ml", - "price": 2000, - "price_postapoc": 1250, - "material": [ "paper", "leather" ], - "symbol": "?", - "color": "brown", - "skill": "cooking", - "required_level": 3, - "max_level": 4, - "intelligence": 4, - "time": "18 m" - }, - { - "id": "recipe_alpha", - "type": "BOOK", - "name": { "str": "PE050 \"Alpha\": Preliminary Report", "str_pl": "copies of PE050 \"Alpha\": Preliminary Report" }, - "description": "This sheaf of papers--dated two weeks before all this started--describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"…", - "weight": "50 g", - "volume": "500 ml", - "price": 125000, - "price_postapoc": 2000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 8, - "max_level": 9, - "intelligence": 12, - "time": "45 m", - "fun": -2 - }, - { - "id": "recipe_animal", - "type": "BOOK", - "name": { "str": "lab journal-Dionne", "str_pl": "lab journals-Dionne" }, - "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from various Earth fauna. The team seems quite enthusiastic--if not eager--about their results.", - "weight": "1700 g", - "volume": "500 ml", - "price": 50000, - "price_postapoc": 2000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 8, - "max_level": 9, - "intelligence": 12, - "time": "45 m", - "fun": -2 - }, - { - "id": "recipe_chimera", - "type": "BOOK", - "name": { "str": "PE065 \"Chimera\": Best Practices", "str_pl": "copies of PE065 \"Chimera\": Best Practices" }, - "description": "This sheaf of papers describes a new chemical formula in detail and supplies instructions for its use as some sort of… crowd-control catalyst? That can't be right…", - "weight": "50 g", - "volume": "500 ml", - "price": 125000, - "price_postapoc": 2000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 8, - "max_level": 9, - "intelligence": 12, - "time": "45 m", - "fun": -2 - }, - { - "id": "recipe_creepy", - "type": "BOOK", - "name": { "str": "lab journal-Smythe", "str_pl": "lab journals-Smythe" }, - "description": "This team logbook details several varieties of mutagenic experiments, focusing on those derived from flesh contaminated with XE037. The results look promising but the procurement methods seem awfully vague…", - "weight": "1700 g", - "volume": "500 ml", - "price": 50000, - "price_postapoc": 2000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 8, - "max_level": 9, - "intelligence": 12, - "time": "45 m", - "fun": -4 - }, - { - "id": "recipe_elfa", - "type": "BOOK", - "name": { "str": "standpipe maintenance log" }, - "description": "This binder details the scheduled maintenance for several plumbing systems throughout the facility. However, some of the log sheets seem to be filled with… a chemical formula?", - "weight": "400 g", - "volume": "750 ml", - "price": 400, - "price_postapoc": 2000, - "material": [ "paper", "plastic" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 9, - "max_level": 9, - "intelligence": 12, - "time": "45 m", - "fun": -2 - }, - { - "id": "recipe_labchem", - "type": "BOOK", - "name": { "str": "chemical reference-CLASSIFIED", "str_pl": "chemical references-CLASSIFIED" }, - "description": "This somewhat technical binder has several intimidating security warnings on the cover, yet guarantees unauthorized readers \"permanent employment, for life\". It contains useful information on \"basic\" chemical projects like methamphetamine and heroin, along with briefing on things called \"XE037\" and \"PE012\".", - "weight": "2000 g", - "volume": "500 ml", - "price": 64000, - "price_postapoc": 2000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 5, - "max_level": 8, - "intelligence": 11, - "time": "35 m", - "fun": -1 - }, - { - "id": "recipe_maiar", - "type": "BOOK", - "name": { "str": "lab journal-x-|xp", "str_pl": "lab journals-x-|xp" }, - "description": "This damaged team logbook lacks (deliberately?) any identifying information, but still contains useful information on several types of mutagen and their development.", - "weight": "1700 g", - "volume": "500 ml", - "price": 50000, - "price_postapoc": 2000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 8, - "max_level": 9, - "intelligence": 12, - "time": "45 m", - "fun": -3 - }, - { - "id": "recipe_medicalmut", - "type": "BOOK", - "name": { - "str": "PE023 \"Medical\": Application and Findings", - "str_pl": "copies of PE023 \"Medical\": Application and Findings" - }, - "description": "This binder of highly technical papers describes some new chemical formula, and its effects on human subjects. It's stamped \"APPROVED\"…", - "weight": "1934 g", - "volume": "1750 ml", - "price": 62000, - "price_postapoc": 2000, - "bashing": 5, - "material": [ "paper", "plastic" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 8, - "max_level": 9, - "intelligence": 12, - "time": "35 m", - "fun": -2 - }, - { - "id": "recipe_raptor", - "type": "BOOK", - "name": { "str": "PE070 \"Raptor\": Proposal", "str_pl": "copies of PE070 \"Raptor\": Proposal" }, - "description": "This sheaf of papers is a highly speculative proposal for focusing \"PE065\". Scribbled notes throughout seem to think that it might work, but that there's no time.", - "weight": "50 g", - "volume": "500 ml", - "price": 125000, - "price_postapoc": 2000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 10, - "max_level": 10, - "intelligence": 12, - "time": "45 m", - "fun": -2 - }, - { - "id": "recipe_serum", - "type": "BOOK", - "name": { "str": "Best Practices for Compound Delivery", "str_pl": "copies of Best Practices for Compound Delivery" }, - "description": "This internal manual details several varieties of mutagenic experiments, as well as describing the protocols used to concentrate mutagens for quicker results. The authors recommend that researchers ensure that their subjects are well-fed and in good health, as the concentrated serums draw heavily on subjects' bodies.", - "weight": "1700 g", - "volume": "500 ml", - "price": 50000, - "price_postapoc": 2000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "cooking", - "required_level": 8, - "max_level": 10, - "intelligence": 12, - "time": "45 m", - "fun": -4 - }, - { - "id": "reference_cooking", - "type": "BOOK", - "name": { "str": "CRC-Merck Handbook, 4th edition", "str_pl": "copies of CRC-Merck Handbook, 4th edition" }, - "description": "This huge hardbound book is a collection of reference data and formulae pertinent to many technical disciplines. If poring over tables of chemical and physical data is your thing, this is the book for you.", - "weight": "5790 g", - "volume": "1750 ml", - "price": 9000, - "price_postapoc": 2000, - "bashing": 7, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "intelligence": 4, - "time": "30 m", - "fun": -2 - }, { "id": "scots_cookbook", "type": "BOOK", @@ -422,26 +173,6 @@ "time": "45 m", "fun": -1 }, - { - "id": "textbook_chemistry", - "type": "BOOK", - "name": { "str": "chemistry textbook" }, - "description": "A college textbook on chemistry.", - "weight": "1587 g", - "volume": "2 L", - "price": 7950, - "price_postapoc": 2000, - "bashing": 5, - "material": [ "paper" ], - "symbol": "?", - "color": "blue", - "skill": "cooking", - "required_level": 3, - "max_level": 6, - "intelligence": 12, - "time": "35 m", - "fun": -1 - }, { "id": "vinegar_maker", "type": "BOOK", @@ -634,7 +365,10 @@ { "id": "distilling_cookbook", "type": "BOOK", - "name": { "str": "Out of the Holler and into the Home: A guide to home distilation. ", "str_pl": "copies of Out of the Holler" }, + "name": { + "str": "Out of the Holler and into the Home: A guide to home distillation. ", + "str_pl": "copies of Out of the Holler" + }, "description": "A book describing the history of at home distillation by liquor. Each chapter contains a complete recipe for its namesake.", "weight": "454 g", "volume": "619 ml", diff --git a/data/json/items/book/fabrication.json b/data/json/items/book/fabrication.json index 0ae0ee0ae3641..2098cdce29076 100644 --- a/data/json/items/book/fabrication.json +++ b/data/json/items/book/fabrication.json @@ -276,25 +276,6 @@ "intelligence": 8, "time": "30 m" }, - { - "id": "textbook_gaswarfare", - "type": "BOOK", - "name": { "str": "Art and Science of Chemical Warfare", "str_pl": "copies of Art and Science of Chemical Warfare" }, - "description": "This in-depth and technical text covers the design, development, dissemination of, and defenses against various chemical weapons throughout the centuries. The photographs the author chose make it a difficult read at times, though the information is top-notch.", - "weight": "854 g", - "volume": "1500 ml", - "price": 400, - "price_postapoc": 1000, - "material": [ "paper" ], - "symbol": "?", - "color": "blue", - "skill": "fabrication", - "required_level": 4, - "max_level": 7, - "intelligence": 9, - "time": "20 m", - "fun": -2 - }, { "id": "textbook_weapeast", "type": "BOOK", @@ -461,26 +442,6 @@ "time": "30 m", "fun": -2 }, - { - "id": "textbook_extraction", - "type": "BOOK", - "name": { "str": "The Essential Oil Enthusiasts Handbook", "str_pl": "copies of The Essential Oil Enthusiasts Handbook" }, - "description": "A heavy hardback book explaining the process of essential oil making, with schematics for the equipment to do it. Good luck, and don't blow yourself up!", - "looks_like": "textbook_chemistry", - "weight": "1420 g", - "volume": "1 L", - "price": 6000, - "price_postapoc": 10000, - "bashing": 4, - "material": [ "paper" ], - "symbol": "?", - "color": "blue", - "skill": "fabrication", - "required_level": 5, - "max_level": 8, - "intelligence": 10, - "time": "60 m" - }, { "id": "concrete_book", "type": "BOOK", diff --git a/data/json/professions.json b/data/json/professions.json index 3167f50b2a603..fa4c0215b79a2 100644 --- a/data/json/professions.json +++ b/data/json/professions.json @@ -375,6 +375,7 @@ { "level": 4, "name": "survival" }, { "level": 3, "name": "fabrication" }, { "level": 3, "name": "cooking" }, + { "level": 3, "name": "chemistry" }, { "level": 2, "name": "firstaid" }, { "level": 2, "name": "gun" }, { "level": 2, "name": "rifle" }, @@ -446,6 +447,7 @@ { "level": 2, "name": "tailor" }, { "level": 2, "name": "computer" }, { "level": 2, "name": "cooking" }, + { "level": 2, "name": "chemistry" }, { "level": 2, "name": "mechanics" }, { "level": 2, "name": "firstaid" }, { "level": 2, "name": "electronics" }, @@ -561,7 +563,7 @@ "points": 3, "skills": [ { "level": 2, "name": "computer" }, - { "level": 2, "name": "cooking" }, + { "level": 2, "name": "chemistry" }, { "level": 2, "name": "electronics" }, { "level": 2, "name": "mechanics" } ], @@ -1006,6 +1008,7 @@ { "level": 2, "name": "traps" }, { "level": 2, "name": "fabrication" }, { "level": 2, "name": "cooking" }, + { "level": 2, "name": "chemistry" }, { "level": 2, "name": "firstaid" }, { "level": 2, "name": "swimming" }, { "level": 1, "name": "lockpick" } @@ -1721,7 +1724,7 @@ "name": "Volunteer Mutant", "description": "Your dreams of becoming a super-human mutant through genetic alteration may have fallen a bit short, but the scientists say you're ready. It's time for a field test.", "points": 1, - "skills": [ { "level": 2, "name": "cooking" }, { "level": 2, "name": "electronics" } ], + "skills": [ { "level": 2, "name": "chemistry" }, { "level": 2, "name": "electronics" } ], "items": { "both": [ "dress_shirt", "pants", "socks", "boots", "knit_scarf", "coat_lab", "glasses_safety", "wristwatch" ], "male": [ "briefs" ], @@ -2011,6 +2014,7 @@ { "level": 4, "name": "rifle" }, { "level": 2, "name": "pistol" }, { "level": 2, "name": "survival" }, + { "level": 2, "name": "chemistry" }, { "level": 1, "name": "cooking" }, { "level": 1, "name": "fabrication" } ], @@ -2467,7 +2471,7 @@ "name": "Meth Cook", "description": "You clawed your way out of poverty by selling products everyone wanted, and they had the nerve to put you in jail for it. Too bad you can't sell drugs to zombies or aliens.", "points": 1, - "skills": [ { "level": 2, "name": "cooking" }, { "level": 2, "name": "firstaid" } ], + "skills": [ { "level": 2, "name": "chemistry" }, { "level": 2, "name": "firstaid" } ], "items": { "both": { "items": [ "striped_shirt", "striped_pants", "sneakers", "socks", "adderall", "matches" ], @@ -3138,6 +3142,7 @@ { "level": 3, "name": "melee" }, { "level": 2, "name": "dodge" }, { "level": 2, "name": "swimming" }, + { "level": 2, "name": "chemistry" }, { "level": 3, "name": "cooking" } ], "items": { @@ -3471,7 +3476,7 @@ "name": "Science Club Member", "description": "The school never let your club play with the really fun chemicals, the kind that make things go boom, but there aren't any teachers around to enforce the rules any more.", "points": 1, - "skills": [ { "level": 1, "name": "cooking" }, { "level": 1, "name": "mechanics" } ], + "skills": [ { "level": 1, "name": "chemistry" }, { "level": 1, "name": "mechanics" } ], "items": { "both": { "items": [ "tshirt", "jacket_light", "jeans", "socks", "sneakers", "knit_scarf", "backpack", "textbook_chemistry", "wristwatch" ], diff --git a/data/json/recipes/ammo/components.json b/data/json/recipes/ammo/components.json index 61a87edd7c23e..829ad2a6fdac1 100644 --- a/data/json/recipes/ammo/components.json +++ b/data/json/recipes/ammo/components.json @@ -4,7 +4,7 @@ "type": "recipe", "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "15 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "recipe_bullets", 3 ], [ "textbook_anarch", 0 ] ], diff --git a/data/json/recipes/ammo/weldgas.json b/data/json/recipes/ammo/weldgas.json index f99e15b3cff12..0e756bf73dc1c 100644 --- a/data/json/recipes/ammo/weldgas.json +++ b/data/json/recipes/ammo/weldgas.json @@ -4,11 +4,11 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "45 m", "charges": 120, - "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_gaswarfare", 5 ], [ "atomic_survival", 3 ] ], + "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_gaswarfare", 4 ], [ "atomic_survival", 3 ] ], "qualities": [ { "id": "PRESSURIZATION", "level": 1 } ], "components": [ [ [ "oxygen", 24 ] ], [ [ "acetylene", 96 ] ] ] }, @@ -17,11 +17,11 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "60 m", "charges": 12, - "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_gaswarfare", 5 ], [ "atomic_survival", 3 ] ], + "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_gaswarfare", 4 ], [ "atomic_survival", 3 ] ], "tools": [ [ [ "acetylene_machine", -1 ] ] ], "components": [ [ [ "water", 12 ], [ "water_clean", 12 ] ], [ [ "chem_carbide", 326 ] ] ] }, diff --git a/data/json/recipes/armor/other.json b/data/json/recipes/armor/other.json index 829d225759a57..a2100a0222fb0 100644 --- a/data/json/recipes/armor/other.json +++ b/data/json/recipes/armor/other.json @@ -238,7 +238,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", "difficulty": 5, - "skills_required": [ "cooking", 1 ], + "skills_required": [ "chemistry", 1 ], "time": "60 m", "reversible": true, "decomp_learn": 4, @@ -297,7 +297,7 @@ "subcategory": "CSC_OTHER_OTHER", "skill_used": "fabrication", "difficulty": 5, - "skills_required": [ "cooking", 1 ], + "skills_required": [ "chemistry", 1 ], "time": "60 m", "reversible": true, "decomp_learn": 4, diff --git a/data/json/recipes/armor/pets_horse.json b/data/json/recipes/armor/pets_horse.json index 437d78fcfa5d4..2fb9e1057eb80 100644 --- a/data/json/recipes/armor/pets_horse.json +++ b/data/json/recipes/armor/pets_horse.json @@ -115,8 +115,8 @@ "id_suffix": "from_scratch", "category": "CC_ANIMALS", "subcategory": "CSC_ANIMALS_EQUINE ARMOR", - "skill_used": "cooking", - "difficulty": 3, + "skill_used": "chemistry", + "difficulty": 4, "skills_required": [ "tailor", 6 ], "time": "525 m", "book_learn": [ diff --git a/data/json/recipes/armor/suit.json b/data/json/recipes/armor/suit.json index e65d0fe571b15..b646b7c2aa211 100644 --- a/data/json/recipes/armor/suit.json +++ b/data/json/recipes/armor/suit.json @@ -42,8 +42,8 @@ "type": "recipe", "category": "CC_ARMOR", "subcategory": "CSC_ARMOR_SUIT", - "skill_used": "cooking", - "difficulty": 3, + "skill_used": "chemistry", + "difficulty": 4, "skills_required": [ "tailor", 3 ], "time": "1 h", "book_learn": [ diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json index 89b643aea3a45..ae77278af0984 100644 --- a/data/json/recipes/chem/fuel.json +++ b/data/json/recipes/chem/fuel.json @@ -5,8 +5,8 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "cooking", - "difficulty": 5, + "skill_used": "chemistry", + "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook", 4 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ], @@ -27,8 +27,8 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "cooking", - "difficulty": 3, + "skill_used": "chemistry", + "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook" ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ], @@ -48,8 +48,8 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 5, "result_mult": 4, "time": "420 m", "book_learn": [ [ "textbook_biodiesel", 5 ] ], @@ -78,8 +78,8 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "cooking", - "difficulty": 2, + "skill_used": "chemistry", + "difficulty": 3, "time": "30 m", "batch_time_factors": [ 80, 4 ], "autolearn": true, diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json index 5b9d12cb522af..5cafd8da8cfe9 100644 --- a/data/json/recipes/chem/mutagens.json +++ b/data/json/recipes/chem/mutagens.json @@ -4,17 +4,17 @@ "result": "mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 8, + "difficulty": 6, "time": "45 m", "batch_time_factors": [ 80, 20 ], "book_learn": [ - [ "recipe_creepy", 8 ], - [ "recipe_animal", 8 ], - [ "recipe_maiar", 7 ], - [ "recipe_serum", 7 ], - [ "recipe_labchem", 7 ] + [ "recipe_creepy", 6 ], + [ "recipe_animal", 6 ], + [ "recipe_maiar", 5 ], + [ "recipe_serum", 5 ], + [ "recipe_labchem", 5 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ @@ -51,12 +51,12 @@ "result": "iv_mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_labchem", 9 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_labchem", 7 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen", 2 ] ] ], "flags": [ "SECRET" ] @@ -66,12 +66,12 @@ "result": "mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_creepy", 8 ] ], + "book_learn": [ [ "recipe_creepy", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], @@ -85,12 +85,12 @@ "result": "iv_mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_creepy", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_creepy", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_plant", 2 ] ] ], "flags": [ "SECRET" ] @@ -100,12 +100,12 @@ "result": "mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_maiar", 8 ] ], + "book_learn": [ [ "recipe_maiar", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], @@ -119,12 +119,12 @@ "result": "iv_mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_maiar", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_maiar", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_insect", 2 ] ] ], "flags": [ "SECRET" ] @@ -134,12 +134,12 @@ "result": "mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_maiar", 8 ] ], + "book_learn": [ [ "recipe_maiar", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "spider_egg", 1 ], [ "chitin_piece", 4 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -149,12 +149,12 @@ "result": "iv_mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_maiar", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_maiar", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_spider", 2 ] ] ], "flags": [ "SECRET" ] @@ -164,12 +164,12 @@ "result": "mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_maiar", 8 ], [ "recipe_creepy", 8 ] ], + "book_learn": [ [ "recipe_maiar", 6 ], [ "recipe_creepy", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "sewage", 3 ], [ "slime_scrap", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -179,12 +179,12 @@ "result": "iv_mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_maiar", 8 ], [ "recipe_creepy", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_maiar", 6 ], [ "recipe_creepy", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_slime", 2 ] ] ], "flags": [ "SECRET" ] @@ -194,12 +194,12 @@ "result": "mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_animal", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], @@ -213,12 +213,12 @@ "result": "iv_mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_fish", 2 ] ] ], "flags": [ "SECRET" ] @@ -228,12 +228,12 @@ "result": "mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_creepy", 8 ] ], + "book_learn": [ [ "recipe_creepy", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], @@ -247,12 +247,12 @@ "result": "iv_mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_creepy", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_creepy", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_rat", 2 ] ] ], "flags": [ "SECRET" ] @@ -262,12 +262,12 @@ "result": "mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 7 ] ], + "book_learn": [ [ "recipe_animal", 5 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "meat", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -277,12 +277,12 @@ "result": "iv_mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_beast", 2 ] ] ], "flags": [ "SECRET" ] @@ -292,12 +292,12 @@ "result": "mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_animal", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "meat", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -307,12 +307,12 @@ "result": "iv_mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_ursine", 2 ] ] ], "flags": [ "SECRET" ] @@ -322,12 +322,12 @@ "result": "mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_animal", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "meat", 1 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -337,12 +337,12 @@ "result": "iv_mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_mouse", 2 ] ] ], "flags": [ "SECRET" ] @@ -352,12 +352,12 @@ "result": "mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_animal", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "meat", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -367,12 +367,12 @@ "result": "iv_mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_feline", 2 ] ] ], "flags": [ "SECRET" ] @@ -382,12 +382,12 @@ "result": "mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_animal", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "meat", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -397,12 +397,12 @@ "result": "iv_mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_lupine", 2 ] ] ], "flags": [ "SECRET" ] @@ -412,12 +412,12 @@ "result": "mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_animal", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "meat", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -427,12 +427,12 @@ "result": "iv_mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_cattle", 2 ] ] ], "flags": [ "SECRET" ] @@ -442,12 +442,12 @@ "result": "mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_creepy", 8 ] ], + "book_learn": [ [ "recipe_creepy", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], @@ -461,12 +461,12 @@ "result": "iv_mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_creepy", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_creepy", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_cephalopod", 2 ] ] ], "flags": [ "SECRET" ] @@ -476,12 +476,12 @@ "result": "mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_animal", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "eggs_bird", 1, "LIST" ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -491,12 +491,12 @@ "result": "iv_mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_bird", 2 ] ] ], "flags": [ "SECRET" ] @@ -506,12 +506,12 @@ "result": "mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_animal", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "egg_reptile", 1 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -521,12 +521,12 @@ "result": "iv_mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_animal", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_animal", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_lizard", 2 ] ] ], "flags": [ "SECRET" ] @@ -536,12 +536,12 @@ "result": "mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_maiar", 8 ] ], + "book_learn": [ [ "recipe_maiar", 6 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], [ [ "meat", 3 ] ], [ [ "ammonia", 1 ], [ "lye_powder", 100 ] ] ], "flags": [ "SECRET" ] @@ -551,12 +551,12 @@ "result": "iv_mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 9, + "difficulty": 7, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 8 ], [ "recipe_maiar", 8 ] ], + "book_learn": [ [ "recipe_serum", 6 ], [ "recipe_maiar", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_troglobite", 2 ] ] ], "flags": [ "SECRET" ] @@ -566,12 +566,12 @@ "result": "mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "recipe_medicalmut", 9 ] ], + "book_learn": [ [ "recipe_medicalmut", 7 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 1 ] ], @@ -601,12 +601,12 @@ "result": "iv_mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_medicalmut", 9 ], [ "recipe_serum", 9 ] ], + "book_learn": [ [ "recipe_medicalmut", 7 ], [ "recipe_serum", 7 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_medical", 2 ] ] ], "flags": [ "SECRET" ] @@ -616,12 +616,12 @@ "result": "purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 9, + "difficulty": 7, "time": "45 m", "batch_time_factors": [ 80, 20 ], - "book_learn": [ [ "record_patient", 9 ], [ "recipe_maiar", 8 ], [ "recipe_labchem", 7 ] ], + "book_learn": [ [ "record_patient", 7 ], [ "recipe_maiar", 6 ], [ "recipe_labchem", 5 ] ], "using": [ [ "mutagen_production_standard", 25 ] ], "components": [ [ [ "mutagen", 2 ] ], [ [ "bleach", 3 ], [ "oxy_powder", 300 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ] ], "flags": [ "SECRET" ] @@ -631,12 +631,12 @@ "result": "iv_purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_serum", 9 ], [ "recipe_labchem", 9 ] ], + "book_learn": [ [ "recipe_serum", 7 ], [ "recipe_labchem", 7 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "purifier", 2 ] ] ], "flags": [ "SECRET" ] @@ -646,11 +646,11 @@ "result": "mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 10, + "difficulty": 8, "time": "20 m", - "book_learn": [ [ "recipe_alpha", 9 ] ], + "book_learn": [ [ "recipe_alpha", 7 ] ], "using": [ [ "mutagen_production_standard", 50 ] ], "components": [ [ [ "mutagen_slime", 2 ], [ "iv_mutagen_slime", 1 ] ], @@ -665,12 +665,12 @@ "result": "iv_mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_alpha", 9 ] ], + "book_learn": [ [ "recipe_alpha", 7 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_alpha", 2 ] ] ], "flags": [ "SECRET" ] @@ -680,11 +680,11 @@ "result": "mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 10, + "difficulty": 8, "time": "12 m", - "book_learn": [ [ "recipe_elfa", 10 ] ], + "book_learn": [ [ "recipe_elfa", 8 ] ], "using": [ [ "mutagen_production_standard", 31 ] ], "components": [ [ [ "mutagen_slime", 2 ], [ "iv_mutagen_slime", 1 ] ], [ [ "mutagen_plant", 1 ] ], [ [ "mutagen_bird", 1 ] ] ], "flags": [ "SECRET" ] @@ -694,12 +694,12 @@ "result": "iv_mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_elfa", 10 ] ], + "book_learn": [ [ "recipe_elfa", 8 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_elfa", 2 ] ] ], "flags": [ "SECRET" ] @@ -709,12 +709,12 @@ "result": "mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_chimera", 9 ] ], + "book_learn": [ [ "recipe_chimera", 7 ] ], "using": [ [ "mutagen_production_standard", 37 ] ], "components": [ [ [ "mutagen_lizard", 1 ] ], [ [ "mutagen_bird", 1 ] ], [ [ "mutagen_beast", 1 ] ], [ [ "mutagen_cattle", 1 ] ] ], "flags": [ "SECRET" ] @@ -724,12 +724,12 @@ "result": "iv_mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_chimera", 8 ] ], + "book_learn": [ [ "recipe_chimera", 6 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_chimera", 2 ] ] ], "flags": [ "SECRET" ] @@ -739,11 +739,11 @@ "result": "mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 10, + "difficulty": 8, "time": "12 m", - "book_learn": [ [ "recipe_raptor", 9 ] ], + "book_learn": [ [ "recipe_raptor", 7 ] ], "using": [ [ "mutagen_production_standard", 31 ] ], "components": [ [ [ "mutagen_lizard", 1 ] ], [ [ "mutagen_bird", 1 ] ], [ [ "purifier", 1 ] ] ], "flags": [ "SECRET" ] @@ -753,12 +753,12 @@ "result": "iv_mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], - "difficulty": 10, + "difficulty": 8, "time": "2 h", "batch_time_factors": [ 20, 5 ], - "book_learn": [ [ "recipe_raptor", 9 ] ], + "book_learn": [ [ "recipe_raptor", 7 ] ], "using": [ [ "serum_production_standard", 37 ] ], "components": [ [ [ "mutagen_raptor", 2 ] ] ], "flags": [ "SECRET" ] diff --git a/data/json/recipes/chem/other.json b/data/json/recipes/chem/other.json index 396ec8b16b95b..9415555939a1e 100644 --- a/data/json/recipes/chem/other.json +++ b/data/json/recipes/chem/other.json @@ -6,7 +6,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "survival", "difficulty": 2, - "skills_required": [ "cooking", 2 ], + "skills_required": [ "chemistry", 1 ], "time": "30 m", "batch_time_factors": [ 70, 4 ], "autolearn": true, @@ -20,8 +20,8 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", - "difficulty": 2, + "skill_used": "chemistry", + "difficulty": 3, "time": "12 m", "autolearn": true, "qualities": [ { "id": "CHEM", "level": 1 } ], @@ -48,7 +48,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "time": "60 m", "batch_time_factors": [ 70, 10 ], diff --git a/data/json/recipes/other/materials.json b/data/json/recipes/other/materials.json index 9901f6c92cf87..c1645575ffc3f 100644 --- a/data/json/recipes/other/materials.json +++ b/data/json/recipes/other/materials.json @@ -77,7 +77,7 @@ "result": "sheet_neoprene", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "25 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ], @@ -176,7 +176,7 @@ "byproducts": [ [ "steel_chunk" ] ], "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ], "time": "30 m", @@ -204,7 +204,7 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 1, "autolearn": true, "time": "40 m", diff --git a/data/json/recipes/other/medical.json b/data/json/recipes/other/medical.json index 5d5679f13ffe7..e3ca6e2b9ec27 100644 --- a/data/json/recipes/other/medical.json +++ b/data/json/recipes/other/medical.json @@ -30,7 +30,7 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", + "skill_used": "firstaid", "difficulty": 1, "time": "5 m", "batch_time_factors": [ 95, 4 ], @@ -42,7 +42,7 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", + "skill_used": "firstaid", "difficulty": 1, "time": "5 m", "batch_time_factors": [ 95, 4 ], @@ -56,8 +56,8 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", - "difficulty": 4, + "skill_used": "chemistry", + "difficulty": 3, "skills_required": [ "firstaid", 2 ], "time": "24 m", "book_learn": [ [ "textbook_firstaid", 2 ], [ "manual_first_aid", 2 ], [ "emergency_book", 2 ], [ "pocket_firstaid", 2 ] ], @@ -70,7 +70,7 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", + "skill_used": "chemistry", "autolearn": true, "book_learn": [ [ "isherwood_herbal_remedies", 1 ] ], "time": "30 s", @@ -81,8 +81,8 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", - "difficulty": 4, + "skill_used": "chemistry", + "difficulty": 3, "skills_required": [ "survival", 4 ], "time": "60 m", "autolearn": true, @@ -96,8 +96,8 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", - "difficulty": 4, + "skill_used": "chemistry", + "difficulty": 3, "skills_required": [ "survival", 4 ], "time": "60 m", "autolearn": true, diff --git a/data/json/recipes/other/tool.json b/data/json/recipes/other/tool.json index 578260da5977f..9a81fdf37b72c 100644 --- a/data/json/recipes/other/tool.json +++ b/data/json/recipes/other/tool.json @@ -366,7 +366,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "cooking", 3 ], + "skills_required": [ "chemistry", 3 ], "difficulty": 4, "time": "200 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "brewing_cookbook", 3 ] ], diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index 70e23d032276e..d2199868690e7 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -663,8 +663,8 @@ "result": "napalm", "category": "CC_AMMO", "subcategory": "CSC_AMMO_OTHER", - "skill_used": "cooking", - "difficulty": 7, + "skill_used": "chemistry", + "difficulty": 6, "time": "60 m", "qualities": [ { "id": "CHEM", "level": 2 } ], "book_learn": [ @@ -686,7 +686,7 @@ "result": "gelled_gasoline", "category": "CC_AMMO", "subcategory": "CSC_AMMO_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "time": "20 m", "batch_time_factors": [ 80, 5 ], @@ -699,7 +699,7 @@ "result": "flamethrower_fuel", "category": "CC_AMMO", "subcategory": "CSC_AMMO_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "time": "3 m", "batch_time_factors": [ 80, 5 ], @@ -768,7 +768,7 @@ "result": "gas_fungicidal", "category": "CC_AMMO", "subcategory": "CSC_AMMO_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 4, "time": "8 m", @@ -782,7 +782,7 @@ "result": "gas_insecticidal", "category": "CC_AMMO", "subcategory": "CSC_AMMO_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 4, "time": "8 m", @@ -796,7 +796,7 @@ "result": "gas_chloramine", "category": "CC_AMMO", "subcategory": "CSC_AMMO_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "8 m", diff --git a/data/json/recipes/recipe_deconstruction.json b/data/json/recipes/recipe_deconstruction.json index 2d39c011cab3f..28b875b32c929 100644 --- a/data/json/recipes/recipe_deconstruction.json +++ b/data/json/recipes/recipe_deconstruction.json @@ -3412,7 +3412,7 @@ "type": "uncraft", "skill_used": "electronics", "difficulty": 4, - "skills_required": [ "cooking", 1 ], + "skills_required": [ "chemistry", 1 ], "time": "1 h", "qualities": [ { "id": "SCREW", "level": 1 } ], "using": [ [ "soldering_standard", 20 ] ], diff --git a/data/json/recipes/recipe_electronics.json b/data/json/recipes/recipe_electronics.json index 82d91de7b011b..75f99200c30d6 100644 --- a/data/json/recipes/recipe_electronics.json +++ b/data/json/recipes/recipe_electronics.json @@ -2279,11 +2279,11 @@ "result": "light_minus_disposable_cell", "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_TOOLS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 5 ], - "difficulty": 6, + "difficulty": 4, "time": "45 m", - "book_learn": [ [ "adv_chemistry", 6 ] ], + "book_learn": [ [ "adv_chemistry", 4 ] ], "using": [ [ "blacksmithing_standard", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], @@ -2300,11 +2300,11 @@ "result": "light_disposable_cell", "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_TOOLS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 5 ], - "difficulty": 6, + "difficulty": 4, "time": "1 h", - "book_learn": [ [ "adv_chemistry", 6 ] ], + "book_learn": [ [ "adv_chemistry", 4 ] ], "using": [ [ "blacksmithing_standard", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], @@ -2321,11 +2321,11 @@ "result": "medium_disposable_cell", "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_TOOLS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 5 ], - "difficulty": 6, + "difficulty": 4, "time": "1 h 20 m", - "book_learn": [ [ "adv_chemistry", 6 ] ], + "book_learn": [ [ "adv_chemistry", 4 ] ], "using": [ [ "blacksmithing_standard", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], @@ -2342,11 +2342,11 @@ "result": "heavy_disposable_cell", "category": "CC_ELECTRONIC", "subcategory": "CSC_ELECTRONIC_TOOLS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 5 ], - "difficulty": 6, + "difficulty": 4, "time": "1 h 45 m", - "book_learn": [ [ "adv_chemistry", 6 ] ], + "book_learn": [ [ "adv_chemistry", 4 ] ], "using": [ [ "blacksmithing_standard", 1 ] ], "qualities": [ { "id": "CHISEL", "level": 3 } ], "tools": [ [ [ "crucible", -1 ], [ "crucible_clay", -1 ] ] ], diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index db4ba180e4e1f..f48586bd4680b 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -66,7 +66,7 @@ "id_suffix": "from_salt_water", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "time": "1 h 30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 7e4e983f759a0..17261fd56247b 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -15,7 +15,7 @@ "result": "soapy_water", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -28,7 +28,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "firstaid", "difficulty": 2, - "skills_required": [ "cooking", 2 ], + "skills_required": [ "chemistry", 2 ], "time": "30 m", "book_learn": [ [ "textbook_firstaid", 2 ], @@ -48,7 +48,7 @@ "result": "acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "10 m", "autolearn": true, @@ -85,7 +85,7 @@ "result": "water_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 1 ], "difficulty": 2, "time": "10 m", @@ -148,7 +148,7 @@ "result": "meth", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "20 m", "book_learn": [ [ "textbook_chemistry", 5 ], [ "adv_chemistry", 5 ], [ "recipe_labchem", 5 ] ], @@ -161,7 +161,7 @@ "result": "crack", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -174,7 +174,7 @@ "result": "poppy_sleep", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -234,7 +234,7 @@ "result": "poppy_pain", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -256,7 +256,7 @@ "result": "fungicide", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -279,7 +279,7 @@ "result": "antifungal", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ @@ -301,7 +301,7 @@ "result": "insecticide", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -322,7 +322,7 @@ "id_suffix": "nicotine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -345,7 +345,7 @@ "result": "antiparasitic", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -372,7 +372,7 @@ "result": "adrenaline_injector", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -399,7 +399,7 @@ "result": "heroin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "2 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], @@ -415,7 +415,7 @@ "result": "diazepam", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "4 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], @@ -428,10 +428,10 @@ "result": "thorazine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 7, + "skill_used": "chemistry", + "difficulty": 6, "time": "4 m", - "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 8 ], [ "atomic_survival", 7 ], [ "recipe_labchem", 7 ] ], + "book_learn": [ [ "textbook_chemistry", 5 ], [ "adv_chemistry", 6 ], [ "atomic_survival", 7 ], [ "recipe_labchem", 6 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 3, "LIST" ] ] ], "components": [ [ [ "salt_water", 1 ], [ "salt", 10 ], [ "saline", 5 ] ], [ [ "diazepam", 5 ] ], [ [ "oxy_powder", 50 ] ] ] @@ -441,10 +441,10 @@ "result": "lsd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", - "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 6 ], [ "recipe_labchem", 7 ] ], + "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 6 ], [ "recipe_labchem", 6 ] ], "qualities": [ { "id": "CHEM", "level": 3 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ @@ -473,11 +473,11 @@ "result": "iodine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 6, + "difficulty": 4, "time": "24 m", - "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ], [ "atomic_survival", 5 ] ], + "book_learn": [ [ "adv_chemistry", 4 ], [ "textbook_chemistry", 4 ], [ "recipe_labchem", 4 ], [ "atomic_survival", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], "components": [ [ [ "disinfectant", 10 ], [ "salt", 50 ] ], [ [ "aspirin", 10 ] ] ] @@ -487,11 +487,11 @@ "result": "prussian_blue", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 7, + "difficulty": 5, "time": "36 m", - "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 7 ], [ "recipe_labchem", 6 ], [ "atomic_survival", 5 ] ], + "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 6 ], [ "recipe_labchem", 5 ], [ "atomic_survival", 5 ] ], "qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], "components": [ @@ -507,16 +507,17 @@ "result": "aspirin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 4, + "difficulty": 2, "time": "24 m", "book_learn": [ [ "adv_chemistry", 2 ], [ "textbook_chemistry", 2 ], [ "recipe_labchem", 2 ], [ "atomic_survival", 3 ], - [ "isherwood_herbal_remedies", 2 ] + [ "isherwood_herbal_remedies", 2 ], + [ "basic_chemistry", 2 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], @@ -527,8 +528,8 @@ "result": "pur_tablets", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 5, "time": "24 m", "book_learn": [ [ "adv_chemistry", 5 ], @@ -546,9 +547,9 @@ "result": "bleach", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 2 ], - "difficulty": 5, + "difficulty": 4, "time": "25 m", "batch_time_factors": [ 90, 4 ], "//": "another variation of chloralkali process, now used to produce bleach (sodium hypochlorite - or rather rough, technical grade hypochlorite/hydroxide/chloride mix), note we will not be heating anything and that the (mostly) electrochemical reaction easily scales in size, some hydrogen gas could be recoverable (optional byproduct)", @@ -557,32 +558,15 @@ "tools": [ [ [ "electrolysis_kit", 250 ] ] ], "components": [ [ [ "salt_water", 2 ], [ "saline", 10 ] ] ] }, - { - "type": "recipe", - "result": "ammonia", - "category": "CC_CHEM", - "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 6, - "time": "36 m", - "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], - "qualities": [ { "id": "CHEM", "level": 2 } ], - "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], - "components": [ - [ [ "water_clean", 1 ], [ "water", 1 ] ], - [ [ "scrap", 1 ] ], - [ [ "charcoal", 5 ], [ "coal_lump", 5 ], [ "lye_powder", 20 ] ] - ] - }, { "type": "recipe", "result": "oxy_powder", "byproducts": [ [ "salt_water", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 2 ], - "difficulty": 7, + "difficulty": 5, "time": "45 m", "batch_time_factors": [ 60, 4 ], "//": "abstracting using chloralkali process (hot solution, unpartitioned cell) to produce sodium chlorate, then perchlorate by anodic oxidation on platinum, then ammonia perchlorate by double decomposition from sodium perchlorate and ammonium chloride; while we can't directly use bleach here but we do end up recovering some brine", @@ -596,11 +580,11 @@ "result": "lye_powder", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 4, + "skill_used": "chemistry", + "difficulty": 3, "time": "3 h", "batch_time_factors": [ 80, 4 ], - "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], + "book_learn": [ [ "adv_chemistry", 2 ], [ "textbook_chemistry", 2 ], [ "recipe_labchem", 2 ], [ "basic_chemistry", 2 ] ], "qualities": [ { "id": "CHEM", "level": 1 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], "components": [ [ [ "charcoal", 50 ] ], [ [ "water_clean", 2 ], [ "water", 2 ] ] ] @@ -611,8 +595,8 @@ "id_suffix": "from_lye", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 3, + "skill_used": "chemistry", + "difficulty": 2, "time": "1 h 30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -625,7 +609,7 @@ "result": "heatpack", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "time": "6 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ], [ "atomic_survival", 4 ] ], @@ -639,11 +623,11 @@ "result": "pheromone", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], - "difficulty": 3, + "difficulty": 4, "time": "1 m 12 s", - "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ], [ "recipe_labchem", 3 ] ], + "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 3 ] ], "tools": [ [ [ "surface_heat", 18, "LIST" ] ] ], "components": [ [ [ "meat_tainted", 1 ], [ "dry_meat_tainted", 1 ] ], [ [ "ammonia", 1 ] ] ] }, @@ -684,9 +668,9 @@ "result": "fertilizer_liquid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], - "difficulty": 3, + "difficulty": 4, "time": "20 m", "autolearn": true, "book_learn": [ [ "adv_chemistry", 2 ], [ "textbook_chemistry", 2 ], [ "recipe_labchem", 3 ], [ "atomic_survival", 2 ] ], @@ -722,10 +706,10 @@ "result": "slime_scrap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 5, "time": "45 m", - "book_learn": [ [ "recipe_creepy", 7 ], [ "recipe_serum", 7 ] ], + "book_learn": [ [ "recipe_creepy", 5 ], [ "recipe_serum", 5 ] ], "qualities": [ { "id": "CUT", "level": 1 }, { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "meat_tainted", 1 ], [ "dry_meat_tainted", 1 ] ] ] @@ -735,8 +719,8 @@ "result": "soap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 3, + "skill_used": "chemistry", + "difficulty": 2, "time": "45 m", "qualities": [ { "id": "CHEM", "level": 1 } ], "autolearn": true, @@ -753,7 +737,6 @@ "result": "soap_flakes", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", "time": "15 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -764,9 +747,9 @@ "result": "poppysyrup", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], - "difficulty": 2, + "difficulty": 3, "time": "5 m", "book_learn": [ [ "textbook_chemistry", 2 ], @@ -786,10 +769,10 @@ "result": "chem_hydrogen_peroxide_conc", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 7, + "skill_used": "chemistry", + "difficulty": 4, "time": "25 m", - "book_learn": [ [ "recipe_labchem", 7 ], [ "textbook_chemistry", 7 ] ], + "book_learn": [ [ "recipe_labchem", 4 ], [ "textbook_chemistry", 4 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], "components": [ [ [ "chem_hydrogen_peroxide", 50 ] ] ] @@ -800,9 +783,9 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ [ "firstaid", 3 ] ], - "difficulty": 4, + "difficulty": 3, "time": "6 m", "autolearn": true, "book_learn": [ [ "recipe_labchem", 3 ], [ "textbook_chemistry", 3 ] ], @@ -815,7 +798,7 @@ "result": "chem_muriatic_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "15 m", "book_learn": [ [ "recipe_labchem", 3 ], [ "textbook_chemistry", 3 ] ], @@ -830,9 +813,9 @@ "byproducts": [ [ "lye", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ [ "electronics", 2 ], [ "mechanics", 2 ] ], - "difficulty": 6, + "difficulty": 5, "time": "40 m", "batch_time_factors": [ 50, 5 ], "//": "abstracted chloralkali process, followed by 'burning' resulting chlorine and hydrogen with electric arc as uv source and crucible serving as reaction furnace, then dissolving resulting hydrogen chloride gas in water", @@ -850,8 +833,8 @@ "result": "chem_sulphuric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 7, + "skill_used": "chemistry", + "difficulty": 5, "time": "15 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], @@ -863,8 +846,8 @@ "result": "chem_nitric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 5, + "skill_used": "chemistry", + "difficulty": 4, "time": "10 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], @@ -877,10 +860,10 @@ "id_suffix": "from ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 5, "time": "40 m", - "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ] ], + "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 }, { "id": "DISTILL", "level": 1 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ], [ [ "pressure_cooker", -1 ] ], [ [ "platinum_grille", -1 ] ] ], @@ -892,8 +875,8 @@ "byproducts": [ [ "chem_potassium_chloride" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 5, + "skill_used": "chemistry", + "difficulty": 4, "time": "10 m", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], @@ -905,8 +888,8 @@ "result": "chem_aluminium_sulphate", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 5, + "skill_used": "chemistry", + "difficulty": 4, "time": "2 m 30 s", "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], @@ -919,7 +902,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "3 m", "autolearn": true, @@ -955,7 +938,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "charges": 680, "time": "45 m", @@ -975,13 +958,13 @@ "byproducts": [ [ "ammonia", 1 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 5, + "skill_used": "chemistry", + "difficulty": 4, "time": "25 m", - "book_learn": [ [ "textbook_anarch", 7 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 6 ] ], + "book_learn": [ [ "textbook_anarch", 7 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 4 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], - "components": [ [ [ "chem_ammonium_nitrate", 225 ] ], [ [ "lye_powder", 150 ] ] ] + "components": [ [ [ "chem_ammonium_nitrate", 225 ] ], [ [ "lye_powder", 150 ] ], [ [ "water_clean", 3 ], [ "water", 3 ] ] ] }, { "type": "recipe", @@ -990,7 +973,7 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "40 m", "batch_time_factors": [ 80, 4 ], @@ -1004,7 +987,7 @@ "result": "chem_black_powder", "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "20 m", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ], [ "textbook_armschina", 5 ] ], @@ -1018,7 +1001,7 @@ "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", "skill_used": "fabrication", - "skills_required": [ "cooking", 1 ], + "skills_required": [ "chemistry", 3 ], "difficulty": 4, "time": "20 m", "book_learn": [ @@ -1048,7 +1031,7 @@ "result": "chem_anfo", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "charges": 100, "time": "5 m", @@ -1062,7 +1045,7 @@ "result": "chem_acetic_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "autolearn": true, @@ -1075,11 +1058,11 @@ "result": "chem_hexamine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 5, "time": "30 m", "batch_time_factors": [ 67, 5 ], - "book_learn": [ [ "recipe_labchem", 6 ] ], + "book_learn": [ [ "recipe_labchem", 5 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 3 } ], "components": [ [ [ "ammonia", 4 ] ], [ [ "chem_formaldehyde", 6 ] ] ] }, @@ -1088,7 +1071,7 @@ "result": "chem_formaldehyde", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "15 m", "batch_time_factors": [ 80, 4 ], @@ -1103,7 +1086,7 @@ "byproducts": [ [ "chem_ethanol", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "time": "10 m", "batch_time_factors": [ 80, 4 ], @@ -1118,7 +1101,7 @@ "id_suffix": "from wood", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "1 h", "batch_time_factors": [ 80, 4 ], @@ -1132,8 +1115,8 @@ "result": "chem_rdx", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 7, + "skill_used": "chemistry", + "difficulty": 5, "time": "1 h 15 m", "book_learn": [ [ "recipe_labchem", 8 ], [ "textbook_anarch", 10 ] ], "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 3 } ], @@ -1145,7 +1128,7 @@ "result": "chem_thermite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "2 m", "autolearn": true, @@ -1157,8 +1140,8 @@ "result": "chem_hmtd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 7, + "skill_used": "chemistry", + "difficulty": 5, "time": "55 m", "book_learn": [ [ "recipe_labchem", 8 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], @@ -1169,7 +1152,7 @@ "result": "chem_rocket_fuel", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "5 m", "book_learn": [ [ "textbook_anarch", 5 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ] ], @@ -1181,7 +1164,7 @@ "result": "tool_rocket_candy", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "time": "30 m", "book_learn": [ [ "textbook_anarch", 4 ], [ "recipe_labchem", 3 ], [ "textbook_chemistry", 5 ] ], @@ -1196,7 +1179,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "survival", "difficulty": 2, - "skills_required": [ "cooking", 1 ], + "skills_required": [ "chemistry", 1 ], "time": "1 h", "batch_time_factors": [ 99, 1 ], "autolearn": true, @@ -1210,7 +1193,7 @@ "id_suffix": "by_electrolysis", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 2 ], "difficulty": 4, "time": "20 m", @@ -1229,7 +1212,7 @@ "skill_used": "firstaid", "difficulty": 3, "batch_time_factors": [ 99, 1 ], - "//": "This difficulty assumes that anaesthesia administration will be handled by the autodoc or the person using the kit. The included amount of ether is an estimate, based on average body size.", + "//": "This difficulty assumes that anesthesia administration will be handled by the autodoc or the person using the kit. The included amount of ether is an estimate, based on average body size.", "time": "2 m 30 s", "book_learn": [ [ "textbook_firstaid", 6 ], [ "emergency_book", 5 ] ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], @@ -1243,8 +1226,8 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "time": "1 h 20 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 7 ] ], "charges": 250, @@ -1260,7 +1243,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "charges": 200, "time": "2 h", @@ -1274,7 +1257,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "charges": 785, "time": "2 h", @@ -1301,8 +1284,8 @@ "result": "hi_q_crude_oil", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 272, "time": "180 m", "book_learn": [ [ "textbook_extraction", 4 ] ], @@ -1320,7 +1303,7 @@ "id_suffix": "using_pipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "batch_time_factors": [ 80, 3 ], "charges": 1, @@ -1334,8 +1317,8 @@ "result": "lo_q_crude_oil", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 181, "time": "60 m", "book_learn": [ [ "textbook_extraction", 4 ] ], @@ -1353,8 +1336,8 @@ "id_suffix": "using_oil_extractor_crude", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 1015, "time": "120 m", "book_learn": [ [ "textbook_extraction", 4 ] ], @@ -1381,8 +1364,8 @@ "result": "lo_q_crude_oil_ethanol", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 10, "time": "4 m", "batch_time_factors": [ 80, 4 ], @@ -1396,8 +1379,8 @@ "result": "hi_q_crude_oil_ethanol", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 10, "time": "4 m", "batch_time_factors": [ 80, 4 ], @@ -1411,7 +1394,7 @@ "result": "hi_q_wax", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "charges": 4, "time": "45 m", @@ -1426,8 +1409,8 @@ "result": "lo_q_crude_oil_ethanol_filtered", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 196, "time": "10 m", "batch_time_factors": [ 80, 4 ], @@ -1440,8 +1423,8 @@ "result": "hi_q_crude_oil_ethanol_filtered", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 196, "time": "5 m", "batch_time_factors": [ 80, 4 ], @@ -1454,8 +1437,8 @@ "result": "lo_q_crude_oil_filtered", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 25, "time": "30 m", "batch_time_factors": [ 80, 4 ], @@ -1470,8 +1453,8 @@ "result": "hi_q_crude_oil_filtered", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 27, "time": "30 m", "batch_time_factors": [ 80, 4 ], @@ -1486,8 +1469,8 @@ "result": "hi_q_distillate_heads", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 600, "time": "180 m", "byproducts": [ [ "hi_q_distillate_tails", 300 ] ], @@ -1503,8 +1486,8 @@ "id_suffix": "using lo_q_crude", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 533, "time": "180 m", "byproducts": [ [ "hi_q_distillate_tails", 267 ] ], @@ -1520,8 +1503,8 @@ "id_suffix": "using_tails", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 633, "time": "180 m", "byproducts": [ [ "hi_q_distillate_tails", 317 ] ], @@ -1536,8 +1519,8 @@ "result": "hi_q_distillate", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", - "difficulty": 6, + "skill_used": "chemistry", + "difficulty": 4, "charges": 633, "time": "180 m", "byproducts": [ [ "hi_q_distillate_tails", 317 ] ], diff --git a/data/json/recipes/recipe_obsolete.json b/data/json/recipes/recipe_obsolete.json index 668449d59b6d7..a50aad7c0bd10 100644 --- a/data/json/recipes/recipe_obsolete.json +++ b/data/json/recipes/recipe_obsolete.json @@ -2484,5 +2484,10 @@ "type": "recipe", "result": "laser_cannon", "obsolete": true + }, + { + "type": "recipe", + "result": "ammonia", + "obsolete": true } ] diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 0a92236c1d106..e2beafc3734ff 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1937,7 +1937,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "cooking", 2 ], + "skills_required": [ "chemistry", 2 ], "time": "2 m", "reversible": true, "decomp_learn": 0, @@ -1956,7 +1956,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "cooking", 2 ], + "skills_required": [ "chemistry", 2 ], "time": "3 m", "reversible": true, "decomp_learn": 0, @@ -2038,7 +2038,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ [ "survival", 1 ], [ "cooking", 2 ] ], + "skills_required": [ [ "survival", 1 ] ], "difficulty": 2, "time": "5 m", "autolearn": true, @@ -2263,7 +2263,7 @@ "result": "pot_copper", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ], "time": "1 h 30 m", @@ -2623,7 +2623,7 @@ "result": "quikclot", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 4, "time": "1 m 12 s", @@ -2637,11 +2637,11 @@ "result": "bfipowder", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], - "difficulty": 6, + "difficulty": 5, "time": "1 m 12 s", - "book_learn": [ [ "textbook_firstaid", 8 ], [ "textbook_chemistry", 7 ], [ "adv_chemistry", 6 ], [ "emergency_book", 8 ] ], + "book_learn": [ [ "textbook_firstaid", 7 ], [ "textbook_chemistry", 5 ], [ "adv_chemistry", 5 ], [ "emergency_book", 7 ] ], "qualities": [ { "id": "CHEM", "level": 1 } ], "tools": [ [ [ "surface_heat", 18, "LIST" ] ] ], "components": [ [ [ "iodine", 2 ] ], [ [ "aspirin", 4 ] ], [ [ "oxy_powder", 50 ] ], [ [ "salt_water", 1 ], [ "saline", 5 ] ] ] @@ -2961,7 +2961,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "cooking", 4 ], + "skills_required": [ "chemistry", 4 ], "difficulty": 4, "time": "30 m", "book_learn": [ [ "glassblowing_book", 5 ] ], @@ -3250,7 +3250,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "cooking", 2 ], + "skills_required": [ "chemistry", 2 ], "difficulty": 3, "time": "1 h", "autolearn": false, @@ -3265,7 +3265,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "cooking", 3 ], + "skills_required": [ "chemistry", 3 ], "difficulty": 4, "time": "1 h 30 m", "autolearn": false, @@ -3381,8 +3381,8 @@ "result": "plastic_chunk", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", - "difficulty": 5, + "skill_used": "chemistry", + "difficulty": 3, "time": "50 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -3662,7 +3662,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "skills_required": [ "cooking", 1 ], + "skills_required": [ "chemistry", 1 ], "difficulty": 1, "time": "5 m", "autolearn": true, @@ -3691,7 +3691,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "skills_required": [ "cooking", 2 ], + "skills_required": [ "chemistry", 2 ], "difficulty": 3, "time": "48 m", "batch_time_factors": [ 20, 10 ], @@ -3717,7 +3717,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "skills_required": [ "cooking", 1 ], + "skills_required": [ "chemistry", 1 ], "difficulty": 1, "time": "5 m", "autolearn": true, @@ -3733,7 +3733,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "survival", - "skills_required": [ "cooking", 2 ], + "skills_required": [ "chemistry", 2 ], "difficulty": 3, "time": "48 m", "batch_time_factors": [ 20, 10 ], @@ -3759,12 +3759,12 @@ "id_suffix": "modern", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 3 ], "difficulty": 4, "time": "20 m", "batch_time_factors": [ 50, 5 ], - "book_learn": [ [ "textbook_survival", 6 ], [ "textbook_chemistry", 5 ], [ "modern_tanner", 4 ] ], + "book_learn": [ [ "textbook_survival", 6 ], [ "textbook_chemistry", 4 ], [ "modern_tanner", 4 ] ], "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "COOK", "level": 3 }, @@ -3780,12 +3780,12 @@ "id_suffix": "modern", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 3 ], "difficulty": 4, "time": "20 m", "batch_time_factors": [ 50, 5 ], - "book_learn": [ [ "textbook_survival", 6 ], [ "textbook_chemistry", 5 ], [ "modern_tanner", 4 ] ], + "book_learn": [ [ "textbook_survival", 6 ], [ "textbook_chemistry", 4 ], [ "modern_tanner", 4 ] ], "qualities": [ { "id": "CHEM", "level": 1 }, { "id": "COOK", "level": 3 }, @@ -4187,10 +4187,10 @@ "result": "neoprene", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "25 m", - "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ], + "book_learn": [ [ "adv_chemistry", 4 ], [ "textbook_chemistry", 4 ] ], "result_mult": 9, "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "sheet_metal", -1 ] ] ], @@ -4431,7 +4431,7 @@ "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", "difficulty": 5, - "book_learn": [ [ "textbook_chemistry", 5 ], [ "textbook_fabrication", 4 ] ], + "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_fabrication", 4 ] ], "time": "2 h", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 3 } ], diff --git a/data/json/recipes/weapon/explosive.json b/data/json/recipes/weapon/explosive.json index cf00b6041a1f1..e3d4f877b6b2d 100644 --- a/data/json/recipes/weapon/explosive.json +++ b/data/json/recipes/weapon/explosive.json @@ -19,10 +19,10 @@ "type": "recipe", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "cooking", - "difficulty": 7, + "skill_used": "chemistry", + "difficulty": 5, "time": "10 m", - "book_learn": [ [ "textbook_anarch", 5 ], [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ] ], + "book_learn": [ [ "textbook_anarch", 5 ], [ "adv_chemistry", 4 ], [ "textbook_chemistry", 4 ] ], "qualities": [ { "id": "CHEM", "level": 2 } ], "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], "components": [ @@ -115,11 +115,11 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", - "skills_required": [ "cooking", 6 ], + "skills_required": [ "chemistry", 5 ], "difficulty": 6, "time": "40 m", "reversible": true, - "book_learn": [ [ "recipe_labchem", 7 ], [ "textbook_anarch", 7 ] ], + "book_learn": [ [ "recipe_labchem", 5 ], [ "textbook_anarch", 7 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "pilot_light", 1 ] ], @@ -135,7 +135,7 @@ "//": "Displaces older teargas recipe. Conventional teargas grenades generally aren't trichloramine.", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "mechanics", 1 ], "difficulty": 4, "time": "8 m", @@ -154,7 +154,7 @@ "type": "recipe", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "mechanics", 1 ], "difficulty": 4, "time": "8 m", @@ -174,7 +174,7 @@ "type": "recipe", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "mechanics", 1 ], "difficulty": 4, "time": "8 m", @@ -284,7 +284,7 @@ "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", - "skills_required": [ "cooking", 5 ], + "skills_required": [ "chemistry", 4 ], "difficulty": 5, "time": "15 m", "reversible": true, @@ -326,11 +326,11 @@ "type": "recipe", "category": "CC_WEAPON", "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "mechanics", 1 ], - "difficulty": 3, + "difficulty": 2, + "book_learn": [ [ "basic_chemistry", 2 ] ], "time": "7 m 30 s", - "autolearn": true, "qualities": [ { "id": "SCREW", "level": 1 } ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ], diff --git a/data/json/skills.json b/data/json/skills.json index 97e0476ee1b1b..47fdf5e59e7d3 100644 --- a/data/json/skills.json +++ b/data/json/skills.json @@ -84,7 +84,7 @@ "type": "skill", "ident": "cooking", "name": { "str": "cooking" }, - "description": "Your skill in combining food ingredients to make other, tastier food items. It may also be used in certain chemical mixtures and other, more esoteric tasks.", + "description": "Your skill in combining food ingredients to make other, tastier food items.", "companion_industry_rank_factor": 1, "display_category": "display_crafting", "companion_skill_practice": [ { "skill": "menial", "weight": 15 } ] @@ -284,6 +284,15 @@ "companion_survival_rank_factor": 1, "display_category": "display_interaction" }, + { + "type": "skill", + "ident": "chemistry", + "name": { "str": "chemistry" }, + "description": "Your skill in creating certain mixtures, solutions and compounds from various chemical ingredients.", + "companion_industry_rank_factor": 1, + "display_category": "display_crafting", + "companion_skill_practice": [ { "skill": "menial", "weight": 15 } ] + }, { "type": "skill", "ident": "weapon", diff --git a/doxygen_doc/doxygen_conf.txt b/doxygen_doc/doxygen_conf.txt index e08a825be1217..924ee93f1babf 100644 --- a/doxygen_doc/doxygen_conf.txt +++ b/doxygen_doc/doxygen_conf.txt @@ -243,6 +243,7 @@ ALIASES += "EFFECT_RIFLE=\xrefitem Effects_Skill_Rifle \"\" \"\" Rifle" ALIASES += "EFFECT_SHOTGUN=\xrefitem Effects_Skill_Shotgun \"\" \"\" Shotgun" ALIASES += "EFFECT_SMG=\xrefitem Effects_Skill_Smg \"\" \"\" Smg" ALIASES += "EFFECT_LOCKPICK=\xrefitem Effects_Skill_Lockpick \"\" \"\" Lock Picking" +ALIASES += "EFFECT_CHEMISTRY=\xrefitem Effects_Skill_Chemistry \"\" \"\" Chemistry" ALIASES += "EFFECT_BARTER_NPC=\xrefitem Effects_Skill_Barter \"\" \"\" NPC Barter" ALIASES += "EFFECT_COMPUTER_NPC=\xrefitem Effects_Skill_Computer \"\" \"\" NPC Computer" @@ -273,6 +274,7 @@ ALIASES += "EFFECT_RIFLE_NPC=\xrefitem Effects_Skill_Rifle \"\" \"\" NPC Rifle" ALIASES += "EFFECT_SHOTGUN_NPC=\xrefitem Effects_Skill_Shotgun \"\" \"\" NPC Shotgun" ALIASES += "EFFECT_SMG_NPC=\xrefitem Effects_Skill_Smg \"\" \"\" NPC Smg" ALIASES += "EFFECT_LOCKPICK_NPC=\xrefitem Effects_Skill_Lockpick \"\" \"\" NPC Lock Picking" +ALIASES += "EFFECT_CHEMISTRY_NPC=\xrefitem Effects_Skill_Chemistry \"\" \"\" NPC Chemistry" # This tag can be used to specify a number of word-keyword mappings (TCL only). # A mapping has the form "name=value". For example adding diff --git a/doxygen_doc/pages.h b/doxygen_doc/pages.h index a61cec74b49ca..5b4c562e8cd24 100644 --- a/doxygen_doc/pages.h +++ b/doxygen_doc/pages.h @@ -152,7 +152,11 @@ * @brief Cross referenced effects of the Smg skill. * @par */ - *! @page Effects_Skill_Lockpick +/*! @page Effects_Skill_Lockpick * @brief Cross referenced effects of the Lock picking skill. * @par */ +/*! @page Effects_Skill_Chemistry + * @brief Cross referenced effects of the Chemistry skill. + * @par + */ diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp index 60de192b795f1..37f48d1480eac 100644 --- a/tests/iteminfo_test.cpp +++ b/tests/iteminfo_test.cpp @@ -627,7 +627,7 @@ TEST_CASE( "show available recipes with item as an ingredient", "[item][iteminfo iodine, q, "--\n" "You could use it to craft: " - "water purification tablet\n" ); + "water purification tablet and antiseptic powder\n" ); } } } diff --git a/tests/reading_test.cpp b/tests/reading_test.cpp index e65beaea1f82e..e13bb96ad78f3 100644 --- a/tests/reading_test.cpp +++ b/tests/reading_test.cpp @@ -305,10 +305,10 @@ TEST_CASE( "reasons for not being able to read", "[reading][reasons]" ) } THEN( "you cannot read without enough skill to understand the book" ) { - dummy.set_skill_level( skill_id( "cooking" ), 7 ); + dummy.set_skill_level( skill_id( "chemistry" ), 5 ); CHECK( dummy.get_book_reader( alpha, reasons ) == nullptr ); - expect_reasons = { "cooking 8 needed to understand. You have 7" }; + expect_reasons = { "chemistry 6 needed to understand. You have 5" }; CHECK( reasons == expect_reasons ); }