Update weapon data: add CarlGustafm45, Sten, NorincoCQ, L1A1, AKM, and Type56 with relevant stats in weapons.json; refactor StechkinAPS class to inherit from MachinePistol

Author: samclane

Discordia/GameLogic/Weapons.py

@@ -33,10 +33,11 @@ class ProjectileType:
 
 class Caliber:
     BB = 0
-    MM_9 = IN_38 = 1  # Pistol & SMG
-    MM_762 = 2  # AK47
-    IN_577 = 3  # Rifles
+    MM_9 = IN_38 = 1
+    MM_762 = 2
+    IN_577 = 3
     IN_45 = 4
+    MM_556 = 5
 
 
 class FiringAction:
@@ -360,15 +361,15 @@ class M1911(FromData, Pistol, FullyImplemented):
     """
 
 
-class StechkinAPS(FromData, Pistol, SelectiveFire, FullyImplemented):
+class StechkinAPS(FromData, MachinePistol, SelectiveFire, FullyImplemented):
     """
     Based on the Stechkin automatic pistol (APS)
     """
 
 
-class APS(FromData, Pistol, SelectiveFire, FullyImplemented):
+class CarlGustafm45(FromData, SMG, FullyImplemented):
     """
-    Based on the Stechkin automatic pistol (APS)
+    Based on the Carl Gustaf m/45
     """
 
 
@@ -378,6 +379,24 @@ class PPSh41(FromData, SMG, SelectiveFire, FullyImplemented):
     """
 
 
+class Sten(FromData, SMG, SelectiveFire, FullyImplemented):
+    """
+    Based on the Sten submachine gun
+    """
+
+
+class NorincoCQ(FromData, SMG, FullyImplemented):
+    """
+    Based on the Norinco CQ
+    """
+
+
+class L1A1(FromData, Rifle, FullyImplemented):
+    """
+    Based on the L1A1 (FN FAL)
+    """
+
+
 class OwenSMG(FromData, SMG, FullyImplemented):
     """
     Based on the Owen Machine Carbine (Australian)
@@ -390,6 +409,18 @@ class AK47(FromData, Rifle, SelectiveFire, FullyImplemented):
     """
 
 
+class AKM(FromData, Rifle, SelectiveFire, FullyImplemented):
+    """
+    Based on the AKM
+    """
+
+
+class Type56(FromData, Rifle, SelectiveFire, FullyImplemented):
+    """
+    Based on the Type 56
+    """
+
+
 class HKG3(FromData, Rifle, SelectiveFire, FullyImplemented):
     """
     Based on the Heckler & Koch G3

Discordia/data/weapons.json

@@ -27,13 +27,49 @@
     "weight_lb": 2.8
   },
   "StechkinAPS": {
-      "name": "Stechkin Automatic Pistol",
-      "caliber": "MM_9",
-      "action": "SemiAutomatic",
-      "capacity": 20,
-      "range_falloff": 0.7,
-      "base_damage": 4,
-      "weight_lb": 2.69
+    "name": "Stechkin Automatic Pistol",
+    "caliber": "MM_9",
+    "action": "SemiAutomatic",
+    "capacity": 20,
+    "range_falloff": 0.7,
+    "base_damage": 4,
+    "weight_lb": 2.69
+  },
+  "CarlGustafm45": {
+    "name": "Carl Gustaf m/45",
+    "caliber": "MM_9",
+    "action": "SemiAutomatic",
+    "capacity": 30,
+    "range_falloff": 0.6,
+    "base_damage": 5,
+    "weight_lb": 10.0
+  },
+  "Sten": {
+    "name": "Sten Submachine Gun",
+    "caliber": "MM_9",
+    "action": "FullyAutomatic",
+    "capacity": 32,
+    "range_falloff": 0.6,
+    "base_damage": 4,
+    "weight_lb": 8.0
+  },
+  "NorincoCQ": {
+    "name": "Norinco CQ",
+    "caliber": "MM_556",
+    "action": "FullyAutomatic",
+    "capacity": 30,
+    "range_falloff": 0.6,
+    "base_damage": 4,
+    "weight_lb": 8.0
+  },
+  "L1A1": {
+    "name": "L1A1 (FN FAL)",
+    "caliber": "MM_762",
+    "action": "FullyAutomatic",
+    "capacity": 20,
+    "range_falloff": 0.3,
+    "base_damage": 14,
+    "weight_lb": 9.7
   },
   "M1911": {
     "name": "M1911 Pistol",
@@ -80,6 +116,24 @@
     "base_damage": 15,
     "weight_lb": 7.7
   },
+  "AKM": {
+    "name": "AKM",
+    "caliber": "MM_762",
+    "action": "FullyAutomatic",
+    "capacity": 30,
+    "range_falloff": 0.35,
+    "base_damage": 15,
+    "weight_lb": 7.7
+  },
+  "Type56": {
+    "name": "Type 56",
+    "caliber": "MM_762",
+    "action": "FullyAutomatic",
+    "capacity": 30,
+    "range_falloff": 0.35,
+    "base_damage": 15,
+    "weight_lb": 7.7
+  },
   "HKG3": {
     "name": "Heckler & Koch G3",
     "caliber": "MM_762",