Port to DDA.

35 files changed, 843 insertions, 352 deletions

diff --git a/json/itemgroups/Weapons_Mods_Ammo/ammo.json b/json/itemgroups/Weapons_Mods_Ammo/ammo.json
index 536fef1..5c660ea 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/ammo.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/ammo.json
@@ -11,7 +11,7 @@
   },
   {
     "type": "item_group",
-    "id": "ammo_pistol_modern_handloads",
+    "id": "ammo_pistol_reloaded",
     "//": "Reloaded pistol ammo balanced according to rarity.",
     "subtype": "distribution",
     "entries": [
@@ -21,16 +21,6 @@
   },
   {
     "type": "item_group",
-    "id": "ammo_pistol_blackpowder_handloads",
-    "//": "Blackpowder pistol ammo balanced according to rarity, additional weight for calibers that have common, manual-action firearms available in that chambering.",
-    "subtype": "distribution",
-    "entries": [
-      { "item": "bp_46mm_fmj", "prob": 20 },
-      { "item": "bp_46mm_shp", "prob": 20 }
-    ]
-  },
-  {
-    "type": "item_group",
     "id": "ammo_rifle_milspec",
     "//": "Military specification rifle ammo found at military sites.",
     "subtype": "distribution",
@@ -59,7 +49,7 @@
   },
   {
     "type": "item_group",
-    "id": "ammo_shotgun_modern_handloads",
+    "id": "ammo_shotgun_reloaded",
     "//": "Reloaded shotgun ammo balanced according to rarity.",
     "subtype": "distribution",
     "entries": [
diff --git a/json/itemgroups/Weapons_Mods_Ammo/field_drops.json b/json/itemgroups/Weapons_Mods_Ammo/field_drops.json
new file mode 100644
index 0000000..e0b2a30
--- /dev/null
+++ b/json/itemgroups/Weapons_Mods_Ammo/field_drops.json
@@ -0,0 +1,90 @@
+[
+  {
+    "id": "field_usp_40",
+    "type": "item_group",
+    "//": "this is a distribution for ammo and magazines an active combatant would have immediately on hand.  Most should be expended.",
+    "//2": "usually takes the form of 100% chance for first mag, 70% for second, 50% for third with reducing chances of them being mostly expended.",
+    "//3": "this group is for the glock 22",
+    "subtype": "collection",
+    "entries": [
+      {
+        "distribution": [ { "item": "usp40mag", "charges": 13, "prob": 50 }, { "item": "usp40mag", "charges": [ 0, 5 ], "prob": 50 } ],
+        "prob": 100
+      },
+      {
+        "distribution": [ { "item": "usp40mag", "charges": 13, "prob": 30 }, { "item": "usp40mag", "charges": [ 0, 5 ], "prob": 70 } ],
+        "prob": 70
+      },
+      {
+        "distribution": [ { "item": "usp40mag", "charges": 13, "prob": 30 }, { "item": "usp40mag", "charges": [ 0, 5 ], "prob": 70 } ],
+        "prob": 50
+      }
+    ]
+  },
+  {
+    "id": "field_hk_p30_9",
+    "type": "item_group",
+    "//": "this is a distribution for ammo and magazines an active combatant would have immediately on hand.  Most should be expended.",
+    "//2": "usually takes the form of 100% chance for first mag, 70% for second, 50% for third with reducing chances of them being mostly expended.",
+    "//3": "this group is for the glock 22",
+    "subtype": "collection",
+    "entries": [
+      {
+        "distribution": [ { "item": "p309mag", "charges": 15, "prob": 50 }, { "item": "p309mag", "charges": [ 0, 5 ], "prob": 50 } ],
+        "prob": 100
+      },
+      {
+        "distribution": [ { "item": "p309mag", "charges": 15, "prob": 30 }, { "item": "p309mag", "charges": [ 0, 5 ], "prob": 70 } ],
+        "prob": 70
+      },
+      {
+        "distribution": [ { "item": "p309mag", "charges": 15, "prob": 30 }, { "item": "p309mag", "charges": [ 0, 5 ], "prob": 70 } ],
+        "prob": 50
+      }
+    ]
+  },
+  {
+    "id": "field_hk_p30_40",
+    "type": "item_group",
+    "//": "this is a distribution for ammo and magazines an active combatant would have immediately on hand.  Most should be expended.",
+    "//2": "usually takes the form of 100% chance for first mag, 70% for second, 50% for third with reducing chances of them being mostly expended.",
+    "//3": "this group is for the glock 22",
+    "subtype": "collection",
+    "entries": [
+      {
+        "distribution": [ { "item": "p3040mag", "charges": 13, "prob": 50 }, { "item": "p3040mag", "charges": [ 0, 5 ], "prob": 50 } ],
+        "prob": 100
+      },
+      {
+        "distribution": [ { "item": "p3040mag", "charges": 13, "prob": 30 }, { "item": "p3040mag", "charges": [ 0, 5 ], "prob": 70 } ],
+        "prob": 70
+      },
+      {
+        "distribution": [ { "item": "p3040mag", "charges": 13, "prob": 30 }, { "item": "p3040mag", "charges": [ 0, 5 ], "prob": 70 } ],
+        "prob": 50
+      }
+    ]
+  },
+  {
+    "id": "field_hk_45",
+    "type": "item_group",
+    "//": "this is a distribution for ammo and magazines an active combatant would have immediately on hand.  Most should be expended.",
+    "//2": "usually takes the form of 100% chance for first mag, 70% for second, 50% for third with reducing chances of them being mostly expended.",
+    "//3": "this group is for the glock 22",
+    "subtype": "collection",
+    "entries": [
+      {
+        "distribution": [ { "item": "hk45mag", "charges": 13, "prob": 50 }, { "item": "hk45mag", "charges": [ 0, 5 ], "prob": 50 } ],
+        "prob": 100
+      },
+      {
+        "distribution": [ { "item": "hk45mag", "charges": 13, "prob": 30 }, { "item": "hk45mag", "charges": [ 0, 5 ], "prob": 70 } ],
+        "prob": 70
+      },
+      {
+        "distribution": [ { "item": "hk45mag", "charges": 13, "prob": 30 }, { "item": "hk45mag", "charges": [ 0, 5 ], "prob": 70 } ],
+        "prob": 50
+      }
+    ]
+  }
+]
diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 6336f5e..3fe8f7c 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -4,10 +4,10 @@
     "id": "guns_pistol_rare",
     "//": "Less common pistols including those only used by police/paramilitary forces.",
     "items": [
-      { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 13 },
-      { "item": "hk_p30_9", "prob": 90, "charges-min": 0, "charges-max": 15 },
-      { "item": "hk_p30_40", "prob": 90, "charges-min": 0, "charges-max": 13 },
-      { "item": "hk_45", "prob": 90, "charges-min": 0, "charges-max": 10 }
+      { "item": "nested_usp_40", "prob": 55 },
+      { "item": "nested_hk_p30_9", "prob": 50 },
+      { "item": "nested_hk_p30_40", "prob": 45 },
+      { "item": "nested_hk_45", "prob": 40 }
     ]
   },
   {
@@ -15,10 +15,10 @@
     "id": "guns_pistol_rare_display",
     "//": "Empty uncommon pistols found exclusively at gun stores.",
     "items": [
-      { "item": "usp_40", "prob": 90, "charges-min": 0, "charges-max": 0 },
-      { "item": "hk_p30_9", "prob": 90, "charges-min": 0, "charges-max": 0 },
-      { "item": "hk_p30_40", "prob": 90, "charges-min": 0, "charges-max": 0 },
-      { "item": "hk_45", "prob": 90, "charges-min": 0, "charges-max": 0 }
+      { "item": "usp_40", "prob": 25, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_p30_9", "prob": 25, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_p30_40", "prob": 15, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_45", "prob": 6, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -26,8 +26,8 @@
     "id": "guns_smg_rare",
     "//": "Less common SMGs including those only used by police/paramilitary forces.",
     "items": [
-      { "item": "hk_ump9", "prob": 30, "charges-min": 0, "charges-max": 30 },
-      { "item": "hk_ump40", "prob": 30, "charges-min": 0, "charges-max": 30 }
+      { "item": "nested_hk_ump9", "prob": 40 },
+      { "item": "nested_hk_ump40", "prob": 35 }
     ]
   },
   {
@@ -35,8 +35,8 @@
     "id": "guns_smg_rare_display",
     "//": "Less common SMGs found exclusively in gun stores.",
     "items": [
-      { "item": "hk_ump9", "prob": 30, "charges-min": 0, "charges-max": 0 },
-      { "item": "hk_ump40", "prob": 30, "charges-min": 0, "charges-max": 0 }
+      { "item": "hk_ump9", "prob": 40, "charges-min": 0, "charges-max": 0 },
+      { "item": "hk_ump40", "prob": 35, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -44,7 +44,7 @@
     "id": "guns_pistol_milspec",
     "//": "Military specification pistols only ever found at military sites.",
     "items": [
-      { "item": "hk_ucp", "prob": 35, "charges-min": 0, "charges-max": 20 }
+      { "item": "nested_hk_ucp", "prob": 35, "charges-min": 0, "charges-max": 20 }
     ]
   },
   {
@@ -52,7 +52,7 @@
     "id": "guns_rifle_rare",
     "//": "Less common rifles including those only used by police/paramilitary forces.",
     "items": [
-      { "item": "hk_psg1a1", "prob": 15, "charges-min": 0, "charges-max": 20 }
+      { "item": "nested_hk_psg1a1", "prob": 15 }
     ]
   },
   {
@@ -68,8 +68,8 @@
     "id": "guns_rifle_milspec",
     "//": "Military specification rifles only ever found at military sites.",
     "items": [
-      { "item": "hk_msg90a2", "prob": 15, "charges-min": 0, "charges-max": 20 },
-      { "item": "hk_g11", "prob": 30, "charges-min": 0, "charges-max": 50 }
+      { "item": "nested_hk_msg90a2", "prob": 15 },
+      { "item": "nested_hk_g11", "prob": 30 }
     ]
   },
   {
@@ -77,13 +77,46 @@
     "id": "guns_shotgun_milspec",
     "//": "Military shotguns currently in service.",
     "items": [
-      { "item": "hk_caws", "prob": 30, "charges-min": 0, "charges-max": 10 }
+      { "item": "nested_hk_caws", "prob": 30 }
     ]
   },
   {
     "type": "item_group",
-    "id": "guns_cop",
-    "//": "Police issue weapons of all types",
+    "id": "sidearms_cop_in_field",
+    "//": "gun plus potential expended magazines",
+    "items": [
+      {
+        "collection": [ { "item": "usp_40", "prob": 100, "charges": [ 0, 13 ] }, { "group": "field_usp_40" } ],
+        "prob": 10
+      },
+      {
+        "collection": [ { "item": "hk_p30_9", "prob": 100, "charges": [ 0, 15 ] }, { "group": "field_hk_p30_9" } ],
+        "prob": 10
+      },
+      {
+        "collection": [ { "item": "hk_p30_40", "prob": 100, "charges": [ 0, 13 ] }, { "group": "field_hk_p30_40" } ],
+        "prob": 10
+      },
+      {
+        "collection": [ { "item": "hk_45", "prob": 100, "charges": [ 0, 10 ] }, { "group": "field_hk_45" } ],
+        "prob": 10
+      }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sidearms_cop_in_field_no_gun",
+    "//": "guns lost but still have mags",
+    "items": [
+      { "item": "field_usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 },
+      { "item": "field_hk_p30_9", "prob": 10, "charges-min": 0, "charges-max": 15 },
+      { "item": "field_hk_p30_40", "prob": 10, "charges-min": 0, "charges-max": 13 },
+      { "item": "field_hk_45", "prob": 10, "charges-min": 0, "charges-max": 10 }
+    ]
+  },
+  {
+    "type": "item_group",
+    "id": "sidearms_cop",
     "items": [
       { "item": "usp_40", "prob": 10, "charges-min": 0, "charges-max": 13 },
       { "item": "hk_p30_9", "prob": 10, "charges-min": 0, "charges-max": 15 },
diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 122117f..24d0465 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -22,12 +22,12 @@
     "id": "mags_swat",
     "//": "Magazines issued to paramilitary forces in addition to standard police issue.",
     "items": [
-      [ "ump9mag", 20 ],
-      [ "ump40mag", 20 ],
-      [ "usp40mag", 10 ],
-      [ "p309mag", 10 ],
-      [ "p3040mag", 10 ],
-      [ "hk45mag", 10 ]
+      { "item": "ump9mag", "prob": 20, "charges": [ 0, 30 ] },
+      { "item": "ump40mag", "prob": 20, "charges": [ 0, 30 ] },
+      { "item": "usp40mag", "prob": 10, "charges": [ 0, 13 ] },
+      { "item": "p309mag", "prob": 10, "charges": [ 0, 15 ] },
+      { "item": "p3040mag", "prob": 10, "charges": [ 0, 13 ] },
+      { "item": "hk45mag", "prob": 10, "charges": [ 0, 10 ] }
     ]
   },
   {
diff --git a/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json b/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
new file mode 100644
index 0000000..d995c3d
--- /dev/null
+++ b/json/itemgroups/Weapons_Mods_Ammo/nested_ammo.json
@@ -0,0 +1,13 @@
+[
+  {
+    "id": "on_hand_473",
+    "type": "item_group",
+    "//": "a collection of ammo that would be found with a loaded gun.",
+    "subtype": "distribution",
+    "entries": [
+      { "item": "473", "prob": 100, "charges": [ 1, 40 ] },
+      { "item": "473", "prob": 75, "charges": [ 44, 80 ] },
+      { "item": "473", "prob": 30, "charges": [ 88, 160 ] }
+    ]
+  }
+]
diff --git a/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
new file mode 100644
index 0000000..86bce89
--- /dev/null
+++ b/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -0,0 +1,145 @@
+[
+  {
+    "id": "nested_usp_40",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "usp_40", "charges-min": 0, "charges-max": 13 },
+      { "item": "usp40mag" },
+      { "item": "usp40mag", "prob": 50 },
+      { "group": "on_hand_40" }
+    ]
+  },
+  {
+    "id": "nested_hk_p30_9",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_p30_9", "charges-min": 0, "charges-max": 15 },
+      { "item": "p309mag" },
+      { "item": "p309mag", "prob": 50 },
+      { "group": "on_hand_9mm" }
+    ]
+  },
+  {
+    "id": "nested_hk_p30_40",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_p30_40", "charges-min": 0, "charges-max": 13 },
+      { "item": "p3040mag" },
+      { "item": "p3040mag", "prob": 50 },
+      { "group": "on_hand_40" }
+    ]
+  },
+  {
+    "id": "nested_hk_45",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_p30_40", "charges-min": 0, "charges-max": 10 },
+      { "item": "hk45mag" },
+      { "item": "hk45mag", "prob": 50 },
+      { "group": "on_hand_45" }
+    ]
+  },
+  {
+    "id": "nested_hk_ump40",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_ump40", "charges-min": 0, "charges-max": 30 },
+      { "item": "ump40mag" },
+      { "item": "ump40mag", "prob": 50 },
+      { "group": "on_hand_40" }
+    ]
+  },
+  {
+    "id": "nested_hk_ump9",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_ump9", "charges-min": 0, "charges-max": 30 },
+      { "item": "ump9mag" },
+      { "item": "ump9mag", "prob": 50 },
+      { "group": "on_hand_9mm" }
+    ]
+  },
+  {
+    "id": "nested_hk_ucp",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_ucp", "charges-min": 0, "charges-max": 20 },
+      { "item": "hk46mag" },
+      { "item": "hk46mag", "prob": 50 },
+      { "group": "on_hand_46" }
+    ]
+  },
+  {
+    "id": "nested_hk_psg1a1",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_psg1a1", "charges-min": 0, "charges-max": 10 },
+      { "item": "g3smallmag" },
+      { "item": "g3smallmag", "prob": 50 },
+      { "group": "on_hand_308" }
+    ]
+  },
+  {
+    "id": "nested_hk_msg90a2",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_msg90a2", "charges-min": 0, "charges-max": 20 },
+      { "item": "g3mag" },
+      { "item": "g3mag", "prob": 50 },
+      { "group": "on_hand_308" }
+    ]
+  },
+  {
+    "id": "nested_hk_g11",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_g11", "charges-min": 0, "charges-max": 50 },
+      { "item": "hk_g11_mag" },
+      { "item": "hk_g11_mag", "prob": 50 },
+      { "group": "on_hand_473" }
+    ]
+  },
+  {
+    "id": "nested_hk_caws",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [
+      { "item": "hk_caws", "charges-min": 0, "charges-max": 10 },
+      { "item": "hk_caws_mag" },
+      { "item": "hk_caws_mag", "prob": 50 },
+      { "group": "on_hand_shot" }
+    ]
+  }
+]
diff --git a/json/items/ammo/obsolete.json b/json/items/ammo/obsolete.json
deleted file mode 100644
index 7f2de99..0000000
--- a/json/items/ammo/obsolete.json
+++ /dev/null
@@ -1,75 +0,0 @@
-[
-  {
-    "id": "shot_000_flechette",
-    "copy-from": "shot_000",
-    "looks_like": "shot_flechette",
-    "type": "AMMO",
-    "name": { "str_sp": "000 flechette shell" },
-    "description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.",
-    "price": 3000,
-    "price_postapoc": 1200,
-    "count": 10,
-    "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 15 } }
-  },
-  {
-    "id": "shot_000_slug",
-    "copy-from": "shot_000",
-    "looks_like": "shot_slug",
-    "type": "AMMO",
-    "name": { "str_sp": "000 shotgun slug" },
-    "description": "A heavy metal slug used with shotguns to give them the range capabilities of a rifle. Extremely damaging but rather inaccurate.",
-    "price": 600,
-    "price_postapoc": 600,
-    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 8 }, "dispersion": 100 },
-    "proportional": { "recoil": 1.4 },
-    "delete": { "effects": [ "SHOT" ] }
-  },
-  {
-    "id": "shot_000_beanbag",
-    "copy-from": "shot_000",
-    "looks_like": "shot_beanbag",
-    "type": "AMMO",
-    "name": { "str_sp": "000 shotgun beanbag" },
-    "description": "A beanbag round for shotguns.  Designated 'less-lethal' and intended to disable.",
-    "price": 750,
-    "price_postapoc": 300,
-    "damage": { "damage_type": "bash", "amount": 6 },
-    "proportional": { "recoil": 0.4, "loudness": 0.6 },
-    "delete": { "effects": [ "SHOT" ] },
-    "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
-  },
-  {
-    "id": "shot_000_he",
-    "copy-from": "shot_000",
-    "looks_like": "shot_he",
-    "type": "AMMO",
-    "name": { "str_sp": "000 explosive slug" },
-    "description": "A shotgun shell shooting a small explosive.  Damaging, but rather inaccurate and short ranged.  Banned in several states.",
-    "price": 4500,
-    "price_postapoc": 2400,
-    "count": 5,
-    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.25 } },
-    "delete": { "effects": [ "SHOT" ] },
-    "extend": { "effects": [ "EXPLOSIVE" ] }
-  },
-  {
-    "id": "reloaded_shot_000_flechette",
-    "copy-from": "shot_000_flechette",
-    "type": "AMMO",
-    "name": { "str_sp": "000 flechette shell, reloaded" },
-    "description": "A shotgun shell filled with tiny steel darts. Extremely damaging, plus the spread makes it very accurate at short range. Slices through most forms of armor with ease.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  },
-  {
-    "id": "reloaded_shot_000_slug",
-    "copy-from": "shot_000_slug",
-    "type": "AMMO",
-    "name": { "str_sp": "000 shotgun slug, reloaded" },
-    "description": "A heavy metal slug used to give a shotgun the range capabilities of a rifle.  Extremely damaging but rather inaccurate.  This one has been hand-reloaded by a survivor or perhaps a pre-Cataclysm hobbyist, leading to slightly inferior performance compared to factory-produced ammo.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "bullet", "amount": 0.9 }, "dispersion": 1.1 },
-    "extend": { "effects": [ "RECYCLED" ] },
-    "delete": { "effects": [ "NEVER_MISFIRES" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
-  }
-]
diff --git a/json/ammo_types.json b/json/items/ammo_types.json
index 2dbc9f6..2dbc9f6 100644
--- a/json/ammo_types.json
+++ b/json/items/ammo_types.json
diff --git a/json/items/generic/obsolete.json b/json/items/generic/obsolete.json
deleted file mode 100644
index 00e5a10..0000000
--- a/json/items/generic/obsolete.json
+++ /dev/null
@@ -1,17 +0,0 @@
-[
-  {
-    "id": "000shot_hull",
-    "type": "GENERIC",
-    "looks_like": "shot_hull",
-    "category": "spare_parts",
-    "name": { "str": "000 shotgun hull" },
-    "description": "An empty hull from a 000 shotgun shell.",
-    "weight": "8 g",
-    "volume": "12ml",
-    "stackable": true,
-    "material": [ "plastic" ],
-    "symbol": "=",
-    "color": "red",
-    "damage_states": [ 0, 0 ]
-  }
-]
diff --git a/json/items/gun/12mm.json b/json/items/gun/12mm.json
index e6e129c..6c0a667 100644
--- a/json/items/gun/12mm.json
+++ b/json/items/gun/12mm.json
@@ -1,6 +1,7 @@
 [
   {
     "id": "hk_g80",
+    "//": "Fixes the name, and adds an emitter mod slot.",
     "copy-from": "hk_g80",
     "type": "GUN",
     "name": { "str": "H&K G80" },
@@ -13,6 +14,7 @@
       [ "sights", 1 ],
       [ "sling", 1 ],
       [ "stock", 1 ],
+      [ "stock accessory", 2 ],
       [ "underbarrel", 1 ]
     ]
   }
diff --git a/json/items/gun/223.json b/json/items/gun/223.json
index 45369b1..85901f6 100644
--- a/json/items/gun/223.json
+++ b/json/items/gun/223.json
@@ -1,24 +1,37 @@
 [
   {
-    "id": "h&k416a5",
-    "copy-from": "h&k416a5",
-    "type": "GUN",
-    "name": { "str_sp": "H&K HK416A5" },
-    "description": "Designed to replace the M4A1, the Heckler & Koch HK416A5 features most of the former's strengths, while being considerably more durable."
-  },
-  {
-    "id": "m27iar",
-    "copy-from": "m27iar",
-    "type": "GUN",
-    "name": { "str_sp": "M27 IAR" },
-    "default_mods": [ "grip", "acog_scope" ]
-  },
-  {
     "id": "hk_g36",
-    "copy-from": "hk_g36",
+    "//": "Overwrite because there doesn't seem to be a way to overwrite variants cleanly short of this.",
+    "copy-from": "rifle_auto",
+    "looks_like": "ar15",
     "type": "GUN",
-    "name": { "str_sp": "H&K G36" },
-    "description": "Designed as a replacement for the early Heckler & Koch G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity. It was later found to have problems overheating during prolonged firefights, and was phased out of active service in 2016.",
+    "name": { "str": "G36 assault rifle" },
+    "description": "An assault rifle chambered in 5.56x45mm and accepting G36 magazines.",
+    "weight": "3630 g",
+    "volume": "4640 ml",
+    "longest_side": "1004 mm",
+    "price": 210000,
+    "price_postapoc": 6000,
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "hk_g36",
+        "name": { "str": "H&K G36" },
+        "description": "Designed as a replacement for the early H&K G3 battle rifle, the G36 is more accurate, and uses the much lighter .223 round, allowing for a higher ammo capacity. It was later found to have problems overheating during prolonged firefights, and was phased out of active service in 2016.",
+        "weight": 1
+      }
+    ],
+    "to_hit": -1,
+    "bashing": 12,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "223" ],
+    "dispersion": 150,
+    "durability": 8,
+    "min_cycle_recoil": 1350,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "g36mag_30rd", "g36mag_100rd" ] } ],
     "built_in_mods": [ "folding_stock" ]
   }
 ]
