From 08753e2e1a88813f133e1cb411a27d1d7e4e85c6 Mon Sep 17 00:00:00 2001
From: jc_gargma <jc_gargma@iserlohn-fortress.net>
Date: Tue, 14 Mar 2023 22:54:38 -0700
Subject: Port to DDA.

---
 json/recipes/12mm.json |  1 +
 json/recipes/46.json   | 12 ++++++++++--
 json/recipes/473.json  |  6 +++++-
 json/recipes/shot.json | 12 +++++++-----
 4 files changed, 23 insertions(+), 8 deletions(-)

(limited to 'json/recipes')

diff --git a/json/recipes/12mm.json b/json/recipes/12mm.json
index 5b30034..0d1338e 100644
--- a/json/recipes/12mm.json
+++ b/json/recipes/12mm.json
@@ -1,6 +1,7 @@
 [
  {
     "type": "recipe",
+    "activity_level": "MODERATE_EXERCISE",
     "result": "bootleg_12mm",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_OTHER",
diff --git a/json/recipes/46.json b/json/recipes/46.json
index 14f8d80..ba00c8f 100644
--- a/json/recipes/46.json
+++ b/json/recipes/46.json
@@ -2,6 +2,7 @@
   { 
     "result": "reloaded_46mm_fmj",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_PISTOL",
     "skill_used": "fabrication",
@@ -13,16 +14,18 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "46mm_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
-      [ [ "gunpowder", 5 ] ],
+      [ [ "gunpowder", 5 ], [ "gunpowder_pistol", 5 ] ],
       [ [ "copper", 1 ] ]
     ]
   },
   { 
     "result": "bp_46mm_fmj",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_PISTOL",
     "skill_used": "fabrication",
@@ -34,6 +37,7 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "46mm_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
@@ -44,6 +48,7 @@
   { 
     "result": "reloaded_46mm_shp",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_PISTOL",
     "skill_used": "fabrication",
@@ -55,16 +60,18 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "46mm_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
-      [ [ "gunpowder", 4 ] ],
+      [ [ "gunpowder", 4 ], [ "gunpowder_pistol", 4 ] ],
       [ [ "copper", 1 ] ]
     ]
   },
   { 
     "result": "bp_46mm_shp",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_PISTOL",
     "skill_used": "fabrication",
@@ -76,6 +83,7 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "bullet_forming", 2 ], [ "ammo_bullet", 2 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
       [ [ "46mm_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
diff --git a/json/recipes/473.json b/json/recipes/473.json
index 19c764f..4ae0eb7 100644
--- a/json/recipes/473.json
+++ b/json/recipes/473.json
@@ -1,6 +1,7 @@
 [
  { 
     "result": "bootleg_473x33mm",
+    "activity_level": "LIGHT_EXERCISE",
     "type": "recipe",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_RIFLE",
@@ -13,16 +14,18 @@
     "charges": 1,
     "reversible": false,
     "using": [ [ "bullet_forming", 10 ], [ "ammo_bullet", 8 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
     "components": [
       [ [ "473mm_mold", 1 ] ],
       [ [ "smrifle_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ],
+      [ [ "gunpowder", 17 ], [ "gunpowder_magnum_pistol", 17 ], [ "gunpowder_rifle", 17 ] ],
       [ [ "copper", 1 ] ]
     ]
   },
   {
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "result": "473mm_mold",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_COMPONENTS",
@@ -34,6 +37,7 @@
     "book_learn": [ [ "recipe_caseless", 5 ]  ],
     "reversible": false,
     "using": [ [ "surface_heat", 10 ] ],
+    "proficiencies": [ { "proficiency": "prof_plasticworking", "required": false, "time_multiplier": 1.5 } ],
     "tools": [ [ [ "mold_plastic", -1 ] ] ],
     "components": [ [ [ "plastic_chunk", 1 ] ] ]
   }
diff --git a/json/recipes/shot.json b/json/recipes/shot.json
index 5a70410..a03a74f 100644
--- a/json/recipes/shot.json
+++ b/json/recipes/shot.json
@@ -2,6 +2,7 @@
   {
     "result": "reloaded_shot_000",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
@@ -13,13 +14,13 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 12 ], [ "ammo_shot", 1 ] ],
-    "components": [
-      [ [ "gunpowder", 6 ] ]
-    ]
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
+    "components": [ [ [ "gunpowder", 12 ], [ "gunpowder_pistol", 12 ], [ "gunpowder_shotgun", 12 ] ] ]
   },
   {
     "result": "reloaded_shot_000_inc",
     "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
     "category": "CC_AMMO",
     "subcategory": "CSC_AMMO_SHOT",
     "skill_used": "fabrication",
@@ -31,9 +32,10 @@
     "charges": 1,
     "reversible": true,
     "using": [ [ "shot_forming", 1 ], [ "ammo_bullet", 12 ], [ "ammo_shot", 1 ] ],
+    "proficiencies": [ { "proficiency": "prof_handloading" } ],
     "components": [
-      [ [ "gunpowder", 5 ] ],
-      [ [ "incendiary", 5 ] ]
+      [ [ "gunpowder", 10 ], [ "gunpowder_pistol", 10 ], [ "gunpowder_shotgun", 10 ] ],
+      [ [ "incendiary", 10 ] ]
     ]
   }
 ]
-- 
cgit v1.2.1