diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 946218071ac64..b12fa6ed072e4 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -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", @@ -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", diff --git a/data/json/recipes/ammo/pistol.json b/data/json/recipes/ammo/pistol.json index 5b1ddda248126..50562ba03ebd7 100644 --- a/data/json/recipes/ammo/pistol.json +++ b/data/json/recipes/ammo/pistol.json @@ -1593,7 +1593,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_9mmfmj", @@ -1611,7 +1611,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_9mm", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_40fmj", @@ -1629,7 +1629,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_40sw", @@ -1647,7 +1647,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 6 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "40_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous_small", 6 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_32_acp", @@ -1665,7 +1665,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_32", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 2 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 2 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_32_acp_jhp", @@ -1683,7 +1683,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_32", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 2 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 2 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_38_fmj", @@ -1701,7 +1701,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38spc", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_38_special", @@ -1719,7 +1719,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38spc", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ] ] }, { "result": "matchhead_38_super_fmj", @@ -1737,7 +1737,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38super", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 4 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_38_super", @@ -1755,7 +1755,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_38super", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 4 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_45_acp", @@ -1773,7 +1773,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous", 3 ] ], [ [ "copper", 2 ] ] ] + "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 2 ] ] ] }, { "result": "matchhead_45_jhp", @@ -1791,7 +1791,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 4 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous", 5 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "45_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous_small", 5 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_762_25", @@ -1809,7 +1809,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_762_25", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 4 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_9x18mm", @@ -1827,7 +1827,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous_small", 4 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_9x18mmfmj", @@ -1845,7 +1845,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "9x18mm_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ], [ [ "red_phosphorous_small", 4 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_380_JHP", @@ -1863,7 +1863,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_380_FMJ", @@ -1881,7 +1881,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ], [ "ammo_380", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_357sig_fmj", @@ -1899,7 +1899,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 7 ], [ "ammo_357sig", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 4 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 4 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_357sig_jhp", @@ -1917,7 +1917,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 8 ], [ "ammo_357sig", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 5 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_357mag_fmj", @@ -1935,7 +1935,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_357mag", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 5 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_357mag_jhp", @@ -1953,7 +1953,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 4 ], [ "ammo_357mag", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 5 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_10mm_fmj", @@ -1971,7 +1971,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_10mm", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_10mm_jhp", @@ -1989,7 +1989,7 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 3 ], [ "ammo_10mm", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_45colt_fmj", @@ -2007,7 +2007,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 5 ], [ "ammo_45colt", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 2 ] ] ] + "components": [ [ [ "red_phosphorous_small", 5 ] ], [ [ "copper", 2 ] ] ] }, { "result": "matchhead_45colt_cowboy", @@ -2025,7 +2025,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 5 ], [ "ammo_45colt", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 3 ] ] ] + "components": [ [ [ "red_phosphorous_small", 3 ] ] ] }, { "result": "matchhead_45colt_jhp", @@ -2043,7 +2043,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 5 ], [ "ammo_45colt", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 5 ] ], [ [ "copper", 2 ] ] ] + "components": [ [ [ "red_phosphorous_small", 5 ] ], [ [ "copper", 2 ] ] ] }, { "result": "matchhead_50ae_jhp", @@ -2061,7 +2061,7 @@ "reversible": true, "using": [ [ "bullet_forming", 6 ], [ "ammo_bullet", 8 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "50ae_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous", 16 ] ], [ [ "copper", 5 ] ] ] + "components": [ [ [ "50ae_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous_small", 16 ] ], [ [ "copper", 5 ] ] ] }, { "result": "matchhead_50ae_fmj", @@ -2079,6 +2079,6 @@ "reversible": true, "using": [ [ "bullet_forming", 6 ], [ "ammo_bullet", 8 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "50ae_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous", 16 ] ], [ [ "copper", 6 ] ] ] + "components": [ [ [ "50ae_casing", 1 ] ], [ [ "lgpistol_primer", 1 ] ], [ [ "red_phosphorous_small", 16 ] ], [ [ "copper", 6 ] ] ] } ] diff --git a/data/json/recipes/ammo/rifle.json b/data/json/recipes/ammo/rifle.json index a0551a623779f..a5da1a57fd8f7 100644 --- a/data/json/recipes/ammo/rifle.json +++ b/data/json/recipes/ammo/rifle.json @@ -1534,7 +1534,7 @@ "reversible": true, "using": [ [ "bullet_forming", 20 ], [ "ammo_bullet", 1 ], [ "ammo_30carbine", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 10 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 10 ] ], [ [ "copper", 1 ] ] ] }, { "result": "reloaded_30carbine_jsp", @@ -1589,7 +1589,7 @@ "reversible": true, "using": [ [ "bullet_forming", 20 ], [ "ammo_bullet", 1 ], [ "ammo_30carbine", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "red_phosphorous", 10 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "red_phosphorous_small", 10 ] ], [ [ "copper", 1 ] ] ] }, { "result": "reloaded_123ln", @@ -1987,7 +1987,7 @@ "reversible": true, "using": [ [ "bullet_forming", 3 ], [ "ammo_bullet", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "22_casing_new", 1 ] ], [ [ "red_phosphorous", 1 ] ], [ [ "copper", 1 ] ] ] + "components": [ [ [ "22_casing_new", 1 ] ], [ [ "red_phosphorous_small", 1 ] ], [ [ "copper", 1 ] ] ] }, { "result": "matchhead_22_lr", @@ -2005,6 +2005,6 @@ "reversible": true, "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 1 ] ], "proficiencies": [ { "proficiency": "prof_handloading" } ], - "components": [ [ [ "22_casing_new", 1 ] ], [ [ "red_phosphorous", 1 ] ] ] + "components": [ [ [ "22_casing_new", 1 ] ], [ [ "red_phosphorous_small", 1 ] ] ] } ] diff --git a/data/json/recipes/chem/drugs.json b/data/json/recipes/chem/drugs.json index b6033067e9556..2c91eb4decd72 100644 --- a/data/json/recipes/chem/drugs.json +++ b/data/json/recipes/chem/drugs.json @@ -77,7 +77,7 @@ "components": [ [ [ "dayquil", 15 ] ], [ [ "iodine_crystal", 15 ] ], - [ [ "red_phosphorous", 270 ] ], + [ [ "red_phosphorous", 3 ], [ "red_phosphorous_small", 270 ] ], [ [ "chem_acetone", 1 ] ], [ [ "chem_methanol", 3 ] ], [ [ "lye_powder", 5 ], [ "chem_potassium_hydroxide", 25 ], [ "lye", 1 ], [ "lye_potassium", 1 ] ] diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index b263af4ed6e5e..4b86ec7b6d1a5 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -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", @@ -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": [ ], + "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", @@ -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", diff --git a/data/json/requirements/explosives.json b/data/json/requirements/explosives.json index 6b426cbfc1058..3f5254e7c1384 100644 --- a/data/json/requirements/explosives.json +++ b/data/json/requirements/explosives.json @@ -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 ],