diff --git a/json/items/gun/308.json b/json/items/gun/308.json
index 600e81c..a65f298 100644
--- a/json/items/gun/308.json
+++ b/json/items/gun/308.json
@@ -13,7 +13,8 @@
     "name": { "str_sp": "H&K PSG1A1" },
     "description": "The Heckler & Koch PSG1A1 is a semi-automatic sniper rifle based the G3 rifle. It is exceptionally accurate for a semi-automatic rifle.",
     "weight": "6670 g",
-    "volume": "2250 ml",
+    "volume": "4000 ml",
+    "longest_side": "1028 mm",
     "price": 205000,
     "price_postapoc": 3850,
     "to_hit": -1,
@@ -21,13 +22,18 @@
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "308",
+    "ammo": [ "308" ],
     "dispersion": 80,
     "min_cycle_recoil": 2700,
     "durability": 8,
     "barrel_length": "650 ml",
     "default_mods": [ "rifle_scope", "adjustable_stock" ],
-    "magazines": [ [ "308", [ "g3smallmag", "g3mag", "g3bigmag", "g3_makeshiftmag" ] ] ]
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "g3smallmag", "g3mag", "g3bigmag", "g3_makeshiftmag" ]
+      }
+    ]
   },
   {
     "id": "hk_msg90a2",
@@ -37,10 +43,17 @@
     "name": { "str_sp": "H&K MSG90A2" },
     "description": "The Heckler & Koch MSG90A2 is a semi-automatic sniper rifle based the G3 rifle. It is exceptionally accurate for a semi-automatic rifle. This is the military version.",
     "weight": "5280 g",
-    "volume": "2250 ml",
+    "volume": "4000 ml",
+    "longest_side": "978 mm",
     "price": 255000,
     "price_postapoc": 4750,
     "barrel_length": "600 ml",
-    "default_mods": [ "rifle_scope", "adjustable_stock" ]
+    "default_mods": [ "rifle_scope", "adjustable_stock" ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "g3mag", "g3smallmag", "g3bigmag", "g3_makeshiftmag" ]
+      }
+    ]
   }
 ]
