From c95becbcfc5e9aa3e0343e387f7e684801dd20f6 Mon Sep 17 00:00:00 2001
From: Atsuihsio <842960157@qq.com>
Date: Mon, 21 Oct 2024 17:18:18 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=9C=AA=E5=AE=9E=E8=A3=85=E7=9E=84?=
 =?UTF-8?q?=E5=87=86=E9=95=9C=E9=85=8D=E4=BB=B6=E7=B3=BB=E7=BB=9F=E7=9A=84?=
 =?UTF-8?q?=E6=AD=A6=E5=99=A8=E6=B7=BB=E5=8A=A0=E4=B8=B4=E6=97=B6=E7=BC=A9?=
 =?UTF-8?q?=E6=94=BE=E5=80=8D=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/data/superbwarfare/guns/aa_12.json         | 1 -
 src/main/resources/data/superbwarfare/guns/abekiri.json       | 1 -
 src/main/resources/data/superbwarfare/guns/ak_47.json         | 1 -
 src/main/resources/data/superbwarfare/guns/bocek.json         | 2 +-
 src/main/resources/data/superbwarfare/guns/devotion.json      | 2 +-
 src/main/resources/data/superbwarfare/guns/glock_17.json      | 1 -
 src/main/resources/data/superbwarfare/guns/glock_18.json      | 1 -
 src/main/resources/data/superbwarfare/guns/hk_416.json        | 1 -
 src/main/resources/data/superbwarfare/guns/hunting_rifle.json | 1 -
 src/main/resources/data/superbwarfare/guns/javelin.json       | 4 +---
 src/main/resources/data/superbwarfare/guns/k_98.json          | 1 -
 src/main/resources/data/superbwarfare/guns/m_1911.json        | 1 -
 src/main/resources/data/superbwarfare/guns/m_4.json           | 1 -
 src/main/resources/data/superbwarfare/guns/m_60.json          | 1 -
 src/main/resources/data/superbwarfare/guns/m_79.json          | 1 -
 src/main/resources/data/superbwarfare/guns/m_870.json         | 1 -
 src/main/resources/data/superbwarfare/guns/m_98b.json         | 2 +-
 src/main/resources/data/superbwarfare/guns/marlin.json        | 1 -
 src/main/resources/data/superbwarfare/guns/minigun.json       | 1 -
 src/main/resources/data/superbwarfare/guns/mk_14.json         | 4 +---
 src/main/resources/data/superbwarfare/guns/mosin_nagant.json  | 2 +-
 src/main/resources/data/superbwarfare/guns/ntw_20.json        | 4 +---
 src/main/resources/data/superbwarfare/guns/qbz_95.json        | 1 -
 src/main/resources/data/superbwarfare/guns/rpg.json           | 1 -
 src/main/resources/data/superbwarfare/guns/rpk.json           | 1 -
 src/main/resources/data/superbwarfare/guns/sentinel.json      | 2 +-
 src/main/resources/data/superbwarfare/guns/sks.json           | 1 -
 src/main/resources/data/superbwarfare/guns/svd.json           | 2 +-
 src/main/resources/data/superbwarfare/guns/taser.json         | 1 -
 src/main/resources/data/superbwarfare/guns/trachelium.json    | 1 -
 src/main/resources/data/superbwarfare/guns/vector.json        | 1 -
 31 files changed, 9 insertions(+), 37 deletions(-)

diff --git a/src/main/resources/data/superbwarfare/guns/aa_12.json b/src/main/resources/data/superbwarfare/guns/aa_12.json
index c88c98298..bde557039 100644
--- a/src/main/resources/data/superbwarfare/guns/aa_12.json
+++ b/src/main/resources/data/superbwarfare/guns/aa_12.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 3.5,
   "recoil_x": 0.006,
   "recoil_y": 0.018,
diff --git a/src/main/resources/data/superbwarfare/guns/abekiri.json b/src/main/resources/data/superbwarfare/guns/abekiri.json
index a6ad5cc3c..9b9ca77da 100644
--- a/src/main/resources/data/superbwarfare/guns/abekiri.json
+++ b/src/main/resources/data/superbwarfare/guns/abekiri.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 4,
   "recoil_x": 0.005,
   "recoil_y": 0.026,
