Port to DDA.HEADmaster

4 files changed, 33 insertions, 26 deletions

diff --git a/json/items/ammo/20x66mm.json b/json/items/ammo/20x66mm.json
index 136f1b2..803e5bd 100644
--- a/json/items/ammo/20x66mm.json
+++ b/json/items/ammo/20x66mm.json
@@ -7,7 +7,7 @@
     "description": "20x66mm caseless shotgun rounds, solid projectile type. Proprietary ammunition for Rivtech shotguns. Being caseless rounds, these cannot be disassembled or reloaded.",
     "price": 1500,
     "price_postapoc": 9000,
-    "relative": { "range": 12, "pierce": 8 },
+    "relative": { "range": 12, "armor_penetration": 8 },
     "proportional": { "recoil": 1.4, "dispersion": 1.3 },
     "delete": { "effects": [ "SHOT" ] }
   },
@@ -17,7 +17,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm buckshot, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless buckshot rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -27,7 +27,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm slug, handmade"  },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless solid projectile rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -37,7 +37,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm flechette, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flechette rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -47,7 +47,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm incendiary, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless incendiary rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -57,7 +57,7 @@
     "type": "AMMO",
     "name": { "str": "20x66mm flare, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 20x66mm caseless flare rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }
diff --git a/json/items/ammo/8x40mm.json b/json/items/ammo/8x40mm.json
index 6edffa2..94b0e14 100644
--- a/json/items/ammo/8x40mm.json
+++ b/json/items/ammo/8x40mm.json
@@ -5,7 +5,7 @@
     "type": "AMMO",
     "name": { "str": "8x40mm JHP, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm JHP caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -15,7 +15,7 @@
     "type": "AMMO",
     "name": { "str": "8x40mm caseless, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm standard caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -25,7 +25,7 @@
     "type": "AMMO",
     "name": { "str": "8x40mm FMJ, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm FMJ caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   },
@@ -35,7 +35,7 @@
     "type": "AMMO",
     "name": { "str": "8x40mm tracer, handmade" },
     "description": "Handcrafted bootleg duplicates of Rivtech 8x40mm tracer caseless rounds. Produced without access to proper ammunition casting machinery, these knockoffs are of lower quality than stock rounds. Being caseless rounds, these cannot be disassembled or reloaded.",
-    "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1 },
+    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
     "extend": { "effects": [ "RECYCLED" ] },
     "delete": { "effects": [ "NEVER_MISFIRES" ] }
   }
diff --git a/json/items/generic/casing.json b/json/items/generic/casing.json
index 84c227e..60c7945 100644
--- a/json/items/generic/casing.json
+++ b/json/items/generic/casing.json
@@ -8,9 +8,7 @@
     "description": "A mold for casting a 8x40mm rifle round. This mold is fragile and will not last beyond a single casting.",
     "material": "plastic",
     "weight": "2 g",
-    "volume": "10ml",
-    "charges": 25,
-    "stack_size": 25
+    "volume": "10ml"
   },
   { 
     "id": "20x66_mold",
@@ -21,8 +19,6 @@
     "description": "A mold for casting a 20x66mm shotgun round. This mold is fragile and will not last beyond a single casting.",
     "material": "plastic",
     "weight": "2 g",
-    "volume": "10ml",
-    "charges": 25,
-    "stack_size": 25
+    "volume": "10ml"
   }
 ]
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",