diff --git a/json/items/gun/40.json b/json/items/gun/40.json
index 8148c40..cde749f 100644
--- a/json/items/gun/40.json
+++ b/json/items/gun/40.json
@@ -5,8 +5,14 @@
     "type": "GUN",
     "name": { "str_sp": "H&K USP .40" },
     "weight": "748 g",
-    "ammo": "40",
-    "magazines": [ [ "40", [ "usp40mag" ] ] ]
+    "ammo": [ "40" ],
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "usp40mag" ]
+      }
+    ]
   },
   {
     "id": "hk_p30_40",
@@ -18,7 +24,13 @@
     "price": 75000,
     "price_postapoc": 3000,
     "min_cycle_recoil": 400,
-    "magazines": [ [ "40", [ "p3040mag" ] ] ],
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "p3040mag" ]
+      }
+    ],
     "built_in_mods": [ "pistol_grip" ]
   },
   {
@@ -28,9 +40,14 @@
     "name": { "str_sp": "H&K UMP40" },
     "description": "Developed as a successor to the MP5 submachine gun, the UMP40 retains the earlier model's supreme accuracy and low recoil, but in the higher .40 caliber.",
     "weight": "2300 g",
-    "ammo": "40",
+    "ammo": [ "40" ],
     "min_cycle_recoil": 500,
-    "magazines": [ [ "40", [ "ump40mag" ] ] ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "ump40mag" ]
+      }
+    ],
     "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ],  [ "AUTO", "auto", 4 ] ]
   }
 ]
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index 99aa47e..7efc3d2 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -1,34 +1,48 @@
 [
   {
     "id": "usp_45",
-    "copy-from": "usp_45",
+    "//": "Overwrite the vanilla usp_45 to ensure the make sure the copy-from order is correct.",
+    "copy-from": "pistol_base",
     "looks_like": "glock_17",
     "type": "GUN",
-    "name": { "str_sp": "H&K USP .45" },
-    "description": "A popular pistol, widely used among law enforcement.  Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
+    "name": { "str": "USP pistol" },
+    "description": "A semi-automatic pistol chambered in .45 ACP and accepting USP magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "usp_45",
+        "name": { "str": "H&K USP .45" },
+        "description": "A popular pistol, widely used among law enforcement.  Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
+        "weight": 1
+      },
+      {
+        "id": "mk23",
+        "name": { "str": "MK 23 MOD 0" },
+        "description": "Jokingly referred to as \"The World's Only Crew-Served Pistol\", this massive pistol was designed as a primary weapon for select \"special operators\".  Its cumbersome nature, the introduction of the derivative HK USP series, and the logistics of getting .45 ACP ammunition in theater doomed this behemoth to US SOCOM armories.  Like the USP, the MK 23 is a remarkably reliable gun; someone could probably take out a nuclear-equipped walking tank with this in their holster."
+      }
+    ],
     "weight": "789 g",