diff --git a/src/main/resources/data/superbwarfare/guns/ak_47.json b/src/main/resources/data/superbwarfare/guns/ak_47.json
index ce8663995..6100f489a 100644
--- a/src/main/resources/data/superbwarfare/guns/ak_47.json
+++ b/src/main/resources/data/superbwarfare/guns/ak_47.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 4,
   "recoil_x": 0.002,
   "recoil_y": 0.012,
diff --git a/src/main/resources/data/superbwarfare/guns/bocek.json b/src/main/resources/data/superbwarfare/guns/bocek.json
index 5dd17e250..bc146be5c 100644
--- a/src/main/resources/data/superbwarfare/guns/bocek.json
+++ b/src/main/resources/data/superbwarfare/guns/bocek.json
@@ -1,5 +1,5 @@
 {
-  "zoom": 2,
+  "CustomZoom": 0.75,
   "spread": 4,
   "recoil_x": 0.005,
   "recoil_y": 0.003,
diff --git a/src/main/resources/data/superbwarfare/guns/devotion.json b/src/main/resources/data/superbwarfare/guns/devotion.json
index fd5508b89..be1c792f8 100644
--- a/src/main/resources/data/superbwarfare/guns/devotion.json
+++ b/src/main/resources/data/superbwarfare/guns/devotion.json
@@ -1,5 +1,5 @@
 {
-  "zoom": 2,
+  "CustomZoom": 0.75,
   "spread": 5,
   "bipod": 1,
   "recoil_x": 0.0018,
diff --git a/src/main/resources/data/superbwarfare/guns/glock_17.json b/src/main/resources/data/superbwarfare/guns/glock_17.json
index 2c84e93dd..45029b6b6 100644
--- a/src/main/resources/data/superbwarfare/guns/glock_17.json
+++ b/src/main/resources/data/superbwarfare/guns/glock_17.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 2.5,
   "recoil_x": 0.004,
   "recoil_y": 0.013,
diff --git a/src/main/resources/data/superbwarfare/guns/glock_18.json b/src/main/resources/data/superbwarfare/guns/glock_18.json
index 8327ee29c..b17b7b3ab 100644
--- a/src/main/resources/data/superbwarfare/guns/glock_18.json
+++ b/src/main/resources/data/superbwarfare/guns/glock_18.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 2.5,
   "recoil_x": 0.004,
   "recoil_y": 0.013,
diff --git a/src/main/resources/data/superbwarfare/guns/hk_416.json b/src/main/resources/data/superbwarfare/guns/hk_416.json
index 81c011b64..be2b35aad 100644
--- a/src/main/resources/data/superbwarfare/guns/hk_416.json
+++ b/src/main/resources/data/superbwarfare/guns/hk_416.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 3.5,
   "recoil_x": 0.0016,
   "recoil_y": 0.009,
diff --git a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
index 0b44ee86e..407389bb4 100644
--- a/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
+++ b/src/main/resources/data/superbwarfare/guns/hunting_rifle.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 7,
   "recoil_x": 0.004,
   "recoil_y": 0.04,
diff --git a/src/main/resources/data/superbwarfare/guns/javelin.json b/src/main/resources/data/superbwarfare/guns/javelin.json
index a0ddbe6ce..41c1c6fe1 100644
--- a/src/main/resources/data/superbwarfare/guns/javelin.json
+++ b/src/main/resources/data/superbwarfare/guns/javelin.json
@@ -1,7 +1,5 @@
 {
-  "zoom": 2,
-  "min_zoom": 2,
-  "max_zoom": 6,
+  "CustomZoom": 1.75,
   "spread": 5,
   "zoomSpread": 5,
   "mag": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/k_98.json b/src/main/resources/data/superbwarfare/guns/k_98.json
index a9553e4c2..18de761d3 100644
--- a/src/main/resources/data/superbwarfare/guns/k_98.json
+++ b/src/main/resources/data/superbwarfare/guns/k_98.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 5,
   "recoil_x": 0.002,
   "recoil_y": 0.063,
diff --git a/src/main/resources/data/superbwarfare/guns/m_1911.json b/src/main/resources/data/superbwarfare/guns/m_1911.json
index 6c51c50de..9ec517f4a 100644
--- a/src/main/resources/data/superbwarfare/guns/m_1911.json
+++ b/src/main/resources/data/superbwarfare/guns/m_1911.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 2.5,
   "recoil_x": 0.006,
   "recoil_y": 0.018,
diff --git a/src/main/resources/data/superbwarfare/guns/m_4.json b/src/main/resources/data/superbwarfare/guns/m_4.json
index 7d619f040..820805041 100644
--- a/src/main/resources/data/superbwarfare/guns/m_4.json
+++ b/src/main/resources/data/superbwarfare/guns/m_4.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 4,
   "recoil_x": 0.0015,
   "recoil_y": 0.011,
diff --git a/src/main/resources/data/superbwarfare/guns/m_60.json b/src/main/resources/data/superbwarfare/guns/m_60.json
index 28587ed40..eb14ff59e 100644
--- a/src/main/resources/data/superbwarfare/guns/m_60.json
+++ b/src/main/resources/data/superbwarfare/guns/m_60.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 5,
   "bipod": 1,
   "recoil_x": 0.004,
diff --git a/src/main/resources/data/superbwarfare/guns/m_79.json b/src/main/resources/data/superbwarfare/guns/m_79.json
index 977ca84c4..192812a29 100644
--- a/src/main/resources/data/superbwarfare/guns/m_79.json
+++ b/src/main/resources/data/superbwarfare/guns/m_79.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 1.5,
   "recoil_x": 0.004,
   "recoil_y": 0.023,
diff --git a/src/main/resources/data/superbwarfare/guns/m_870.json b/src/main/resources/data/superbwarfare/guns/m_870.json
index 6f6fc7d79..99b807b80 100644
--- a/src/main/resources/data/superbwarfare/guns/m_870.json
+++ b/src/main/resources/data/superbwarfare/guns/m_870.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 3,
   "recoil_x": 0.009,
   "recoil_y": 0.04,
diff --git a/src/main/resources/data/superbwarfare/guns/m_98b.json b/src/main/resources/data/superbwarfare/guns/m_98b.json
index ae6259b01..4294e956d 100644
--- a/src/main/resources/data/superbwarfare/guns/m_98b.json
+++ b/src/main/resources/data/superbwarfare/guns/m_98b.json
@@ -1,5 +1,5 @@
 {
-  "zoom": 6,
+  "CustomZoom": 4.75,
   "min_zoom": 4,
   "max_zoom": 8,
   "spread": 6,
diff --git a/src/main/resources/data/superbwarfare/guns/marlin.json b/src/main/resources/data/superbwarfare/guns/marlin.json
index 17d482a0d..2e24f89f1 100644
--- a/src/main/resources/data/superbwarfare/guns/marlin.json
+++ b/src/main/resources/data/superbwarfare/guns/marlin.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 2,
   "recoil_x": 0.004,
   "recoil_y": 0.031,
diff --git a/src/main/resources/data/superbwarfare/guns/minigun.json b/src/main/resources/data/superbwarfare/guns/minigun.json
index 565498d94..803683fc8 100644
--- a/src/main/resources/data/superbwarfare/guns/minigun.json
+++ b/src/main/resources/data/superbwarfare/guns/minigun.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1,
   "spread": 1.5,
   "recoil_x": 0.005,
   "recoil_y": 0.070,
diff --git a/src/main/resources/data/superbwarfare/guns/mk_14.json b/src/main/resources/data/superbwarfare/guns/mk_14.json
index 7e42bcaca..c687917c2 100644
--- a/src/main/resources/data/superbwarfare/guns/mk_14.json
+++ b/src/main/resources/data/superbwarfare/guns/mk_14.json
@@ -1,7 +1,5 @@
 {
-  "zoom": 4,
-  "min_zoom": 1.25,
-  "max_zoom": 6,
+  "CustomZoom": 3.75,
   "spread": 5,
   "bipod": 1,
   "recoil_x": 0.006,
diff --git a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
index c02c92dcd..2ad9e2ce4 100644
--- a/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
+++ b/src/main/resources/data/superbwarfare/guns/mosin_nagant.json
@@ -1,5 +1,5 @@
 {
-  "zoom": 3.5,
+  "CustomZoom": 2.25,
   "spread": 4.8,
   "recoil_x": 0.002,
   "recoil_y": 0.063,
diff --git a/src/main/resources/data/superbwarfare/guns/ntw_20.json b/src/main/resources/data/superbwarfare/guns/ntw_20.json
index cc2a0a27e..eba7e3fa4 100644
--- a/src/main/resources/data/superbwarfare/guns/ntw_20.json
+++ b/src/main/resources/data/superbwarfare/guns/ntw_20.json
@@ -1,7 +1,5 @@
 {
-  "zoom": 6,
-  "min_zoom": 1.3,
-  "max_zoom": 6,
+  "CustomZoom": 3.75,
   "bipod": 1,
   "spread": 8,
   "recoil_x": 0.01,
diff --git a/src/main/resources/data/superbwarfare/guns/qbz_95.json b/src/main/resources/data/superbwarfare/guns/qbz_95.json
index a9c9af405..9e4b0d527 100644
--- a/src/main/resources/data/superbwarfare/guns/qbz_95.json
+++ b/src/main/resources/data/superbwarfare/guns/qbz_95.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 3.7,
   "recoil_x": 0.0013,
   "recoil_y": 0.009,
diff --git a/src/main/resources/data/superbwarfare/guns/rpg.json b/src/main/resources/data/superbwarfare/guns/rpg.json
index abf1f0004..233fd42a0 100644
--- a/src/main/resources/data/superbwarfare/guns/rpg.json
+++ b/src/main/resources/data/superbwarfare/guns/rpg.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 5,
   "recoil_x": 0.008,
   "recoil_y": 0.018,
diff --git a/src/main/resources/data/superbwarfare/guns/rpk.json b/src/main/resources/data/superbwarfare/guns/rpk.json
index f9846a91b..00f39602e 100644
--- a/src/main/resources/data/superbwarfare/guns/rpk.json
+++ b/src/main/resources/data/superbwarfare/guns/rpk.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 5.5,
   "bipod": 1,
   "recoil_x": 0.0018,
diff --git a/src/main/resources/data/superbwarfare/guns/sentinel.json b/src/main/resources/data/superbwarfare/guns/sentinel.json
index 6eae0fad9..1068b3abe 100644
--- a/src/main/resources/data/superbwarfare/guns/sentinel.json
+++ b/src/main/resources/data/superbwarfare/guns/sentinel.json
@@ -1,5 +1,5 @@
 {
-  "zoom": 3,
+  "CustomZoom": 1.75,
   "spread": 6,
   "recoil_x": 0.007,
   "recoil_y": 0.018,
diff --git a/src/main/resources/data/superbwarfare/guns/sks.json b/src/main/resources/data/superbwarfare/guns/sks.json
index 33c48454a..4a077a744 100644
--- a/src/main/resources/data/superbwarfare/guns/sks.json
+++ b/src/main/resources/data/superbwarfare/guns/sks.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 4.5,
   "recoil_x": 0.004,
   "recoil_y": 0.015,
diff --git a/src/main/resources/data/superbwarfare/guns/svd.json b/src/main/resources/data/superbwarfare/guns/svd.json
index c63bf2d20..2d3c4e348 100644
--- a/src/main/resources/data/superbwarfare/guns/svd.json
+++ b/src/main/resources/data/superbwarfare/guns/svd.json
@@ -1,5 +1,5 @@
 {
-  "zoom": 4,
+  "CustomZoom": 2.75,
   "spread": 5.5,
   "recoil_x": 0.004,
   "recoil_y": 0.009,
diff --git a/src/main/resources/data/superbwarfare/guns/taser.json b/src/main/resources/data/superbwarfare/guns/taser.json
index 28bdc3a15..20fd61a49 100644
--- a/src/main/resources/data/superbwarfare/guns/taser.json
+++ b/src/main/resources/data/superbwarfare/guns/taser.json
@@ -2,7 +2,6 @@
   "spread": 2,
   "recoil_x": 0.0001,
   "recoil_y": 0.002,
-  "zoom": 1.25,
   "damage": 5,
   "velocity": 3,
   "mag": 1,
diff --git a/src/main/resources/data/superbwarfare/guns/trachelium.json b/src/main/resources/data/superbwarfare/guns/trachelium.json
index 0440bb393..75feed441 100644
--- a/src/main/resources/data/superbwarfare/guns/trachelium.json
+++ b/src/main/resources/data/superbwarfare/guns/trachelium.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 3,
   "recoil_x": 0.005,
   "recoil_y": 0.032,
diff --git a/src/main/resources/data/superbwarfare/guns/vector.json b/src/main/resources/data/superbwarfare/guns/vector.json
index e0567de24..98fb6621a 100644
--- a/src/main/resources/data/superbwarfare/guns/vector.json
+++ b/src/main/resources/data/superbwarfare/guns/vector.json
@@ -1,5 +1,4 @@
 {
-  "zoom": 1.25,
   "spread": 2.3,
   "recoil_x": 0.002,
   "recoil_y": 0.007,