添加减伤计算的空值，补充json

src/main/java/com/atsuishio/superbwarfare/data/gun/DamageReduce.java

@@ -8,12 +8,13 @@ public class DamageReduce {
     public ReduceType type = null;
 
     @SerializedName("Rate")
-    private double rate = 0.007;
+    private double rate;
 
     @SerializedName("MinDistance")
-    private double minDistance = 100;
+    private double minDistance;
 
     public DamageReduce() {
+        this(ReduceType.EMPTY);
     }
 
     public DamageReduce(ReduceType type) {
@@ -56,6 +57,8 @@ public class DamageReduce {
         RIFLE("Rifle", 0.007, 100),
         @SerializedName("Smg")
         SMG("Smg", 0.02, 50),
+        @SerializedName("Empty")
+        EMPTY("Empty", 0, 0),
         ;
 
         public final double rate;

src/main/resources/data/superbwarfare/guns/homemade_shotgun.json

@@ -14,6 +14,9 @@
   "BypassesArmor": 0.01,
   "SoundRadius": 16,
   "RPM": 600,
+  "DamageReduce": {
+    "Type": "Shotgun"
+  },
   "AmmoType": "@ShotgunAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/hunting_rifle.json

@@ -11,6 +11,9 @@
   "EmptyReloadTime": 64,
   "BypassesArmor": 0.7,
   "SoundRadius": 20,
+  "DamageReduce": {
+    "Type": "Sniper"
+  },
   "AmmoType": "@SniperAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/insidious.json

@@ -14,7 +14,12 @@
   "BypassesArmor": 0.4,
   "SoundRadius": 12,
   "RPM": 900,
-  "AvailableFireModes": ["Burst"],
+  "AvailableFireModes": [
+    "Burst"
+  ],
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/k_98.json

@@ -20,6 +20,9 @@
   "FinishTime": 18,
   "BypassesArmor": 0.5,
   "SoundRadius": 18,
+  "DamageReduce": {
+    "Type": "Sniper"
+  },
   "AmmoType": "@SniperAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/m_1911.json

@@ -13,6 +13,9 @@
   "BypassesArmor": 0.2,
   "SoundRadius": 10,
   "RPM": 400,
+  "DamageReduce": {
+    "Type": "Handgun"
+  },
   "AmmoType": "@HandgunAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/m_4.json

@@ -16,7 +16,13 @@
   "BypassesArmor": 0.25,
   "SoundRadius": 14,
   "RPM": 850,
-  "AvailableFireModes": ["Semi", "Auto"],
+  "AvailableFireModes": [
+    "Semi",
+    "Auto"
+  ],
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/m_60.json

@@ -14,7 +14,12 @@
   "BypassesArmor": 0.25,
   "SoundRadius": 15,
   "RPM": 600,
-  "AvailableFireModes": ["Auto"],
+  "AvailableFireModes": [
+    "Auto"
+  ],
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/m_870.json

@@ -20,6 +20,9 @@
   "BypassesArmor": 0.05,
   "SoundRadius": 16,
   "BoltActionTime": 11,
+  "DamageReduce": {
+    "Type": "Shotgun"
+  },
   "AmmoType": "@ShotgunAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/m_98b.json

@@ -15,6 +15,9 @@
   "EmptyReloadTime": 80,
   "BypassesArmor": 0.6,
   "SoundRadius": 18,
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@SniperAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/marlin.json

@@ -18,6 +18,9 @@
   "BypassesArmor": 0.3,
   "SoundRadius": 15,
   "BoltActionTime": 12,
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/minigun.json

@@ -15,6 +15,9 @@
   "AmmoType": "@RifleAmmo",
   "ShootDelay": 10,
   "HeatPerShoot": 0.5,
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AvailablePerks": [
     "@Ammo",
     "superbwarfare:field_doctor",

src/main/resources/data/superbwarfare/guns/mk_14.json

@@ -16,7 +16,13 @@
   "BypassesArmor": 0.4,
   "SoundRadius": 16,
   "RPM": 700,
-  "AvailableFireModes": ["Semi", "Auto"],
+  "AvailableFireModes": [
+    "Semi",
+    "Auto"
+  ],
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/mosin_nagant.json

@@ -19,6 +19,9 @@
   "FinishTime": 18,
   "BypassesArmor": 0.54,
   "SoundRadius": 18,
+  "DamageReduce": {
+    "Type": "Sniper"
+  },
   "AmmoType": "@SniperAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/mp_443.json

@@ -13,6 +13,9 @@
   "BypassesArmor": 0.15,
   "SoundRadius": 8,
   "RPM": 400,
+  "DamageReduce": {
+    "Type": "Handgun"
+  },
   "AmmoType": "@HandgunAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/ntw_20.json

@@ -15,6 +15,9 @@
   "EmptyReloadTime": 112,
   "BypassesArmor": 1,
   "SoundRadius": 22,
+  "DamageReduce": {
+    "Type": "Heavy"
+  },
   "AmmoType": "@HeavyAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/qbz_95.json

@@ -16,7 +16,13 @@
   "BypassesArmor": 0.28,
   "SoundRadius": 13,
   "RPM": 650,
-  "AvailableFireModes": ["Semi", "Auto"],
+  "AvailableFireModes": [
+    "Semi",
+    "Auto"
+  ],
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/rpk.json

@@ -16,7 +16,13 @@
   "BypassesArmor": 0.23,
   "SoundRadius": 14,
   "RPM": 600,
-  "AvailableFireModes": ["Semi", "Auto"],
+  "AvailableFireModes": [
+    "Semi",
+    "Auto"
+  ],
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/sentinel.json

@@ -14,6 +14,9 @@
   "EmptyReloadTime": 89,
   "BypassesArmor": 0.8,
   "SoundRadius": 20,
+  "DamageReduce": {
+    "Type": "Sniper"
+  },
   "AmmoType": "@SniperAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/sks.json

@@ -13,6 +13,9 @@
   "BypassesArmor": 0.23,
   "SoundRadius": 16,
   "RPM": 400,
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "AmmoType": "@RifleAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/svd.json

@@ -15,6 +15,9 @@
   "BypassesArmor": 0.45,
   "SoundRadius": 17,
   "RPM": 300,
+  "DamageReduce": {
+    "Type": "Sniper"
+  },
   "AmmoType": "@SniperAmmo",
   "AvailablePerks": [
     "@Ammo",

src/main/resources/data/superbwarfare/guns/trachelium.json

@@ -13,6 +13,9 @@
   "SoundRadius": 10,
   "RPM": 240,
   "AmmoType": "@RifleAmmo",
+  "DamageReduce": {
+    "Type": "Rifle"
+  },
   "ShootDelay": 6,
   "AvailablePerks": [
     "@Ammo",