From 7e0f272819b2093f892320d23ae071e4273cf43b Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 10:11:47 -0400
Subject: [PATCH 01/26] Add WASR-10, Mini Draco

---
 data/json/items/gun/762.json | 77 +++++++++++++++++++++++++++++++++++-
 1 file changed, 76 insertions(+), 1 deletion(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index e0c507a87aadd..fc204dab396a5 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -115,5 +115,80 @@
     ],
     "magazines": [ [ "762", [ "762x39_clip" ] ] ],
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
-  }
+  },
+  {
+    "id": "ak47",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "WASR-10" },
+    "description": "A semi-automatic-only civilian-legal Kalashnikov-pattern rifle, imported from Romania.  A valuable survivor's commodity.",
+    "weight": "2560 g",
+    "volume": "1750 ml",
+    "price": 56000,
+    "to_hit": -1,
+    "bashing": 12,
+    "material": [ "steel", "wood" ],
+    "symbol": "(",
+    "color": "brown",
+    "ammo": "762",
+    "skill": "rifle",
+    "dispersion": 180,
+    "durability": 8,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
+    "barrel_length": "250 ml",
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ],
+    "flags": [ "NEVER_JAMS" ]
+  },
+  {
+    "id": "ak47",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "Mini Draco" },
+    "description": "Essentially a semi-auto AK with a short barrel and no stock, this unwieldy ""pistol"" has seen some popularity with civilian shooters and gangbangers alike.",
+    "weight": "3300 g",
+    "volume": "1750 ml",
+    "price": 54000,
+    "to_hit": -5,
+    "bashing": 8,
+    "material": [ "steel", "wood" ],
+    "symbol": "(",
+    "color": "brown",
+    "ammo": "762",
+    "skill": "pistol",
+    "dispersion": 240,
+    "durability": 7,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
+    "barrel_length": "250 ml",
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail", 1 ],
+      [ "sights", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel", 1 ]
+    ],
+    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ],
+  },
 ]

From d067c8d3b70aba4ff767e8d3d22ede6776dbd27e Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 10:24:01 -0400
Subject: [PATCH 02/26] Add WASR-10, Mini Draco to itemgroups

---
 data/json/itemgroups/Weapons_Mods_Ammo/guns.json | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index c048bb7d6a613..fad6e0fb3d9a9 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -93,7 +93,8 @@
       { "item": "sw_500", "prob": 25, "charges-min": 0, "charges-max": 5 },
       { "item": "sw629", "prob": 40, "charges-min": 0, "charges-max": 6 },
       { "item": "usp_45", "prob": 70, "charges-min": 0, "charges-max": 12 },
-      { "item": "usp_9mm", "prob": 120, "charges-min": 0, "charges-max": 15 }
+      { "item": "usp_9mm", "prob": 120, "charges-min": 0, "charges-max": 15 },
+      { "item": "draco", "prob": 30, "charges-min": 0, "charges-max": 30 }
     ]
   },
   {
@@ -112,7 +113,8 @@
       { "item": "sw_500", "prob": 25, "charges-min": 0, "charges-max": 0 },
       { "item": "sw629", "prob": 40, "charges-min": 0, "charges-max": 0 },
       { "item": "usp_45", "prob": 70, "charges-min": 0, "charges-max": 0 },
-      { "item": "usp_9mm", "prob": 120, "charges-min": 0, "charges-max": 0 }
+      { "item": "usp_9mm", "prob": 120, "charges-min": 0, "charges-max": 0 },
+      { "item": "draco", "prob": 30, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -268,7 +270,8 @@
       { "item": "ruger_mini", "prob": 60, "charges-min": 0, "charges-max": 5 },
       { "item": "sks", "prob": 40, "charges-min": 0, "charges-max": 10 },
       { "item": "win70", "prob": 15, "charges-min": 0, "charges-max": 3 },
-      { "item": "1895sbl", "prob": 15, "charges-min": 0, "charges-max": 7 }
+      { "item": "1895sbl", "prob": 15, "charges-min": 0, "charges-max": 7 },
+      { "item": "wasr10", "prob": 35, "charges-min": 0, "charges-max": 30 }
     ]
   },
   {
@@ -291,7 +294,8 @@
       { "item": "ruger_mini", "prob": 60, "charges-min": 0, "charges-max": 0 },
       { "item": "sks", "prob": 40, "charges-min": 0, "charges-max": 0 },
       { "item": "win70", "prob": 15, "charges-min": 0, "charges-max": 0 },
-      { "item": "1895sbl", "prob": 15, "charges-min": 0, "charges-max": 0 }
+      { "item": "1895sbl", "prob": 15, "charges-min": 0, "charges-max": 0 },
+      { "item": "wasr10", "prob": 35, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -744,7 +748,8 @@
       { "item": "shotgun_s", "prob": 10 },
       { "item": "shotgun_d", "prob": 10, "charges-min": 0, "charges-max": 2 },
       { "item": "sten", "prob": 20, "charges-min": 0, "charges-max": 32 },
-      { "item": "sks", "prob": 10, "charges-min": 0, "charges-max": 10 }
+      { "item": "sks", "prob": 10, "charges-min": 0, "charges-max": 10 },
+      { "item": "wasr10", "prob": 5, "charges-min": 0, "charges-max": 30 }
     ]
   }
 ]