-    "volume": "500 ml",
-    "price": 68000,
+    "volume": "483 ml",
+    "longest_side": "241 mm",
+    "price": 70000,
     "price_postapoc": 2500,
     "to_hit": -2,
     "bashing": 8,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "45",
+    "ammo": [ "45" ],
     "ranged_damage": { "damage_type": "bullet", "amount": -1 },
     "dispersion": 400,
     "durability": 9,
     "blackpowder_tolerance": 48,
     "min_cycle_recoil": 450,
-    "magazine_well": "250 ml",
-    "magazines": [ [ "45", [ "usp45mag" ] ] ],
-    "delete": { "built_in_mods": [ "match_trigger" ] }
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
+    "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "usp45mag" ] } ]
   },
   {
     "id": "hk_45",
     "copy-from": "usp_45",
-    "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str_sp": "H&K HK45" },
     "description": "Originally intended to replace the US military's aging M9 pistol, the HK45 combines the famed durability of the USP series with a more ergonomic design based on the P2000 to allow for greater control during operation.",
@@ -36,33 +50,44 @@
     "price": 75000,
     "price_postapoc": 3000,
     "min_cycle_recoil": 400,
-    "magazines": [ [ "45", [ "hk45mag" ] ] ],
+    "pocket_data": [ { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "hk45mag" ] } ],
     "built_in_mods": [ "pistol_grip" ]
   },
   {
     "id": "hk_ump45",
+    "//": "Overwrite the vanilla ump45 to ensure the ump9 and ump40 load based on this one.",
     "looks_like": "hk_mp5",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str_sp": "H&K UMP45" },
-    "description": "Developed as a successor to the MP5 submachine gun, the UMP45 retains the earlier model's supreme accuracy and low recoil, but in the higher .45 caliber.",
-    "weight": "2500 g",
-    "volume": "1250 ml",
+    "name": { "str": "UMP45 SMG" },
+    "description": "A submachine gun chambered in .45 ACP and accepting UMP45 magazines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "hk_ump45",
+        "name": { "str": "H&K UMP45" },
+        "description": "Developed as a successor to the MP5 submachine gun, the UMP45 retains the earlier model's supreme accuracy and low recoil, but in the higher .45 caliber.",
+        "weight": 1
+      }
+    ],
+    "ascii_picture": "hk_ump",
+    "weight": "2300 g",
+    "volume": "4451 ml",
+    "longest_side": "452 mm",
     "price": 290000,
     "price_postapoc": 3000,
     "to_hit": -2,
-    "ascii_picture": "hk_ump",
     "bashing": 11,
     "material": [ "steel", "plastic" ],
     "symbol": "(",
     "color": "dark_gray",
