Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Add Chemistry Proficiencies #64107

Merged
merged 71 commits into from
Mar 25, 2023
Merged
Show file tree
Hide file tree
Changes from 33 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
16ea984
Update chemicals.json
Alm999 Mar 9, 2023
1b66d06
Update chemicals.json
Alm999 Mar 9, 2023
37f5034
Update other.json
Alm999 Mar 9, 2023
9943be3
Merge branch 'CleverRaven:master' into Chemistry-Proficiency-Stuff
Alm999 Mar 10, 2023
b42ef2e
Update fuel.json
Alm999 Mar 10, 2023
17a363a
Update drugs.json
Alm999 Mar 10, 2023
3bb3bcb
Update mutagens.json
Alm999 Mar 10, 2023
6094fcd
Update mutagens.json
Alm999 Mar 10, 2023
879ee0c
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
25a3c7d
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
51144c4
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
c9964f9
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
bd97b46
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
c0cc56f
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
2aa6938
Update data/json/recipes/chem/mutagens.json
Alm999 Mar 10, 2023
31c8eb7
Update data/json/recipes/chem/mutagens.json
Alm999 Mar 10, 2023
cbd9d46
Update data/json/recipes/chem/mutagens.json
Alm999 Mar 10, 2023
5d32b3e
Update data/json/recipes/chem/mutagens.json
Alm999 Mar 10, 2023
1fcc558
Update data/json/recipes/chem/mutagens.json
Alm999 Mar 10, 2023
f40a1ee
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
e254fbe
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
7c7ccc7
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
54cc3cf
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
8ea3400
Update data/json/recipes/chem/mutagens.json
Alm999 Mar 10, 2023
9e5b503
Update data/json/recipes/chem/chemicals.json
Alm999 Mar 10, 2023
edf36ab
Update chemicals.json
Alm999 Mar 10, 2023
b1a0e4c
Update drugs.json
Alm999 Mar 10, 2023
b633fef
Update fuel.json
Alm999 Mar 10, 2023
0424147
Update mutagens.json
Alm999 Mar 10, 2023
0368bc9
Update other.json
Alm999 Mar 10, 2023
6f3f750
Merge branch 'CleverRaven:master' into Chemistry-Proficiency-Stuff
Alm999 Mar 10, 2023
a9d0ac1
Update fuel.json
Alm999 Mar 10, 2023
35aad6f
Update mutagens.json
Alm999 Mar 10, 2023
aa22e63
Update other.json
Alm999 Mar 10, 2023
ac6a07f
Merge branch 'CleverRaven:master' into Chemistry-Proficiency-Stuff
Alm999 Mar 11, 2023
b34feee
Update recipe_medsandchemicals.json
Alm999 Mar 11, 2023
8d658bf
Update recipe_medsandchemicals.json
Alm999 Mar 11, 2023
13a112a
Add chemistry related proficiencies to recipes
Alm999 Mar 11, 2023
371b65a
Update data/json/recipes/recipe_medsandchemicals.json
Alm999 Mar 12, 2023
b13a59b
Merge branch 'CleverRaven:master' into Chemistry_Proficiences_Continu…
Alm999 Mar 12, 2023
782cd36
Merge branch 'CleverRaven:master' into Chemistry-Proficiency-Stuff
Alm999 Mar 12, 2023
fa7679c
Update recipe_ammo.json
Alm999 Mar 12, 2023
9ad8e7d
Update recipe_food.json
Alm999 Mar 12, 2023
d80d2ed
Merge branch 'CleverRaven:master' into Chemical_Stuff_#2
Alm999 Mar 12, 2023
a148aef
Add chemistry proficiencies to recipes
Alm999 Mar 12, 2023
e395883
Merge branch 'CleverRaven:master' into Chemical_Stuff_#2
Alm999 Mar 12, 2023
c5fb0e6
Add chemical proficiencies
Alm999 Mar 12, 2023
b8f709d
"Distillation" and "Beverage Distillation" profs.
Alm999 Mar 12, 2023
c939430
Add chemical proficiencies
Alm999 Mar 12, 2023
df8a377
Merge branch 'CleverRaven:master' into Chemical_Stuff_#2
Alm999 Mar 12, 2023
34430e6
Update recipe_medsandchemicals.json
Alm999 Mar 12, 2023
a0dfce1
Update recipe_medsandchemicals.json
Alm999 Mar 12, 2023
b9362b6
Merge branch 'Chemistry_Proficiences_Continued_#1' into Chemical_Stuf…
Alm999 Mar 12, 2023
0082fd9
Merge pull request #2 from Alm999/Chemical_Stuff_#2
Alm999 Mar 12, 2023
74960a4
Merge branch 'CleverRaven:master' into Chemistry-Proficiency-Stuff
Alm999 Mar 12, 2023
04f1ffe
Merge pull request #3 from Alm999/Chemistry_Proficiences_Continued_#1
Alm999 Mar 12, 2023
61940d7
Merge branch 'CleverRaven:master' into Chemistry-Proficiency-Stuff
Alm999 Mar 13, 2023
3754613
proficiencies corrections
Alm999 Mar 13, 2023
84e46a1
Proficiencies fix
Alm999 Mar 13, 2023
19e6841
Chemical Proficiencies fix
Alm999 Mar 13, 2023
f4a15d2
Add Chemistry and Handloading proficiencies
Alm999 Mar 13, 2023
15bd67f
Add Chemical proficiencies
Alm999 Mar 13, 2023
a0f6e7b
Add chemistry proficiencies
Alm999 Mar 13, 2023
c68488c
Add chemical proficiencies
Alm999 Mar 13, 2023
4dc7d0b
Add Handloading to dynamite bomb
Alm999 Mar 13, 2023
41024fb
Merge branch 'CleverRaven:master' into Chemistry-Proficiency-Stuff
Alm999 Mar 14, 2023
347e2f7
Merge branch 'CleverRaven:master' into Chemistry-Proficiency-Stuff
Alm999 Mar 14, 2023
4cc0f87
Add chemical proficiencies
Alm999 Mar 14, 2023
ed98d9b
Add chemistry proficiencies
Alm999 Mar 14, 2023
cf9e313
Small correction for chem. profs.
Alm999 Mar 14, 2023
637ad16
Merge branch 'master' into Chemistry-Proficiency-Stuff
Alm999 Mar 18, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 80 additions & 0 deletions data/json/recipes/chem/chemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,11 @@
"batch_time_factors": [ 99, 2 ],
"autolearn": true,
"charges": 1,
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"qualities": [ { "id": "BOIL", "level": 1 } ],
"tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ], [ [ "cotton_patchwork", -1 ], [ "felt_patch", -1 ] ] ],
"components": [ [ [ "feces_bird", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
Expand All @@ -30,6 +35,12 @@
"batch_time_factors": [ 80, 2 ],
"autolearn": true,
"charges": 75,
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_distilling" },
{ "proficiency": "prof_organic_chemistry" }
],
"qualities": [ { "id": "CHEM", "level": 2 }, { "id": "CUT", "level": 2 }, { "id": "FINE_DISTILL", "level": 1 } ],
"tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "thermometer", -1 ] ] ],
"components": [
Expand All @@ -52,6 +63,12 @@
"time": "1 h",
"batch_time_factors": [ 80, 2 ],
"book_learn": [ [ "adv_chemistry", 4 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 4 ], [ "atomic_survival", 4 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_distilling" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"qualities": [ { "id": "CHEM", "level": 2 }, { "id": "DISTILL", "level": 1 } ],
"tools": [ [ [ "surface_heat", 30, "LIST" ] ] ],
"components": [
Expand All @@ -71,6 +88,11 @@
"batch_time_factors": [ 99, 1 ],
"book_learn": [ [ "adv_chemistry", 4 ] ],
"charges": 105,
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_organic_chemistry" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 5, "LIST" ] ], [ [ "chem_citric_acid", -1 ] ] ],
"components": [ [ [ "chem_benzene", 90 ] ], [ [ "chem_methanol", 32 ] ] ]
Expand All @@ -87,6 +109,11 @@
"time": "10 m",
"batch_time_factors": [ 80, 2 ],
"book_learn": [ [ "adv_chemistry", 4 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 4 ], [ "atomic_survival", 4 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_organic_chemistry" }
],
"qualities": [ { "id": "CHEM", "level": 2 }, { "id": "SEPARATE", "level": 1 } ],
"components": [ [ [ "chem_acetone", 1 ] ], [ [ "bleach", 6 ] ] ]
},
Expand All @@ -103,6 +130,11 @@
"time": "12 h",
"batch_time_factors": [ 99, 2 ],
"book_learn": [ [ "adv_chemistry", 4 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 4 ], [ "atomic_survival", 4 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_organic_chemistry" }
],
"qualities": [
{ "id": "CHEM", "level": 2 },
{ "id": "HAMMER", "level": 1 },
Expand Down Expand Up @@ -136,6 +168,11 @@
"difficulty": 5,
"time": "1 h",
"book_learn": [ [ "adv_chemistry", 4 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"charges": 49,
"qualities": [ { "id": "CHEM", "level": 2 }, { "id": "SAW_M", "level": 1 } ],
"tools": [ [ [ "electrolysis_kit", 50 ] ] ],
Expand All @@ -153,6 +190,11 @@
"time": "30 m",
"batch_time_factors": [ 80, 2 ],
"book_learn": [ [ "adv_chemistry", 4 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 4 ], [ "atomic_survival", 4 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"components": [ [ [ "chem_muriatic_acid", 1 ] ], [ [ "material_limestone", 45 ], [ "material_quicklime", 24 ] ] ]
},
Expand All @@ -172,6 +214,11 @@
"time": "1 h",
"batch_time_factors": [ 80, 2 ],
"book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 6 ], [ "recipe_labchem", 5 ], [ "atomic_survival", 5 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [ [ [ "salt_water", 3 ] ], [ [ "material_limestone", 8 ] ], [ [ "ammonia_liquid", 4 ] ] ]
Expand All @@ -189,6 +236,11 @@
"time": "30 m",
"batch_time_factors": [ 80, 2 ],
"book_learn": [ [ "adv_chemistry", 4 ], [ "textbook_chemistry", 5 ], [ "recipe_labchem", 4 ], [ "atomic_survival", 4 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"qualities": [ { "id": "BOIL", "level": 2 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [ [ [ "chem_baking_soda", 76 ] ] ]
Expand All @@ -206,6 +258,11 @@
"time": "30 m",
"batch_time_factors": [ 80, 2 ],
"book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 6 ], [ "recipe_labchem", 5 ], [ "atomic_survival", 5 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [
[ [ "surface_heat", 25, "LIST" ] ],
Expand All @@ -226,6 +283,13 @@
"time": "2 h",
"batch_time_factors": [ 80, 2 ],
"book_learn": [ [ "adv_chemistry", 5 ], [ "textbook_chemistry", 6 ], [ "recipe_labchem", 5 ], [ "atomic_survival", 5 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_distilling" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_organic_chemistry" }
],
"qualities": [ { "id": "CHEM", "level": 2 }, { "id": "FINE_DISTILL", "level": 1 } ],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ], [ [ "ketene_lamp", 50 ] ] ],
"components": [ [ [ "chem_acetic_acid", 1 ] ], [ [ "chem_acetone", 1 ] ] ]
Expand All @@ -241,6 +305,12 @@
"time": "1 h",
"batch_time_factors": [ 99, 2 ],
"book_learn": [ [ "adv_chemistry", 7 ], [ "recipe_labchem", 7 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_organic_chemistry" }
],
"charges": 958,
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
Expand All @@ -257,6 +327,11 @@
"time": "90 m",
"batch_time_factors": [ 99, 2 ],
"book_learn": [ [ "adv_chemistry", 7 ], [ "recipe_labchem", 7 ] ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"charges": 1168,
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 30, "LIST" ] ] ],
Expand All @@ -280,6 +355,11 @@
"difficulty": 5,
"time": "30 m",
"autolearn": true,
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_intro_chem_synth" },
{ "proficiency": "prof_inorganic_chemistry" }
],
"tools": [
[ [ "electrolyzer_makeshift", 10500 ] ],
[ [ "ammonia_machine_reactor", 50000 ] ],
Expand Down
11 changes: 11 additions & 0 deletions data/json/recipes/chem/drugs.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@
"batch_time_factors": [ 99, 2 ],
"book_learn": [ [ "adv_chemistry", 7 ], [ "recipe_labchem", 7 ] ],
"charges": 1941,
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_pharmaceutical" }
],
"qualities": [ { "id": "CHEM", "level": 2 }, { "id": "SEPARATE", "level": 1 }, { "id": "ANALYSIS", "level": 1 } ],
"tools": [ [ [ "surface_heat", 60, "LIST" ] ], [ [ "cotton_patchwork", -1 ], [ "felt_patch", -1 ] ] ],
"components": [
Expand Down Expand Up @@ -56,6 +61,12 @@
"time": "6 h",
"book_learn": [ [ "recipe_labchem", 6 ] ],
"batch_time_factors": [ 30, 5 ],
"proficiencies": [
{ "proficiency": "prof_intro_chemistry" },
{ "proficiency": "prof_inorganic_chemistry" },
{ "proficiency": "prof_organic_chemistry" },
{ "proficiency": "prof_pharmaceutical" }
],
"qualities": [ { "id": "CHEM", "level": 3 }, { "id": "SEPARATE", "level": 1 } ],
"components": [
[ [ "dayquil", 15 ] ],
Expand Down
5 changes: 5 additions & 0 deletions data/json/recipes/chem/fuel.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
"difficulty": 4,
"time": "30 m",
"book_learn": [ [ "textbook_chemistry" ], [ "distilling_cookbook", 4 ] ],
"proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_distilling" } ],
"qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 2 } ],
"tools": [ [ [ "surface_heat", 30, "LIST" ] ], [ [ "thermometer", -1 ] ] ],
"components": [ [ [ "mixed_alcohol_strong", 14 ], [ "mixed_alcohol_weak", 10 ], [ "wash_liquor", 42, "LIST" ] ] ]
Expand All @@ -25,6 +26,7 @@
"difficulty": 4,
"time": "30 m",
"book_learn": [ [ "textbook_chemistry" ], [ "distilling_cookbook" ] ],
"proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_distilling" } ],
"qualities": [ { "id": "BOIL", "level": 2 }, { "id": "DISTILL", "level": 1 } ],
"tools": [ [ [ "surface_heat", 60, "LIST" ] ] ],
"components": [ [ [ "moonshine", 40 ] ] ]
Expand All @@ -42,6 +44,7 @@
"time": "420 m",
"book_learn": [ [ "textbook_biodiesel", 5 ] ],
"batch_time_factors": [ 99, 1 ],
"proficiencies": [ { "proficiency": "prof_intro_chemistry" } ],
"qualities": [ { "id": "CHEM", "level": 2 } ],
"tools": [ [ [ "surface_heat", 100, "LIST" ] ] ],
"components": [
Expand Down Expand Up @@ -73,6 +76,7 @@
"byproducts": [ [ "diesel", 40 ] ],
"batch_time_factors": [ 80, 4 ],
"book_learn": [ [ "catalytic_cracking_handbook", 5 ] ],
"proficiencies": [ { "proficiency": "prof_intro_chemistry" } ],
"qualities": [ { "id": "CUT", "level": 2 }, { "id": "COOK", "level": 3 }, { "id": "EXTRACT", "level": 3 } ],
"tools": [ [ [ "surface_heat", 40, "LIST" ] ], [ [ "water", 100 ], [ "water_clean", 100 ] ] ],
"components": [
Expand Down Expand Up @@ -100,6 +104,7 @@
"time": "5 s",
"batch_time_factors": [ 95, 5 ],
"autolearn": true,
"proficiencies": [ { "proficiency": "prof_intro_chemistry" } ],
"components": [ [ [ "edible_tallow_lard", 2, "LIST" ], [ "tallow_tainted", 2 ], [ "cooking_oil", 16 ], [ "cooking_oil2", 16 ] ] ],
"flags": [ "ALLOW_ROTTEN" ]
}
Expand Down
Loading