Skip to content

Commit

Permalink
Add white phosphorus and related recipes (#74599)
Browse files Browse the repository at this point in the history
* Add a new recipe of smoke bombs

Add a recipe for making smoke bombs using white phosphorus

* Modify recipes related to phosphorus

Modify the recipe for red phosphorus and add a recipe for producing white phosphorus

* Add white phosphorus

* Add white phosphorus to the item group

* Update data/json/recipes/recipe_medsandchemicals.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/recipes/recipe_medsandchemicals.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

* Update data/json/recipes/weapon/explosive.json

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>

---------

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
  • Loading branch information
Rocket-F-1024 and github-actions[bot] authored Jun 20, 2024
1 parent c0fa700 commit f1b4459
Show file tree
Hide file tree
Showing 5 changed files with 65 additions and 10 deletions.
1 change: 1 addition & 0 deletions data/json/itemgroups/science_and_tech.json
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@
{ "item": "denat_alcohol", "prob": 6, "charges": [ 250, -1 ] },
{ "item": "methed_alcohol", "prob": 4, "charges": [ 250, -1 ] },
{ "item": "red_phosphorous", "prob": 10, "charges": [ 100, 1200 ] },
{ "item": "white_phosphorous", "prob": 10, "charges": [ 100, 1200 ] },
{ "item": "acetic_anhydride", "prob": 8 },
{ "item": "iodine_crystal", "prob": 12 }
]
Expand Down
1 change: 1 addition & 0 deletions data/json/itemgroups/supplies.json
Original file line number Diff line number Diff line change
Expand Up @@ -459,6 +459,7 @@
[ "chem_aluminium_sulphate", 10 ],
[ "chem_saltpetre", 10 ],
{ "item": "red_phosphorous", "prob": 5, "charges": [ 100, -1 ] },
{ "item": "white_phosphorous", "prob": 5, "charges": [ 100, -1 ] },
{ "item": "bismuth", "prob": 5, "charges": [ 1, -1 ] },
{ "item": "chem_benzene", "prob": 10, "charges": [ 1, -1 ] },
{ "item": "chem_toluene", "prob": 10, "charges": [ 1, -1 ] },
Expand Down
20 changes: 18 additions & 2 deletions data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -1935,15 +1935,31 @@
"category": "chems",
"name": { "str_sp": "red phosphorous" },
"description": "An allotrope of the element phosphorous. It's what you use to light matches, but can also be used in the synthesis of methamphetamine. You could use it to make bombs, and if you were truly desperate you might even be able to use it as a propellant for bullets.",
"weight": "100 mg",
"weight": "10 g",
"volume": "5 ml",
"//": "Density around 2.2g/cm3, but since it's a powder, it's a bit lower, around 1.8-2.0 g/cm3",
"container": "bottle_plastic_small",
"symbol": "=",
"color": "red",
"price": "50 cent",
"price_postapoc": "2 cent",
"count": 1000,
"stack_size": 25
},
{
"id": "white_phosphorous",
"type": "AMMO",
"ammo_type": "components",
"category": "chems",
"name": { "str_sp": "white phosphorous" },
"description": "An allotrope of the element phosphorous. Extremely flammable, produces toxic smoke, you can use it to make smoke bombs.",
"weight": "7500 mg",
"volume": "5 ml",
"//": "Density around 1.8g/cm3, but since it's a powder, it's a bit lower, around 1.5 g/cm3",
"container": "bottle_plastic_small",
"symbol": "=",
"color": "white",
"price": "50 cent",
"price_postapoc": "2 cent",
"stack_size": 25
},
{
Expand Down
32 changes: 24 additions & 8 deletions data/json/recipes/recipe_medsandchemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -1494,16 +1494,32 @@
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "red_phosphorous",
"charges": 3,
"batch_time_factors": [ 95, 1 ],
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_CHEMICALS",
"difficulty": 3,
"skill_used": "chemistry",
"time": "1 h",
"tools": [ [ [ "vac_oven_small", 1000 ] ] ],
"book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_chemistry", 3 ], [ "adv_chemistry", 3 ], [ "textbook_anarch", 3 ] ],
"components": [ [ [ "white_phosphorous", 4 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "white_phosphorous",
"charges": 1,
"batch_time_factors": [ 60, 5 ],
"batch_time_factors": [ 95, 1 ],
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_OTHER",
"skill_used": "fabrication",
"time": "10 m",
"autolearn": true,
"qualities": [ { "id": "FINE_GRIND", "level": 1 }, { "id": "CUT", "level": 1 }, { "id": "SIEVE", "level": 1 } ],
"//": "calculation based on https://www.youtube.com/watch?v=5ZrfNAHDjWU; 1 matchbox contains 30 mg phosphorus and 1 unit of phosphor is 100 mg",
"components": [ [ [ "survival_match", 1 ], [ "ref_matches", 3 ], [ "matches", 5 ] ] ]
"subcategory": "CSC_CHEM_CHEMICALS",
"difficulty": 3,
"skill_used": "chemistry",
"time": "30 m",
"qualities": [ { "id": "CHEM", "level": 2 } ],
"book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_chemistry", 3 ], [ "adv_chemistry", 3 ], [ "textbook_anarch", 3 ] ],
"tools": [ [ [ "surface_heat", 50, "LIST" ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ],
"components": [ [ [ "bone_meal_any", 1, "LIST" ] ], [ [ "material_sand", 3 ] ], [ [ "charcoal", 7 ], [ "coal_lump", 7 ] ] ]
},
{
"type": "recipe",
Expand Down
21 changes: 21 additions & 0 deletions data/json/recipes/weapon/explosive.json
Original file line number Diff line number Diff line change
Expand Up @@ -264,6 +264,27 @@
[ [ "superglue", 1 ] ]
]
},
{
"result": "smokebomb",
"id_suffix": "with_white_phosphorous",
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"category": "CC_WEAPON",
"subcategory": "CSC_WEAPON_EXPLOSIVE",
"skill_used": "chemistry",
"skills_required": [ "mechanics", 1 ],
"difficulty": 2,
"book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_chemistry", 3 ], [ "adv_chemistry", 3 ], [ "textbook_anarch", 3 ] ],
"proficiencies": [ { "proficiency": "prof_intro_chemistry" }, { "proficiency": "prof_inorganic_chemistry" } ],
"time": "7 m 30 s",
"qualities": [ { "id": "SCREW", "level": 1 } ],
"using": [ [ "small_gas_canister_case", 1 ] ],
"components": [
[ [ "water", 1 ], [ "water_clean", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ],
[ [ "white_phosphorous", 20 ] ],
[ [ "superglue", 1 ] ]
]
},
{
"result": "military_explosive_small_grenade",
"type": "recipe",
Expand Down

0 comments on commit f1b4459

Please sign in to comment.