From 573ba82ab191aabdae9266ff9e912e20d9d70aca Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 10:25:20 -0400
Subject: [PATCH 03/26] Add WASR-10 and Mini Draco IDs

---
 data/json/items/gun/762.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index fc204dab396a5..9ffd760b6dcea 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -117,7 +117,7 @@
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
   },
   {
-    "id": "ak47",
+    "id": "wasr10",
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
@@ -155,7 +155,7 @@
     "flags": [ "NEVER_JAMS" ]
   },
   {
-    "id": "ak47",
+    "id": "draco",
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,

From ce00ec6a9da0171af71b8d805094f1ea61a513c5 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 10:41:45 -0400
Subject: [PATCH 04/26] Fix double quotes

---
 data/json/items/gun/762.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 9ffd760b6dcea..48771dff11f22 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -160,7 +160,7 @@
     "type": "GUN",
     "reload_noise_volume": 10,
     "name": { "str": "Mini Draco" },
-    "description": "Essentially a semi-auto AK with a short barrel and no stock, this unwieldy ""pistol"" has seen some popularity with civilian shooters and gangbangers alike.",
+    "description": "Essentially a semi-auto AK with a short barrel and no stock, this unwieldy \"pistol\" has seen some popularity with civilian shooters and gangbangers alike.",
     "weight": "3300 g",
     "volume": "1750 ml",
     "price": 54000,

From 24b2fc925f76ddc75da3bc3012a6b55cacbba2a0 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 10:46:13 -0400
Subject: [PATCH 05/26] Fix quotations

---
 data/json/items/gun/762.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 48771dff11f22..fa8ae4ea625c5 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -189,6 +189,6 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ],
+    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ]
   },
 ]

From 68532f8e40420908972c5241f1e8d842fc970597 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 11:00:01 -0400
Subject: [PATCH 06/26] Update WASR-10 and Draco stats

---
 data/json/items/gun/762.json | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index fa8ae4ea625c5..6e75c506d49be 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -123,9 +123,9 @@
     "reload_noise_volume": 10,
     "name": { "str": "WASR-10" },
     "description": "A semi-automatic-only civilian-legal Kalashnikov-pattern rifle, imported from Romania.  A valuable survivor's commodity.",
-    "weight": "2560 g",
+    "weight": "3300 g",
     "volume": "1750 ml",
-    "price": 56000,
+    "price": 79500,
     "to_hit": -1,
     "bashing": 12,
     "material": [ "steel", "wood" ],
@@ -161,9 +161,9 @@
     "reload_noise_volume": 10,
     "name": { "str": "Mini Draco" },
     "description": "Essentially a semi-auto AK with a short barrel and no stock, this unwieldy \"pistol\" has seen some popularity with civilian shooters and gangbangers alike.",
-    "weight": "3300 g",
-    "volume": "1750 ml",
-    "price": 54000,
+    "weight": "2560 g",
+    "volume": "1250 ml",
+    "price": 72500,
     "to_hit": -5,
     "bashing": 8,
     "material": [ "steel", "wood" ],

From b6c044e4281c0a120a731949a46489682717b474 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 11:01:05 -0400
Subject: [PATCH 07/26] Formatting

---
 data/json/items/gun/762.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 6e75c506d49be..16e32f83efef3 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -190,5 +190,5 @@
       [ "underbarrel", 1 ]
     ],
     "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ]
-  },
+  }
 ]

From 17d640ba5238dba4c47b7674897cafbda851db94 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 11:15:21 -0400
Subject: [PATCH 08/26] Lint JSON

---
 data/json/items/gun/762.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 16e32f83efef3..428b868dc9235 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -122,7 +122,7 @@
     "type": "GUN",
     "reload_noise_volume": 10,
     "name": { "str": "WASR-10" },
