Adding the rare gun H&K USC 45 carbine (CleverRaven#58636)

* Add USC 45 carbine * Always with the linting * Generic guns migration already * Text style * Update data/json/items/gun/45.json Co-authored-by: Anton Burmistrov <[email protected]> * Update data/json/items/gun/45.json Co-authored-by: Anton Burmistrov <[email protected]> * Added range increase Co-authored-by: Anton Burmistrov <[email protected]>
tornikeo · Jun 26, 2022 · a7b2f11 · a7b2f11
1 parent 10632d8
commit a7b2f11
Show file tree

Hide file tree

Showing 7 changed files with 113 additions and 4 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -474,7 +474,8 @@
       { "group": "nested_weatherby_5", "prob": 15 },
       { "group": "nested_hk417_13", "prob": 40 },
       { "group": "nested_ar15_retool_300blk", "prob": 15 },
-      { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 }
+      { "group": "nested_iwi_tavor_x95_300blk", "prob": 10 },
+      { "group": "nested_hk_usc45", "prob": 20 }
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -390,7 +390,10 @@
       [ "augmag_42rd", 5 ],
       [ "augmag_100rd", 2 ],
       [ "g36mag_30rd", 15 ],
-      [ "g36mag_100rd", 3 ]
+      [ "g36mag_100rd", 3 ],
+      [ "usc10mag", 5 ],
+      [ "usc15mag", 7 ],
+      [ "usc20mag", 20 ]
     ]
   },
   {

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -47,6 +47,18 @@
       { "group": "on_hand_45" }
     ]
   },
+  {
+    "id": "nested_hk_usc45",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags, and some ammo to repack",
+    "subtype": "collection",
+    "entries": [
+      { "item": "hk_usc45", "charges-min": 0, "charges-max": 20 },
+      { "item": "usc20mag" },
+      { "item": "usc20mag", "prob": 50 },
+      { "group": "on_hand_45" }
+    ]
+  },
   {
     "id": "nested_glock_22",
     "type": "item_group",

diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json
@@ -239,6 +239,44 @@
     "flags": [ "RELOAD_EJECT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 1 } } ]
   },
+  {
+    "id": "hk_usc45",
+    "copy-from": "rifle_semi",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "name": { "str": "H&K USC 45 Carbine" },
+    "description": "A compact, light weight carbine chambering the popular .45 ACP pistol round.  Resembling the popular UMP submachine gun in both its blowback operating system and light weight polymer frame construction.  This civilian variant is distinguished by its skeletonized stock and 16 inch barrel.",
+    "weight": "2781 g",
+    "volume": "6116 ml",
+    "longest_side": "900 mm",
+    "price": 160000,
+    "price_postapoc": 3100,
+    "bashing": 12,
+    "range": 20,
+    "material": [ "steel", "plastic" ],
+    "symbol": "(",
+    "color": "dark_gray",
+    "ammo": [ "45" ],
+    "ranged_damage": { "damage_type": "bullet", "amount": 4 },
+    "dispersion": 160,
+    "durability": 9,
+    "min_cycle_recoil": 1350,
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "grip mount", 1 ],
+      [ "rail mount", 1 ],
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
+    ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE_WELL", "item_restriction": [ "usc10mag", "usc15mag", "usc20mag" ] } ]
+  },
   {
     "id": "smg_45",
     "copy-from": "smg_base",

diff --git a/data/json/items/magazine/45.json b/data/json/items/magazine/45.json
@@ -172,6 +172,57 @@
     "flags": [ "MAG_COMPACT" ],
     "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 12 } } ]
   },
+  {
+    "id": "usc10mag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USC 45 Carbine 10-round magazine" },
+    "description": "A 10 round magazine for use with the H&K USC 45 Carbine.",
+    "weight": "145 g",
+    "volume": "160 ml",
+    "price": 3399,
+    "price_postapoc": 100,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "45" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 10 } } ]
+  },
+  {
+    "id": "usc15mag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USC 45 Carbine 15-round magazine" },
+    "description": "A 15 round magazine for use with the H&K USC 45 Carbine.",
+    "weight": "217 g",
+    "volume": "240 ml",
+    "price": 3699,
+    "price_postapoc": 150,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "45" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 15 } } ]
+  },
+  {
+    "id": "usc20mag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "H&K USC 45 Carbine 20-round magazine" },
+    "description": "A 20 round magazine for use with the H&K USC 45 Carbine.",
+    "weight": "290 g",
+    "volume": "320 ml",
+    "price": 3999,
+    "price_postapoc": 200,
+    "material": [ "steel" ],
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": [ "45" ],
+    "flags": [ "MAG_COMPACT" ],
+    "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "45": 20 } } ]
+  },
   {
     "id": "ppq45mag",
     "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
@@ -296,7 +296,8 @@
       "fs2000",
       "robofac_gun",
       "obrez",
-      "mk47"
+      "mk47",
+      "hk_usc45"
     ],
     "type": "MIGRATION",
     "replace": "rifle_sporter"

diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -282,7 +282,10 @@
       "famasmag",
       "robofac40",
       "robofac100",
-      "robofac50"
+      "robofac50",
+      "usc10mag",
+      "usc15mag",
+      "usc20mag"
     ],
     "type": "MIGRATION",
     "replace": "rifle_mag"