-    "ammo": "45",
+    "ammo": [ "45" ],
     "skill": "smg",
     "ranged_damage": { "damage_type": "bullet", "amount": 1 },
     "dispersion": 240,
     "durability": 8,
     "min_cycle_recoil": 540,
-    "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ],  [ "AUTO", "auto", 4 ] ],
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
     "valid_mod_locations": [
       [ "accessories", 3 ],
       [ "barrel", 1 ],
@@ -78,6 +103,8 @@
       [ "underbarrel", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
-    "magazines": [ [ "45", [ "ump45mag", "ump45_makeshiftmag" ] ] ]
+    "default_mods": [ "folding_stock" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "ump45mag", "ump45_makeshiftmag" ] } ]
+  }
   }
 ]
diff --git a/json/items/gun/46.json b/json/items/gun/46.json
index 72d4f2e..41821fc 100644
--- a/json/items/gun/46.json
+++ b/json/items/gun/46.json
@@ -6,7 +6,7 @@
     "name": { "str_sp": "H&K UCP" },
     "description": "The Heckler & Koch UCP is a small, very high capacity pistol designed to counter most common body armors.",
     "weight": "730 g",
-    "volume": "500 ml",
+    "volume": "460 ml",
     "price": 125000,
     "price_postapoc": 2150,
     "to_hit": -2,
@@ -20,6 +20,7 @@
     "dispersion": 410,
     "durability": 9,
     "min_cycle_recoil": 81 ,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
     "valid_mod_locations": [
       [ "accessories", 2 ],
       [ "barrel", 1 ],
@@ -33,19 +34,54 @@
       [ "underbarrel", 1 ]
     ],
     "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
-    "magazine_well": "250 ml",
-    "magazines": [ [ "46", [ "hk46mag", "hk46midmag", "hk46bigmag" ] ] ]
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "hk46mag", "hk46midmag", "hk46bigmag" ]
+      }
+    ]
   },
   {
     "id": "hk_mp7",
-    "copy-from": "hk_mp7",
+    "//": "Overwrite vanilla mp7",
+    "looks_like": "hk_mp5",
     "type": "GUN",
-    "name": { "str_sp": "H&K MP7A2" },
+    "reload_noise_volume": 10,
+    "name": { "str": "H&K MP7A2" },
+    "description": "Designed as a personal defense weapon, the MP7 fires the high-powered 4.6x30mm round while being lightweight, compact in size, and practically recoil-free.",
     "weight": "1960 g",
-    "volume": "1000 ml",
-    "bashing": 10,
+    "volume": "2083 ml",
+    "longest_side": "42 cm",
+    "price": 175000,
+    "price_postapoc": 3000,
+    "to_hit": -2,
+    "bashing": 7,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "46" ],
+    "skill": "smg",
     "ranged_damage": { "damage_type": "bullet", "amount": 1 },
+    "dispersion": 260,
+    "durability": 8,
+    "min_cycle_recoil": 81,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 5 ] ],
     "built_in_mods": [ "folding_stock" ],
-    "magazines": [ [ "46", [ "hk46bigmag", "hk46midmag", "hk46mag" ] ] ]
+    "valid_mod_locations": [
+      [ "accessories", 3 ],
+      [ "barrel", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "hk46bigmag", "hk46midmag", "hk46mag" ] } ]
   }
 ]
diff --git a/json/items/gun/473.json b/json/items/gun/473.json
index 8a91a5e..72275da 100644
--- a/json/items/gun/473.json
+++ b/json/items/gun/473.json
@@ -1,13 +1,14 @@
 [
   {
     "id": "hk_g11",
+    "looks_like": "rm51_assault_rifle",
     "type": "GUN",
     "reload_noise_volume": 10,
     "name": { "str_sp": "H&K G11K2" },
     "description": "The Heckler & Koch G11 is a bullpup assault rifle that was designed to replace the G3 rifle. It utilizes the caseless 4.73x33mm round from an internal magazine bay and has a very high rate of burst fire.",
     "weight": "3650 g",
-    "volume": "1500 ml",
-    "looks_like": "rm51_assault_rifle",
+    "volume": "4957 ml",
+    "longest_side": "740 mm",
     "price": 1500000,
     "price_postapoc": 10000,
     "to_hit": -1,
@@ -30,9 +31,10 @@
       [ "sling", 1 ],
       [ "underbarrel", 1 ]
     ],
-    "magazine_well": "500 ml",
+    "pocket_data": [
+      { "magazine_well": "500 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "hk_g11_mag" ] }
+    ],
     "default_mods": [ "acog_scope" ],
-    "magazines": [ [ "473", [ "hk_g11_mag" ] ] ],
     "flags": [ "NEVER_JAMS" ]
   }
 ]
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
index 1961e2b..a6bcee9 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -1,10 +1,36 @@
 [
   {
     "id": "usp_9mm",
-    "copy-from": "usp_9mm",
+    "//": "Overwrite vanilla version to ensure proper copy-from ordering.",
+    "copy-from": "pistol_base",
+    "looks_like": "glock_17",
     "type": "GUN",
     "name": { "str_sp": "H&K USP 9mm" },
-    "weight": "748 g"
+    "description": "A popular pistol, widely used among law enforcement.  Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.",
+    "weight": "748 g",
+    "volume": "460 ml",
+    "longest_side": "230 mm",
+    "price": 68000,
+    "price_postapoc": 2500,
+    "to_hit": -2,
+    "bashing": 8,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "9mm" ],
+    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
+    "dispersion": 400,
+    "durability": 9,
+    "blackpowder_tolerance": 48,
+    "min_cycle_recoil": 450,
+    "weapon_category": [ "AUTOMATIC_PISTOLS" ],
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "usp9mag", "usp9mag_10rd", "usp9mag_18rd", "usp9mag_20rd", "usp9mag_32rd" ]
+      }
+    ]
   },
   {
     "id": "hk_p30_9",
@@ -16,7 +42,13 @@
     "price": 75000,
     "price_postapoc": 3000,
     "min_cycle_recoil": 400,
-    "magazines": [ [ "9mm", [ "p309mag" ] ] ],
+    "pocket_data": [
+      {
+        "magazine_well": "250 ml",
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "p309mag" ]
+      }
+    ],
     "built_in_mods": [ "pistol_grip" ]
   },
   {
@@ -24,23 +56,19 @@
     "copy-from": "hk_mp5",
     "type": "GUN",
     "name": { "str_sp": "H&K MP5A4" },
-    "weight": "2540 g",
-    "volume": "1750 ml"
+    "weight": "2540 g"
   },
   {
-    "id": "hk_mp5k",
-    "copy-from": "hk_mp5k",
+    "id": "hk_mp5sd",
+    "copy-from": "hk_mp5sd",
     "type": "GUN",
-    "name": { "str_sp": "H&K MP5K-PDW" },
-    "weight": "2530 g",
-    "volume": "1250 ml"
+    "name": { "str_sp": "H&K MP5SD" }
   },
   {
-    "id": "hk_mp5sd",
-    "copy-from": "hk_mp5sd",
+    "id": "hk_mp5k",
+    "copy-from": "hk_mp5k",
     "type": "GUN",
-    "name": { "str_sp": "H&K MP5SD" },
-    "volume": "2000 ml"
+    "name": { "str_sp": "H&K MP5K-PDW" }
   },
   {
     "id": "hk_ump9",
@@ -49,9 +77,14 @@
     "name": { "str_sp": "H&K UMP9" },
     "description": "Developed as a successor to the MP5 submachine gun, the UMP9 retains the earlier model's supreme accuracy and low recoil, but with reduced size and weight.",
     "weight": "2300 g",
-    "ammo": "9mm",
+    "ammo": [ "9mm" ],
     "min_cycle_recoil": 450,
-    "magazines": [ [ "9mm", [ "ump9mag" ] ] ],
+    "pocket_data": [
+      {
+        "pocket_type": "MAGAZINE_WELL",
+        "item_restriction": [ "ump9mag" ]
+      }
+    ],
     "modes": [ [ "DEFAULT", "semi", 1 ], [ "BURST", "burst", 2 ],  [ "AUTO", "auto", 4 ] ]
   }
 ]
