Update for everyday and carried guns changeset, aka field guns.

2 files changed, 147 insertions, 0 deletions

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..a3a940a
--- /dev/null
+++ b/json/itemgroups/Weapons_Mods_Ammo/field_drops.json
@@ -0,0 +1,82 @@
+[
+  {
+    "id": "everyday_usp_40",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "usp_40", "charges-min": 0, "charges-max": 13 }, { "item": "usp40mag" }, { "item": "usp40mag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_p30_9",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_p30_9", "charges-min": 0, "charges-max": 15 }, { "item": "p309mag" }, { "item": "p309mag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_p30_40",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_p30_40", "charges-min": 0, "charges-max": 13 }, { "item": "p3040mag" }, { "item": "p3040mag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_45",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_45", "charges-min": 0, "charges-max": 10 }, { "item": "hk45mag" }, { "item": "hk45mag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_ump9",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_ump9", "charges-min": 0, "charges-max": 30 }, { "item": "ump9mag" }, { "item": "ump9mag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_ump9",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_ump40", "charges-min": 0, "charges-max": 30 }, { "item": "ump40mag" }, { "item": "ump40mag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_psg1a1",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_psg1a1", "charges-min": 0, "charges-max": 10 }, { "item": "g3smallmag" }, { "item": "g3smallmag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_msg90a2",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_msg90a2", "charges-min": 0, "charges-max": 20 }, { "item": "g3mag" }, { "item": "g3mag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_g11",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_g11", "charges-min": 0, "charges-max": 50 }, { "item": "hk_g11_mag" }, { "item": "hk_g11_mag", "prob": 50 } ]
+  },
+  {
+    "id": "everyday_hk_caws",
+    "type": "item_group",
+    "//": "this is a distribution for the gun, reasonable number of backup mags",
+    "subtype": "collection",
+    "ammo": 100,
+    "entries": [ { "item": "hk_caws", "charges-min": 0, "charges-max": 10 }, { "item": "hk_caws_mag" }, { "item": "hk_caws_mag", "prob": 50 } ]
+  }
+]
diff --git a/json/itemgroups/Weapons_Mods_Ammo/guns.json b/json/itemgroups/Weapons_Mods_Ammo/guns.json
index 18ff5af..e854f96 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -12,6 +12,17 @@
   },
   {
     "type": "item_group",
+    "id": "carried_guns_pistol_rare",
+    "//": "Less common pistols including those only used by police/paramilitary forces. As these are carried, they either have mags OR loose ammo rather than both",
+    "items": [
+      { "group": "everyday_usp_40", "prob": 100 },
+      { "group": "everyday_hk_p30_9", "prob": 120 },
+      { "group": "everyday_hk_p30_40", "prob": 90 },
+      { "group": "everyday_hk_45", "prob": 60 }
+    ]
+  },
+  {
+    "type": "item_group",
     "id": "guns_pistol_rare_display",
     "//": "Empty uncommon pistols found exclusively at gun stores.",
     "items": [
@@ -32,6 +43,15 @@
   },
   {
     "type": "item_group",
+    "id": "carried_guns_smg_rare",
+    "//": "Less common SMGs including those only carried by police/paramilitary forces. Either mags or loose ammo are included.",
+    "items": [
+      { "group": "everyday_hk_ump9", "prob": 40 },
+      { "group": "everyday_hk_ump40", "prob": 35 }
+    ]
+  },
+  {
+    "type": "item_group",
     "id": "guns_smg_rare_display",
     "//": "Less common SMGs found exclusively in gun stores.",
     "items": [
@@ -57,6 +77,14 @@
   },
   {
     "type": "item_group",
+    "id": "carried_guns_rifle_rare",
+    "//": "Less common rifles including those only carried by police/paramilitary forces. Served with mags or a side of loose ammo.",
+    "items": [
+      { "group": "everyday_hk_psg1a1", "prob": 40 }
+    ]
+  },
+  {
+    "type": "item_group",
     "id": "guns_rifle_rare_display",
     "//": "Less common rifles found exclusively in gun stores.",
     "items": [
@@ -74,6 +102,15 @@
   },
   {
     "type": "item_group",
+    "id": "carried_guns_rifle_milspec",
+    "//": "Military specification rifles only ever carried by the military. Issued with mags or loose ammo.",
+    "items": [
+      { "group": "everyday_hk_msg90a2", "prob": 15 },
+      { "group": "everyday_hk_g11", "prob": 30 }
+    ]
+  },
+  {
+    "type": "item_group",
     "id": "guns_shotgun_milspec",
     "//": "Military shotguns currently in service.",
     "items": [
@@ -82,6 +119,14 @@
   },
   {
     "type": "item_group",
+    "id": "carried_guns_shotgun_milspec",
+    "//": "Military shotguns currently in service. Might have mags, might have loose ammo.",
+    "items": [
+      { "group": "everyday_hk_caws", "prob": 30 }
+    ]
+  },
+  {
+    "type": "item_group",
     "id": "sidearms_cop",
     "//": "Police issue weapons of all types",
     "items": [
@@ -93,11 +138,31 @@
   },
   {
     "type": "item_group",
+    "id": "carried_guns_cop",
+    "//": "gun plus potential expended magazines",
+    "items": [
+      { "group": "everyday_usp_40", "prob": 100 },
+      { "group": "everyday_hk_p30_9", "prob": 120 },
+      { "group": "everyday_hk_p30_40", "prob": 90 },
+      { "group": "everyday_hk_45", "prob": 60 }
+    ]
+  },
+  {
+    "type": "item_group",
     "id": "guns_swat",
     "//": "Guns issued to paramilitary forces in addition to standard police issue.",
     "items": [
       { "group": "nested_hk_ump9", "prob": 15 },
       { "group": "nested_hk_ump40", "prob": 15 }
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "carried_guns_swat",
+    "//": "Guns issued to paramilitary forces in addition to standard police issue.",
+    "items": [
+      { "group": "everyday_hk_ump9", "prob": 15 },
+      { "group": "everyday_hk_ump40", "prob": 15 }
+    ]
   }
 ]