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

Balancing recipe imbalances due to red phosphorus weight changes #74722

Merged
merged 9 commits into from
Jun 23, 2024
18 changes: 17 additions & 1 deletion data/json/items/chemicals_and_resources.json
Original file line number Diff line number Diff line change
Expand Up @@ -1934,7 +1934,7 @@
"ammo_type": "components",
"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.",
"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 in small portions as a propellant for bullets.",
"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",
Expand All @@ -1945,6 +1945,22 @@
"price_postapoc": "2 cent",
"stack_size": 25
},
{
"id": "red_phosphorous_small",
"type": "AMMO",
"ammo_type": "components",
"category": "chems",
"name": { "str_sp": "small portion of 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",
"volume": "1 ml",
"container": "bottle_plastic_small",
"symbol": "=",
"color": "red",
"price": "50 cent",
"price_postapoc": "2 cent",
"stack_size": 25
},
{
"id": "white_phosphorous",
"type": "AMMO",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/chem/drugs.json
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
"components": [
[ [ "dayquil", 15 ] ],
[ [ "iodine_crystal", 15 ] ],
[ [ "red_phosphorous", 270 ] ],
[ [ "red_phosphorous", 3 ], [ "red_phosphorous_small", 270] ],
Rocket-F-1024 marked this conversation as resolved.
Show resolved Hide resolved
[ [ "chem_acetone", 1 ] ],
[ [ "chem_methanol", 3 ] ],
[ [ "lye_powder", 5 ], [ "chem_potassium_hydroxide", 25 ], [ "lye", 1 ], [ "lye_potassium", 1 ] ]
Expand Down
46 changes: 46 additions & 0 deletions data/json/recipes/recipe_medsandchemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -1494,6 +1494,7 @@
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "red_phosphorous",
"id_suffix": "with_white_phosphorous",
"charges": 3,
"batch_time_factors": [ 95, 1 ],
"category": "CC_CHEM",
Expand All @@ -1505,6 +1506,35 @@
"book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_chemistry", 3 ], [ "adv_chemistry", 3 ], [ "textbook_anarch", 3 ] ],
"components": [ [ [ "white_phosphorous", 4 ] ] ]
},
{
"type": "recipe",
"activity_level": "NO_EXERCISE",
"result": "red_phosphorous",
"charges": 1,
"category": "CC_OTHER",
"subcategory": "CSC_OTHER_OTHER",
"skill_used": "chemistry",
"time": "1 s",
"reversible": true,
"autolearn": true,
"tools": [],
Rocket-F-1024 marked this conversation as resolved.
Show resolved Hide resolved
"components": [ [ [ "red_phosphorous_small", 100 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
"result": "red_phosphorous_small",
"charges": 1,
"batch_time_factors": [ 60, 5 ],
"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 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
Expand All @@ -1521,6 +1551,22 @@
"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",
"activity_level": "LIGHT_EXERCISE",
"result": "white_phosphorous",
"id_suffix": "with_red_phosphorous",
"charges": 4,
"batch_time_factors": [ 95, 1 ],
"category": "CC_CHEM",
"subcategory": "CSC_CHEM_CHEMICALS",
"difficulty": 3,
"skill_used": "chemistry",
"time": "6 m",
"tools": [ [ [ "vac_oven_small", 100 ] ] ],
"book_learn": [ [ "textbook_gaswarfare", 2 ], [ "textbook_chemistry", 3 ], [ "adv_chemistry", 3 ], [ "textbook_anarch", 3 ] ],
"components": [ [ [ "red_phosphorous", 3 ] ] ]
},
{
"type": "recipe",
"activity_level": "LIGHT_EXERCISE",
Expand Down
3 changes: 2 additions & 1 deletion data/json/requirements/explosives.json
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@
[
[ "chem_black_powder", 90 ],
[ "gunpowder", 90 ],
[ "red_phosphorous", 100 ],
[ "red_phosphorous_small", 100 ],
[ "red_phosphorous", 1 ],
[ "gunpowder_pistol", 90 ],
[ "gunpowder_shotgun", 90 ],
[ "gunpowder_magnum_pistol", 80 ],
Expand Down
Loading