diff --git a/json/items/gun/shot.json b/json/items/gun/shot.json
index 0c1a329..6f366bb 100644
--- a/json/items/gun/shot.json
+++ b/json/items/gun/shot.json
@@ -2,21 +2,27 @@
   {
     "id": "hk_caws",
     "copy-from": "shotgun_base",
+    "looks_like": "hk_g36",
     "type": "GUN",
+    "reload_noise_volume": 10,
     "name": { "str_sp": "H&K CAWS" },
     "description": "The Heckler & Koch CAWS is a bullpup combat shotgun designed to fill the need for a high accuracy, short-range weapon with low recoil.",
     "weight": "3700 g",
     "volume": "2000 ml",
-    "looks_like": "hk_g36",
+    "longest_side": "775 mm",
     "price": 300000,
     "price_postapoc": 8000,
     "to_hit": -1,
     "bashing": 12,
     "material": [ "steel", "plastic" ],
-    "ranged_damage": 5,
-    "dispersion": 300,
-    "durability": 8,
+    "ranged_damage": { "damage_type": "bullet", "amount": 5 },
+    "symbol": "(",
+    "color": "dark_gray",
     "ammo": [ "shot" ],
+    "skill": "shotgun",
+    "dispersion": 350,
+    "durability": 8,
+    "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 2 ] ],
     "barrel_length": "81 ml",
     "valid_mod_locations": [
       [ "accessories", 2 ],
@@ -30,8 +36,8 @@
       [ "sights mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "magazine_well": "250 ml",
-    "modes": [ [ "DEFAULT", "semi", 1 ], [ "AUTO", "auto", 2 ] ],
-    "magazines": [ [ "shot", [ "hk_caws_mag" ] ] ]
+    "pocket_data": [
+      { "magazine_well": "250 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "hk_caws_mag" ] }
+    ]
   }
 ]
diff --git a/json/items/magazine/223.json b/json/items/magazine/223.json
index 1129624..1fa20c4 100644
--- a/json/items/magazine/223.json
+++ b/json/items/magazine/223.json
@@ -5,11 +5,11 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "H&K G36 30-round magazine" },
+    "description": "A standard capacity box magazine for use with the H&K G36 assault rifle.",
     "weight": "127 g", 
     "material": [ "plastic" ],
-    "description": "A standard capacity box magazine for use with the H&K G36 assault rifle.",
     "ammo_type": [ "223" ],
-    "reliability": 9
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 30 } } ]
   },
   {
     "id": "g36mag_100rd",
@@ -18,6 +18,7 @@
     "type": "MAGAZINE",
     "name": { "str": "H&K G36 100-round double drum magazine" },
     "description": "A bulky 100-round double drum magazine for use with the H&K G36 assault rifle.",
-    "ammo_type": [ "223" ]
+    "ammo_type": [ "223" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "223": 100 } } ]
   }
 ]
diff --git a/json/items/magazine/308.json b/json/items/magazine/308.json
index 50a4d02..1eb894f 100644
--- a/json/items/magazine/308.json
+++ b/json/items/magazine/308.json
@@ -1,35 +1,52 @@
 [
   {
     "id": "hk417mag_20rd",
-    "copy-from": "hk417mag_20rd",
+    "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK417 magazine" },
-    "description": "A 20 round double stack box magazine for the Heckler & Koch HK417 rifle.",
+    "name": { "str": "H&K HK417 20-round magazine" },
+    "description": "A 20-round double stack box magazine for the H&K HK417 rifle.",
+    "weight": "90 g",
+    "volume": "500 ml",
+    "price": 5600,
+    "price_postapoc": 250,
     "material": [ "plastic" ],
-    "weight": "90 g"
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "308" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 20 } } ]
   },
   {
     "id": "hk417mag_10rd",
-    "copy-from": "hk417mag_10rd",
+    "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK417 compact magazine" },
-    "description": "A 10 round double stack box magazine for the Heckler & Koch HK417 rifle.",
+    "name": { "str": "H&K HK417 10-round magazine" },
+    "description": "A 10-round double stack box magazine for the Heckler & Koch HK417 rifle.",
+    "weight": "55 g",
+    "volume": "250 ml",
+    "price": 5000,
+    "price_postapoc": 100,
     "material": [ "plastic" ],
-    "weight": "55 g"
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "308" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 10 } } ]
   },
   {
     "id": "hk417_makeshiftmag",
-    "copy-from": "hk417_makeshiftmag",
+    "copy-from": "fal_makeshiftmag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK417 makeshift magazine" },
-    "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with Heckler & Koch HK417 rifle."
+    "price_postapoc": 50,
+    "name": { "str": "H&K HK417 5-round makeshift magazine" },
+    "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch HK417 rifle."
   },
   {
     "id": "g3smallmag",
-    "looks_like": "stanag30",
+    "looks_like": "g3mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K PSG1 magazine" },
-    "description": "A 10-round aluminum box magazine for the H&K PSG1A1 rifle.",
+    "name": { "str": "H&K G3 10 round magazine" },
+    "description": "A 10-round aluminum box magazine for the H&K G3 rifle.",
     "weight": "75 g",
     "volume": "250 ml",
     "price": 4500,
@@ -38,8 +55,7 @@
     "symbol": "#",
     "color": "light_gray",
     "ammo_type": [ "308" ],
-    "capacity": 10,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "308": 10 } } ]
   }
 ]
diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json
index 3be341c..2fcaab8 100644
--- a/json/items/magazine/40.json
+++ b/json/items/magazine/40.json
@@ -6,7 +6,7 @@
     "name": { "str": "H&K USP .40 magazine" },
     "description": "A standard capacity magazine for use with the Heckler & Koch USP .40 handgun.",
     "ammo_type": [ "40" ],
-    "capacity": 13
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40": 13 } } ]
   },
   {
     "id": "p3040mag",
@@ -23,6 +23,6 @@
     "description": "A standard 30-round box magazine for use with the Heckler & Koch UMP40 SMG.",
     "weight": "200 g",
     "ammo_type": [ "40" ],
-    "capacity": 30
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "40": 30 } } ]
   }
 ]
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
index 344187d..e9585aa 100644
--- a/json/items/magazine/45.json
+++ b/json/items/magazine/45.json
@@ -1,42 +1,71 @@
 [
   {
     "id": "ump45mag",
+    "//": "Overwrite so the ump40 and ump9 mags are based on this one.",
     "looks_like": "mp5mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K UMP45 magazine" },
+    "name": { "str": "H&K UMP45 25-round magazine" },
     "description": "A standard 25-round box magazine for use with the Heckler & Koch UMP45 SMG.",
-    "weight": "400 g",
+    "weight": "200 g",
     "volume": "500 ml",
     "price": 4950,
     "price_postapoc": 100,
-    "material": "steel",
+    "material": [ "plastic", "steel" ],
     "symbol": "#",
     "color": "light_gray",
-    "ammo_type": "45",
-    "capacity": 25,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
+    "ammo_type": [ "45" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 25 } } ]
   },
   {
     "id": "ump45_makeshiftmag",
     "copy-from": "ump45_makeshiftmag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K UMP45 makeshift magazine" },
