Merge branch 'main' into CMMG-MkG-Guard

cataclysmbnteam · Jun 20, 2024 · 28abcfb · 28abcfb
2 parents ec2e35c + 0e34548
commit 28abcfb
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 2 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/everydaycarry_guns.json
@@ -66,6 +66,18 @@
       { "group": "nested_glock22_mag", "charges-min": 0, "prob": 50 }
     ]
   },
+  {
+    "id": "everyday_asr_10mm",
+    "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": "asr_10mm", "ammo-group": "on_hand_10mm", "charges": [ 0, 15 ] },
+      { "group": "nested_glock20_mag", "charges-min": 0 },
+      { "group": "nested_glock20_mag", "charges-min": 0, "prob": 50 }
+    ]
+  },
   {
     "id": "everyday_m1911",
     "type": "item_group",

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -424,6 +424,7 @@
       { "group": "nested_ar10", "prob": 20 },
       { "group": "nested_ar15", "prob": 30 },
       { "group": "nested_cx4", "prob": 45 },
+      { "group": "nested_asr_10mm", "prob": 15 },
       { "group": "nested_ksub2000", "prob": 30 },
       { "group": "nested_m1a", "prob": 50 },
       { "group": "nested_marlin_9a", "prob": 80 },
@@ -450,6 +451,7 @@
       { "group": "everyday_ar10", "prob": 20 },
       { "group": "everyday_ar15", "prob": 30 },
       { "group": "everyday_cx4", "prob": 45 },
+      { "group": "everyday_asr_10mm", "prob": 15 },
       { "group": "everyday_ksub2000", "prob": 30 },
       { "group": "everyday_m1a", "prob": 50 },
       { "group": "everyday_marlin_9a", "prob": 80 },
@@ -475,6 +477,7 @@
       { "item": "ar10", "prob": 20, "charges-min": 0, "charges-max": 0 },
       { "item": "ar15", "prob": 30, "charges-min": 0, "charges-max": 0 },
       { "item": "cx4", "prob": 45, "charges-min": 0, "charges-max": 0 },
+      { "item": "asr_10mm", "prob": 15, "charges-min": 0, "charges-max": 0 },
       { "item": "ksub2000", "prob": 30, "charges-min": 0, "charges-max": 0 },
       { "item": "m1a", "prob": 50, "charges-min": 0, "charges-max": 0 },
       { "item": "marlin_9a", "prob": 80, "charges-min": 0, "charges-max": 0 },

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/nested_guns.json
@@ -33,7 +33,7 @@
     "subtype": "collection",
     "ammo": 100,
     "entries": [
-      { "item": "glock_20", "ammo-group": "on_hand_10mm", "charges": [ 0, 6 ] },
+      { "item": "glock_20", "ammo-group": "on_hand_10mm", "charges": [ 0, 15 ] },
       { "group": "nested_glock20_mag" },
       { "group": "nested_glock20_mag", "prob": 50 },
       { "group": "on_hand_10mm" }
@@ -78,6 +78,19 @@
       { "group": "on_hand_357sig" }
     ]
   },
+  {
+    "id": "nested_asr_10mm",
+    "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": "asr_10mm", "ammo-group": "on_hand_10mm", "charges": [ 0, 15 ] },
+      { "group": "nested_glock20_mag" },
+      { "group": "nested_glock20_mag", "prob": 50 },
+      { "group": "on_hand_10mm" }
+    ]
+  },
   {
     "id": "nested_m1911",
     "type": "item_group",

diff --git a/data/json/items/gun/10mm.json b/data/json/items/gun/10mm.json
@@ -20,5 +20,29 @@
     "blackpowder_tolerance": 48,
     "min_cycle_recoil": 570,
     "magazines": [ [ "10mm", [ "glock20mag", "glock20bigmag", "glock20drum50rd" ] ] ]
+  },
+  {
+    "id": "asr_10mm",
+    "looks_like": "cx4",
+    "copy-from": "rifle_manual",
+    "type": "GUN",
+    "name": { "str": "TNW Aero Survival Rifle" },
+    "description": "A pistol caliber carbine made of aircraft aluminum.  This is the 10mm version and can use Glock 20 magazines.",
+    "weight": "2580 g",
+    "volume": "1500 ml",
+    "price": "600 USD",
+    "price_postapoc": "50 USD",
+    "bashing": 8,
+    "material": [ "steel", "plastic" ],
+    "color": "dark_gray",
+    "ammo": "10mm",
+    "range": 20,
+    "ranged_damage": { "damage_type": "bullet", "amount": 2 },
+    "dispersion": 170,
+    "durability": 10,
+    "min_cycle_recoil": 500,
+    "barrel_length": "250 ml",
+    "magazine_well": "150 ml",
+    "magazines": [ [ "10mm", [ "glock20mag", "glock20bigmag", "glock20drum50rd" ] ] ]
   }
 ]
diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -126,7 +126,7 @@
     "replace": "pistol_medium"
   },
   {
-    "id": [ "cx4", "hk_mp5_semi_pistol", "ksub2000", "calico", "mkg_guard" ],
+    "id": [ "asr_10mm", "cx4", "hk_mp5_semi_pistol", "ksub2000", "calico", "mkg_guard" ],
     "type": "MIGRATION",
     "replace": "pistol_pcc"
   },