From 22b1bb8b86045d14a6faff74921171f3eb498f80 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Mon, 31 Jan 2022 20:39:51 -0800
Subject: Port to DDA.

---
 json/recipes/weapons/ammo/rivtech.json | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

(limited to 'json/recipes/weapons/ammo')

diff --git a/json/recipes/weapons/ammo/rivtech.json b/json/recipes/weapons/ammo/rivtech.json
index 70b748d..d939598 100644
--- a/json/recipes/weapons/ammo/rivtech.json
+++ b/json/recipes/weapons/ammo/rivtech.json
@@ -2,6 +2,7 @@
  { 
     "result": "8mm_bootleg_jhp",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "skill_used": "fabrication",
@@ -16,13 +17,14 @@
     "components": [
       [ [ "8mm_mold", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ],
-      [ [ "gunpowder", 7 ] ],
+      [ [ "gunpowder", 25 ], [ "gunpowder_rifle", 25 ], [ "gunpowder_magnum_pistol", 25 ] ],
       [ [ "copper", 3 ] ]
     ]
   },
  { 
     "result": "8mm_bootleg_caseless",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "skill_used": "fabrication",
@@ -37,13 +39,14 @@
     "components": [
       [ [ "8mm_mold", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ],
-      [ [ "gunpowder", 7 ] ],
+      [ [ "gunpowder", 25 ], [ "gunpowder_rifle", 25 ], [ "gunpowder_magnum_pistol", 25 ] ],
       [ [ "copper", 4 ] ]
     ]
   },
  { 
     "result": "8mm_bootleg_fmj",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "skill_used": "fabrication",
@@ -58,13 +61,14 @@
     "components": [
       [ [ "8mm_mold", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ],
-      [ [ "gunpowder", 7 ] ],
+      [ [ "gunpowder", 25 ], [ "gunpowder_rifle", 25 ], [ "gunpowder_magnum_pistol", 25 ] ],
       [ [ "copper", 5 ] ]
     ]
   },
  { 
     "result": "8mm_bootleg_inc",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
     "skill_used": "fabrication",
@@ -79,7 +83,7 @@
     "components": [
       [ [ "8mm_mold", 1 ] ],
       [ [ "lgrifle_primer", 1 ] ],
-      [ [ "gunpowder", 7 ] ],
+      [ [ "gunpowder", 25 ], [ "gunpowder_rifle", 25 ], [ "gunpowder_magnum_pistol", 25 ] ],
       [ [ "copper", 4 ] ],
       [ [ "incendiary", 2 ] ]
     ]
@@ -87,6 +91,7 @@
   { 
     "result": "20x66_bootleg_shot",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
@@ -101,12 +106,13 @@
     "components": [
       [ [ "20x66_mold", 1 ] ],
       [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ]
+      [ [ "gunpowder", 20 ], [ "gunpowder_pistol", 20 ], [ "gunpowder_shotgun", 20 ] ]
     ]
   },
   { 
     "result": "20x66_bootleg_slug",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
@@ -121,12 +127,13 @@
     "components": [
       [ [ "20x66_mold", 1 ] ],
       [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ]
+      [ [ "gunpowder", 20 ], [ "gunpowder_pistol", 20 ], [ "gunpowder_shotgun", 20 ] ]
     ]
   },
   { 
     "result": "20x66_bootleg_flechette",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
@@ -142,12 +149,13 @@
       [ [ "combatnail", 10 ] ],
       [ [ "20x66_mold", 1 ] ],
       [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ]
+      [ [ "gunpowder", 20 ], [ "gunpowder_pistol", 20 ], [ "gunpowder_shotgun", 20 ] ]
     ]
   },
   { 
     "result": "20x66_bootleg_inc",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
@@ -162,13 +170,14 @@
     "components": [
       [ [ "20x66_mold", 1 ] ],
       [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ],
+      [ [ "gunpowder", 20 ], [ "gunpowder_pistol", 20 ], [ "gunpowder_shotgun", 20 ] ],
       [ [ "incendiary", 2 ] ]
     ]
   },
   { 
     "result": "20x66_bootleg_flare",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
@@ -187,8 +196,9 @@
     ]
   },
   {
-    "type": "recipe",
     "result": "8mm_mold",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_COMPONENTS",
     "skill_used": "fabrication",
@@ -202,8 +212,9 @@
     "components": [ [ [ "plastic_chunk", 1 ] ] ]
   },
   {
-    "type": "recipe",
     "result": "20x66_mold",
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_COMPONENTS",
     "skill_used": "fabrication",
-- 
cgit v1.2.1