-    "description": "A semi-automatic-only civilian-legal Kalashnikov-pattern rifle, imported from Romania.  A valuable survivor's commodity.",
+    "description": "A semi-automatic-only civilian-legal Kalashnikov-pattern rifle, imported from Romania.  A valuable survivors' commodity.",
     "weight": "3300 g",
     "volume": "1750 ml",
     "price": 79500,

From a1b382dbed4b1293d92dc97b960abf11f5a1d6bc Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 26 Mar 2020 17:04:00 -0400
Subject: [PATCH 09/26] Add Generic Guns support for WASR-10, Mini Draco

---
 data/mods/Generic_Guns/firearms/gg_firearms_migration.json | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index 9e670dda9d701..d6b8ea6f5645f 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -56,7 +56,7 @@
     "replace": "pistol_machine"
   },
   {
-    "id": [ "deagle_44", "m1911-460" ],
+    "id": [ "deagle_44", "m1911-460", "draco" ],
     "type": "MIGRATION",
     "replace": "pistol_magnum_automag"
   },
@@ -255,7 +255,8 @@
       "fn_fal",
       "m1a",
       "sks",
-      "mosin44"
+      "mosin44",
+      "wasr10"
     ],
     "type": "MIGRATION",
     "replace": "rifle_sporter"

From aac2d6404ef98ed60ae8a2d2807449fd38a503d1 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Sun, 29 Mar 2020 22:59:43 -0400
Subject: [PATCH 10/26] WASR-10/Draco: Audit weight, volume, and mod slots

---
 data/json/items/gun/762.json | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 428b868dc9235..948ca9e963636 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -122,9 +122,9 @@
     "type": "GUN",
     "reload_noise_volume": 10,
     "name": { "str": "WASR-10" },
-    "description": "A semi-automatic-only civilian-legal Kalashnikov-pattern rifle, imported from Romania.  A valuable survivors' commodity.",
-    "weight": "3300 g",
-    "volume": "1750 ml",
+    "description": "A semi-automatic, civilian-legal, Kalashnikov-pattern rifle, imported from Romania.  A valuable survivors' commodity.",
+    "weight": "3402 g",
+    "volume": "4414 ml",
     "price": 79500,
     "to_hit": -1,
     "bashing": 12,
@@ -145,11 +145,11 @@
       [ "grip", 1 ],
       [ "mechanism", 4 ],
       [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
       [ "sling", 1 ],
       [ "stock", 1 ],
-      [ "underbarrel", 1 ]
+      [ "underbarrel mount", 1 ]
     ],
     "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ],
     "flags": [ "NEVER_JAMS" ]
@@ -161,8 +161,8 @@
     "reload_noise_volume": 10,
     "name": { "str": "Mini Draco" },
     "description": "Essentially a semi-auto AK with a short barrel and no stock, this unwieldy \"pistol\" has seen some popularity with civilian shooters and gangbangers alike.",
-    "weight": "2560 g",
-    "volume": "1250 ml",
+    "weight": "2563 g",
+    "volume": "2167 ml",
     "price": 72500,
     "to_hit": -5,
     "bashing": 8,
@@ -183,11 +183,11 @@
       [ "grip", 1 ],
       [ "mechanism", 4 ],
       [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
       [ "sling", 1 ],
-      [ "stock", 1 ],
-      [ "underbarrel", 1 ]
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
     ],
     "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ]
   }

From c1a01c0cf643ac4e1a20aee3f0f2be760d2c734a Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Wed, 1 Apr 2020 18:40:07 -0400
Subject: [PATCH 11/26] Change WASR-10 to generic AK-47