+    "price_postapoc": 50,
+    "name": { "str": "H&K UMP45 20-round makeshift magazine" },
     "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch UMP45 SMG."
   },
   {
     "id": "usp45mag",
-    "copy-from": "usp45mag",
+    "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": { "str": "H&K USP .45 magazine" },
-    "description": "A standard capacity magazine for use with the Heckler & Koch USP .45 handgun."
+    "name": { "str": "USP .45 pistol 12-round magazine" },
+    "description": "A 12-round magazine for use with the USP pistol",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "usp45mag",
+        "name": { "str": "H&K USP .45 12-round magazine" },
+        "description": "A standard capacity magazine for use with the Heckler & Koch USP handgun.",
+        "weight": 1
+      }
+    ],
+    "weight": "60 g",
+    "volume": "250 ml",
+    "price": 5900,
+    "price_postapoc": 100,
+    "material": [ "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "45" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 12 } } ]
   },
   {
     "id": "hk45mag",
-    "copy-from": "usp45mag",
+    "looks_like": "glock17_17",
     "type": "MAGAZINE",
-    "name": { "str": "H&K HK45 magazine" },
+    "name": { "str": "H&K HK45 pistol 10-round magazine" },
     "description": "A standard capacity magazine for use with the Heckler & Koch HK45 handgun.",
-    "capacity": 10
+    "weight": "60 g",
+    "volume": "250 ml",
+    "price": 5900,
+    "price_postapoc": 100,
+    "material": [ "plastic" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "45" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 12 } } ]
   }
 ]
diff --git a/json/items/magazine/46.json b/json/items/magazine/46.json
index 856a12f..5e39fb2 100644
--- a/json/items/magazine/46.json
+++ b/json/items/magazine/46.json
@@ -1,33 +1,46 @@
 [
   {
     "id": "hk46mag",
-    "looks_like": "mp5mag",
-    "copy-from": "hk46mag",
+    "//": "Overwrite to ensure other 4.6mm mags are based on this.",
+    "looks_like": "usp9mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K 4.6mm magazine" },
+    "name": { "str": "H&K 4.6mm 20-round magazine" },
     "description": "A standard capacity 20-round magazine for use with H&K's proprietary 4.6x30mm round.",
-    "weight": "100 g"
+    "weight": "100 g",
+    "volume": "250 ml",
+    "price": 4700,
+    "price_postapoc": 100,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "46" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "46": 20 } } ]
   },
   {
     "id": "hk46bigmag",
     "looks_like": "mp5mag",
-    "copy-from": "hk46bigmag",
+    "copy-from": "hk46mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K 4.6mm extended magazine" },
+    "name": { "str": "H&K 4.6mm 40-round magazine" },
     "description": "An extended 40-round magazine for use with H&K's proprietary 4.6x30mm round.",
-    "weight": "200 g"
+    "weight": "200 g",
+    "volume": "500 ml",
+    "price": 6300,
+    "price_postapoc": 500,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "46": 40 } } ]
   },
   {
     "id": "hk46midmag",
     "looks_like": "hk46bigmag",
-    "copy-from": "hk46bigmag",
+    "copy-from": "hk46mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K 4.6mm expanded magazine" },
+    "name": { "str": "H&K 4.6mm 30-round magazine" },
     "description": "An expanded 30-round magazine for use with H&K's proprietary 4.6x30mm round.",
     "weight": "150 g",
     "volume": "375 ml",
     "price": 5500,
     "price_postapoc": 300,
-    "capacity": 30
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "46": 30 } } ]
   }
 ]
diff --git a/json/items/magazine/473.json b/json/items/magazine/473.json
index 94a53b0..acebdbc 100644
--- a/json/items/magazine/473.json
+++ b/json/items/magazine/473.json
@@ -5,7 +5,7 @@
     "type": "MAGAZINE",
     "name": { "str": "H&K G11 magazine" },
     "description": "A 50 round box magazine for use with the Heckler & Koch G11 caseless assault rifle.",
-    "weight": "5 g",
+    "weight": "100 g",
     "volume": "500 ml",
     "price": 20000,
     "price_postapoc": 400,
@@ -13,9 +13,8 @@
     "symbol": "#",
     "color": "dark_gray",
     "ammo_type": [ "473" ],
-    "capacity": 50,
-    "reliability": 10,
     "reload_time": 50,
-    "flags": [ "MAG_COMPACT" ]
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "473": 50 } } ]
   }
 ]
diff --git a/json/items/magazine/9mm.json b/json/items/magazine/9mm.json
index 14644f2..21dd829 100644
--- a/json/items/magazine/9mm.json
+++ b/json/items/magazine/9mm.json
@@ -1,28 +1,181 @@
 [
   {
     "id": "usp9mag",
+    "looks_like": "glock17_17",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9x19mm 15-round magazine" },
+    "description": "A factory specification 15-round box magazine for use with the dependable Heckler & Koch USP 9x19mm pistol.",
+    "weight": "75 g",
+    "volume": "250 ml",
+    "price": 3850,
+    "price_postapoc": 100,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "9mm" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 15 } } ]
+  },
+  {
+    "id": "usp9mag_10rd",
     "copy-from": "usp9mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K USP 9mm magazine" }
+    "name": { "str": "H&K USP 9x19mm 10-round magazine" },
+    "description": "A 10-round box magazine for use with the Heckler & Koch USP 9x19mm pistol, physically of the same size as a 15-round magazine.  It's made to comply with laws that limit maximum magazine capacity for firearms in some states.",
+    "weight": "75 g",
+    "price_postapoc": 80,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 10 } } ]
+  },
+  {
+    "id": "usp9mag_18rd",
+    "copy-from": "usp9mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9x19mm 18-round magazine" },
+    "description": "An extended 18-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
+    "weight": "90 g",
+    "volume": "270 ml",
+    "price": 4000,
+    "price_postapoc": 120,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 18 } } ]
+  },
+  {
+    "id": "usp9mag_20rd",
+    "copy-from": "usp9mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9x19mm 20-round magazine" },
+    "description": "An extended 20-round box magazine for use with the Heckler & Koch USP 9x19mm pistol.",
+    "weight": "98 g",
+    "volume": "280 ml",
+    "price": 4200,
+    "price_postapoc": 130,
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 20 } } ]
+  },
+  {
+    "id": "usp9mag_32rd",
+    "copy-from": "usp9mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USP 9x19mm 32-round magazine" },
+    "description": "An extended 32-round box magazine for use with the H&K USP 9x19mm pistol.",
+    "weight": "140 g",
+    "volume": "420 ml",
+    "price": 4800,
+    "price_postapoc": 180,
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 32 } } ]
   },
   {
     "id": "p309mag",
     "copy-from": "usp9mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K P30 9mm magazine" },
-    "description": "A standard capacity magazine for use with the Heckler & Koch P30 9mm handgun."
+    "name": { "str": "H&K P30 9mm 15-round magazine" },
+    "description": "A factory specification 15-round box magazine for use with the Heckler & Koch P30 9mm handgun."
   },
   {
     "id": "mp5mag",
+    "//": "Tileset whitelist for SMG magazines",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 30-round magazine" },
+    "description": "A standard capacity curved magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "210 g",
+    "volume": "500 ml",
+    "price": 4100,
+    "price_postapoc": 250,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 30 } } ],
+    "ammo_type": [ "9mm" ],
+    "flags": [ "MAG_COMPACT" ]
+  },
+  {
+    "id": "mp5mag_100rd",
     "copy-from": "mp5mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K MP5 magazine" }
