Add the Hi-Point 3895, a .380 ACP PCC (#66373)

* add the hpt3895 * add 3895 mag * spawns for hp3895mag * nested_hpt3895 * add spawns for hpt3895 * Hi Point -> Hi-Point * remove a comma * Update data/json/items/gun/380.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> * fixes * desgined->designed * migration * migration * _10rd * Update data/json/items/gun/380.json Co-authored-by: TheShadowFerret <[email protected]> * remove CF from name --------- Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> Co-authored-by: TheShadowFerret <[email protected]>
CleverRaven · Jun 23, 2023 · 619f62b · 619f62b
1 parent 1eea8b2
commit 619f62b
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 8 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -489,7 +489,8 @@
       { "group": "nested_converted_ar15", "prob": 6 },
       { "group": "nested_converted_mdrx", "prob": 1 },
       { "group": "nested_converted_cz600", "prob": 1 },
-      { "group": "nested_rdb_223", "prob": 1 }
+      { "group": "nested_rdb_223", "prob": 1 },
+      { "group": "nested_hpt3895", "prob": 1 }
     ]
   },
   {
@@ -517,6 +518,7 @@
       { "item": "remington_700", "prob": 4, "charges-min": 0, "charges-max": 4 },
       { "item": "ruger_1022", "prob": 7, "charges-min": 0, "charges-max": 10 },
       { "item": "ruger_mini", "prob": 1, "charges-min": 0, "charges-max": 5 },
+      { "item": "hpt3895", "prob": 1, "charges-min": 0, "charges-max": 10 },
       { "item": "sks", "prob": 1, "charges-min": 0, "charges-max": 10 },
       { "item": "win70", "prob": 2, "charges-min": 0, "charges-max": 3 },
       { "item": "vz58ts", "prob": 1, "charges-min": 0, "charges-max": 30 },
@@ -543,6 +545,7 @@
       { "item": "ar10", "prob": 35, "charges-min": 0, "charges-max": 0 },
       { "item": "modular_ar15", "prob": 45, "charges-min": 0, "charges-max": 0 },
       { "item": "cx4", "prob": 30, "charges-min": 0, "charges-max": 0 },
+      { "item": "hpt3895", "prob": 1, "charges-min": 0, "charges-max": 0 },
       { "item": "ksub2000", "prob": 10, "charges-min": 0, "charges-max": 0 },
       { "item": "remington700_270", "prob": 25, "charges-min": 0, "charges-max": 0 },
       { "item": "ruger_m77", "prob": 10, "charges-min": 0, "charges-max": 0 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -174,9 +174,11 @@
       [ "ppq45mag", 1 ],
       [ "taurus_spectrum_mag", 1 ],
       [ "hptc9", 1 ],
-      [ "hptcf380", 1 ],
-      [ "hptjcp", 1 ],
-      [ "hptjhp", 1 ],
+      [ "hptcf380mag_8rd", 2 ],
+      [ "hptcf380mag_10rd", 1 ],
+      [ "hpt3895mag_10rd", 1 ],
+      [ "hptjcpmag", 2 ],
+      [ "hptjhpmag", 2 ],
       [ "witness_mag_10", 2 ],
       [ "cz75mag_12rd", 9 ],
       [ "cz75mag_20rd", 5 ],

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -481,6 +481,19 @@
       { "group": "on_hand_380" }
     ]
   },
+  {
+    "id": "nested_hpt3895",
+    "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": "hpt3895", "charges-min": 0, "charges-max": 10 },
+      { "item": "hpt3895mag_10rd" },
+      { "item": "hpt3895mag_10rd", "prob": 50 },
+      { "group": "on_hand_380" }
+    ]
+  },
   {
     "id": "nested_hptjcp",
     "type": "item_group",

diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json
@@ -171,5 +171,55 @@
     "flags": [ "RELOAD_EJECT", "EASY_CLEAN" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "380": 1 } } ],
     "melee_damage": { "bash": 10 }
