summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjc_gargma <jc_gargma@iserlohn-fortress.net>2021-06-03 12:55:35 -0700
committerjc_gargma <jc_gargma@iserlohn-fortress.net>2021-06-03 12:55:35 -0700
commit58a3390c905f3b4015f1dbb9225252139b34705d (patch)
treea3479f10564dabe9b08c51566caedc4c0d738303
parentTweak flashbang recipe in line with other military grenades (diff)
downloadcataclysm-dda-mod_grenade-crafting-58a3390c905f3b4015f1dbb9225252139b34705d.tar.xz
Convert recipes from rdx to composition_b
Add recipe for making composition_b
-rw-r--r--json/recipes/ammo/40x46.json2
-rw-r--r--json/recipes/recipe_medsandchemicals.json19
-rw-r--r--json/recipes/weapons/explosive.json4
-rw-r--r--readme6
4 files changed, 27 insertions, 4 deletions
diff --git a/json/recipes/ammo/40x46.json b/json/recipes/ammo/40x46.json
index 735891a..8837e2a 100644
--- a/json/recipes/ammo/40x46.json
+++ b/json/recipes/ammo/40x46.json
@@ -16,7 +16,7 @@
"components": [
[ [ "pilot_light", 1 ] ],
[ [ "sheet_metal_small", 6 ] ],
- [ [ "chem_rdx", 200 ] ],
+ [ [ "chem_compositionb", 200 ] ],
[ [ "40x46mm_m118_casing", 1 ] ],
[ [ "smpistol_primer", 1 ] ]
]
diff --git a/json/recipes/recipe_medsandchemicals.json b/json/recipes/recipe_medsandchemicals.json
new file mode 100644
index 0000000..cdb2119
--- /dev/null
+++ b/json/recipes/recipe_medsandchemicals.json
@@ -0,0 +1,19 @@
+[
+{
+ "type": "recipe",
+ "result": "chem_compositionb",
+ "category": "CC_CHEM",
+ "subcategory": "CSC_CHEM_CHEMICALS",
+ "skill_used": "cooking",
+ "difficulty": 8,
+ "time": "45 m",
+ "book_learn": [ [ "recipe_labchem", 8 ], [ "textbook_anarch", 10 ] ],
+ "qualities": [ { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 3 } ],
+ "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ],
+ "components": [
+ [ [ "chem_rdx", 400 ] ],
+ [ [ "dynamite", 1 ] ],
+ [ [ "chem_sulphuric_acid", 2 ] ]
+ ]
+ }
+]
diff --git a/json/recipes/weapons/explosive.json b/json/recipes/weapons/explosive.json
index 8fa27b9..6c86e8c 100644
--- a/json/recipes/weapons/explosive.json
+++ b/json/recipes/weapons/explosive.json
@@ -126,7 +126,7 @@
"components": [
[ [ "pilot_light", 1 ] ],
[ [ "sheet_metal_small", 6 ] ],
- [ [ "chem_rdx", 200 ] ],
+ [ [ "chem_compositionb", 200 ] ],
[ [ "canister_empty", 1 ] ]
]
},
@@ -182,7 +182,7 @@
"tools": [ [ [ "mold_plastic", -1 ] ], [ [ "hotplate", 50 ], [ "toolset", 50 ] ] ],
"components": [
[ [ "pilot_light", 1 ] ],
- [ [ "chem_rdx", 1500 ] ],
+ [ [ "chem_compositionb", 1500 ] ],
[ [ "plastic_chunk", 1 ] ],
[ [ "lamp_oil", 100 ], [ "motor_oil", 100 ] ]
]
diff --git a/readme b/readme
index 73bb809..8a4427d 100644
--- a/readme
+++ b/readme
@@ -15,7 +15,11 @@ Rename grenade to fragmentation grenade
Rename flashbang to flashbang grenade
Rename smoke bomb to smoke grenade
-Fix thw wildly inconsistent use of grenade, canister, armed, active, lit amongst explosives.
+Fix the wildly inconsistent use of grenade, canister, armed, active, lit amongst explosives.
-$GRENADE (lit) for those using matches
-$GRENADE (active) for those using pins
-$EXPLOSIVE (armed) for those on a manual timer
+
+
+Todo-
+Clean up smaoke grenade recipe