+    "name": { "str": "H&K MP5 100-round double drum magazine" },
+    "description": "A bulky 100-round double drum magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "780 g",
+    "volume": "800 ml",
+    "price": 7000,
+    "price_postapoc": 700,
+    "material": [ "steel", "plastic" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 100 } } ],
+    "reload_time": 160,
+    "flags": [ "MAG_BULKY" ]
   },
   {
     "id": "mp5bigmag",
-    "copy-from": "mp5bigmag",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 50-round drum magazine" },
+    "description": "A drum magazine for use with the Heckler & Koch MP5 SMG.  Much greater capacity, but less reliable than the factory specification magazine.",
+    "weight": "350 g",
+    "volume": "750 ml",
+    "price": 6920,
+    "price_postapoc": 500,
+    "reload_time": 160,
+    "flags": [ "MAG_BULKY" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 50 } } ]
+  },
+  {
+    "id": "mp5mag_40rd",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 40-round magazine" },
+    "description": "An extended-capacity 40-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "280 g",
+    "volume": "667 ml",
+    "price": 4550,
+    "price_postapoc": 360,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 40 } } ]
+  },
+  {
+    "id": "mp5mag_38rd",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 38-round magazine" },
+    "description": "An extended-capacity 38-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "266 g",
+    "volume": "633 ml",
+    "price": 4500,
+    "price_postapoc": 350,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 38 } } ]
+  },
+  {
+    "id": "mp5mag_20rd",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 20-round magazine" },
+    "description": "A compact 20-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "128 g",
+    "volume": "172 ml",
+    "price": 3500,
+    "price_postapoc": 200,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 20 } } ]
+  },
+  {
+    "id": "mp5mag_15rd",
+    "copy-from": "mp5mag",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K MP5 15-round magazine" },
+    "description": "A compact 15-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "96 g",
+    "volume": "129 ml",
+    "price": 3000,
+    "price_postapoc": 150,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 15 } } ]
+  },
+  {
+    "id": "mp5mag_10rd",
+    "copy-from": "mp5mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K MP5 extended magazine" }
+    "name": { "str": "H&K MP5 10-round magazine" },
+    "description": "A compact 10-round magazine for use with the Heckler & Koch MP5 SMG.",
+    "weight": "64 g",
+    "volume": "86 ml",
+    "price": 2500,
+    "price_postapoc": 100,
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 10 } } ]
   },
   {
     "id": "ump9mag",
@@ -32,6 +185,6 @@
     "description": "A standard 30-round curved box magazine for use with the Heckler & Koch UMP9 SMG.",
     "weight": "200 g",
     "ammo_type": [ "9mm" ],
-    "capacity": 30
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "9mm": 30 } } ]
   }
 ]
diff --git a/json/items/magazine/shot.json b/json/items/magazine/shot.json
index ac22067..50fdc95 100644
--- a/json/items/magazine/shot.json
+++ b/json/items/magazine/shot.json
@@ -3,7 +3,7 @@
     "id": "hk_caws_mag",
     "looks_like": "saiga10mag",
     "type": "MAGAZINE",
-    "name": { "str": "H&K CAWS box magazine" },
+    "name": { "str": "H&K CAWS 10-round magazine" },
     "description": "A removable plastic box magazine for the H&K CAWS shotgun. Holds 10 shells.",
     "weight": "210 g",
     "volume": "500 ml",
@@ -13,8 +13,7 @@
     "symbol": "#",
     "color": "dark_gray",
     "ammo_type": [ "shot" ],
-    "capacity": 10,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "shot": 10 } } ]
   }
 ]
diff --git a/json/items/migration.json b/json/items/migration.json
index 0421568..184db76 100644
--- a/json/items/migration.json
+++ b/json/items/migration.json
@@ -3,50 +3,5 @@
     "id": "hk_ucp",
     "type": "MIGRATION",
     "replace": "hk_ucp"
-  },
-  {
-    "id": "shot_000_flechette",
-    "type": "MIGRATION",
-    "replace": "shot_flechette"
-  },
-  {
-    "id": "reloaded_shot_000_flechette",
-    "type": "MIGRATION",
-    "replace": "reloaded_shot_flechette"
-  },
-  {
-    "id": "shot_000_slug",
-    "type": "MIGRATION",
-    "replace": "shot_slug"
-  },
-  {
-    "id": "reloaded_shot_000_slug",
-    "type": "MIGRATION",
-    "replace": "reloaded_shot_slug"
-  },
-  {
-    "id": "shot_000_beanbag",
-    "type": "MIGRATION",
-    "replace": "shot_beanbag"
-  },
-  {
-    "id": "shot_000_he",
-    "type": "MIGRATION",
-    "replace": "shot_he"
-  },
-  {
-    "id": "000shot_hull",
-    "type": "MIGRATION",
-    "replace": "shot_hull"
-  },
-  {
-    "result": "reloaded_shot_000_flechette",
-    "type": "recipe",
-    "obsolete": true
-  },
-  {
-    "result": "reloaded_shot_000_slug",
-    "type": "recipe",
-    "obsolete": true
   }
 ]
diff --git a/json/martialarts.json b/json/martialarts.json
deleted file mode 100644
index 9b3906a..0000000
--- a/json/martialarts.json
+++ /dev/null
@@ -1,22 +0,0 @@
-[
-  {
-    "id": "style_krav_maga",
-    "copy-from": "style_krav_maga",
-    "type": "martial_art",
-    "extend": {
-      "weapons": [
-        "usp_40",
-        "hk_ucp",
-        "hk_p30_9",
-        "hk_p30_40",
-        "hk_45",
-        "hk_mp5",
-        "hk_ump9",
-        "hk_ump40",
-        "hk_ump45",
-        "hk_mp7",
-        "hk_g11"
-      ]
-    }
-  }
-]
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 ] ]
     ]
   }
 ]
diff --git a/json/uncraft/46.json b/json/uncraft/46.json
index bb78887..40845f9 100644
--- a/json/uncraft/46.json
+++ b/json/uncraft/46.json
@@ -2,6 +2,7 @@
   {
     "result": "46mm",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "gun",
     "difficulty": 5,
     "time": "5 s",
@@ -10,7 +11,7 @@
       [ [ "lead", 2 ] ],
       [ [ "46mm_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
-      [ [ "gunpowder", 4 ] ],
+      [ [ "gunpowder_pistol", 4 ] ],
       [ [ "copper", 1 ] ]
     ],
     "charges": 1
@@ -18,6 +19,7 @@
   {
     "result": "46mm_fmj",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "gun",
     "difficulty": 5,
     "time": "5 s",
@@ -26,7 +28,7 @@
       [ [ "lead", 2 ] ],
       [ [ "46mm_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
-      [ [ "gunpowder", 5 ] ],
+      [ [ "gunpowder_pistol", 5 ] ],
       [ [ "copper", 1 ] ]
     ],
     "charges": 1
@@ -34,6 +36,7 @@
   {
     "result": "46mm_shp",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "gun",
     "difficulty": 5,
     "time": "5 s",
@@ -42,7 +45,7 @@
       [ [ "lead", 2 ] ],
       [ [ "46mm_casing", 1 ] ],
       [ [ "smpistol_primer", 1 ] ],
-      [ [ "gunpowder", 4 ] ],
+      [ [ "gunpowder_pistol", 4 ] ],
       [ [ "copper", 1 ] ]
     ],
     "charges": 1
diff --git a/json/uncraft/shot.json b/json/uncraft/shot.json
index 96aed7b..a3d3e54 100644
--- a/json/uncraft/shot.json
+++ b/json/uncraft/shot.json
@@ -2,6 +2,7 @@
   {
     "result": "shot_000",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "gun",
     "difficulty": 5,
     "time": "1 s",
@@ -9,7 +10,7 @@
     "components": [
       [ [ "shot_hull", 1 ] ],
       [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ],
+      [ [ "gunpowder_shotgun", 6 ] ],
       [ [ "lead", 12 ] ]
     ],
     "charges": 1
@@ -17,6 +18,7 @@
   {
     "result": "shot_000_inc",
     "type": "uncraft",
+    "activity_level": "MODERATE_EXERCISE",
     "skill_used": "gun",
     "difficulty": 5,
     "time": "1 s",
@@ -24,7 +26,7 @@
     "components": [
       [ [ "shot_hull", 1 ] ],
       [ [ "shotgun_primer", 1 ] ],
-      [ [ "gunpowder", 6 ] ],
+      [ [ "gunpowder_shotgun", 6 ] ],
       [ [ "lead", 12 ] ],
       [ [ "incendiary", 12 ] ]
     ],
diff --git a/modinfo.json b/modinfo.json
index 8235473..9fc7f4c 100644
--- a/modinfo.json
+++ b/modinfo.json
@@ -6,6 +6,6 @@
     "authors": ["jc_gargma"],
     "description": "Adds various H&K weapons, and tweaks existing ones.",
     "category": "items",
-    "dependencies": [ "bn" ]
+    "dependencies": [ "dda" ]
   }
 ]