---
 data/json/items/gun/762.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 948ca9e963636..76ef8b369d3c9 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -117,12 +117,12 @@
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
   },
   {
-    "id": "wasr10",
+    "id": "aksemi",
     "looks_like": "ar15",
     "type": "GUN",
     "reload_noise_volume": 10,
-    "name": { "str": "WASR-10" },
-    "description": "A semi-automatic, civilian-legal, Kalashnikov-pattern rifle, imported from Romania.  A valuable survivors' commodity.",
+    "name": { "str": "AK-47" },
+    "description": "A civilian-legal clone of the iconic Kalashnikov, these rifles was made and imported by many different firms.  A valuable survivors' commodity for its reliability in harsh conditions.",
     "weight": "3402 g",
     "volume": "4414 ml",
     "price": 79500,

From 66ce2dff6a849ca2322486cf4cbea5e85ed92055 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Wed, 1 Apr 2020 19:16:56 -0400
Subject: [PATCH 12/26] Update wasr10 to aksemi

---
 data/json/itemgroups/Weapons_Mods_Ammo/guns.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
index fad6e0fb3d9a9..521938b3ea608 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -271,7 +271,7 @@
       { "item": "sks", "prob": 40, "charges-min": 0, "charges-max": 10 },
       { "item": "win70", "prob": 15, "charges-min": 0, "charges-max": 3 },
       { "item": "1895sbl", "prob": 15, "charges-min": 0, "charges-max": 7 },
-      { "item": "wasr10", "prob": 35, "charges-min": 0, "charges-max": 30 }
+      { "item": "aksemi", "prob": 35, "charges-min": 0, "charges-max": 30 }
     ]
   },
   {
@@ -295,7 +295,7 @@
       { "item": "sks", "prob": 40, "charges-min": 0, "charges-max": 0 },
       { "item": "win70", "prob": 15, "charges-min": 0, "charges-max": 0 },
       { "item": "1895sbl", "prob": 15, "charges-min": 0, "charges-max": 0 },
-      { "item": "wasr10", "prob": 35, "charges-min": 0, "charges-max": 0 }
+      { "item": "aksemi", "prob": 35, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -749,7 +749,7 @@
       { "item": "shotgun_d", "prob": 10, "charges-min": 0, "charges-max": 2 },
       { "item": "sten", "prob": 20, "charges-min": 0, "charges-max": 32 },
       { "item": "sks", "prob": 10, "charges-min": 0, "charges-max": 10 },
-      { "item": "wasr10", "prob": 5, "charges-min": 0, "charges-max": 30 }
+      { "item": "aksemi", "prob": 5, "charges-min": 0, "charges-max": 30 }
     ]
   }
 ]

From 518eec3738829f0968a829455191dfadb96a44bf Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Wed, 1 Apr 2020 22:03:09 -0400
Subject: [PATCH 13/26] Add/rework AK magazines

Add 10, 20, and 75 round AK magazines.
Change IDs of existing AK magazines to match.
Audit existing AK magazine specs.

https://www.centuryarms.com/maak78a.html
AK drum mag specs
-Weight = 2.25 lbs empty = 1021g
-Volume = pi r^2 h = 63.617 in^3 = 1.042 L, + 100ml to account for feed lips
-Price = copied from link $120

https://www.lightfighter.net/topic/article-dimensions-magazines-and-other-items
-AK 30 round volume

https://www.reddit.com/r/ak47/comments/3tf05z/762x39_ak_magazine_weight_reference/
-AK 30 and 20-round weight

AK 20 round found listed at 7 inch height, recalculate volume to 17.5 in^3.  Use % deviation from 30 rounder to extrapolate 10 and 40 round volume.  Reduce/increase weight by 30% from 30 round magazine for every 10 rounds lost or gained.  (was within 3 grams between the found 30 and 20 rounder weight.)

https://www.centuryarms.com/maak78a.html
AK drum mag specs
-Weight = 2.25 lbs empty = 1021g
-Volume = pi r^2 h = 63.617 in^3 = 1.042 L, + 100ml to account for feed lips
-Price = copied from link $120

https://www.lightfighter.net/topic/article-dimensions-magazines-and-other-items
-AK 30 round volume

https://www.reddit.com/r/ak47/comments/3tf05z/762x39_ak_magazine_weight_reference/
-AK 30 and 20-round weight

AK 20 round found listed at 7 inch height, recalculate volume to 17.5 in^3.  Use % deviation from 30 rounder to extrapolate 10 and 40 round volume.  Reduce/increase weight by 30% from 30 round magazine for every 10 rounds lost or gained.  (was within 3 grams between the found 30 and 20 rounder weight.)
---
 data/json/items/magazine/762.json | 80 +++++++++++++++++++++++++------
 1 file changed, 65 insertions(+), 15 deletions(-)

