Skip to content

Commit

Permalink
Allow crafting with biodiesel (#37127)
Browse files Browse the repository at this point in the history
  • Loading branch information
azraneth authored and kevingranade committed Jan 17, 2020
1 parent e750871 commit 5c93d6f
Show file tree
Hide file tree
Showing 8 changed files with 17 additions and 8 deletions.
3 changes: 2 additions & 1 deletion data/json/recipes/other/tool.json
Original file line number Diff line number Diff line change
Expand Up @@ -535,7 +535,8 @@
[ "chem_ethanol", 100 ],
[ "denat_alcohol", 100 ],
[ "gasoline", 250 ],
[ "diesel", 250 ]
[ "diesel", 250 ],
[ "biodiesel", 250 ]
]
],
"flags": [ "BLIND_HARD" ]
Expand Down
7 changes: 4 additions & 3 deletions data/json/recipes/recipe_ammo.json
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,8 @@
[ "chem_ethanol", 100, "NO_RECOVER" ],
[ "denat_alcohol", 100, "NO_RECOVER" ],
[ "gasoline", 250, "NO_RECOVER" ],
[ "diesel", 250, "NO_RECOVER" ]
[ "diesel", 250, "NO_RECOVER" ],
[ "biodiesel", 250, "NO_RECOVER" ]
]
]
},
Expand Down Expand Up @@ -747,7 +748,7 @@
],
"tools": [ [ [ "surface_heat", 25, "LIST" ] ] ],
"components": [
[ [ "gasoline", 125 ], [ "diesel", 125 ] ],
[ [ "gasoline", 125 ], [ "diesel", 125 ], [ "biodiesel", 125 ] ],
[ [ "plastic_chunk", 4 ] ],
[ [ "bleach", 2 ] ],
[ [ "oxy_powder", 15 ] ],
Expand Down Expand Up @@ -782,7 +783,7 @@
[ "textbook_anarch", 2, "Stuff THE MAN doesn't want you to know" ],
[ "manual_launcher", 2 ]
],
"components": [ [ [ "gasoline", 125 ] ], [ [ "diesel", 125 ] ] ]
"components": [ [ [ "gasoline", 125 ] ], [ [ "diesel", 125 ], [ "biodiesel", 125 ] ] ]
},
{
"type": "recipe",
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/recipe_medsandchemicals.json
Original file line number Diff line number Diff line change
Expand Up @@ -1035,7 +1035,7 @@
"time": "3 h",
"book_learn": [ [ "textbook_anarch", 6 ], [ "recipe_labchem", 5 ], [ "textbook_chemistry", 7 ] ],
"qualities": [ { "id": "CONTAIN", "level": 1 } ],
"components": [ [ [ "chem_ammonium_nitrate", 90 ] ], [ [ "diesel", 500 ], [ "gasoline", 500 ] ] ]
"components": [ [ [ "chem_ammonium_nitrate", 90 ] ], [ [ "diesel", 500 ], [ "biodiesel", 500 ], [ "gasoline", 500 ] ] ]
},
{
"type": "recipe",
Expand Down
1 change: 1 addition & 0 deletions data/json/recipes/recipe_others.json
Original file line number Diff line number Diff line change
Expand Up @@ -1608,6 +1608,7 @@
[ "shot_he", 3 ],
[ "gasoline", 600 ],
[ "diesel", 600 ],
[ "biodiesel", 600 ],
[ "grenade", 1 ]
]
]
Expand Down
3 changes: 2 additions & 1 deletion data/json/recipes/weapon/bashing.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
[ "chem_ethanol", 100 ],
[ "denat_alcohol", 100 ],
[ "gasoline", 250 ],
[ "diesel", 250 ]
[ "diesel", 250 ],
[ "biodiesel", 250 ]
]
]
},
Expand Down
3 changes: 2 additions & 1 deletion data/json/recipes/weapon/explosive.json
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,7 @@
"components": [
[ [ "jug_plastic", 1 ], [ "jar_3l_glass", 1 ] ],
[ [ "fertilizer_liquid", 4 ], [ "fertilizer_commercial", 4 ] ],
[ [ "gasoline", 400 ], [ "diesel", 400 ], [ "sugar", 100 ] ],
[ [ "gasoline", 400 ], [ "diesel", 400 ], [ "biodiesel", 400 ], [ "sugar", 100 ] ],
[ [ "string_6", 1 ], [ "rag", 1 ] ]
]
},
Expand Down Expand Up @@ -227,6 +227,7 @@
[
[ "gasoline", 500 ],
[ "diesel", 500 ],
[ "biodiesel", 500 ],
[ "chem_ethanol", 500 ],
[ "chem_methanol", 500 ],
[ "ether", 500 ],
Expand Down
4 changes: 4 additions & 0 deletions data/mods/blazemod/blaze_ammo_recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
[ "gunpowder", 216 ],
[ "gasoline", 600 ],
[ "diesel", 600 ],
[ "biodiesel", 600 ],
[ "chem_rdx", 1 ],
[ "chem_hmtd", 2 ],
[ "chem_anfo", 5 ]
Expand Down Expand Up @@ -78,6 +79,7 @@
[ "lamp_oil", 150 ],
[ "gasoline", 200 ],
[ "diesel", 200 ],
[ "biodiesel", 200 ],
[ "napalm", 100 ]
],
[
Expand Down Expand Up @@ -109,6 +111,7 @@
[ "lamp_oil", 600 ],
[ "gasoline", 1000 ],
[ "diesel", 1000 ],
[ "biodiesel", 1000 ],
[ "napalm", 400 ]
],
[
Expand Down Expand Up @@ -137,6 +140,7 @@
[ "gunpowder", 72 ],
[ "gasoline", 200 ],
[ "diesel", 200 ],
[ "biodiesel", 200 ],
[ "chem_rdx", 1 ],
[ "chem_hmtd", 2 ],
[ "chem_anfo", 5 ]
Expand Down
2 changes: 1 addition & 1 deletion data/mods/blazemod/blaze_blob_recipes.json
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@
[ [ "clutter", 1 ] ],
[ [ "bfeed", 250 ] ],
[ [ "stomach", 8 ], [ "stomach_large", 4 ], [ "hstomach", 8 ], [ "hstomach_large", 4 ], [ "plant_sac", 2 ] ],
[ [ "gasoline", 500 ], [ "diesel", 500 ] ],
[ [ "gasoline", 500 ], [ "diesel", 500 ], [ "biodiesel", 500 ] ],
[ [ "mutagen", 1 ] ]
]
},
Expand Down

0 comments on commit 5c93d6f

Please sign in to comment.