diff options
| author | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-10-03 20:37:55 -0700 |
|---|---|---|
| committer | jc_gargma <jc_gargma@iserlohn-fortress.net> | 2021-10-03 20:37:55 -0700 |
| commit | c3474b80d9d0c1a550779fbdab593e1bf1b39840 (patch) | |
| tree | 381c5a847e5b407c02a43cb73b1214af18c0bad1 | |
| parent | Clean up folders based on BN 2021-09-20-1725 (diff) | |
| download | cataclysm-dda-mod_recipe-fixes-c3474b80d9d0c1a550779fbdab593e1bf1b39840.tar.xz | |
Updated for removal of specialized gunpowders from BN
| -rw-r--r-- | Readme.txt | 10 | ||||
| -rw-r--r-- | json/recipes/ammo/40x46mm.json | 12 | ||||
| -rw-r--r-- | json/recipes/ammo/40x53mm.json | 6 | ||||
| -rw-r--r-- | json/recipes/ammo/rifle.json | 21 |
4 files changed, 11 insertions, 38 deletions
@@ -61,12 +61,6 @@ This was just silly. -- -300blk ammunition can now be crafted with magnum and rifle powder. - -Comparable .223, 5.56mm, and 762x39mm could use these. - --- - Peanut Butter can now be preserved. -- @@ -113,12 +107,12 @@ The base one could. --- 40x46mm reloaded: -Can now use mixed gunpowder in addition to shotgun powder. +Use shot_forming instead of bulltet_forming. Use small pistol primer instead of large pistol primer. --- 40x53mm reloaded: -Can now use mixed gunpowder in addition to shotgun powder. +Use shot_forming instead of bulltet_forming. --- Light Turret: diff --git a/json/recipes/ammo/40x46mm.json b/json/recipes/ammo/40x46mm.json index 705d5fc..35c33d7 100644 --- a/json/recipes/ammo/40x46mm.json +++ b/json/recipes/ammo/40x46mm.json @@ -18,7 +18,7 @@ "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], + [ [ "gunpowder", 30 ] ], [ [ "40x46mm_m118_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] @@ -42,7 +42,7 @@ "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], + [ [ "gunpowder", 30 ] ], [ [ "40x46mm_m199_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] @@ -66,7 +66,7 @@ "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], + [ [ "gunpowder", 30 ] ], [ [ "40x46mm_m118_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] @@ -90,7 +90,7 @@ "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], + [ [ "gunpowder", 30 ] ], [ [ "40x46mm_m199_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] @@ -115,7 +115,7 @@ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], [ [ "combatnail", 70 ] ], - [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], + [ [ "gunpowder", 30 ] ], [ [ "40x46mm_m118_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] @@ -140,7 +140,7 @@ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], [ [ "combatnail", 70 ] ], - [ [ "gunpowder_shotgun", 30 ], [ "gunpowder", 30 ] ], + [ [ "gunpowder", 30 ] ], [ [ "40x46mm_m199_casing", 1 ] ], [ [ "smpistol_primer", 1 ] ] ] diff --git a/json/recipes/ammo/40x53mm.json b/json/recipes/ammo/40x53mm.json index c68ed06..0827c20 100644 --- a/json/recipes/ammo/40x53mm.json +++ b/json/recipes/ammo/40x53mm.json @@ -18,7 +18,7 @@ "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ], + [ [ "gunpowder", 35 ] ], [ [ "40x53mm_m169_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ] @@ -42,7 +42,7 @@ "components": [ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], - [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ], + [ [ "gunpowder", 35 ] ], [ [ "40x53mm_m169_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ] @@ -67,7 +67,7 @@ [ [ "sheet_metal_small", 1 ] ], [ [ "paper", 1 ], [ "wax", 1 ] ], [ [ "combatnail", 100 ] ], - [ [ "gunpowder_shotgun", 35 ], [ "gunpowder", 35 ] ], + [ [ "gunpowder", 35 ] ], [ [ "40x53mm_m169_casing", 1 ] ], [ [ "lgrifle_primer", 1 ] ] ] diff --git a/json/recipes/ammo/rifle.json b/json/recipes/ammo/rifle.json deleted file mode 100644 index 795fd22..0000000 --- a/json/recipes/ammo/rifle.json +++ /dev/null @@ -1,21 +0,0 @@ -[ - { - "result": "reloaded_300blk", - "type": "recipe", - "category": "CC_AMMO", - "subcategory": "CSC_AMMO_RIFLE", - "skill_used": "fabrication", - "difficulty": 5, - "skills_required": [ "gun", 5 ], - "time": "2 m", - "batch_time_factors": [ 60, 5 ], - "book_learn": [ [ "recipe_bullets", 3 ], [ "mag_rifle", 4 ] ], - "charges": 1, - "reversible": true, - "using": [ [ "bullet_forming", 4 ], [ "ammo_bullet", 5 ], [ "ammo_300blk", 1 ] ], - "components": [ - [ [ "gunpowder", 4 ], [ "gunpowder_magnum_pistol", 4 ], [ "gunpowder_rifle", 4 ] ], - [ [ "copper", 2 ] ] - ] - } -] |