diff --git a/data/json/items/magazine/762.json b/data/json/items/magazine/762.json
index be25f54a1823f..6def6fcec0ec1 100644
--- a/data/json/items/magazine/762.json
+++ b/data/json/items/magazine/762.json
@@ -17,31 +17,47 @@
     "flags": [ "SPEEDLOADER" ]
   },
   {
-    "id": "akmbigmag",
+    "id": "akmag10",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": { "str": "AKM extended magazine" },
-    "description": "A 40-round, 7.62x39mm magazine initially designed for the RPK but compatible with the AKM rifle.",
-    "weight": "570 g",
-    "volume": "750 ml",
-    "price": 8300,
+    "name": { "str": "AK 10-round magazine" },
+    "description": "A compact 10-round magazine for AK-pattern rifles, made of stamped sheet metal.",
+    "weight": "130 g",
+    "volume": "151 ml",
+    "price": 3000,
     "material": "steel",
     "symbol": "#",
     "color": "light_gray",
     "ammo_type": "762",
-    "capacity": 40,
-    "reliability": 8,
-    "reload_time": 120,
-    "flags": [ "MAG_BULKY" ]
+    "capacity": 10,
+    "reliability": 9,
+    "flags": [ "MAG_COMPACT" ]
+  },
+  {
+    "id": "akmag20",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "AK 20-round magazine" },
+    "description": "A compact 20-round magazine for 7.62x39 AK-pattern rifles, made of stamped sheet metal.  Originally designed for tank crews.",
+    "weight": "283 g",
+    "volume": "265 ml",
+    "price": 3000,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "762",
+    "capacity": 20,
+    "reliability": 9,
+    "flags": [ "MAG_COMPACT" ]
   },
   {
-    "id": "akmmag",
+    "id": "akmag30",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": { "str": "AKM magazine" },
-    "description": "A standard 30-round magazine made for the AKM rifle, made of stamped sheet metal.",
-    "weight": "430 g",
-    "volume": "500 ml",
+    "name": { "str": "AK 30-round magazine" },
+    "description": "A standard 30-round magazine for 7.62x39 AK-pattern rifles, made of stamped sheet metal.",
+    "weight": "326 g",
+    "volume": "379 ml",
     "price": 2800,
     "material": "steel",
     "symbol": "#",
@@ -50,5 +66,39 @@
     "capacity": 30,
     "reliability": 9,
     "flags": [ "MAG_COMPACT" ]
+  },
+  {
+    "id": "akmag40",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "AK 40-round magazine" },
+    "description": "An extended 40-round magazine for 7.62x39 AK-pattern rifles, made of stamped sheet metal.",
+    "weight": "424 g",
+    "volume": "493 ml",
+    "price": 4500,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "762",
+    "capacity": 40,
+    "reliability": 8,
+    "flags": [ "MAG_BULKY" ]
+  },
+  {
+    "id": "akdrum75",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "AK drum magazine" },
+    "description": "A bulky 75-round drum magazine made for 7.62x39  AK-pattern rifles.",
+    "weight": "1020 g",
+    "volume": "1142 ml",
+    "price": 12000,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "762",
+    "capacity": 75,
+    "reliability": 7,
+    "flags": [ "MAG_BULKY" ]
   }
 ]

From 3ec8daf2efc462e01364176765a6b6c4d208d761 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Wed, 1 Apr 2020 22:03:16 -0400
Subject: [PATCH 14/26] Add new AK magazines to itemgroups

---
 data/json/itemgroups/Weapons_Mods_Ammo/magazines.json | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
index 608f32d83da0e..80a8daab5b062 100644
--- a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
+++ b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -216,7 +216,8 @@
       [ "stanag10", 30 ],
       [ "ruger30", 20 ],
       [ "stanag30", 10 ],
-      [ "ar10mag_20rd", 30 ]
+      [ "ar10mag_20rd", 30 ],
+      [ "akmag30", 25 ]
     ]
   },
   {
@@ -230,8 +231,10 @@
     "id": "mags_rifle_rare",
     "//": "Aftermarket or otherwise uncommon rifle magazines excluding milspec.",
     "items": [
-      [ "akmbigmag", 5 ],
-      [ "akmmag", 25 ],
+      [ "akmag10", 40 ],
+      [ "akmag20", 40 ],
+      [ "akmag40", 40 ],
+      [ "akdrum75", 30 ],
       [ "falmag", 100 ],
       [ "falbigmag", 50 ],
       [ "g3mag", 80 ],

From 14838b4092f2a6692e3be0b11ced1fe0c3d90350 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Wed, 1 Apr 2020 22:03:27 -0400
Subject: [PATCH 15/26] Update magazine compatibility to new magazines

Minor: remove NEVER_JAMS flag from AKs, audit AKM specs.
---
 data/json/items/gun/762.json | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 76ef8b369d3c9..5f50853fbd222 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -6,8 +6,8 @@
     "reload_noise_volume": 10,
     "name": { "str": "AKM" },
     "description": "One of the most recognizable assault rifles ever made, the AKM is renowned for its durability even under the worst conditions.",
-    "weight": "3300 g",
-    "volume": "1750 ml",
+    "weight": "3402 g",
+    "volume": "4414 ml",
     "price": 290000,
     "to_hit": -1,
     "bashing": 12,
@@ -28,14 +28,13 @@
       [ "grip", 1 ],
       [ "mechanism", 4 ],
       [ "muzzle", 1 ],
-      [ "rail", 1 ],
-      [ "sights", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
       [ "sling", 1 ],
       [ "stock", 1 ],
-      [ "underbarrel", 1 ]
+      [ "underbarrel mount", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ],
-    "flags": [ "NEVER_JAMS" ]
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ],
   },
   {
     "id": "arx160",
@@ -74,7 +73,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ]
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40" ] ] ],
   },
   {
     "id": "sks",
@@ -151,8 +150,7 @@
       [ "stock", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ],
-    "flags": [ "NEVER_JAMS" ]
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ],
   },
   {
     "id": "draco",
@@ -189,6 +187,6 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ]
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ],
   }
 ]

