Convert from stab to now-supported bullet damage.

-Except for the 000 beanbag, which is now bashing.

7 files changed, 26 insertions, 19 deletions

diff --git a/json/items/ammo/000shot.json b/json/items/ammo/000shot.json
index 810a931..3d18b05 100644
--- a/json/items/ammo/000shot.json
+++ b/json/items/ammo/000shot.json
@@ -18,7 +18,7 @@
     "ammo_type": "000shot",
     "casing": "000shot_hull",
     "range": 12,
-    "damage": { "damage_type": "stab", "amount": 60 },
+    "damage": { "damage_type": "bullet", "amount": 60 },
     "recoil": 3500,
     "loudness": 160,
     "effects": [ "COOKOFF", "SHOT" ]
@@ -33,7 +33,7 @@
     "price": 3000,
     "price_postapoc": 1200,
     "count": 10,
-    "relative": { "damage": { "damage_type": "stab", "amount": -5, "armor_penetration": 15 } }
+    "relative": { "damage": { "damage_type": "bullet", "amount": -5, "armor_penetration": 15 } }
   },
   {
     "id": "shot_000_slug",
@@ -44,7 +44,7 @@
     "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": "stab", "armor_penetration": 8 }, "dispersion": 100 },
+    "relative": { "range": 12, "damage": { "damage_type": "bullet", "armor_penetration": 8 }, "dispersion": 100 },
     "proportional": { "recoil": 1.4 },
     "delete": { "effects": [ "SHOT" ] }
   },
@@ -57,7 +57,7 @@
     "description": "A beanbag round for shotguns, not deadly but designed to disable.",
     "price": 750,
     "price_postapoc": 300,
-    "proportional": { "damage": { "damage_type": "stab", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
+    "proportional": { "damage": { "damage_type": "bash", "amount": 0.1 }, "recoil": 0.4, "loudness": 0.6 },
     "delete": { "effects": [ "SHOT" ] },
     "extend": { "effects": [ "BEANBAG", "NOGIB" ] }
   },
@@ -82,7 +82,7 @@
     "price": 4500,
     "price_postapoc": 2400,
     "count": 5,
-    "proportional": { "damage": { "damage_type": "stab", "amount": 0.25, "armor_penetration": 0.25 } },
+    "proportional": { "damage": { "damage_type": "bullet", "amount": 0.25, "armor_penetration": 0.25 } },
     "delete": { "effects": [ "SHOT" ] },
     "extend": { "effects": [ "EXPLOSIVE" ] }
   },
