From daefd6350fca9ff9b913d5410b3cfd226c41b237 Mon Sep 17 00:00:00 2001
From: 17146 <1714673995@qq.com>
Date: Mon, 26 May 2025 02:03:35 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=87=8F=E4=BC=A4=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E7=9A=84=E7=A9=BA=E5=80=BC=EF=BC=8C=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?json?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../atsuishio/superbwarfare/data/gun/DamageReduce.java    | 7 +++++--
 .../data/superbwarfare/guns/homemade_shotgun.json         | 3 +++
 .../resources/data/superbwarfare/guns/hunting_rifle.json  | 3 +++
 src/main/resources/data/superbwarfare/guns/insidious.json | 7 ++++++-
 src/main/resources/data/superbwarfare/guns/k_98.json      | 3 +++
 src/main/resources/data/superbwarfare/guns/m_1911.json    | 3 +++
 src/main/resources/data/superbwarfare/guns/m_4.json       | 8 +++++++-
 src/main/resources/data/superbwarfare/guns/m_60.json      | 7 ++++++-
 src/main/resources/data/superbwarfare/guns/m_870.json     | 3 +++
 src/main/resources/data/superbwarfare/guns/m_98b.json     | 3 +++
 src/main/resources/data/superbwarfare/guns/marlin.json    | 3 +++
 src/main/resources/data/superbwarfare/guns/minigun.json   | 3 +++
 src/main/resources/data/superbwarfare/guns/mk_14.json     | 8 +++++++-
 .../resources/data/superbwarfare/guns/mosin_nagant.json   | 3 +++
 src/main/resources/data/superbwarfare/guns/mp_443.json    | 3 +++
 src/main/resources/data/superbwarfare/guns/ntw_20.json    | 3 +++
 src/main/resources/data/superbwarfare/guns/qbz_95.json    | 8 +++++++-
 src/main/resources/data/superbwarfare/guns/rpk.json       | 8 +++++++-
 src/main/resources/data/superbwarfare/guns/sentinel.json  | 3 +++
 src/main/resources/data/superbwarfare/guns/sks.json       | 3 +++
 src/main/resources/data/superbwarfare/guns/svd.json       | 3 +++
 .../resources/data/superbwarfare/guns/trachelium.json     | 3 +++
 22 files changed, 90 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/atsuishio/superbwarfare/data/gun/DamageReduce.java b/src/main/java/com/atsuishio/superbwarfare/data/gun/DamageReduce.java
index 16f6df021..c332e578f 100644
--- a/src/main/java/com/atsuishio/superbwarfare/data/gun/DamageReduce.java
+++ b/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;
diff --git a/src/main/resources/data/superbwarfare/guns/homemade_shotgun.json b/src/main/resources/data/superbwarfare/guns/homemade_shotgun.json
index 655c07d82..63c90fd02 100644
--- a/src/main/resources/data/superbwarfare/guns/homemade_shotgun.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
index d716fd38e..f9d308303 100644
--- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/insidious.json b/src/main/resources/data/superbwarfare/guns/insidious.json
index 6a911258b..d05c3abd1 100644
--- a/src/main/resources/data/superbwarfare/guns/insidious.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json
index 78b946013..d6b1fbedb 100644
--- a/src/main/resources/data/superbwarfare/guns/k_98.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json
index 29114b1f2..acf5dfae8 100644
--- a/src/main/resources/data/superbwarfare/guns/m_1911.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json
index a33256332..c59cb51fa 100644
--- a/src/main/resources/data/superbwarfare/guns/m_4.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json
index 9b8a92a2f..92d15b0bc 100644
--- a/src/main/resources/data/superbwarfare/guns/m_60.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json
index 59abffda2..a39ca9bab 100644
--- a/src/main/resources/data/superbwarfare/guns/m_870.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json
index bfc50e290..a576206c3 100644
--- a/src/main/resources/data/superbwarfare/guns/m_98b.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json
index 92fc869a0..c51489f1a 100644
--- a/src/main/resources/data/superbwarfare/guns/marlin.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json
index 1f3ac9b3a..cb2a53f6c 100644
--- a/src/main/resources/data/superbwarfare/guns/minigun.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json
index 3175c5c78..c0294f6f8 100644
--- a/src/main/resources/data/superbwarfare/guns/mk_14.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
index 6bab82da1..faae49ed8 100644
--- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/mp_443.json b/src/main/resources/data/superbwarfare/guns/mp_443.json
index 39ba3a7cb..c95439082 100644
--- a/src/main/resources/data/superbwarfare/guns/mp_443.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json
index efe2cd437..a69b40acb 100644
--- a/src/main/resources/data/superbwarfare/guns/ntw_20.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json
index 3166c198c..a4864c25e 100644
--- a/src/main/resources/data/superbwarfare/guns/qbz_95.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json
index fd98becc2..34ef9547f 100644
--- a/src/main/resources/data/superbwarfare/guns/rpk.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json
index b0fc36176..9ffc60e07 100644
--- a/src/main/resources/data/superbwarfare/guns/sentinel.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json
index 330865d0a..01a09a9e0 100644
--- a/src/main/resources/data/superbwarfare/guns/sks.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json
index 5a53f3a1b..c2d7765ed 100644
--- a/src/main/resources/data/superbwarfare/guns/svd.json
+++ b/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",
diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json
index 8bf4ff7c7..59351f1e2 100644
--- a/src/main/resources/data/superbwarfare/guns/trachelium.json
+++ b/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",