Add AK-47 semi-auto rifle, Mini Draco pistol, AK magazines (#39041)

CleverRaven · Apr 14, 2020 · f40ad4c · f40ad4c
1 parent 62e99a7
commit f40ad4c
Show file tree

Hide file tree

Showing 9 changed files with 183 additions and 40 deletions.
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/guns.json b/data/json/itemgroups/Weapons_Mods_Ammo/guns.json
@@ -97,7 +97,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 }
     ]
   },
   {
@@ -116,7 +117,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 }
     ]
   },
   {
@@ -273,7 +275,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": "aksemi", "prob": 35, "charges-min": 0, "charges-max": 30 }
     ]
   },
   {
@@ -296,7 +299,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": "aksemi", "prob": 35, "charges-min": 0, "charges-max": 0 }
     ]
   },
   {
@@ -753,7 +757,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": "aksemi", "prob": 5, "charges-min": 0, "charges-max": 30 }
     ]
   }
 ]
diff --git a/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json b/data/json/itemgroups/Weapons_Mods_Ammo/magazines.json
@@ -220,7 +220,8 @@
       [ "stanag10", 30 ],
       [ "ruger30", 20 ],
       [ "stanag30", 10 ],
-      [ "ar10mag_20rd", 30 ]
+      [ "ar10mag_20rd", 30 ],
+      [ "akmag30", 25 ]
     ]
   },
   {
@@ -234,8 +235,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 ],

diff --git 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 },

diff --git 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,
     "price_postapoc": 4000,
     "to_hit": -1,
@@ -20,7 +20,6 @@
     "dispersion": 180,
     "durability": 9,
     "modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ],
-    "barrel_length": "250 ml",
     "valid_mod_locations": [
       [ "accessories", 4 ],
       [ "barrel", 1 ],
@@ -29,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",
@@ -76,7 +74,7 @@
       [ "stock", 1 ],
       [ "underbarrel", 1 ]
     ],
-    "magazines": [ [ "762", [ "akmmag", "akmbigmag" ] ] ]
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40" ] ] ]
   },
   {
     "id": "sks",
@@ -118,5 +116,78 @@
     ],
     "magazines": [ [ "762", [ "762x39_clip" ] ] ],
     "flags": [ "RELOAD_ONE", "NEVER_JAMS" ]
+  },
+  {
+    "id": "aksemi",
+    "looks_like": "ar15",
+    "type": "GUN",
+    "reload_noise_volume": 10,
+    "name": { "str": "AK-47" },
+    "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,
+    "to_hit": -1,
+    "bashing": 12,
+    "material": [ "steel", "wood" ],
+    "symbol": "(",
+    "color": "brown",
+    "ammo": "762",
+    "skill": "rifle",
+    "dispersion": 180,
+    "durability": 8,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
+      [ "sling", 1 ],
+      [ "stock", 1 ],
+      [ "underbarrel mount", 1 ]
+    ],
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ]
+  },
+  {
+    "id": "draco",
+    "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": "2563 g",
+    "volume": "2167 ml",
+    "price": 72500,
+    "to_hit": -5,
+    "bashing": 8,
+    "material": [ "steel", "wood" ],
+    "symbol": "(",
+    "color": "brown",
+    "ammo": "762",
+    "skill": "pistol",
+    "dispersion": 240,
+    "ranged_damage": -5,
+    "durability": 7,
+    "modes": [ [ "DEFAULT", "semi-auto", 1 ] ],
+    "valid_mod_locations": [
+      [ "accessories", 4 ],
+      [ "barrel", 1 ],
+      [ "bore", 1 ],
+      [ "brass catcher", 1 ],
+      [ "grip", 1 ],
+      [ "mechanism", 4 ],
+      [ "muzzle", 1 ],
+      [ "rail mount", 1 ],
+      [ "sights mount", 1 ],
+      [ "sling", 1 ],
+      [ "stock mount", 1 ],
+      [ "underbarrel mount", 1 ]
+    ],
+    "magazines": [ [ "762", [ "akmag30", "akmag10", "akmag20", "akmag40", "akdrum75" ] ] ]
   }
 ]
diff --git 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 7.62x39 AK-pattern rifles, made of stamped sheet metal.  Made for restricted civilian use.",
+    "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 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,
+    "material": "steel",
+    "symbol": "#",
+    "color": "light_gray",
+    "ammo_type": "762",
+    "capacity": 75,
+    "reliability": 7,
+    "flags": [ "MAG_BULKY" ]
   }
 ]
diff --git a/data/json/items/migration.json b/data/json/items/migration.json
@@ -1178,5 +1178,15 @@
     "id": "p226mag_15rd_357sig",
     "type": "MIGRATION",
     "replace": "p226mag_12rd_357sig"
+  },
+  {
+    "id": "akmmag",
+    "type": "MIGRATION",
+    "replace": "akmag30"
+  },
+  {
+    "id": "akmbigmag",
+    "type": "MIGRATION",
+    "replace": "akmag40"
   }
 ]
diff --git 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" ] ]
     ]

diff --git 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"
   },
@@ -262,7 +262,8 @@
       "m1a",
       "sks",
       "mosin44",
-      "famas"
+      "famas",
+      "aksemi"
     ],
     "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
@@ -161,8 +161,11 @@
       "ar10mag_20rd",
       "ak74mag",
       "rpk74mag",
-      "akmbigmag",
-      "akmmag",
+      "akmag10",
+      "akmag20",
+      "akmag30",
+      "akmag40",
+      "akdrum75",
       "8x40_100_mag",
       "8x40_250_mag",
       "8x40_25_mag",