From f201c502d108465f107b9c4538752913c8a7f43f Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Wed, 1 Apr 2020 22:08:54 -0400
Subject: [PATCH 16/26] Obsolete old AK magazine IDs

---
 data/json/items/obsolete.json | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
index 669a917d08933..69b8c3b8c9cc5 100644
--- a/data/json/items/obsolete.json
+++ b/data/json/items/obsolete.json
@@ -1885,5 +1885,40 @@
       "explosion": { "power": 1340, "shrapnel": { "casing_mass": 1000, "fragment_mass": 0.01 } }
     },
     "flags": [ "BOMB", "TRADER_AVOID" ]
+  },
+  {
+    "id": "akmbigmag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "AKM extended magazine" },
+    "description": "A 40-round, 7.62x39mm magazine initially designed for the RPK but compatible with the AKM rifle.",
+    "weight": "570 g",
+    "volume": "750 ml",
+    "price": 8300,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "762",
+    "capacity": 40,
+    "reliability": 8,
+    "reload_time": 120,
+    "flags": [ "MAG_BULKY" ]
+  },
+  {
+    "id": "akmmag",
+    "looks_like": "stanag30",
+    "type": "MAGAZINE",
+    "name": { "str": "AKM magazine" },
+    "description": "A standard 30-round magazine made for the AKM rifle, made of stamped sheet metal.",
+    "weight": "430 g",
+    "volume": "500 ml",
+    "price": 2800,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "762",
+    "capacity": 30,
+    "reliability": 9,
+    "flags": [ "MAG_COMPACT" ]
   }
 ]

From 860bf04af9cbb35ea7b60379b720f7eeb36df1bc Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Wed, 1 Apr 2020 22:09:29 -0400
Subject: [PATCH 17/26] Change reference to new AK mag

---
 data/json/itemgroups/roof.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/itemgroups/roof.json b/data/json/itemgroups/roof.json
index f005bd68bde8e..ad5b058031517 100644
--- a/data/json/itemgroups/roof.json
+++ b/data/json/itemgroups/roof.json
@@ -11,7 +11,7 @@
       { "item": "mre_lemontuna_box", "prob": 5 },
       { "item": "mre_asianbeef_box", "prob": 5 },
       { "item": "ak47", "prob": 20 },
-      { "item": "akmmag", "prob": 20 },
+      { "item": "akmag30", "prob": 20 },
       { "item": "762_m43", "prob": 20 },
       { "item": "cig", "prob": 10 },
       { "item": "joint_roach", "prob": 20 },

From 51f747afc419c9b941ceef87d3ce108795feb440 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Wed, 1 Apr 2020 22:19:04 -0400
Subject: [PATCH 18/26] Lint JSON

---
 data/json/items/gun/762.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index 5f50853fbd222..fb6379d1f8058 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -34,7 +34,7 @@
       [ "stock", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ],
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ]
   },
   {
     "id": "arx160",
@@ -73,7 +73,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40" ] ] ],
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40" ] ] ]
   },
   {
     "id": "sks",
@@ -150,7 +150,7 @@
       [ "stock", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ],
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ]
   },
   {
     "id": "draco",
@@ -187,6 +187,6 @@
       [ "stock mount", 1 ],
       [ "underbarrel mount", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ],
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ]
   }
 ]

From b85ed7a117295445fd055685357f395146e232dd Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 2 Apr 2020 12:37:28 -0400
Subject: [PATCH 19/26] Undo obsolete AK mags

---
 data/json/items/obsolete.json | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json
index eb861fdc51aca..45027899774a0 100644
--- a/data/json/items/obsolete.json
+++ b/data/json/items/obsolete.json
@@ -1896,40 +1896,5 @@
     "price": 450000,
     "weight": "100 g",
     "difficulty": 8