@@ -91,7 +91,7 @@
     "copy-from": "shot_000",
     "type": "AMMO",
     "name": { "str": "000 shot, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -100,7 +100,7 @@
     "copy-from": "shot_000_flechette",
     "type": "AMMO",
     "name": { "str": "000 flechette shell, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -109,7 +109,7 @@
     "copy-from": "shot_000_slug",
     "type": "AMMO",
     "name": { "str": "000 shotgun slug, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   },
@@ -118,7 +118,7 @@
     "copy-from": "shot_000_inc",
     "type": "AMMO",
     "name": { "str": "000 incendiary shell, reloaded" },
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
diff --git a/json/items/ammo/12mm.json b/json/items/ammo/12mm.json
index 6f0541e..74d2737 100644
--- a/json/items/ammo/12mm.json
+++ b/json/items/ammo/12mm.json
@@ -6,7 +6,7 @@
     "looks_like": "12mm",
     "name": { "str": "H&K 12mm, handmade" },
     "description": "Handcrafted bootleg duplicates of the 12mm projectiles used in H&K railguns. Normally made of cobalt, these knockoffs are made of more readily available steel instead.",
-    "proportional": { "price": 0.7, "damage": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
diff --git a/json/items/ammo/46.json b/json/items/ammo/46.json
index e0dd5a7..0a21d61 100644
--- a/json/items/ammo/46.json
+++ b/json/items/ammo/46.json
@@ -17,7 +17,7 @@
     "ammo_type": "46",
     "casing": "46mm_casing",
     "range": 14,
-    "damage": { "damage_type": "stab", "amount": 24, "armor_penetration": 24 },
+    "damage": { "damage_type": "bullet", "amount": 24, "armor_penetration": 24 },
     "dispersion": 40,
     "recoil": 90,
     "effects": [ "COOKOFF", "NEVER_MISFIRES" ]
@@ -30,7 +30,7 @@
     "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
     "proportional": {
       "price": 0.7,
-      "damage": { "damage_type": "stab", "amount": 0.9, "armor_penetration": 0.2 },
+      "damage": { "damage_type": "bullet", "amount": 0.9, "armor_penetration": 0.2 },
       "dispersion": 1.1
     },
     "extend": { "effects": [ "RECYCLED" ] },
@@ -44,7 +44,7 @@
     "description": "4.6x30mm ammunition with 31gr copper plated lead bullets.  It has low recoil, but no usual armor penetration due to using simple lead bullets rather than proper factory-made penetrator projectiles.",
     "proportional": {
       "price": 0.3,
-      "damage": { "damage_type": "stab", "amount": 0.46, "armor_penetration": 0.1 },
+      "damage": { "damage_type": "bullet", "amount": 0.46, "armor_penetration": 0.1 },
       "recoil": 0.46,
       "dispersion": 1.2
     },
diff --git a/json/items/ammo/473.json b/json/items/ammo/473.json
index b772a3c..a52d697 100644
--- a/json/items/ammo/473.json
+++ b/json/items/ammo/473.json
@@ -17,7 +17,7 @@
     "stack_size": 100,
     "ammo_type": "473",
     "range": 36,
-    "damage": { "damage_type": "stab", "amount": 35, "armor_penetration": 10 },
+    "damage": { "damage_type": "bullet", "amount": 35, "armor_penetration": 10 },
     "dispersion": 25,
     "recoil": 1200,
     "effects": [ "NEVER_MISFIRES" ]
@@ -28,7 +28,7 @@
     "type": "AMMO",
     "name": { "str": "4.73x33mm, handmade" },
     "description": "Handcrafted bootleg duplicates of 4.73x33mm 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": { "damage_type": "stab", "amount": 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" ], "flags": [ "IRREPLACEABLE_CONSUMABLE" ] }
   }
diff --git a/json/items/gun/45.json b/json/items/gun/45.json
index 4084f04..99aa47e 100644
--- a/json/items/gun/45.json
+++ b/json/items/gun/45.json
@@ -16,7 +16,7 @@
     "symbol": "(",
     "color": "dark_gray",
     "ammo": "45",
-    "ranged_damage": { "damage_type": "stab", "amount": -1 },
+    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
     "dispersion": 400,
     "durability": 9,
     "blackpowder_tolerance": 48,
@@ -58,7 +58,7 @@
     "color": "dark_gray",
     "ammo": "45",
     "skill": "smg",
-    "ranged_damage": { "damage_type": "stab", "amount": 1 },
+    "ranged_damage": { "damage_type": "bullet", "amount": 1 },
     "dispersion": 240,
     "durability": 8,
     "min_cycle_recoil": 540,
diff --git a/json/items/gun/46.json b/json/items/gun/46.json
index ecd48ad..72d4f2e 100644
--- a/json/items/gun/46.json
+++ b/json/items/gun/46.json
@@ -16,7 +16,7 @@
     "color": "light_gray",
     "ammo": [ "46" ],
     "skill": "pistol",
-    "ranged_damage": { "damage_type": "stab", "amount": -1 },
+    "ranged_damage": { "damage_type": "bullet", "amount": -1 },
     "dispersion": 410,
     "durability": 9,
     "min_cycle_recoil": 81 ,
@@ -44,7 +44,7 @@
     "weight": "1960 g",
     "volume": "1000 ml",
     "bashing": 10,
-    "ranged_damage": { "damage_type": "stab", "amount": 1 },
+    "ranged_damage": { "damage_type": "bullet", "amount": 1 },
     "built_in_mods": [ "folding_stock" ],
     "magazines": [ [ "46", [ "hk46bigmag", "hk46midmag", "hk46mag" ] ] ]
   }
diff --git a/json/items/gun/9mm.json b/json/items/gun/9mm.json
index 1983dc3..1961e2b 100644
--- a/json/items/gun/9mm.json
+++ b/json/items/gun/9mm.json
@@ -36,6 +36,13 @@
     "volume": "1250 ml"
   },
   {
+    "id": "hk_mp5sd",
+    "copy-from": "hk_mp5sd",
+    "type": "GUN",
+    "name": { "str_sp": "H&K MP5SD" },
+    "volume": "2000 ml"
+  },
+  {
     "id": "hk_ump9",
     "copy-from": "hk_ump45",
     "type": "GUN",