diff --git a/data/json/recipes/weapon/explosive.json b/data/json/recipes/weapon/explosive.json index 7f16be27fc4fb..b0c40007e1fd2 100644 --- a/data/json/recipes/weapon/explosive.json +++ b/data/json/recipes/weapon/explosive.json @@ -209,21 +209,8 @@ "time": "30 s", "reversible": true, "autolearn": true, - "components": [ - [ [ "rag", 1 ] ], - [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "clay_canister", 1 ] ], - [ - [ "gasoline", 500 ], - [ "diesel", 500 ], - [ "biodiesel", 500 ], - [ "chem_ethanol", 500 ], - [ "chem_methanol", 500 ], - [ "ether", 500 ], - [ "denat_alcohol", 500 ], - [ "lamp_oil", 500 ], - [ "motor_oil", 500 ] - ] - ] + "using": [ [ "flammable_liquid", 500 ] ], + "components": [ [ [ "rag", 1 ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "clay_canister", 1 ] ] ] }, { "result": "nail_bomb", diff --git a/data/json/requirements/explosives.json b/data/json/requirements/explosives.json index be7cadcc72434..d0a0dc0f6929b 100644 --- a/data/json/requirements/explosives.json +++ b/data/json/requirements/explosives.json @@ -1,4 +1,45 @@ [ + { + "id": "flammable_liquid", + "type": "requirement", + "//": "This should contain all flammable liquids useful for things like molotovs, 1 mL.", + "components": [ + [ + [ "gasoline", 1 ], + [ "diesel", 1 ], + [ "biodiesel", 1 ], + [ "chem_ethanol", 1 ], + [ "chem_methanol", 1 ], + [ "ether", 1 ], + [ "denat_alcohol", 1 ], + [ "lamp_oil", 1 ], + [ "motor_oil", 1 ], + [ "jp8", 1 ], + [ "avgas", 1 ] + ] + ] + }, + { + "id": "accelerant_liquid", + "type": "requirement", + "//": "This should contain all flammable liquids with a flash point below 30 degrees centigrade, 1 mL.", + "components": [ + [ + [ "gasoline", 1 ], + [ "chem_ethanol", 1 ], + [ "chem_methanol", 1 ], + [ "ether", 1 ], + [ "denat_alcohol", 1 ], + [ "avgas", 1 ] + ] + ] + }, + { + "id": "fuel_liquid", + "type": "requirement", + "//": "This should contain all flammable liquids with a flash point above 30 degrees centigrade, 1 mL.", + "components": [ [ [ "diesel", 1 ], [ "biodiesel", 1 ], [ "lamp_oil", 1 ], [ "jp8", 1 ], [ "motor_oil", 1 ] ] ] + }, { "id": "volatile_explosive", "type": "requirement",