-  },
-  {
-    "id": "akmbigmag",
-    "looks_like": "stanag30",
-    "type": "MAGAZINE",
-    "name": { "str": "AKM extended magazine" },
-    "description": "A 40-round, 7.62x39mm magazine initially designed for the RPK but compatible with the AKM rifle.",
-    "weight": "570 g",
-    "volume": "750 ml",
-    "price": 8300,
-    "material": "steel",
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "762",
-    "capacity": 40,
-    "reliability": 8,
-    "reload_time": 120,
-    "flags": [ "MAG_BULKY" ]
-  },
-  {
-    "id": "akmmag",
-    "looks_like": "stanag30",
-    "type": "MAGAZINE",
-    "name": { "str": "AKM magazine" },
-    "description": "A standard 30-round magazine made for the AKM rifle, made of stamped sheet metal.",
-    "weight": "430 g",
-    "volume": "500 ml",
-    "price": 2800,
-    "material": "steel",
-    "symbol": "#",
-    "color": "light_gray",
-    "ammo_type": "762",
-    "capacity": 30,
-    "reliability": 9,
-    "flags": [ "MAG_COMPACT" ]
   }
 ]

From 1b3e9c29e8553691fba6c658abbf1ec9a636a1f6 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 2 Apr 2020 12:40:14 -0400
Subject: [PATCH 20/26] Migrate AK mags

---
 data/json/items/migration.json | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/data/json/items/migration.json b/data/json/items/migration.json
index 23dacf6f67db4..ae001e75d032b 100644
--- a/data/json/items/migration.json
+++ b/data/json/items/migration.json
@@ -1153,5 +1153,15 @@
     "id": "bio_solar",
     "type": "MIGRATION",
     "replace": "potato"
+  },
+    {
+    "id": "akmmag",
+    "type": "MIGRATION",
+    "replace": "akmag30"
+  },
+    {
+    "id": "akmbigmag",
+    "type": "MIGRATION",
+    "replace": "akmag40"
   }
 ]

From e8b961015f88eba7d6fed76cedeac49bd4393965 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Thu, 2 Apr 2020 12:43:48 -0400
Subject: [PATCH 21/26] lint JSON

---
 data/json/items/migration.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/items/migration.json b/data/json/items/migration.json
index ae001e75d032b..2aef97c76d406 100644
--- a/data/json/items/migration.json
+++ b/data/json/items/migration.json
@@ -1154,12 +1154,12 @@
     "type": "MIGRATION",
     "replace": "potato"
   },