+  },
+  {
+    "id": "hpt3895",
+    "looks_like": "cx4",
+    "type": "GUN",
+    "name": { "str": ".380 ACP pistol-caliber carbine" },
+    "description": "A pistol-caliber carbine chambered in .380 ACP.  It is more powerful and accurate than an equivalent pistol but the .380 ACP round is nonetheless fairly weak.  Accepts 10-round magazines, which are not shared with any .380 ACP pistol unlike many other similar pistol-caliber carbines.",
+    "variant_type": "gun",
+    "variants": [
+      {
+        "id": "hpt3895",
+        "name": { "str": "Hi-Point 3895" },
+        "description": "A pistol-caliber carbine chambered in .380 ACP, designed by Hi-Point Firearms.  Its 16.5\" barrel provides extra stopping power over an equivalent pistol, but .380 is still a relatively weak caliber.  Accepts 10-round magazines, which are notably not interchangeable with those of CF380 pistols.",
+        "weight": 1
+      }
+    ],
+    "weight": "2835 g",
+    "volume": "1881 ml",
+    "longest_side": "787 mm",
+    "price": 31500,
+    "price_postapoc": 2500,
+    "to_hit": -1,
+    "symbol": "(",
+    "material": [ "plastic", "steel", "zinc" ],
+    "color": "dark_gray",
+    "ammo": [ "380" ],
+    "skill": "rifle",
+    "range": 17,
+    "dispersion": 180,
+    "durability": 8,
+    "blackpowder_tolerance": 30,
+    "min_cycle_recoil": 270,
+    "ranged_damage": { "damage_type": "bullet", "amount": 2 },
+    "valid_mod_locations": [
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "stock accessory", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "faults": [ "fault_gun_blackpowder", "fault_gun_dirt", "fault_gun_chamber_spent" ],
+    "pocket_data": [ { "magazine_well": "236 ml", "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "hpt3895mag_10rd" ] } ],
+    "melee_damage": { "bash": 10 }
   }
 ]
diff --git a/data/json/items/magazine/380.json b/data/json/items/magazine/380.json
@@ -72,7 +72,7 @@
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "CF-380 8-round magazine" },
-    "description": "An 8-round steel box magazine for use with the Hi-Point CF-380.",
+    "description": "An 8-round steel box magazine for use with the Hi-Point CF-380.  Does not fit the Hi-Point 3895 carbine.",
     "weight": "110 g",
     "volume": "236 ml",
     "price": 2500,
@@ -89,7 +89,7 @@
     "looks_like": "glock17_17",
     "type": "MAGAZINE",
     "name": { "str": "CF-380 10-round magazine" },
-    "description": "A 10-round steel box magazine for use with the Hi-Point CF-380.",
+    "description": "A 10-round steel box magazine for use with the Hi-Point CF-380.  Does not fit the Hi-Point 3895 carbine.",
     "weight": "110 g",
     "volume": "236 ml",
     "price": 2500,
@@ -101,6 +101,14 @@
     "flags": [ "MAG_COMPACT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "380": 10 } } ]
   },
+  {
+    "id": "hpt3895mag_10rd",
+    "looks_like": "hptcf380mag_10rd",
+    "type": "MAGAZINE",
+    "name": { "str": "Hi-Point 3895 10-round magazine" },
+    "description": "A 10-round steel box magazine for use with the Hi-Point 3895 pistol-caliber carbine.  Does not fit the Hi-Point CF-380 pistol.",
+    "copy-from": "hptcf380mag_10rd"
+  },
   {
     "id": "taurus_spectrum_mag",
     "looks_like": "glock17_17",

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -139,7 +139,7 @@
     "replace": "pistol_medium"
   },
   {
-    "id": [ "cx4", "hk_mp5_semi_pistol", "ksub2000", "calico", "hk_mp5_10_semi", "TDI_10", "mp40semi" ],
+    "id": [ "cx4", "hk_mp5_semi_pistol", "ksub2000", "calico", "hk_mp5_10_semi", "TDI_10", "mp40semi", "hpt3895" ],
     "type": "MIGRATION",
     "replace": "pistol_pcc"
   },

diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -94,7 +94,8 @@
       "p226mag_15rd_9mm",
       "sp2022mag_10rd_9mm",
       "sp2022mag_12rd_9mm",
-      "sp2022mag_15rd_9mm"
+      "sp2022mag_15rd_9mm",
+      "hpt3895mag_10rd"
     ],
     "type": "MIGRATION",
     "replace": "pistol_mag"