From c3638890f05a8dda3675071bdb3005c038f5743b Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 02:05:07 -0500 Subject: [PATCH 01/14] Update chemicals_and_resources.json --- data/json/items/chemicals_and_resources.json | 90 ++++++++++++++++++++ 1 file changed, 90 insertions(+) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index ee33b8aa39dac..45787e49aa7cd 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -184,6 +184,22 @@ "//": "density: 3.57–3.76 g/cm3", "bashing": 1 }, + { + "type": "GENERIC", + "id": "material_lithiophilite", + "category": "spare_parts", + "price": 250, + "name": "lithiophilite", + "name_plural": "lithiophilite", + "symbol": "*", + "color": "red", + "desc": "A chunk of lithiophilite. Similar to granite, it forms with triphylite and is a source of lithium.", + "material": "stone", + "volume": "250 ml", + "weight": "918 g", + "//": "density: ~3.67 g/cm3", + "bashing": 1 + }, { "type": "GENERIC", "id": "material_zincite", @@ -542,6 +558,80 @@ "container": "bottle_plastic_small", "count": 100 }, + { + "type": "AMMO", + "id": "chem_lithium", + "category": "chems", + "price": 600, + "name": "lithium", + "name_plural": "lithium", + "symbol": "=", + "color": "white", + "description": "A piece of lithium. Isolated from a mixture of lithium chloride and potassium chloride, it is a volatile element that is commonly used in the making of heat-resistant glass and ceramics as well as lithium batteries.", + "material": "powder_nonflam", + "volume": "25 ml", + "weight": "134 mg", + "//": "density: 0.534 g/cm3", + "bashing": 1, + "ammo_type": "components", + "container": "bottle_plastic_small", + "count": 100 + }, + { + "type": "AMMO", + "id": "chem_lithium_chloride", + "category": "chems", + "price": 600, + "name": "lithium chloride", + "name_plural": "lithium chloride", + "symbol": "=", + "color": "white", + "description": "A handful of lithium chloride. Normally produced from a reaction between lithium carbonate and hydrochloric acid, it is used to isolate lithium for use in batteries and glass.", + "material": "powder_nonflam", + "volume": "21 ml", + "weight": "434 mg", + "//": "density: 2.068 g/cm3", + "bashing": 1, + "ammo_type": "components", + "container": "bottle_plastic_small", + "count": 100 + }, + { + "type": "AMMO", + "id": "chem_lithium_carbonate", + "category": "chems", + "price": 600, + "name": "lithium carbonate", + "name_plural": "lithium carbonate", + "symbol": "=", + "color": "white", + "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders. It is also used to prepare lithium compounds for use in lithium-ion batteries.", + "material": "powder_nonflam", + "volume": "20 ml", + "weight": "443 mg", + "bashing": 1, + "ammo_type": "components", + "container": "bottle_plastic_small", + "count": 100 + }, + { + "type": "AMMO", + "id": "chem_lithium_iron_phosphate", + "category": "chems", + "price": 600, + "name": "lithium iron phosphate", + "name_plural": "lithium iron phosphate", + "symbol": "=", + "color": "white", + "description": "A handful of lithium iron phosphate. Used in the isolation of lithium and the production of lithium-ion batteries.", + "material": "powder_nonflam", + "volume": "20 ml", + "weight": "450 mg", + "bashing": 1, + "ammo_type": "components", + "container": "bottle_plastic_small", + "count": 100 + }, { "type": "AMMO", "id": "chem_potassium_chloride", From 40790066ee62d6bed001cad9886d7aa6bc175760 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 02:47:35 -0500 Subject: [PATCH 02/14] Update chemicals_and_resources.json --- data/json/items/chemicals_and_resources.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 45787e49aa7cd..9dc07f95ebdb2 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -193,7 +193,7 @@ "name_plural": "lithiophilite", "symbol": "*", "color": "red", - "desc": "A chunk of lithiophilite. Similar to granite, it forms with triphylite and is a source of lithium.", + "description": "A chunk of lithiophilite. Similar to granite, it forms with triphylite and is a source of lithium.", "material": "stone", "volume": "250 ml", "weight": "918 g", @@ -567,7 +567,7 @@ "name_plural": "lithium", "symbol": "=", "color": "white", - "description": "A piece of lithium. Isolated from a mixture of lithium chloride and potassium chloride, it is a volatile element that is commonly used in the making of heat-resistant glass and ceramics as well as lithium batteries.", + "description": "A piece of lithium. Isolated from a mixture of lithium chloride and potassium chloride, it is a volatile element that is commonly used in the making of heat-resistant glass and ceramics as well as lithium batteries.", "material": "powder_nonflam", "volume": "25 ml", "weight": "134 mg", @@ -586,7 +586,7 @@ "name_plural": "lithium chloride", "symbol": "=", "color": "white", - "description": "A handful of lithium chloride. Normally produced from a reaction between lithium carbonate and hydrochloric acid, it is used to isolate lithium for use in batteries and glass.", + "description": "A handful of lithium chloride. Normally produced from a reaction between lithium carbonate and hydrochloric acid, it is used to isolate lithium for use in batteries and glass.", "material": "powder_nonflam", "volume": "21 ml", "weight": "434 mg", @@ -605,7 +605,7 @@ "name_plural": "lithium carbonate", "symbol": "=", "color": "white", - "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders. It is also used to prepare lithium compounds for use in lithium-ion batteries.", + "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders. It is also used to prepare lithium compounds for use in lithium-ion batteries.", "material": "powder_nonflam", "volume": "20 ml", "weight": "443 mg", @@ -623,7 +623,7 @@ "name_plural": "lithium iron phosphate", "symbol": "=", "color": "white", - "description": "A handful of lithium iron phosphate. Used in the isolation of lithium and the production of lithium-ion batteries.", + "description": "A handful of lithium iron phosphate. Used in the isolation of lithium and the production of lithium-ion batteries.", "material": "powder_nonflam", "volume": "20 ml", "weight": "450 mg", From ec0c2911ea94f70b4cded5fc65750f65c1ad54e3 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 02:48:14 -0500 Subject: [PATCH 03/14] Update chemicals_and_resources.json --- data/json/items/chemicals_and_resources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 9dc07f95ebdb2..7d84049fd10d0 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -605,7 +605,7 @@ "name_plural": "lithium carbonate", "symbol": "=", "color": "white", - "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders. It is also used to prepare lithium compounds for use in lithium-ion batteries.", + "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders. It is also used to prepare lithium compounds for use in lithium-ion batteries.", "material": "powder_nonflam", "volume": "20 ml", "weight": "443 mg", From 0d48a7039f9d74c7213de6e094a8bed1b9521a07 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 10:44:48 -0500 Subject: [PATCH 04/14] Update chemicals_and_resources.json --- data/json/items/chemicals_and_resources.json | 65 ++------------------ 1 file changed, 6 insertions(+), 59 deletions(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 7d84049fd10d0..1bef463d71062 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -184,22 +184,6 @@ "//": "density: 3.57–3.76 g/cm3", "bashing": 1 }, - { - "type": "GENERIC", - "id": "material_lithiophilite", - "category": "spare_parts", - "price": 250, - "name": "lithiophilite", - "name_plural": "lithiophilite", - "symbol": "*", - "color": "red", - "description": "A chunk of lithiophilite. Similar to granite, it forms with triphylite and is a source of lithium.", - "material": "stone", - "volume": "250 ml", - "weight": "918 g", - "//": "density: ~3.67 g/cm3", - "bashing": 1 - }, { "type": "GENERIC", "id": "material_zincite", @@ -567,30 +551,11 @@ "name_plural": "lithium", "symbol": "=", "color": "white", - "description": "A piece of lithium. Isolated from a mixture of lithium chloride and potassium chloride, it is a volatile element that is commonly used in the making of heat-resistant glass and ceramics as well as lithium batteries.", - "material": "powder_nonflam", - "volume": "25 ml", - "weight": "134 mg", - "//": "density: 0.534 g/cm3", - "bashing": 1, - "ammo_type": "components", - "container": "bottle_plastic_small", - "count": 100 - }, - { - "type": "AMMO", - "id": "chem_lithium_chloride", - "category": "chems", - "price": 600, - "name": "lithium chloride", - "name_plural": "lithium chloride", - "symbol": "=", - "color": "white", - "description": "A handful of lithium chloride. Normally produced from a reaction between lithium carbonate and hydrochloric acid, it is used to isolate lithium for use in batteries and glass.", - "material": "powder_nonflam", - "volume": "21 ml", - "weight": "434 mg", - "//": "density: 2.068 g/cm3", + "description": "A piece of lithium in mineral oil. It is a volatile element that is commonly used in the making of heat-resistant glass and ceramics.", + "material": "powder", + "volume": "250 ml", + "weight": "426 mg", + "phase": "liquid", "bashing": 1, "ammo_type": "components", "container": "bottle_plastic_small", @@ -605,7 +570,7 @@ "name_plural": "lithium carbonate", "symbol": "=", "color": "white", - "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders. It is also used to prepare lithium compounds for use in lithium-ion batteries.", + "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders.", "material": "powder_nonflam", "volume": "20 ml", "weight": "443 mg", @@ -614,24 +579,6 @@ "container": "bottle_plastic_small", "count": 100 }, - { - "type": "AMMO", - "id": "chem_lithium_iron_phosphate", - "category": "chems", - "price": 600, - "name": "lithium iron phosphate", - "name_plural": "lithium iron phosphate", - "symbol": "=", - "color": "white", - "description": "A handful of lithium iron phosphate. Used in the isolation of lithium and the production of lithium-ion batteries.", - "material": "powder_nonflam", - "volume": "20 ml", - "weight": "450 mg", - "bashing": 1, - "ammo_type": "components", - "container": "bottle_plastic_small", - "count": 100 - }, { "type": "AMMO", "id": "chem_potassium_chloride", From e4a3e4ddaf8d32bba6dfdf48be725916ad835927 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 10:47:30 -0500 Subject: [PATCH 05/14] Update chemicals_and_resources.json --- data/json/items/chemicals_and_resources.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 1bef463d71062..407628922b28c 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -558,8 +558,7 @@ "phase": "liquid", "bashing": 1, "ammo_type": "components", - "container": "bottle_plastic_small", - "count": 100 + "container": "bottle_plastic_small" }, { "type": "AMMO", From 2a08141db83ea7242aec505bf895a226468854c1 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 10:50:52 -0500 Subject: [PATCH 06/14] Update chemicals_and_resources.json --- data/json/items/chemicals_and_resources.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 407628922b28c..0170e51f7ebda 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -554,7 +554,7 @@ "description": "A piece of lithium in mineral oil. It is a volatile element that is commonly used in the making of heat-resistant glass and ceramics.", "material": "powder", "volume": "250 ml", - "weight": "426 mg", + "weight": "185 g", "phase": "liquid", "bashing": 1, "ammo_type": "components", From ca9d18d92c664c92d73d68ea30033b6d046833ea Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 13:22:17 -0500 Subject: [PATCH 07/14] Chemistry Skill Separated chemistry from cooking, and changed recipes on a case-by-case basis to chemistry --- data/json/items/book/chemistry.json | 253 ++++++++++++++++++ data/json/items/book/cooking.json | 251 ----------------- data/json/recipes/chem/fuel.json | 8 +- data/json/recipes/chem/mutagens.json | 94 +++---- data/json/recipes/chem/other.json | 6 +- data/json/recipes/other/medical.json | 8 +- data/json/recipes/recipe_food.json | 18 +- .../json/recipes/recipe_medsandchemicals.json | 145 +++++----- data/json/recipes/recipe_others.json | 20 +- data/json/skills.json | 8 + 10 files changed, 411 insertions(+), 400 deletions(-) create mode 100644 data/json/items/book/chemistry.json diff --git a/data/json/items/book/chemistry.json b/data/json/items/book/chemistry.json new file mode 100644 index 0000000000000..166bda3f1136d --- /dev/null +++ b/data/json/items/book/chemistry.json @@ -0,0 +1,253 @@ +[ + { + "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": 25000, + "bashing": 5, + "material": [ "paper" ], + "symbol": "?", + "color": "blue", + "skill": "chemistry", + "required_level": 5, + "max_level": 8, + "intelligence": 12, + "time": "35 m", + "fun": -1 + }, + { + "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": 1250000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 1250000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 1250000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 1250000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "required_level": 8, + "max_level": 9, + "intelligence": 12, + "time": "45 m", + "fun": -4 + }, + { + "id": "recipe_elfa", + "type": "BOOK", + "name": "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": 1250000, + "material": [ "paper", "plastic" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 125000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 1250000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 1250000, + "bashing": 5, + "material": [ "paper", "plastic" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 1250000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 1250000, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "skill": "chemistry", + "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": 30000, + "bashing": 7, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "intelligence": 4, + "time": "30 m", + "fun": -2 + }, + { + "id": "textbook_chemistry", + "type": "BOOK", + "name": "chemistry textbook", + "description": "A college textbook on chemistry.", + "weight": "1587 g", + "volume": "2 L", + "price": 7950, + "price_postapoc": 16000, + "bashing": 5, + "material": [ "paper" ], + "symbol": "?", + "color": "blue", + "skill": "chemistry", + "required_level": 3, + "max_level": 6, + "intelligence": 12, + "time": "35 m", + "fun": -1 + } +] diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index d0052ddac13fd..61ed43424b765 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": 25000, - "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", @@ -187,217 +167,6 @@ "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": 1250000, - "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": 1250000, - "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": 1250000, - "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": 1250000, - "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": "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": 1250000, - "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": 125000, - "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": 1250000, - "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": 1250000, - "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": 1250000, - "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": 1250000, - "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": 30000, - "bashing": 7, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "intelligence": 4, - "time": "30 m", - "fun": -2 - }, { "id": "scots_cookbook", "type": "BOOK", @@ -422,26 +191,6 @@ "time": "45 m", "fun": -1 }, - { - "id": "textbook_chemistry", - "type": "BOOK", - "name": "chemistry textbook", - "description": "A college textbook on chemistry.", - "weight": "1587 g", - "volume": "2 L", - "price": 7950, - "price_postapoc": 16000, - "bashing": 5, - "material": [ "paper" ], - "symbol": "?", - "color": "blue", - "skill": "cooking", - "required_level": 3, - "max_level": 6, - "intelligence": 12, - "time": "35 m", - "fun": -1 - }, { "id": "cookbook_liverforkids", "type": "BOOK", diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json index af07cf82cd877..45f1261515145 100644 --- a/data/json/recipes/chem/fuel.json +++ b/data/json/recipes/chem/fuel.json @@ -5,7 +5,7 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook", 4 ] ], @@ -27,7 +27,7 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook" ] ], @@ -48,7 +48,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "result_mult": 4, "time": "420 m", @@ -78,7 +78,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "time": "30 m", "autolearn": true, diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json index 75e495d0f6dc2..48836c825b91c 100644 --- a/data/json/recipes/chem/mutagens.json +++ b/data/json/recipes/chem/mutagens.json @@ -4,7 +4,7 @@ "result": "mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 8, "time": "45 m", @@ -39,7 +39,7 @@ "byproducts": [ [ "jabberwock_heart_desiccated" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "survival", + "skill_used": "chemistry", "difficulty": 2, "time": "5 m", "autolearn": true, @@ -51,7 +51,7 @@ "result": "iv_mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -66,7 +66,7 @@ "result": "mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -85,7 +85,7 @@ "result": "iv_mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -100,7 +100,7 @@ "result": "mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -119,7 +119,7 @@ "result": "iv_mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -134,7 +134,7 @@ "result": "mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -149,7 +149,7 @@ "result": "iv_mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -164,7 +164,7 @@ "result": "mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -179,7 +179,7 @@ "result": "iv_mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -194,7 +194,7 @@ "result": "mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -213,7 +213,7 @@ "result": "iv_mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -228,7 +228,7 @@ "result": "mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -247,7 +247,7 @@ "result": "iv_mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -262,7 +262,7 @@ "result": "mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -277,7 +277,7 @@ "result": "iv_mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -292,7 +292,7 @@ "result": "mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -307,7 +307,7 @@ "result": "iv_mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -322,7 +322,7 @@ "result": "mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -337,7 +337,7 @@ "result": "iv_mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -352,7 +352,7 @@ "result": "mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -367,7 +367,7 @@ "result": "iv_mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -382,7 +382,7 @@ "result": "mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -397,7 +397,7 @@ "result": "iv_mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -412,7 +412,7 @@ "result": "mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -427,7 +427,7 @@ "result": "iv_mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -442,7 +442,7 @@ "result": "mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -461,7 +461,7 @@ "result": "iv_mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -476,7 +476,7 @@ "result": "mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -491,7 +491,7 @@ "result": "iv_mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -506,7 +506,7 @@ "result": "mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -521,7 +521,7 @@ "result": "iv_mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -536,7 +536,7 @@ "result": "mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -551,7 +551,7 @@ "result": "iv_mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -566,7 +566,7 @@ "result": "mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -601,7 +601,7 @@ "result": "iv_mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -616,7 +616,7 @@ "result": "purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -635,7 +635,7 @@ "result": "iv_purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -650,7 +650,7 @@ "result": "mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "20 m", @@ -669,7 +669,7 @@ "result": "iv_mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -684,7 +684,7 @@ "result": "mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "12 m", @@ -698,7 +698,7 @@ "result": "iv_mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -713,7 +713,7 @@ "result": "mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "2 h", @@ -728,7 +728,7 @@ "result": "iv_mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -743,7 +743,7 @@ "result": "mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "12 m", @@ -757,7 +757,7 @@ "result": "iv_mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", diff --git a/data/json/recipes/chem/other.json b/data/json/recipes/chem/other.json index 6a0218efe44c8..606b9011c5109 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", 2 ], "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], @@ -19,7 +19,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "time": "12 m", "autolearn": true, @@ -47,7 +47,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/medical.json b/data/json/recipes/other/medical.json index 5d5679f13ffe7..82b1a0937b928 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": "chemistry", "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": "chemistry", "difficulty": 1, "time": "5 m", "batch_time_factors": [ 95, 4 ], @@ -56,7 +56,7 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "skills_required": [ "firstaid", 2 ], "time": "24 m", @@ -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", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index f758114cf789f..789ef67d2f291 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -40,7 +40,7 @@ "result": "water_clean", "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", - "skill_used": "cooking", + "skill_used": "chemistry", "time": "5 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -54,7 +54,7 @@ "category": "CC_FOOD", "id_suffix": "using_water_purifier", "subcategory": "CSC_FOOD_DRINKS", - "skill_used": "cooking", + "skill_used": "chemistry", "time": "9 s", "autolearn": true, "tools": [ [ [ "water_purifier", 1 ] ] ], @@ -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 ], @@ -80,7 +80,7 @@ "id_suffix": "from_mineral", "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 ], @@ -3677,7 +3677,7 @@ "result": "salt", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "48 m", "autolearn": true, @@ -3692,7 +3692,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skills_required": [ "survival", 2 ], - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "time": "48 m", "autolearn": true, @@ -3706,7 +3706,7 @@ "id_suffix": "from_sweets", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "24 m", "charges": 10, @@ -3742,7 +3742,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "//": "high-temperature acid hydrolysis, to extract edible wood sugars", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 7, "time": "1 h", "book_learn": [ [ "adv_chemistry", 7 ], [ "textbook_chemistry", 8 ], [ "recipe_labchem", 6 ] ], @@ -3760,7 +3760,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "//": "process sugar beets into sugar", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "1 h 30 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ], [ "cookbook_foodfashions", 5, "Natural Beet Sugar" ] ], diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 4b314063d5384..5098efd28f229 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -4,7 +4,7 @@ "result": "salt_water", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -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", @@ -98,7 +98,7 @@ "result": "tallow_tainted", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "time": "15 m", "autolearn": true, @@ -123,7 +123,7 @@ "result": "tobacco", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "time": "18 m", "autolearn": true, @@ -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 ] ], @@ -165,7 +165,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 ] ], @@ -178,7 +178,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", @@ -200,7 +200,7 @@ "result": "bonemeal_tablet", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 2, "time": "20 m", @@ -219,7 +219,7 @@ "result": "flavored_bonemeal_tablet", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "30 m", @@ -238,7 +238,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", @@ -260,7 +260,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", @@ -282,7 +282,7 @@ "result": "antifungal", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ @@ -304,7 +304,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 ] ], @@ -325,7 +325,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 ] ], @@ -348,7 +348,7 @@ "result": "antiparasitic", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -375,7 +375,7 @@ "result": "adrenaline_injector", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -402,7 +402,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 ] ], @@ -418,7 +418,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 ] ], @@ -431,7 +431,7 @@ "result": "thorazine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 7, "time": "4 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 8 ], [ "atomic_survival", 7 ], [ "recipe_labchem", 7 ] ], @@ -444,7 +444,7 @@ "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 ] ], @@ -476,7 +476,7 @@ "result": "iodine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 6, "time": "24 m", @@ -490,7 +490,7 @@ "result": "prussian_blue", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 7, "time": "36 m", @@ -510,7 +510,7 @@ "result": "aspirin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 4, "time": "24 m", @@ -530,7 +530,7 @@ "result": "pur_tablets", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "24 m", "book_learn": [ @@ -549,7 +549,7 @@ "result": "bleach", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 2 ], "difficulty": 5, "time": "25 m", @@ -565,7 +565,7 @@ "result": "ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "36 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], @@ -583,7 +583,7 @@ "byproducts": [ [ "salt_water", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "electronics", 2 ], "difficulty": 7, "time": "45 m", @@ -599,7 +599,7 @@ "result": "lye_powder", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "3 h", "batch_time_factors": [ 80, 4 ], @@ -614,7 +614,7 @@ "id_suffix": "from_lye", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "time": "1 h 30 m", "autolearn": true, @@ -628,7 +628,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 ] ], @@ -642,7 +642,7 @@ "result": "pheromone", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 3, "time": "1 m 12 s", @@ -676,7 +676,7 @@ "result": "fertilizer_liquid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "20 m", @@ -697,7 +697,7 @@ "result": "flask_yeast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 2, "time": "30 m", "autolearn": true, @@ -714,7 +714,7 @@ "result": "slime_scrap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "45 m", "book_learn": [ [ "recipe_creepy", 7 ], [ "recipe_serum", 7 ] ], @@ -727,7 +727,7 @@ "result": "soap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "time": "45 m", "qualities": [ { "id": "CHEM", "level": 1 } ], @@ -745,7 +745,7 @@ "result": "soap_flakes", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "time": "15 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -757,7 +757,7 @@ "id_suffix": "fast_cut", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], @@ -768,7 +768,7 @@ "result": "poppysyrup", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -790,7 +790,7 @@ "result": "chem_hydrogen_peroxide_conc", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 7, "time": "25 m", "book_learn": [ [ "recipe_labchem", 7 ], [ "textbook_chemistry", 7 ] ], @@ -804,7 +804,7 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ [ "firstaid", 3 ] ], "difficulty": 4, "time": "6 m", @@ -819,7 +819,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 ] ], @@ -834,7 +834,7 @@ "byproducts": [ [ "lye", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ [ "electronics", 2 ], [ "mechanics", 2 ] ], "difficulty": 6, "time": "40 m", @@ -854,7 +854,7 @@ "result": "chem_sulphuric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 7, "time": "15 m", "autolearn": true, @@ -867,7 +867,7 @@ "result": "chem_nitric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "10 m", "autolearn": true, @@ -881,7 +881,7 @@ "id_suffix": "from ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "40 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ] ], @@ -896,7 +896,7 @@ "byproducts": [ [ "chem_potassium_chloride" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "10 m", "autolearn": true, @@ -909,7 +909,7 @@ "result": "chem_aluminium_sulphate", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "2 m 30 s", "autolearn": true, @@ -923,7 +923,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "3 m", "autolearn": true, @@ -937,7 +937,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "charges": 680, "time": "45 m", @@ -957,7 +957,7 @@ "byproducts": [ [ "ammonia", 1 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "25 m", "book_learn": [ [ "textbook_anarch", 7 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 6 ] ], @@ -972,7 +972,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 ], @@ -986,7 +986,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 ] ], @@ -1000,7 +1000,7 @@ "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", "skill_used": "fabrication", - "skills_required": [ "cooking", 1 ], + "skills_required": [ "chemistry", 1 ], "difficulty": 4, "time": "20 m", "book_learn": [ @@ -1030,7 +1030,7 @@ "result": "chem_anfo", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "3 h", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 7 ] ], @@ -1042,7 +1042,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, @@ -1055,7 +1055,7 @@ "result": "chem_hexamine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "batch_time_factors": [ 67, 5 ], @@ -1068,7 +1068,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 ], @@ -1083,7 +1083,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 ], @@ -1098,7 +1098,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 ], @@ -1112,7 +1112,7 @@ "result": "chem_rdx", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 7, "time": "1 h 15 m", "book_learn": [ [ "recipe_labchem", 8 ], [ "textbook_anarch", 10 ] ], @@ -1125,7 +1125,7 @@ "result": "chem_thermite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 4, "time": "2 m", "autolearn": true, @@ -1137,7 +1137,7 @@ "result": "chem_hmtd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 7, "time": "55 m", "book_learn": [ [ "recipe_labchem", 8 ] ], @@ -1149,7 +1149,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 ] ], @@ -1161,7 +1161,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 ] ], @@ -1176,7 +1176,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, @@ -1190,7 +1190,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", @@ -1207,6 +1207,7 @@ "category": "CC_OTHER", "subcategory": "CC_OTHER_MEDICAL", "skill_used": "firstaid", + "skills_required": [ "chemistry", 2 ], "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.", @@ -1223,7 +1224,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 6, "time": "1 h 20 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 7 ] ], @@ -1240,7 +1241,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "charges": 200, "time": "2 h", @@ -1254,7 +1255,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 3, "charges": 785, "time": "2 h", diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index d50a3bc6d82c3..eb3b79236e480 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1900,7 +1900,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, @@ -1919,7 +1919,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, @@ -2226,7 +2226,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", @@ -2526,7 +2526,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", @@ -2540,7 +2540,7 @@ "result": "bfipowder", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "cooking", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 6, "time": "1 m 12 s", @@ -2865,7 +2865,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 ] ], @@ -3152,7 +3152,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "cooking", 2 ], + "skills_required": [ "chemistry", 2 ], "difficulty": 3, "time": "1 h", "batch_time_factors": [ 75, 4 ], @@ -3166,7 +3166,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": true, @@ -3281,7 +3281,7 @@ "result": "plastic_chunk", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "50 m", "autolearn": true, @@ -4097,7 +4097,7 @@ "result": "neoprene", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "cooking", + "skill_used": "chemistry", "difficulty": 5, "time": "25 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ], diff --git a/data/json/skills.json b/data/json/skills.json index 4b95663302082..bd3eaf709e0e5 100644 --- a/data/json/skills.json +++ b/data/json/skills.json @@ -15,6 +15,14 @@ "display_category": "display_social", "companion_skill_practice": [ { "skill": "recruiting", "weight": 15 }, { "skill": "recruiting", "weight": 70 } ] }, + { + "type": "skill", + "ident": "chemistry", + "name": "chemicals", + "description": "Your skill in mixing compounds together and knowing many scientific processes. Higher levels allow the creation of mutagens.", + "companion_industry_rank_factor": 1, + "display_category": "display_crafting" + } { "type": "skill", "ident": "computer", From 7ba809a36c2bc5d4c8b5a6ec42596c733b046889 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 13:26:59 -0500 Subject: [PATCH 08/14] Science instead of Chemistry --- data/json/items/book/chemistry.json | 24 +-- data/json/recipes/chem/fuel.json | 8 +- data/json/recipes/chem/mutagens.json | 94 +++++------ data/json/recipes/chem/other.json | 6 +- data/json/recipes/recipe_food.json | 18 +-- .../json/recipes/recipe_medsandchemicals.json | 146 +++++++++--------- data/json/recipes/recipe_others.json | 20 +-- data/json/skills.json | 4 +- 8 files changed, 160 insertions(+), 160 deletions(-) diff --git a/data/json/items/book/chemistry.json b/data/json/items/book/chemistry.json index 166bda3f1136d..b82e824ec549c 100644 --- a/data/json/items/book/chemistry.json +++ b/data/json/items/book/chemistry.json @@ -12,7 +12,7 @@ "material": [ "paper" ], "symbol": "?", "color": "blue", - "skill": "chemistry", + "skill": "science", "required_level": 5, "max_level": 8, "intelligence": 12, @@ -31,7 +31,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -50,7 +50,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -69,7 +69,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -88,7 +88,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -107,7 +107,7 @@ "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 9, "max_level": 9, "intelligence": 12, @@ -126,7 +126,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 5, "max_level": 8, "intelligence": 11, @@ -145,7 +145,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -168,7 +168,7 @@ "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -187,7 +187,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 10, "max_level": 10, "intelligence": 12, @@ -206,7 +206,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "chemistry", + "skill": "science", "required_level": 8, "max_level": 10, "intelligence": 12, @@ -243,7 +243,7 @@ "material": [ "paper" ], "symbol": "?", "color": "blue", - "skill": "chemistry", + "skill": "science", "required_level": 3, "max_level": 6, "intelligence": 12, diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json index 45f1261515145..fe2078c283963 100644 --- a/data/json/recipes/chem/fuel.json +++ b/data/json/recipes/chem/fuel.json @@ -5,7 +5,7 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook", 4 ] ], @@ -27,7 +27,7 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook" ] ], @@ -48,7 +48,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "result_mult": 4, "time": "420 m", @@ -78,7 +78,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 2, "time": "30 m", "autolearn": true, diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json index 48836c825b91c..414cf5f372c67 100644 --- a/data/json/recipes/chem/mutagens.json +++ b/data/json/recipes/chem/mutagens.json @@ -4,7 +4,7 @@ "result": "mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 8, "time": "45 m", @@ -39,7 +39,7 @@ "byproducts": [ [ "jabberwock_heart_desiccated" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 2, "time": "5 m", "autolearn": true, @@ -51,7 +51,7 @@ "result": "iv_mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -66,7 +66,7 @@ "result": "mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -85,7 +85,7 @@ "result": "iv_mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -100,7 +100,7 @@ "result": "mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -119,7 +119,7 @@ "result": "iv_mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -134,7 +134,7 @@ "result": "mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -149,7 +149,7 @@ "result": "iv_mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -164,7 +164,7 @@ "result": "mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -179,7 +179,7 @@ "result": "iv_mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -194,7 +194,7 @@ "result": "mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -213,7 +213,7 @@ "result": "iv_mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -228,7 +228,7 @@ "result": "mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -247,7 +247,7 @@ "result": "iv_mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -262,7 +262,7 @@ "result": "mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -277,7 +277,7 @@ "result": "iv_mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -292,7 +292,7 @@ "result": "mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -307,7 +307,7 @@ "result": "iv_mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -322,7 +322,7 @@ "result": "mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -337,7 +337,7 @@ "result": "iv_mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -352,7 +352,7 @@ "result": "mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -367,7 +367,7 @@ "result": "iv_mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -382,7 +382,7 @@ "result": "mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -397,7 +397,7 @@ "result": "iv_mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -412,7 +412,7 @@ "result": "mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -427,7 +427,7 @@ "result": "iv_mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -442,7 +442,7 @@ "result": "mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -461,7 +461,7 @@ "result": "iv_mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -476,7 +476,7 @@ "result": "mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -491,7 +491,7 @@ "result": "iv_mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -506,7 +506,7 @@ "result": "mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -521,7 +521,7 @@ "result": "iv_mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -536,7 +536,7 @@ "result": "mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -551,7 +551,7 @@ "result": "iv_mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -566,7 +566,7 @@ "result": "mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -601,7 +601,7 @@ "result": "iv_mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -616,7 +616,7 @@ "result": "purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -635,7 +635,7 @@ "result": "iv_purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -650,7 +650,7 @@ "result": "mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "20 m", @@ -669,7 +669,7 @@ "result": "iv_mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -684,7 +684,7 @@ "result": "mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "12 m", @@ -698,7 +698,7 @@ "result": "iv_mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -713,7 +713,7 @@ "result": "mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "2 h", @@ -728,7 +728,7 @@ "result": "iv_mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -743,7 +743,7 @@ "result": "mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "12 m", @@ -757,7 +757,7 @@ "result": "iv_mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", diff --git a/data/json/recipes/chem/other.json b/data/json/recipes/chem/other.json index 606b9011c5109..38916c8365101 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": [ "chemistry", 2 ], + "skills_required": [ "science", 2 ], "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], @@ -19,7 +19,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 2, "time": "12 m", "autolearn": true, @@ -47,7 +47,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "time": "60 m", "batch_time_factors": [ 70, 10 ], diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 789ef67d2f291..98007e422e0b3 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -40,7 +40,7 @@ "result": "water_clean", "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", - "skill_used": "chemistry", + "skill_used": "science", "time": "5 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -54,7 +54,7 @@ "category": "CC_FOOD", "id_suffix": "using_water_purifier", "subcategory": "CSC_FOOD_DRINKS", - "skill_used": "chemistry", + "skill_used": "science", "time": "9 s", "autolearn": true, "tools": [ [ [ "water_purifier", 1 ] ] ], @@ -66,7 +66,7 @@ "id_suffix": "from_salt_water", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "time": "1 h 30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -80,7 +80,7 @@ "id_suffix": "from_mineral", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "time": "1 h 30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -3677,7 +3677,7 @@ "result": "salt", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "48 m", "autolearn": true, @@ -3692,7 +3692,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skills_required": [ "survival", 2 ], - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 2, "time": "48 m", "autolearn": true, @@ -3706,7 +3706,7 @@ "id_suffix": "from_sweets", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "24 m", "charges": 10, @@ -3742,7 +3742,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "//": "high-temperature acid hydrolysis, to extract edible wood sugars", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 7, "time": "1 h", "book_learn": [ [ "adv_chemistry", 7 ], [ "textbook_chemistry", 8 ], [ "recipe_labchem", 6 ] ], @@ -3760,7 +3760,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "//": "process sugar beets into sugar", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "1 h 30 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ], [ "cookbook_foodfashions", 5, "Natural Beet Sugar" ] ], diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 5098efd28f229..ac64bdbf2594b 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -4,7 +4,7 @@ "result": "salt_water", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -15,7 +15,7 @@ "result": "soapy_water", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -28,7 +28,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "firstaid", "difficulty": 2, - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "science", 2 ], "time": "30 m", "book_learn": [ [ "textbook_firstaid", 2 ], @@ -48,7 +48,7 @@ "result": "acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "10 m", "autolearn": true, @@ -85,7 +85,7 @@ "result": "water_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "electronics", 1 ], "difficulty": 2, "time": "10 m", @@ -98,7 +98,7 @@ "result": "tallow_tainted", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 2, "time": "15 m", "autolearn": true, @@ -123,7 +123,7 @@ "result": "tobacco", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 2, "time": "18 m", "autolearn": true, @@ -148,7 +148,7 @@ "result": "meth", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "20 m", "book_learn": [ [ "textbook_chemistry", 5 ], [ "adv_chemistry", 5 ], [ "recipe_labchem", 5 ] ], @@ -165,7 +165,7 @@ "result": "crack", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -178,7 +178,7 @@ "result": "poppy_sleep", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -200,7 +200,7 @@ "result": "bonemeal_tablet", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "survival", 2 ], "difficulty": 2, "time": "20 m", @@ -219,7 +219,7 @@ "result": "flavored_bonemeal_tablet", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "30 m", @@ -238,7 +238,7 @@ "result": "poppy_pain", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -260,7 +260,7 @@ "result": "fungicide", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -282,7 +282,7 @@ "result": "antifungal", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "30 m", "book_learn": [ @@ -304,7 +304,7 @@ "result": "insecticide", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -325,7 +325,7 @@ "id_suffix": "nicotine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -348,7 +348,7 @@ "result": "antiparasitic", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -375,7 +375,7 @@ "result": "adrenaline_injector", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -402,7 +402,7 @@ "result": "heroin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "2 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], @@ -418,7 +418,7 @@ "result": "diazepam", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "4 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], @@ -431,7 +431,7 @@ "result": "thorazine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 7, "time": "4 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 8 ], [ "atomic_survival", 7 ], [ "recipe_labchem", 7 ] ], @@ -444,7 +444,7 @@ "result": "lsd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 6 ], [ "recipe_labchem", 7 ] ], @@ -476,7 +476,7 @@ "result": "iodine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 6, "time": "24 m", @@ -490,7 +490,7 @@ "result": "prussian_blue", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 7, "time": "36 m", @@ -510,7 +510,7 @@ "result": "aspirin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 4, "time": "24 m", @@ -530,7 +530,7 @@ "result": "pur_tablets", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "24 m", "book_learn": [ @@ -549,7 +549,7 @@ "result": "bleach", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "electronics", 2 ], "difficulty": 5, "time": "25 m", @@ -565,7 +565,7 @@ "result": "ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "36 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], @@ -583,7 +583,7 @@ "byproducts": [ [ "salt_water", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "electronics", 2 ], "difficulty": 7, "time": "45 m", @@ -599,7 +599,7 @@ "result": "lye_powder", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "3 h", "batch_time_factors": [ 80, 4 ], @@ -614,7 +614,7 @@ "id_suffix": "from_lye", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "time": "1 h 30 m", "autolearn": true, @@ -628,7 +628,7 @@ "result": "heatpack", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "time": "6 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ], [ "atomic_survival", 4 ] ], @@ -642,7 +642,7 @@ "result": "pheromone", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "survival", 1 ], "difficulty": 3, "time": "1 m 12 s", @@ -676,7 +676,7 @@ "result": "fertilizer_liquid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "20 m", @@ -697,7 +697,7 @@ "result": "flask_yeast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 2, "time": "30 m", "autolearn": true, @@ -714,7 +714,7 @@ "result": "slime_scrap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "45 m", "book_learn": [ [ "recipe_creepy", 7 ], [ "recipe_serum", 7 ] ], @@ -727,7 +727,7 @@ "result": "soap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "time": "45 m", "qualities": [ { "id": "CHEM", "level": 1 } ], @@ -745,7 +745,7 @@ "result": "soap_flakes", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "time": "15 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -757,7 +757,7 @@ "id_suffix": "fast_cut", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], @@ -768,7 +768,7 @@ "result": "poppysyrup", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -790,7 +790,7 @@ "result": "chem_hydrogen_peroxide_conc", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 7, "time": "25 m", "book_learn": [ [ "recipe_labchem", 7 ], [ "textbook_chemistry", 7 ] ], @@ -804,7 +804,7 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ [ "firstaid", 3 ] ], "difficulty": 4, "time": "6 m", @@ -819,7 +819,7 @@ "result": "chem_muriatic_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "15 m", "book_learn": [ [ "recipe_labchem", 3 ], [ "textbook_chemistry", 3 ] ], @@ -834,7 +834,7 @@ "byproducts": [ [ "lye", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ [ "electronics", 2 ], [ "mechanics", 2 ] ], "difficulty": 6, "time": "40 m", @@ -854,7 +854,7 @@ "result": "chem_sulphuric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 7, "time": "15 m", "autolearn": true, @@ -867,7 +867,7 @@ "result": "chem_nitric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "10 m", "autolearn": true, @@ -881,7 +881,7 @@ "id_suffix": "from ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "40 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ] ], @@ -896,7 +896,7 @@ "byproducts": [ [ "chem_potassium_chloride" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "10 m", "autolearn": true, @@ -909,7 +909,7 @@ "result": "chem_aluminium_sulphate", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "2 m 30 s", "autolearn": true, @@ -923,7 +923,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "3 m", "autolearn": true, @@ -937,7 +937,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "charges": 680, "time": "45 m", @@ -957,7 +957,7 @@ "byproducts": [ [ "ammonia", 1 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "25 m", "book_learn": [ [ "textbook_anarch", 7 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 6 ] ], @@ -972,7 +972,7 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "40 m", "batch_time_factors": [ 80, 4 ], @@ -986,7 +986,7 @@ "result": "chem_black_powder", "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "20 m", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ], [ "textbook_armschina", 5 ] ], @@ -1000,7 +1000,7 @@ "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 1 ], + "skills_required": [ "science", 1 ], "difficulty": 4, "time": "20 m", "book_learn": [ @@ -1030,7 +1030,7 @@ "result": "chem_anfo", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "3 h", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 7 ] ], @@ -1042,7 +1042,7 @@ "result": "chem_acetic_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "30 m", "autolearn": true, @@ -1055,7 +1055,7 @@ "result": "chem_hexamine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "30 m", "batch_time_factors": [ 67, 5 ], @@ -1068,7 +1068,7 @@ "result": "chem_formaldehyde", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "15 m", "batch_time_factors": [ 80, 4 ], @@ -1083,7 +1083,7 @@ "byproducts": [ [ "chem_ethanol", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "time": "10 m", "batch_time_factors": [ 80, 4 ], @@ -1098,7 +1098,7 @@ "id_suffix": "from wood", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "1 h", "batch_time_factors": [ 80, 4 ], @@ -1112,7 +1112,7 @@ "result": "chem_rdx", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 7, "time": "1 h 15 m", "book_learn": [ [ "recipe_labchem", 8 ], [ "textbook_anarch", 10 ] ], @@ -1125,7 +1125,7 @@ "result": "chem_thermite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "2 m", "autolearn": true, @@ -1137,7 +1137,7 @@ "result": "chem_hmtd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 7, "time": "55 m", "book_learn": [ [ "recipe_labchem", 8 ] ], @@ -1149,7 +1149,7 @@ "result": "chem_rocket_fuel", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "time": "5 m", "book_learn": [ [ "textbook_anarch", 5 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ] ], @@ -1161,7 +1161,7 @@ "result": "tool_rocket_candy", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "time": "30 m", "book_learn": [ [ "textbook_anarch", 4 ], [ "recipe_labchem", 3 ], [ "textbook_chemistry", 5 ] ], @@ -1176,7 +1176,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "survival", "difficulty": 2, - "skills_required": [ "chemistry", 1 ], + "skills_required": [ "science", 1 ], "time": "1 h", "batch_time_factors": [ 99, 1 ], "autolearn": true, @@ -1190,7 +1190,7 @@ "id_suffix": "by_electrolysis", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "electronics", 2 ], "difficulty": 4, "time": "20 m", @@ -1207,7 +1207,7 @@ "category": "CC_OTHER", "subcategory": "CC_OTHER_MEDICAL", "skill_used": "firstaid", - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "science", 2 ], "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.", @@ -1224,7 +1224,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 6, "time": "1 h 20 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 7 ] ], @@ -1241,7 +1241,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "charges": 200, "time": "2 h", @@ -1255,7 +1255,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 3, "charges": 785, "time": "2 h", diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index eb3b79236e480..4c7a637c727b0 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1900,7 +1900,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "science", 2 ], "time": "2 m", "reversible": true, "decomp_learn": 0, @@ -1919,7 +1919,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "science", 2 ], "time": "3 m", "reversible": true, "decomp_learn": 0, @@ -2226,7 +2226,7 @@ "result": "pot_copper", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 4, "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ], "time": "1 h 30 m", @@ -2526,7 +2526,7 @@ "result": "quikclot", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 4, "time": "1 m 12 s", @@ -2540,7 +2540,7 @@ "result": "bfipowder", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "chemistry", + "skill_used": "science", "skills_required": [ "firstaid", 1 ], "difficulty": 6, "time": "1 m 12 s", @@ -2865,7 +2865,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 4 ], + "skills_required": [ "science", 4 ], "difficulty": 4, "time": "30 m", "book_learn": [ [ "glassblowing_book", 5 ] ], @@ -3152,7 +3152,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "science", 2 ], "difficulty": 3, "time": "1 h", "batch_time_factors": [ 75, 4 ], @@ -3166,7 +3166,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 3 ], + "skills_required": [ "science", 3 ], "difficulty": 4, "time": "1 h 30 m", "autolearn": true, @@ -3281,7 +3281,7 @@ "result": "plastic_chunk", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "50 m", "autolearn": true, @@ -4097,7 +4097,7 @@ "result": "neoprene", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "science", "difficulty": 5, "time": "25 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ], diff --git a/data/json/skills.json b/data/json/skills.json index bd3eaf709e0e5..3b828b0c31fd4 100644 --- a/data/json/skills.json +++ b/data/json/skills.json @@ -17,8 +17,8 @@ }, { "type": "skill", - "ident": "chemistry", - "name": "chemicals", + "ident": "science", + "name": "science", "description": "Your skill in mixing compounds together and knowing many scientific processes. Higher levels allow the creation of mutagens.", "companion_industry_rank_factor": 1, "display_category": "display_crafting" From de17b186e0f04232dd63443a09dfef35978b8e63 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 13:31:24 -0500 Subject: [PATCH 09/14] Revert "Science instead of Chemistry" This reverts commit 7ba809a36c2bc5d4c8b5a6ec42596c733b046889. --- data/json/items/book/chemistry.json | 24 +-- data/json/recipes/chem/fuel.json | 8 +- data/json/recipes/chem/mutagens.json | 94 +++++------ data/json/recipes/chem/other.json | 6 +- data/json/recipes/recipe_food.json | 18 +-- .../json/recipes/recipe_medsandchemicals.json | 146 +++++++++--------- data/json/recipes/recipe_others.json | 20 +-- data/json/skills.json | 4 +- 8 files changed, 160 insertions(+), 160 deletions(-) diff --git a/data/json/items/book/chemistry.json b/data/json/items/book/chemistry.json index b82e824ec549c..166bda3f1136d 100644 --- a/data/json/items/book/chemistry.json +++ b/data/json/items/book/chemistry.json @@ -12,7 +12,7 @@ "material": [ "paper" ], "symbol": "?", "color": "blue", - "skill": "science", + "skill": "chemistry", "required_level": 5, "max_level": 8, "intelligence": 12, @@ -31,7 +31,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -50,7 +50,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -69,7 +69,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -88,7 +88,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -107,7 +107,7 @@ "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 9, "max_level": 9, "intelligence": 12, @@ -126,7 +126,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 5, "max_level": 8, "intelligence": 11, @@ -145,7 +145,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -168,7 +168,7 @@ "material": [ "paper", "plastic" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 8, "max_level": 9, "intelligence": 12, @@ -187,7 +187,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 10, "max_level": 10, "intelligence": 12, @@ -206,7 +206,7 @@ "material": [ "paper" ], "symbol": "?", "color": "light_green", - "skill": "science", + "skill": "chemistry", "required_level": 8, "max_level": 10, "intelligence": 12, @@ -243,7 +243,7 @@ "material": [ "paper" ], "symbol": "?", "color": "blue", - "skill": "science", + "skill": "chemistry", "required_level": 3, "max_level": 6, "intelligence": 12, diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json index fe2078c283963..45f1261515145 100644 --- a/data/json/recipes/chem/fuel.json +++ b/data/json/recipes/chem/fuel.json @@ -5,7 +5,7 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook", 4 ] ], @@ -27,7 +27,7 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook" ] ], @@ -48,7 +48,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "result_mult": 4, "time": "420 m", @@ -78,7 +78,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 2, "time": "30 m", "autolearn": true, diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json index 414cf5f372c67..48836c825b91c 100644 --- a/data/json/recipes/chem/mutagens.json +++ b/data/json/recipes/chem/mutagens.json @@ -4,7 +4,7 @@ "result": "mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 8, "time": "45 m", @@ -39,7 +39,7 @@ "byproducts": [ [ "jabberwock_heart_desiccated" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 2, "time": "5 m", "autolearn": true, @@ -51,7 +51,7 @@ "result": "iv_mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -66,7 +66,7 @@ "result": "mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -85,7 +85,7 @@ "result": "iv_mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -100,7 +100,7 @@ "result": "mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -119,7 +119,7 @@ "result": "iv_mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -134,7 +134,7 @@ "result": "mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -149,7 +149,7 @@ "result": "iv_mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -164,7 +164,7 @@ "result": "mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -179,7 +179,7 @@ "result": "iv_mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -194,7 +194,7 @@ "result": "mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -213,7 +213,7 @@ "result": "iv_mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -228,7 +228,7 @@ "result": "mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -247,7 +247,7 @@ "result": "iv_mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -262,7 +262,7 @@ "result": "mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -277,7 +277,7 @@ "result": "iv_mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -292,7 +292,7 @@ "result": "mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -307,7 +307,7 @@ "result": "iv_mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -322,7 +322,7 @@ "result": "mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -337,7 +337,7 @@ "result": "iv_mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -352,7 +352,7 @@ "result": "mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -367,7 +367,7 @@ "result": "iv_mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -382,7 +382,7 @@ "result": "mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -397,7 +397,7 @@ "result": "iv_mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -412,7 +412,7 @@ "result": "mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -427,7 +427,7 @@ "result": "iv_mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -442,7 +442,7 @@ "result": "mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -461,7 +461,7 @@ "result": "iv_mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -476,7 +476,7 @@ "result": "mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -491,7 +491,7 @@ "result": "iv_mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -506,7 +506,7 @@ "result": "mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -521,7 +521,7 @@ "result": "iv_mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -536,7 +536,7 @@ "result": "mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -551,7 +551,7 @@ "result": "iv_mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -566,7 +566,7 @@ "result": "mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -601,7 +601,7 @@ "result": "iv_mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -616,7 +616,7 @@ "result": "purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -635,7 +635,7 @@ "result": "iv_purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -650,7 +650,7 @@ "result": "mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "20 m", @@ -669,7 +669,7 @@ "result": "iv_mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -684,7 +684,7 @@ "result": "mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "12 m", @@ -698,7 +698,7 @@ "result": "iv_mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -713,7 +713,7 @@ "result": "mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "2 h", @@ -728,7 +728,7 @@ "result": "iv_mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -743,7 +743,7 @@ "result": "mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "12 m", @@ -757,7 +757,7 @@ "result": "iv_mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", diff --git a/data/json/recipes/chem/other.json b/data/json/recipes/chem/other.json index 38916c8365101..606b9011c5109 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": [ "science", 2 ], + "skills_required": [ "chemistry", 2 ], "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], @@ -19,7 +19,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 2, "time": "12 m", "autolearn": true, @@ -47,7 +47,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "time": "60 m", "batch_time_factors": [ 70, 10 ], diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 98007e422e0b3..789ef67d2f291 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -40,7 +40,7 @@ "result": "water_clean", "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", - "skill_used": "science", + "skill_used": "chemistry", "time": "5 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -54,7 +54,7 @@ "category": "CC_FOOD", "id_suffix": "using_water_purifier", "subcategory": "CSC_FOOD_DRINKS", - "skill_used": "science", + "skill_used": "chemistry", "time": "9 s", "autolearn": true, "tools": [ [ [ "water_purifier", 1 ] ] ], @@ -66,7 +66,7 @@ "id_suffix": "from_salt_water", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "time": "1 h 30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -80,7 +80,7 @@ "id_suffix": "from_mineral", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "time": "1 h 30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -3677,7 +3677,7 @@ "result": "salt", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "48 m", "autolearn": true, @@ -3692,7 +3692,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skills_required": [ "survival", 2 ], - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 2, "time": "48 m", "autolearn": true, @@ -3706,7 +3706,7 @@ "id_suffix": "from_sweets", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "24 m", "charges": 10, @@ -3742,7 +3742,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "//": "high-temperature acid hydrolysis, to extract edible wood sugars", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 7, "time": "1 h", "book_learn": [ [ "adv_chemistry", 7 ], [ "textbook_chemistry", 8 ], [ "recipe_labchem", 6 ] ], @@ -3760,7 +3760,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "//": "process sugar beets into sugar", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "1 h 30 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ], [ "cookbook_foodfashions", 5, "Natural Beet Sugar" ] ], diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index ac64bdbf2594b..5098efd28f229 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -4,7 +4,7 @@ "result": "salt_water", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -15,7 +15,7 @@ "result": "soapy_water", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "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": [ "science", 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": "science", + "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": "science", + "skill_used": "chemistry", "skills_required": [ "electronics", 1 ], "difficulty": 2, "time": "10 m", @@ -98,7 +98,7 @@ "result": "tallow_tainted", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 2, "time": "15 m", "autolearn": true, @@ -123,7 +123,7 @@ "result": "tobacco", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 2, "time": "18 m", "autolearn": true, @@ -148,7 +148,7 @@ "result": "meth", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "20 m", "book_learn": [ [ "textbook_chemistry", 5 ], [ "adv_chemistry", 5 ], [ "recipe_labchem", 5 ] ], @@ -165,7 +165,7 @@ "result": "crack", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -178,7 +178,7 @@ "result": "poppy_sleep", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -200,7 +200,7 @@ "result": "bonemeal_tablet", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 2, "time": "20 m", @@ -219,7 +219,7 @@ "result": "flavored_bonemeal_tablet", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "30 m", @@ -238,7 +238,7 @@ "result": "poppy_pain", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -260,7 +260,7 @@ "result": "fungicide", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -282,7 +282,7 @@ "result": "antifungal", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ @@ -304,7 +304,7 @@ "result": "insecticide", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -325,7 +325,7 @@ "id_suffix": "nicotine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -348,7 +348,7 @@ "result": "antiparasitic", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -375,7 +375,7 @@ "result": "adrenaline_injector", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -402,7 +402,7 @@ "result": "heroin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "2 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], @@ -418,7 +418,7 @@ "result": "diazepam", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "4 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], @@ -431,7 +431,7 @@ "result": "thorazine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 7, "time": "4 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 8 ], [ "atomic_survival", 7 ], [ "recipe_labchem", 7 ] ], @@ -444,7 +444,7 @@ "result": "lsd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 6 ], [ "recipe_labchem", 7 ] ], @@ -476,7 +476,7 @@ "result": "iodine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 6, "time": "24 m", @@ -490,7 +490,7 @@ "result": "prussian_blue", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 7, "time": "36 m", @@ -510,7 +510,7 @@ "result": "aspirin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 4, "time": "24 m", @@ -530,7 +530,7 @@ "result": "pur_tablets", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "24 m", "book_learn": [ @@ -549,7 +549,7 @@ "result": "bleach", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "electronics", 2 ], "difficulty": 5, "time": "25 m", @@ -565,7 +565,7 @@ "result": "ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "36 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], @@ -583,7 +583,7 @@ "byproducts": [ [ "salt_water", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "electronics", 2 ], "difficulty": 7, "time": "45 m", @@ -599,7 +599,7 @@ "result": "lye_powder", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "3 h", "batch_time_factors": [ 80, 4 ], @@ -614,7 +614,7 @@ "id_suffix": "from_lye", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "time": "1 h 30 m", "autolearn": true, @@ -628,7 +628,7 @@ "result": "heatpack", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "time": "6 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ], [ "atomic_survival", 4 ] ], @@ -642,7 +642,7 @@ "result": "pheromone", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 3, "time": "1 m 12 s", @@ -676,7 +676,7 @@ "result": "fertilizer_liquid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "20 m", @@ -697,7 +697,7 @@ "result": "flask_yeast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 2, "time": "30 m", "autolearn": true, @@ -714,7 +714,7 @@ "result": "slime_scrap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "45 m", "book_learn": [ [ "recipe_creepy", 7 ], [ "recipe_serum", 7 ] ], @@ -727,7 +727,7 @@ "result": "soap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "time": "45 m", "qualities": [ { "id": "CHEM", "level": 1 } ], @@ -745,7 +745,7 @@ "result": "soap_flakes", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "time": "15 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -757,7 +757,7 @@ "id_suffix": "fast_cut", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], @@ -768,7 +768,7 @@ "result": "poppysyrup", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -790,7 +790,7 @@ "result": "chem_hydrogen_peroxide_conc", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 7, "time": "25 m", "book_learn": [ [ "recipe_labchem", 7 ], [ "textbook_chemistry", 7 ] ], @@ -804,7 +804,7 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ [ "firstaid", 3 ] ], "difficulty": 4, "time": "6 m", @@ -819,7 +819,7 @@ "result": "chem_muriatic_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "15 m", "book_learn": [ [ "recipe_labchem", 3 ], [ "textbook_chemistry", 3 ] ], @@ -834,7 +834,7 @@ "byproducts": [ [ "lye", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ [ "electronics", 2 ], [ "mechanics", 2 ] ], "difficulty": 6, "time": "40 m", @@ -854,7 +854,7 @@ "result": "chem_sulphuric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 7, "time": "15 m", "autolearn": true, @@ -867,7 +867,7 @@ "result": "chem_nitric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "10 m", "autolearn": true, @@ -881,7 +881,7 @@ "id_suffix": "from ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "40 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ] ], @@ -896,7 +896,7 @@ "byproducts": [ [ "chem_potassium_chloride" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "10 m", "autolearn": true, @@ -909,7 +909,7 @@ "result": "chem_aluminium_sulphate", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "2 m 30 s", "autolearn": true, @@ -923,7 +923,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "3 m", "autolearn": true, @@ -937,7 +937,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "charges": 680, "time": "45 m", @@ -957,7 +957,7 @@ "byproducts": [ [ "ammonia", 1 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "25 m", "book_learn": [ [ "textbook_anarch", 7 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 6 ] ], @@ -972,7 +972,7 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "40 m", "batch_time_factors": [ 80, 4 ], @@ -986,7 +986,7 @@ "result": "chem_black_powder", "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "20 m", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ], [ "textbook_armschina", 5 ] ], @@ -1000,7 +1000,7 @@ "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", "skill_used": "fabrication", - "skills_required": [ "science", 1 ], + "skills_required": [ "chemistry", 1 ], "difficulty": 4, "time": "20 m", "book_learn": [ @@ -1030,7 +1030,7 @@ "result": "chem_anfo", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "3 h", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 7 ] ], @@ -1042,7 +1042,7 @@ "result": "chem_acetic_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "30 m", "autolearn": true, @@ -1055,7 +1055,7 @@ "result": "chem_hexamine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "30 m", "batch_time_factors": [ 67, 5 ], @@ -1068,7 +1068,7 @@ "result": "chem_formaldehyde", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "15 m", "batch_time_factors": [ 80, 4 ], @@ -1083,7 +1083,7 @@ "byproducts": [ [ "chem_ethanol", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "time": "10 m", "batch_time_factors": [ 80, 4 ], @@ -1098,7 +1098,7 @@ "id_suffix": "from wood", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "1 h", "batch_time_factors": [ 80, 4 ], @@ -1112,7 +1112,7 @@ "result": "chem_rdx", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 7, "time": "1 h 15 m", "book_learn": [ [ "recipe_labchem", 8 ], [ "textbook_anarch", 10 ] ], @@ -1125,7 +1125,7 @@ "result": "chem_thermite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "2 m", "autolearn": true, @@ -1137,7 +1137,7 @@ "result": "chem_hmtd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 7, "time": "55 m", "book_learn": [ [ "recipe_labchem", 8 ] ], @@ -1149,7 +1149,7 @@ "result": "chem_rocket_fuel", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "time": "5 m", "book_learn": [ [ "textbook_anarch", 5 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ] ], @@ -1161,7 +1161,7 @@ "result": "tool_rocket_candy", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "time": "30 m", "book_learn": [ [ "textbook_anarch", 4 ], [ "recipe_labchem", 3 ], [ "textbook_chemistry", 5 ] ], @@ -1176,7 +1176,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "survival", "difficulty": 2, - "skills_required": [ "science", 1 ], + "skills_required": [ "chemistry", 1 ], "time": "1 h", "batch_time_factors": [ 99, 1 ], "autolearn": true, @@ -1190,7 +1190,7 @@ "id_suffix": "by_electrolysis", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "electronics", 2 ], "difficulty": 4, "time": "20 m", @@ -1207,7 +1207,7 @@ "category": "CC_OTHER", "subcategory": "CC_OTHER_MEDICAL", "skill_used": "firstaid", - "skills_required": [ "science", 2 ], + "skills_required": [ "chemistry", 2 ], "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.", @@ -1224,7 +1224,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 6, "time": "1 h 20 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 7 ] ], @@ -1241,7 +1241,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "charges": 200, "time": "2 h", @@ -1255,7 +1255,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 3, "charges": 785, "time": "2 h", diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index 4c7a637c727b0..eb3b79236e480 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1900,7 +1900,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "science", 2 ], + "skills_required": [ "chemistry", 2 ], "time": "2 m", "reversible": true, "decomp_learn": 0, @@ -1919,7 +1919,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "science", 2 ], + "skills_required": [ "chemistry", 2 ], "time": "3 m", "reversible": true, "decomp_learn": 0, @@ -2226,7 +2226,7 @@ "result": "pot_copper", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 4, "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ], "time": "1 h 30 m", @@ -2526,7 +2526,7 @@ "result": "quikclot", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 4, "time": "1 m 12 s", @@ -2540,7 +2540,7 @@ "result": "bfipowder", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "science", + "skill_used": "chemistry", "skills_required": [ "firstaid", 1 ], "difficulty": 6, "time": "1 m 12 s", @@ -2865,7 +2865,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "science", 4 ], + "skills_required": [ "chemistry", 4 ], "difficulty": 4, "time": "30 m", "book_learn": [ [ "glassblowing_book", 5 ] ], @@ -3152,7 +3152,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "science", 2 ], + "skills_required": [ "chemistry", 2 ], "difficulty": 3, "time": "1 h", "batch_time_factors": [ 75, 4 ], @@ -3166,7 +3166,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "science", 3 ], + "skills_required": [ "chemistry", 3 ], "difficulty": 4, "time": "1 h 30 m", "autolearn": true, @@ -3281,7 +3281,7 @@ "result": "plastic_chunk", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "50 m", "autolearn": true, @@ -4097,7 +4097,7 @@ "result": "neoprene", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "science", + "skill_used": "chemistry", "difficulty": 5, "time": "25 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ], diff --git a/data/json/skills.json b/data/json/skills.json index 3b828b0c31fd4..bd3eaf709e0e5 100644 --- a/data/json/skills.json +++ b/data/json/skills.json @@ -17,8 +17,8 @@ }, { "type": "skill", - "ident": "science", - "name": "science", + "ident": "chemistry", + "name": "chemicals", "description": "Your skill in mixing compounds together and knowing many scientific processes. Higher levels allow the creation of mutagens.", "companion_industry_rank_factor": 1, "display_category": "display_crafting" From 1db07626c68e1905b6f659d6f22762ec2a080d71 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 13:31:34 -0500 Subject: [PATCH 10/14] Revert "Chemistry Skill" This reverts commit ca9d18d92c664c92d73d68ea30033b6d046833ea. --- data/json/items/book/chemistry.json | 253 ------------------ data/json/items/book/cooking.json | 251 +++++++++++++++++ data/json/recipes/chem/fuel.json | 8 +- data/json/recipes/chem/mutagens.json | 94 +++---- data/json/recipes/chem/other.json | 6 +- data/json/recipes/other/medical.json | 8 +- data/json/recipes/recipe_food.json | 18 +- .../json/recipes/recipe_medsandchemicals.json | 145 +++++----- data/json/recipes/recipe_others.json | 20 +- data/json/skills.json | 8 - 10 files changed, 400 insertions(+), 411 deletions(-) delete mode 100644 data/json/items/book/chemistry.json diff --git a/data/json/items/book/chemistry.json b/data/json/items/book/chemistry.json deleted file mode 100644 index 166bda3f1136d..0000000000000 --- a/data/json/items/book/chemistry.json +++ /dev/null @@ -1,253 +0,0 @@ -[ - { - "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": 25000, - "bashing": 5, - "material": [ "paper" ], - "symbol": "?", - "color": "blue", - "skill": "chemistry", - "required_level": 5, - "max_level": 8, - "intelligence": 12, - "time": "35 m", - "fun": -1 - }, - { - "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": 1250000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 1250000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 1250000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 1250000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "required_level": 8, - "max_level": 9, - "intelligence": 12, - "time": "45 m", - "fun": -4 - }, - { - "id": "recipe_elfa", - "type": "BOOK", - "name": "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": 1250000, - "material": [ "paper", "plastic" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 125000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 1250000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 1250000, - "bashing": 5, - "material": [ "paper", "plastic" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 1250000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 1250000, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "skill": "chemistry", - "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": 30000, - "bashing": 7, - "material": [ "paper" ], - "symbol": "?", - "color": "light_green", - "intelligence": 4, - "time": "30 m", - "fun": -2 - }, - { - "id": "textbook_chemistry", - "type": "BOOK", - "name": "chemistry textbook", - "description": "A college textbook on chemistry.", - "weight": "1587 g", - "volume": "2 L", - "price": 7950, - "price_postapoc": 16000, - "bashing": 5, - "material": [ "paper" ], - "symbol": "?", - "color": "blue", - "skill": "chemistry", - "required_level": 3, - "max_level": 6, - "intelligence": 12, - "time": "35 m", - "fun": -1 - } -] diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index 61ed43424b765..d0052ddac13fd 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -1,4 +1,24 @@ [ + { + "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": 25000, + "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", @@ -167,6 +187,217 @@ "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": 1250000, + "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": 1250000, + "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": 1250000, + "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": 1250000, + "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": "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": 1250000, + "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": 125000, + "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": 1250000, + "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": 1250000, + "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": 1250000, + "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": 1250000, + "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": 30000, + "bashing": 7, + "material": [ "paper" ], + "symbol": "?", + "color": "light_green", + "intelligence": 4, + "time": "30 m", + "fun": -2 + }, { "id": "scots_cookbook", "type": "BOOK", @@ -191,6 +422,26 @@ "time": "45 m", "fun": -1 }, + { + "id": "textbook_chemistry", + "type": "BOOK", + "name": "chemistry textbook", + "description": "A college textbook on chemistry.", + "weight": "1587 g", + "volume": "2 L", + "price": 7950, + "price_postapoc": 16000, + "bashing": 5, + "material": [ "paper" ], + "symbol": "?", + "color": "blue", + "skill": "cooking", + "required_level": 3, + "max_level": 6, + "intelligence": 12, + "time": "35 m", + "fun": -1 + }, { "id": "cookbook_liverforkids", "type": "BOOK", diff --git a/data/json/recipes/chem/fuel.json b/data/json/recipes/chem/fuel.json index 45f1261515145..af07cf82cd877 100644 --- a/data/json/recipes/chem/fuel.json +++ b/data/json/recipes/chem/fuel.json @@ -5,7 +5,7 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook", 4 ] ], @@ -27,7 +27,7 @@ "byproducts": [ [ "water_clean" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "time": "30 m", "book_learn": [ [ "textbook_chemistry" ], [ "brewing_cookbook" ] ], @@ -48,7 +48,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "result_mult": 4, "time": "420 m", @@ -78,7 +78,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_FUEL", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 2, "time": "30 m", "autolearn": true, diff --git a/data/json/recipes/chem/mutagens.json b/data/json/recipes/chem/mutagens.json index 48836c825b91c..75e495d0f6dc2 100644 --- a/data/json/recipes/chem/mutagens.json +++ b/data/json/recipes/chem/mutagens.json @@ -4,7 +4,7 @@ "result": "mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 8, "time": "45 m", @@ -39,7 +39,7 @@ "byproducts": [ [ "jabberwock_heart_desiccated" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "survival", "difficulty": 2, "time": "5 m", "autolearn": true, @@ -51,7 +51,7 @@ "result": "iv_mutagen", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -66,7 +66,7 @@ "result": "mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -85,7 +85,7 @@ "result": "iv_mutagen_plant", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -100,7 +100,7 @@ "result": "mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -119,7 +119,7 @@ "result": "iv_mutagen_insect", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -134,7 +134,7 @@ "result": "mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -149,7 +149,7 @@ "result": "iv_mutagen_spider", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -164,7 +164,7 @@ "result": "mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -179,7 +179,7 @@ "result": "iv_mutagen_slime", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -194,7 +194,7 @@ "result": "mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -213,7 +213,7 @@ "result": "iv_mutagen_fish", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -228,7 +228,7 @@ "result": "mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -247,7 +247,7 @@ "result": "iv_mutagen_rat", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -262,7 +262,7 @@ "result": "mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -277,7 +277,7 @@ "result": "iv_mutagen_beast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -292,7 +292,7 @@ "result": "mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -307,7 +307,7 @@ "result": "iv_mutagen_ursine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -322,7 +322,7 @@ "result": "mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -337,7 +337,7 @@ "result": "iv_mutagen_mouse", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -352,7 +352,7 @@ "result": "mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -367,7 +367,7 @@ "result": "iv_mutagen_feline", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -382,7 +382,7 @@ "result": "mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -397,7 +397,7 @@ "result": "iv_mutagen_lupine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -412,7 +412,7 @@ "result": "mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -427,7 +427,7 @@ "result": "iv_mutagen_cattle", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -442,7 +442,7 @@ "result": "mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -461,7 +461,7 @@ "result": "iv_mutagen_cephalopod", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -476,7 +476,7 @@ "result": "mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -491,7 +491,7 @@ "result": "iv_mutagen_bird", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -506,7 +506,7 @@ "result": "mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -521,7 +521,7 @@ "result": "iv_mutagen_lizard", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -536,7 +536,7 @@ "result": "mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -551,7 +551,7 @@ "result": "iv_mutagen_troglobite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 9, "time": "2 h", @@ -566,7 +566,7 @@ "result": "mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -601,7 +601,7 @@ "result": "iv_mutagen_medical", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -616,7 +616,7 @@ "result": "purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 9, "time": "45 m", @@ -635,7 +635,7 @@ "result": "iv_purifier", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -650,7 +650,7 @@ "result": "mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "20 m", @@ -669,7 +669,7 @@ "result": "iv_mutagen_alpha", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -684,7 +684,7 @@ "result": "mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "12 m", @@ -698,7 +698,7 @@ "result": "iv_mutagen_elfa", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -713,7 +713,7 @@ "result": "mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "2 h", @@ -728,7 +728,7 @@ "result": "iv_mutagen_chimera", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", @@ -743,7 +743,7 @@ "result": "mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 10, "time": "12 m", @@ -757,7 +757,7 @@ "result": "iv_mutagen_raptor", "category": "CC_CHEM", "subcategory": "CSC_CHEM_MUTAGEN", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 3 ], "difficulty": 10, "time": "2 h", diff --git a/data/json/recipes/chem/other.json b/data/json/recipes/chem/other.json index 606b9011c5109..6a0218efe44c8 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": [ "chemistry", 2 ], + "skills_required": [ "cooking", 2 ], "time": "30 m", "autolearn": true, "book_learn": [ [ "recipe_arrows", 1 ], [ "textbook_survival", 1 ], [ "survival_book", 1 ] ], @@ -19,7 +19,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 2, "time": "12 m", "autolearn": true, @@ -47,7 +47,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "time": "60 m", "batch_time_factors": [ 70, 10 ], diff --git a/data/json/recipes/other/medical.json b/data/json/recipes/other/medical.json index 82b1a0937b928..5d5679f13ffe7 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": "chemistry", + "skill_used": "cooking", "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": "chemistry", + "skill_used": "cooking", "difficulty": 1, "time": "5 m", "batch_time_factors": [ 95, 4 ], @@ -56,7 +56,7 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "skills_required": [ "firstaid", 2 ], "time": "24 m", @@ -70,7 +70,7 @@ "type": "recipe", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "chemistry", + "skill_used": "cooking", "autolearn": true, "book_learn": [ [ "isherwood_herbal_remedies", 1 ] ], "time": "30 s", diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index 789ef67d2f291..f758114cf789f 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -40,7 +40,7 @@ "result": "water_clean", "category": "CC_FOOD", "subcategory": "CSC_FOOD_DRINKS", - "skill_used": "chemistry", + "skill_used": "cooking", "time": "5 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -54,7 +54,7 @@ "category": "CC_FOOD", "id_suffix": "using_water_purifier", "subcategory": "CSC_FOOD_DRINKS", - "skill_used": "chemistry", + "skill_used": "cooking", "time": "9 s", "autolearn": true, "tools": [ [ [ "water_purifier", 1 ] ] ], @@ -66,7 +66,7 @@ "id_suffix": "from_salt_water", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "time": "1 h 30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -80,7 +80,7 @@ "id_suffix": "from_mineral", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "time": "1 h 30 m", "autolearn": true, "batch_time_factors": [ 80, 4 ], @@ -3677,7 +3677,7 @@ "result": "salt", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "48 m", "autolearn": true, @@ -3692,7 +3692,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skills_required": [ "survival", 2 ], - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 2, "time": "48 m", "autolearn": true, @@ -3706,7 +3706,7 @@ "id_suffix": "from_sweets", "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "24 m", "charges": 10, @@ -3742,7 +3742,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "//": "high-temperature acid hydrolysis, to extract edible wood sugars", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 7, "time": "1 h", "book_learn": [ [ "adv_chemistry", 7 ], [ "textbook_chemistry", 8 ], [ "recipe_labchem", 6 ] ], @@ -3760,7 +3760,7 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "//": "process sugar beets into sugar", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "1 h 30 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ], [ "cookbook_foodfashions", 5, "Natural Beet Sugar" ] ], diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 5098efd28f229..4b314063d5384 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -4,7 +4,7 @@ "result": "salt_water", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -15,7 +15,7 @@ "result": "soapy_water", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "time": "1 m", "autolearn": true, "flags": [ "BLIND_HARD" ], @@ -28,7 +28,7 @@ "subcategory": "CSC_OTHER_MEDICAL", "skill_used": "firstaid", "difficulty": 2, - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "cooking", 2 ], "time": "30 m", "book_learn": [ [ "textbook_firstaid", 2 ], @@ -48,7 +48,7 @@ "result": "acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "10 m", "autolearn": true, @@ -85,7 +85,7 @@ "result": "water_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "electronics", 1 ], "difficulty": 2, "time": "10 m", @@ -98,7 +98,7 @@ "result": "tallow_tainted", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 2, "time": "15 m", "autolearn": true, @@ -123,7 +123,7 @@ "result": "tobacco", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 2, "time": "18 m", "autolearn": true, @@ -148,7 +148,7 @@ "result": "meth", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "20 m", "book_learn": [ [ "textbook_chemistry", 5 ], [ "adv_chemistry", 5 ], [ "recipe_labchem", 5 ] ], @@ -165,7 +165,7 @@ "result": "crack", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -178,7 +178,7 @@ "result": "poppy_sleep", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -200,7 +200,7 @@ "result": "bonemeal_tablet", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 2, "time": "20 m", @@ -219,7 +219,7 @@ "result": "flavored_bonemeal_tablet", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "30 m", @@ -238,7 +238,7 @@ "result": "poppy_pain", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -260,7 +260,7 @@ "result": "fungicide", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -282,7 +282,7 @@ "result": "antifungal", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "30 m", "book_learn": [ @@ -304,7 +304,7 @@ "result": "insecticide", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -325,7 +325,7 @@ "id_suffix": "nicotine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 4 ], [ "recipe_labchem", 4 ] ], @@ -348,7 +348,7 @@ "result": "antiparasitic", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -375,7 +375,7 @@ "result": "adrenaline_injector", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "30 m", "book_learn": [ @@ -402,7 +402,7 @@ "result": "heroin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "2 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], @@ -418,7 +418,7 @@ "result": "diazepam", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "4 m", "book_learn": [ [ "textbook_chemistry", 7 ], [ "adv_chemistry", 7 ], [ "atomic_survival", 6 ], [ "recipe_labchem", 6 ] ], @@ -431,7 +431,7 @@ "result": "thorazine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 7, "time": "4 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 8 ], [ "atomic_survival", 7 ], [ "recipe_labchem", 7 ] ], @@ -444,7 +444,7 @@ "result": "lsd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "30 m", "book_learn": [ [ "textbook_chemistry", 8 ], [ "adv_chemistry", 6 ], [ "recipe_labchem", 7 ] ], @@ -476,7 +476,7 @@ "result": "iodine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 6, "time": "24 m", @@ -490,7 +490,7 @@ "result": "prussian_blue", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 7, "time": "36 m", @@ -510,7 +510,7 @@ "result": "aspirin", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 4, "time": "24 m", @@ -530,7 +530,7 @@ "result": "pur_tablets", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "24 m", "book_learn": [ @@ -549,7 +549,7 @@ "result": "bleach", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "electronics", 2 ], "difficulty": 5, "time": "25 m", @@ -565,7 +565,7 @@ "result": "ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "36 m", "book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 5 ] ], @@ -583,7 +583,7 @@ "byproducts": [ [ "salt_water", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "electronics", 2 ], "difficulty": 7, "time": "45 m", @@ -599,7 +599,7 @@ "result": "lye_powder", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "3 h", "batch_time_factors": [ 80, 4 ], @@ -614,7 +614,7 @@ "id_suffix": "from_lye", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "time": "1 h 30 m", "autolearn": true, @@ -628,7 +628,7 @@ "result": "heatpack", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "time": "6 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ], [ "atomic_survival", 4 ] ], @@ -642,7 +642,7 @@ "result": "pheromone", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 3, "time": "1 m 12 s", @@ -676,7 +676,7 @@ "result": "fertilizer_liquid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "survival", 2 ], "difficulty": 3, "time": "20 m", @@ -697,7 +697,7 @@ "result": "flask_yeast", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 2, "time": "30 m", "autolearn": true, @@ -714,7 +714,7 @@ "result": "slime_scrap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "45 m", "book_learn": [ [ "recipe_creepy", 7 ], [ "recipe_serum", 7 ] ], @@ -727,7 +727,7 @@ "result": "soap", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "time": "45 m", "qualities": [ { "id": "CHEM", "level": 1 } ], @@ -745,7 +745,7 @@ "result": "soap_flakes", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "time": "15 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 } ], @@ -757,7 +757,7 @@ "id_suffix": "fast_cut", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "time": "10 m", "autolearn": true, "qualities": [ { "id": "CUT", "level": 2 } ], @@ -768,7 +768,7 @@ "result": "poppysyrup", "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "survival", 1 ], "difficulty": 2, "time": "5 m", @@ -790,7 +790,7 @@ "result": "chem_hydrogen_peroxide_conc", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 7, "time": "25 m", "book_learn": [ [ "recipe_labchem", 7 ], [ "textbook_chemistry", 7 ] ], @@ -804,7 +804,7 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_DRUGS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ [ "firstaid", 3 ] ], "difficulty": 4, "time": "6 m", @@ -819,7 +819,7 @@ "result": "chem_muriatic_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "15 m", "book_learn": [ [ "recipe_labchem", 3 ], [ "textbook_chemistry", 3 ] ], @@ -834,7 +834,7 @@ "byproducts": [ [ "lye", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ [ "electronics", 2 ], [ "mechanics", 2 ] ], "difficulty": 6, "time": "40 m", @@ -854,7 +854,7 @@ "result": "chem_sulphuric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 7, "time": "15 m", "autolearn": true, @@ -867,7 +867,7 @@ "result": "chem_nitric_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "10 m", "autolearn": true, @@ -881,7 +881,7 @@ "id_suffix": "from ammonia", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "40 m", "book_learn": [ [ "adv_chemistry", 6 ], [ "textbook_chemistry", 6 ] ], @@ -896,7 +896,7 @@ "byproducts": [ [ "chem_potassium_chloride" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "10 m", "autolearn": true, @@ -909,7 +909,7 @@ "result": "chem_aluminium_sulphate", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "2 m 30 s", "autolearn": true, @@ -923,7 +923,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "3 m", "autolearn": true, @@ -937,7 +937,7 @@ "byproducts": [ [ "water" ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "charges": 680, "time": "45 m", @@ -957,7 +957,7 @@ "byproducts": [ [ "ammonia", 1 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "25 m", "book_learn": [ [ "textbook_anarch", 7 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 6 ] ], @@ -972,7 +972,7 @@ "result_mult": 5, "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "40 m", "batch_time_factors": [ 80, 4 ], @@ -986,7 +986,7 @@ "result": "chem_black_powder", "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "20 m", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ], [ "textbook_armschina", 5 ] ], @@ -1000,7 +1000,7 @@ "category": "CC_AMMO", "subcategory": "CSC_AMMO_COMPONENTS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 1 ], + "skills_required": [ "cooking", 1 ], "difficulty": 4, "time": "20 m", "book_learn": [ @@ -1030,7 +1030,7 @@ "result": "chem_anfo", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "3 h", "book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 7 ] ], @@ -1042,7 +1042,7 @@ "result": "chem_acetic_acid", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "30 m", "autolearn": true, @@ -1055,7 +1055,7 @@ "result": "chem_hexamine", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "30 m", "batch_time_factors": [ 67, 5 ], @@ -1068,7 +1068,7 @@ "result": "chem_formaldehyde", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "15 m", "batch_time_factors": [ 80, 4 ], @@ -1083,7 +1083,7 @@ "byproducts": [ [ "chem_ethanol", 2 ] ], "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "time": "10 m", "batch_time_factors": [ 80, 4 ], @@ -1098,7 +1098,7 @@ "id_suffix": "from wood", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "1 h", "batch_time_factors": [ 80, 4 ], @@ -1112,7 +1112,7 @@ "result": "chem_rdx", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 7, "time": "1 h 15 m", "book_learn": [ [ "recipe_labchem", 8 ], [ "textbook_anarch", 10 ] ], @@ -1125,7 +1125,7 @@ "result": "chem_thermite", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "2 m", "autolearn": true, @@ -1137,7 +1137,7 @@ "result": "chem_hmtd", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 7, "time": "55 m", "book_learn": [ [ "recipe_labchem", 8 ] ], @@ -1149,7 +1149,7 @@ "result": "chem_rocket_fuel", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "time": "5 m", "book_learn": [ [ "textbook_anarch", 5 ], [ "recipe_labchem", 4 ], [ "textbook_chemistry", 5 ] ], @@ -1161,7 +1161,7 @@ "result": "tool_rocket_candy", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "time": "30 m", "book_learn": [ [ "textbook_anarch", 4 ], [ "recipe_labchem", 3 ], [ "textbook_chemistry", 5 ] ], @@ -1176,7 +1176,7 @@ "subcategory": "CSC_CHEM_OTHER", "skill_used": "survival", "difficulty": 2, - "skills_required": [ "chemistry", 1 ], + "skills_required": [ "cooking", 1 ], "time": "1 h", "batch_time_factors": [ 99, 1 ], "autolearn": true, @@ -1190,7 +1190,7 @@ "id_suffix": "by_electrolysis", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "electronics", 2 ], "difficulty": 4, "time": "20 m", @@ -1207,7 +1207,6 @@ "category": "CC_OTHER", "subcategory": "CC_OTHER_MEDICAL", "skill_used": "firstaid", - "skills_required": [ "chemistry", 2 ], "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.", @@ -1224,7 +1223,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 6, "time": "1 h 20 m", "book_learn": [ [ "textbook_chemistry", 4 ], [ "adv_chemistry", 7 ] ], @@ -1241,7 +1240,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "charges": 200, "time": "2 h", @@ -1255,7 +1254,7 @@ "type": "recipe", "category": "CC_CHEM", "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 3, "charges": 785, "time": "2 h", diff --git a/data/json/recipes/recipe_others.json b/data/json/recipes/recipe_others.json index eb3b79236e480..d50a3bc6d82c3 100644 --- a/data/json/recipes/recipe_others.json +++ b/data/json/recipes/recipe_others.json @@ -1900,7 +1900,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "cooking", 2 ], "time": "2 m", "reversible": true, "decomp_learn": 0, @@ -1919,7 +1919,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "cooking", 2 ], "time": "3 m", "reversible": true, "decomp_learn": 0, @@ -2226,7 +2226,7 @@ "result": "pot_copper", "category": "CC_OTHER", "subcategory": "CSC_OTHER_TOOLS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 4, "book_learn": [ [ "textbook_chemistry", 4 ], [ "textbook_fabrication", 4 ], [ "welding_book", 4 ] ], "time": "1 h 30 m", @@ -2526,7 +2526,7 @@ "result": "quikclot", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 4, "time": "1 m 12 s", @@ -2540,7 +2540,7 @@ "result": "bfipowder", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MEDICAL", - "skill_used": "chemistry", + "skill_used": "cooking", "skills_required": [ "firstaid", 1 ], "difficulty": 6, "time": "1 m 12 s", @@ -2865,7 +2865,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 4 ], + "skills_required": [ "cooking", 4 ], "difficulty": 4, "time": "30 m", "book_learn": [ [ "glassblowing_book", 5 ] ], @@ -3152,7 +3152,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 2 ], + "skills_required": [ "cooking", 2 ], "difficulty": 3, "time": "1 h", "batch_time_factors": [ 75, 4 ], @@ -3166,7 +3166,7 @@ "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", "skill_used": "fabrication", - "skills_required": [ "chemistry", 3 ], + "skills_required": [ "cooking", 3 ], "difficulty": 4, "time": "1 h 30 m", "autolearn": true, @@ -3281,7 +3281,7 @@ "result": "plastic_chunk", "category": "CC_OTHER", "subcategory": "CSC_OTHER_MATERIALS", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "50 m", "autolearn": true, @@ -4097,7 +4097,7 @@ "result": "neoprene", "category": "CC_CHEM", "subcategory": "CSC_CHEM_OTHER", - "skill_used": "chemistry", + "skill_used": "cooking", "difficulty": 5, "time": "25 m", "book_learn": [ [ "adv_chemistry", 3 ], [ "textbook_chemistry", 3 ] ], diff --git a/data/json/skills.json b/data/json/skills.json index bd3eaf709e0e5..4b95663302082 100644 --- a/data/json/skills.json +++ b/data/json/skills.json @@ -15,14 +15,6 @@ "display_category": "display_social", "companion_skill_practice": [ { "skill": "recruiting", "weight": 15 }, { "skill": "recruiting", "weight": 70 } ] }, - { - "type": "skill", - "ident": "chemistry", - "name": "chemicals", - "description": "Your skill in mixing compounds together and knowing many scientific processes. Higher levels allow the creation of mutagens.", - "companion_industry_rank_factor": 1, - "display_category": "display_crafting" - } { "type": "skill", "ident": "computer", From dae7afa0dc895125b097ba4df59a904f5b96fb91 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 13:46:47 -0500 Subject: [PATCH 11/14] Update cooking.json --- data/json/items/book/cooking.json | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/data/json/items/book/cooking.json b/data/json/items/book/cooking.json index d0052ddac13fd..ce7518bbd03f0 100644 --- a/data/json/items/book/cooking.json +++ b/data/json/items/book/cooking.json @@ -19,6 +19,26 @@ "time": "35 m", "fun": -1 }, + { + "id": "salt_chemistry", + "type": "BOOK", + "name": { "str": "Chemistry of Metallic Salts", "str_pl": "copies of Chemistry of Metallic Salts" }, + "description": "A textbook on the principle of metallic salts such as aluminum sulfate.", + "weight": "1615 g", + "volume": "1750 ml", + "price": 5000, + "price_postapoc": 20000, + "bashing": 4, + "material": [ "paper" ], + "symbol": "?", + "color": "blue", + "skill": "cooking", + "required_level": 3, + "max_level": 5, + "intelligence": 10, + "time": "20 m", + "fun": -1 + }, { "id": "brewing_cookbook", "type": "BOOK", From 4f4fff8cc5d7a3f2a9e098b8ffbc4b51548ac5c3 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 14:36:34 -0500 Subject: [PATCH 12/14] Salts --- data/json/items/chemicals_and_resources.json | 38 +++++++++++++++++- .../json/recipes/recipe_medsandchemicals.json | 39 +++++++++++++++++++ 2 files changed, 76 insertions(+), 1 deletion(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 0170e51f7ebda..c4b5c45a7ea41 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -560,6 +560,42 @@ "ammo_type": "components", "container": "bottle_plastic_small" }, + { + "type": "AMMO", + "id": "chem_lithium_hydroxide", + "category": "chems", + "price": 600, + "name": "lithium hydroxide", + "name_plural": "lithium hydroxide", + "symbol": "=", + "color": "white", + "description": "A handful of lithium hydroxide. Produced from a combination of lithium and water, it can be used to produce lithium peroxide. It is typically used in the production of lithium greases.", + "material": "powder_nonflam", + "volume": "50 ml", + "weight": "74 g", + "bashing": 1, + "ammo_type": "components", + "container": "bottle_plastic_small", + "count": 100 + }, + { + "type": "AMMO", + "id": "chem_lithium_peroxide", + "category": "chems", + "price": 600, + "name": "lithium peroxide", + "name_plural": "lithium peroxide", + "symbol": "=", + "color": "white", + "description": "A handful of lithium peroxide. Produced from a combination of hydrogen peroxide and lithium hydroxide, it can be used to produce lithium carbonate.", + "material": "powder_nonflam", + "volume": "35 ml", + "weight": "81 g", + "bashing": 1, + "ammo_type": "components", + "container": "bottle_plastic_small", + "count": 100 + }, { "type": "AMMO", "id": "chem_lithium_carbonate", @@ -572,7 +608,7 @@ "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders.", "material": "powder_nonflam", "volume": "20 ml", - "weight": "443 mg", + "weight": "42 g", "bashing": 1, "ammo_type": "components", "container": "bottle_plastic_small", diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 4b314063d5384..e78d56aae91e3 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1275,5 +1275,44 @@ "autolearn": true, "qualities": [ { "id": "CHISEL", "level": 2 }, { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "material_rhodonite", 1 ] ] ] + }, + { + "result": "chem_lithium_carbonate", + "type": "recipe", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_CHEMICALS", + "skill_used": "cooking", + "difficulty": 3, + "charge": 100, + "time": "1 h", + "book_learn": [ "salt_chemistry", 3 ], + "qualities": [ { "id": "CONTAIN", "level": 1 } ], + "components": [ [ [ "chem_lithium_peroxide", 1 ] ], [ [ "coal_lump", 1 ] ] ] + }, + { + "result": "chem_lithium_peroxide", + "type": "recipe", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_CHEMICALS", + "skill_used": "cooking", + "difficulty": 3, + "charge": 100, + "time": "1 h", + "book_learn": [ "salt_chemistry", 3 ], + "qualities": [ { "id": "CONTAIN", "level": 1 } ], + "components": [ [ [ "chem_lithium_hydroxide", 1 ] ], [ [ "chem_hydrogen_peroxide", 1 ] ] ] + }, + { + "result": "chem_lithium_hydroxide", + "type": "recipe", + "category": "CC_CHEM", + "subcategory": "CSC_CHEM_CHEMICALS", + "skill_used": "cooking", + "difficulty": 3, + "charge": 100, + "time": "1 h", + "book_learn": [ "salt_chemistry", 3 ], + "qualities": [ { "id": "CONTAIN", "level": 1 } ], + "components": [ [ [ "chem_lithium", 1 ] ], [ [ "water_clean", 1 ] ] ] } ] From 3b1df8c8bb44c9cdf879991a5a7ce967a5db6837 Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 14:48:18 -0500 Subject: [PATCH 13/14] Update recipe_medsandchemicals.json --- data/json/recipes/recipe_medsandchemicals.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index e78d56aae91e3..60e2a102413a6 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1286,8 +1286,8 @@ "charge": 100, "time": "1 h", "book_learn": [ "salt_chemistry", 3 ], - "qualities": [ { "id": "CONTAIN", "level": 1 } ], - "components": [ [ [ "chem_lithium_peroxide", 1 ] ], [ [ "coal_lump", 1 ] ] ] + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 2 } ], + "components": [ [ [ "chem_lithium_peroxide", 100 ] ], [ [ "coal_lump", 1 ], [ "charcoal", 1 ] ] ] }, { "result": "chem_lithium_peroxide", @@ -1299,8 +1299,8 @@ "charge": 100, "time": "1 h", "book_learn": [ "salt_chemistry", 3 ], - "qualities": [ { "id": "CONTAIN", "level": 1 } ], - "components": [ [ [ "chem_lithium_hydroxide", 1 ] ], [ [ "chem_hydrogen_peroxide", 1 ] ] ] + "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 2 } ], + "components": [ [ [ "chem_lithium_hydroxide", 100 ] ], [ [ "chem_hydrogen_peroxide", 1 ] ] ] }, { "result": "chem_lithium_hydroxide", From 75cbd8a006dfe37851bb18c4d4ab5f02873452aa Mon Sep 17 00:00:00 2001 From: roaringjohn Date: Fri, 17 Jan 2020 15:07:01 -0500 Subject: [PATCH 14/14] Get rid of useless lithium compounds --- data/json/items/chemicals_and_resources.json | 48 +++---------------- .../json/recipes/recipe_medsandchemicals.json | 39 --------------- 2 files changed, 6 insertions(+), 81 deletions(-) diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index c4b5c45a7ea41..d7c15b43b0e36 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -562,53 +562,17 @@ }, { "type": "AMMO", - "id": "chem_lithium_hydroxide", + "id": "chem_lithium_hydride", "category": "chems", "price": 600, - "name": "lithium hydroxide", - "name_plural": "lithium hydroxide", + "name": "lithium hydride", + "name_plural": "lithium hydride", "symbol": "=", "color": "white", - "description": "A handful of lithium hydroxide. Produced from a combination of lithium and water, it can be used to produce lithium peroxide. It is typically used in the production of lithium greases.", - "material": "powder_nonflam", + "description": "A handful of lithium hydride. Produced from a reaction between lithium and hydrogen, it can be used in a variety of ways.", + "material": "powder", "volume": "50 ml", - "weight": "74 g", - "bashing": 1, - "ammo_type": "components", - "container": "bottle_plastic_small", - "count": 100 - }, - { - "type": "AMMO", - "id": "chem_lithium_peroxide", - "category": "chems", - "price": 600, - "name": "lithium peroxide", - "name_plural": "lithium peroxide", - "symbol": "=", - "color": "white", - "description": "A handful of lithium peroxide. Produced from a combination of hydrogen peroxide and lithium hydroxide, it can be used to produce lithium carbonate.", - "material": "powder_nonflam", - "volume": "35 ml", - "weight": "81 g", - "bashing": 1, - "ammo_type": "components", - "container": "bottle_plastic_small", - "count": 100 - }, - { - "type": "AMMO", - "id": "chem_lithium_carbonate", - "category": "chems", - "price": 600, - "name": "lithium carbonate", - "name_plural": "lithium carbonate", - "symbol": "=", - "color": "white", - "description": "A handful of lithium carbonate. Commonly used in the processing of metal oxides and treatment of mood disorders.", - "material": "powder_nonflam", - "volume": "20 ml", - "weight": "42 g", + "weight": "39 g", "bashing": 1, "ammo_type": "components", "container": "bottle_plastic_small", diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 60e2a102413a6..4b314063d5384 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -1275,44 +1275,5 @@ "autolearn": true, "qualities": [ { "id": "CHISEL", "level": 2 }, { "id": "HAMMER", "level": 2 } ], "components": [ [ [ "material_rhodonite", 1 ] ] ] - }, - { - "result": "chem_lithium_carbonate", - "type": "recipe", - "category": "CC_CHEM", - "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 3, - "charge": 100, - "time": "1 h", - "book_learn": [ "salt_chemistry", 3 ], - "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 2 } ], - "components": [ [ [ "chem_lithium_peroxide", 100 ] ], [ [ "coal_lump", 1 ], [ "charcoal", 1 ] ] ] - }, - { - "result": "chem_lithium_peroxide", - "type": "recipe", - "category": "CC_CHEM", - "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 3, - "charge": 100, - "time": "1 h", - "book_learn": [ "salt_chemistry", 3 ], - "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 2 } ], - "components": [ [ [ "chem_lithium_hydroxide", 100 ] ], [ [ "chem_hydrogen_peroxide", 1 ] ] ] - }, - { - "result": "chem_lithium_hydroxide", - "type": "recipe", - "category": "CC_CHEM", - "subcategory": "CSC_CHEM_CHEMICALS", - "skill_used": "cooking", - "difficulty": 3, - "charge": 100, - "time": "1 h", - "book_learn": [ "salt_chemistry", 3 ], - "qualities": [ { "id": "CONTAIN", "level": 1 } ], - "components": [ [ [ "chem_lithium", 1 ] ], [ [ "water_clean", 1 ] ] ] } ]