-    {
+  {
     "id": "akmmag",
     "type": "MIGRATION",
     "replace": "akmag30"
   },
-    {
+  {
     "id": "akmbigmag",
     "type": "MIGRATION",
     "replace": "akmag40"

From d138db0e097f29047b9a3f25442fcad0d3f08f7e Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Fri, 3 Apr 2020 13:10:45 -0400
Subject: [PATCH 22/26] Description edit

---
 data/json/items/magazine/762.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/json/items/magazine/762.json b/data/json/items/magazine/762.json
index 6def6fcec0ec1..aac28518aa064 100644
--- a/data/json/items/magazine/762.json
+++ b/data/json/items/magazine/762.json
@@ -21,7 +21,7 @@
     "looks_like": "stanag30",
     "type": "MAGAZINE",
     "name": { "str": "AK 10-round magazine" },
-    "description": "A compact 10-round magazine for AK-pattern rifles, made of stamped sheet metal.",
+    "description": "A compact 10-round magazine for 7.62x39 AK-pattern rifles, made of stamped sheet metal.  Made for restricted civilian use.",
     "weight": "130 g",
     "volume": "151 ml",
     "price": 3000,
@@ -88,8 +88,8 @@
     "id": "akdrum75",
     "looks_like": "stanag30",
     "type": "MAGAZINE",
-    "name": { "str": "AK drum magazine" },
-    "description": "A bulky 75-round drum magazine made for 7.62x39  AK-pattern rifles.",
+    "name": { "str": "AK 75-round drum magazine" },
+    "description": "A bulky 75-round drum magazine for 7.62x39 AK-pattern rifles, made of stamped sheet metal.",
     "weight": "1020 g",
     "volume": "1142 ml",
     "price": 12000,

From 2b0d4ce0421b80e1f394a50dd137adbbab329ead Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Fri, 3 Apr 2020 13:29:32 -0400
Subject: [PATCH 23/26] Update GG for AK-47

Co-Authored-By: LaVeyanFiend <51099123+LaVeyanFiend@users.noreply.github.com>
---
 data/mods/Generic_Guns/firearms/gg_firearms_migration.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
index d6b8ea6f5645f..f3f845ca9ae90 100644
--- a/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
+++ b/data/mods/Generic_Guns/firearms/gg_firearms_migration.json
@@ -256,7 +256,7 @@
       "m1a",
       "sks",
       "mosin44",
-      "wasr10"
+      "aksemi"
     ],
     "type": "MIGRATION",
     "replace": "rifle_sporter"

From 0165b3f9254b05cdfc1a0b71ba205741057a0bb2 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Fri, 3 Apr 2020 13:33:53 -0400
Subject: [PATCH 24/26] Update GG migration for new AK mags

---
 .../Generic_Guns/magazines/gg_magazines_migration.json     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
index 13723cfef68d2..203386890aa65 100644
--- a/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
+++ b/data/mods/Generic_Guns/magazines/gg_magazines_migration.json
@@ -158,8 +158,11 @@
       "ar10mag_20rd",
       "ak74mag",
       "rpk74mag",
-      "akmbigmag",
-      "akmmag",
+      "akmag10",
+      "akmag20",
+      "akmag30",
+      "akmag40",
+      "akdrum75",
       "8x40_100_mag",
       "8x40_250_mag",
       "8x40_25_mag",

From b74bf9468d9f55d7c8c6e61a09569d2e265089b7 Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Fri, 3 Apr 2020 21:38:40 -0400
Subject: [PATCH 25/26] Update 762.json

-Revised AK-47 description
-Remove barrel_length from AKs
-Add -5 damage penalty to Draco
---
 data/json/items/gun/762.json | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json
index fb6379d1f8058..6bc06ab84c8ec 100644
--- a/data/json/items/gun/762.json
+++ b/data/json/items/gun/762.json
@@ -19,7 +19,6 @@
     "dispersion": 180,
     "durability": 9,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -121,7 +120,7 @@
     "type": "GUN",
     "reload_noise_volume": 10,
     "name": { "str": "AK-47" },
-    "description": "A civilian-legal clone of the iconic Kalashnikov, these rifles was made and imported by many different firms.  A valuable survivors' commodity for its reliability in harsh conditions.",
+    "description": "Civilian-legal clones of the iconic Kalashnikov, like this one, were manufactured and imported by many different firms.  Even without full-auto function, their solid firepower and reliability in harsh conditions make them valuable weapons in this new world.",
     "weight": "3402 g",
     "volume": "4414 ml",
     "price": 79500,
@@ -135,7 +134,6 @@
     "dispersion": 180,
     "durability": 8,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
-    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -170,9 +168,9 @@
     "ammo": "762",
     "skill": "pistol",
     "dispersion": 240,
+    "ranged_damage": -5,
     "durability": 7,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
-    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],

From bb537a8ec10650d87f742125766fec2c0554c21f Mon Sep 17 00:00:00 2001
From: carmakazi <49455167+carmakazi@users.noreply.github.com>
Date: Fri, 10 Apr 2020 09:23:51 -0400
Subject: [PATCH 26/26] Update 7.62 weapons to new AK mags

---
 data/mods/EW_Pack/ew_weapons.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/data/mods/EW_Pack/ew_weapons.json b/data/mods/EW_Pack/ew_weapons.json
index f11fdbe806a49..152692c6f1937 100644
--- a/data/mods/EW_Pack/ew_weapons.json
+++ b/data/mods/EW_Pack/ew_weapons.json
@@ -38,7 +38,7 @@
     "magazines": [
       [ "654", [ "svs24_robomag", "svs24_robodrum" ] ],
       [ "545x39", [ "cw24_robomag", "cw24_bigrobomag", "ak74mag" ] ],
-      [ "762", [ "akmmag", "akmbigmag" ] ]
+      [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ]
     ]
   },
   {
@@ -104,7 +104,7 @@
     ],
     "magazines": [
       [ "545x39", [ "cw24_robomag", "cw24_bigrobomag" ] ],
-      [ "762", [ "akmmag", "akmbigmag" ] ],
+      [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ],
       [ "654", [ "svs24_robomag", "svs24_robodrum" ] ]
     ]
   },
@@ -130,7 +130,7 @@
     "price": 160000,
     "ammo": "762",
     "magazines": [
-      [ "762", [ "akmmag", "akmbigmag" ] ],
+      [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ],
       [ "545x39", [ "cw24_robomag", "cw24_bigrobomag" ] ],
       [ "654", [ "svs24_robomag", "svs24_robodrum" ] ]
     ]