Add the stock G36 magazine

Expand H&K in descriptions

7 files changed, 38 insertions, 9 deletions

diff --git a/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 1fbc69b..a9fab0d 100644
--- a/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -24,5 +24,13 @@
     "items": [
       [ "usp40mag", 12 ]
     ]
+  },
+  {
+    "type": "item_group",
+    "id": "mags_rifle_rare",
+    "//": "Aftermarket or otherwise uncommon rifle magazines excluding milspec.",
+    "items": [
+      [ "hk_g36_mag", 80 ]
+    ]
   }
 ]
diff --git a/json/items/gun/223.json b/json/items/gun/223.json
index 2aeb418..87da684 100644
--- a/json/items/gun/223.json
+++ b/json/items/gun/223.json
@@ -5,5 +5,13 @@
     "type": "GUN",
     "name": { "str": "H&K HK416 A5" },
     "description": "Designed to replace the M4A1, the Heckler & Koch HK416A5 features most of the former's strengths, while being considerably more durable."
-  }
+  },
+  {
+    "id": "hk_g36",
+    "copy-from": "hk_g36",
+    "type": "GUN",
+    "name": { "str": "H&K G36" },
+    "description": "Designed as a replacement for the early Heckler & Koch G3 battle rifle, the G36 is more accurate, and uses the much-lighter .223 round, allowing for a higher ammo capacity.",
+    "magazines": [ [ "223", [ "hk_g36_mag", "stanag30", "stanag50", "survivor223mag" ] ] ]
+  },
 ]
diff --git a/json/items/magazine/223.json b/json/items/magazine/223.json
new file mode 100644
index 0000000..79b80cf
--- /dev/null
+++ b/json/items/magazine/223.json
@@ -0,0 +1,13 @@
+[
+  {
+    "id": "hk_g36_mag",
+    "type": "MAGAZINE",
+    "copy_from": "stanag30",
+    "name": { "str": "H&K G36 magazine" },
+    "description": "A 30 round box magazine for the Heckler & Koch G36 rifle.",
+    "weight": "127 g", 
+    "material": "plastic",
+    "ammo_type": [ "223" ],
+    "reliability": 9
+  }
+]
diff --git a/json/items/magazine/308.json b/json/items/magazine/308.json
index ed9de92..d34d64a 100644
--- a/json/items/magazine/308.json
+++ b/json/items/magazine/308.json
@@ -4,20 +4,20 @@
     "copy-from": "hk417mag_20rd",
     "type": "MAGAZINE",
     "name": { "str": "H&K HK417 magazine" },
-    "description": "A 20 round double stack box magazine for the H&K HK417 rifle."
+    "description": "A 20 round double stack box magazine for the Heckler & Koch HK417 rifle."
   },
   {
     "id": "hk417mag_10rd",
     "copy-from": "hk417mag_10rd",
     "type": "MAGAZINE",
     "name": { "str": "H&K HK417 compact magazine" },
-    "description": "A 10 round double stack box magazine for the H&K HK417 rifle."
+    "description": "A 10 round double stack box magazine for the Heckler & Koch HK417 rifle."
   },
   {
     "id": "hk417_makeshiftmag",
     "copy-from": "hk417_makeshiftmag",
     "type": "MAGAZINE",
     "name": { "str": "H&K HK417 makeshift magazine" },
-    "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with H&K HK417 rifle."
+    "description": "An improvised 5-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with Heckler & Koch HK417 rifle."
   }
 ]
diff --git a/json/items/magazine/40.json b/json/items/magazine/40.json
index f4736a3..340b82a 100644
--- a/json/items/magazine/40.json
+++ b/json/items/magazine/40.json
@@ -4,7 +4,7 @@
     "copy-from": "usp9mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K USP .40 magazine" },
-    "description": "A standard capacity magazine for use with the H&K USP .40 handgun.",
+    "description": "A standard capacity magazine for use with the Heckler & Koch USP .40 handgun.",
     "ammo_type": "40",
     "capacity": 13
   }
diff --git a/json/items/magazine/45.json b/json/items/magazine/45.json
index a753757..b3b6f75 100644
--- a/json/items/magazine/45.json
+++ b/json/items/magazine/45.json
@@ -4,20 +4,20 @@
     "copy-from": "ump45mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K UMP45 magazine" },
-    "description": "A standard 25-round box magazine for use with the H&K UMP45 SMG."
+    "description": "A standard 25-round box magazine for use with the Heckler & Koch UMP45 SMG."
   },
   {
     "id": "ump45_makeshiftmag",
     "copy-from": "ump45_makeshiftmag",
     "type": "MAGAZINE",
     "name": { "str": "H&K UMP45 makeshift magazine" },
-    "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the H&K UMP45 SMG."
+    "description": "An improvised 20-round straight single-stack box magazine consisting of little more than a bent sheet of steel held together by duct tape and hope, for use with the Heckler & Koch UMP45 SMG."
   },
   {
     "id": "usp45mag",
     "copy-from": "usp45mag",
     "type": "MAGAZINE",
     "name": { "str": "H&K USP .45 magazine" },
-    "description": "A standard capacity magazine for use with the H&K USP .45 handgun."
+    "description": "A standard capacity magazine for use with the Heckler & Koch USP .45 handgun."
   }
 ]
diff --git a/json/items/magazine/473.json b/json/items/magazine/473.json
index 10b7e57..a67064a 100644
--- a/json/items/magazine/473.json
+++ b/json/items/magazine/473.json
@@ -4,7 +4,7 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "H&K G11 magazine" },
-    "description": "A 50 round box magazine for use with H&K G11 caseless assault rifle.",
+    "description": "A 50 round box magazine for use with Heckler & Koch G11 caseless assault rifle.",
     "weight": "5 g",
     "volume": "500 ml",
     "price": 25000,