From 318096f6d11efe870d537cf3b393bc36a2dfe072 Mon Sep 17 00:00:00 2001
From: Mike-MF <TyroneMF@hotmail.com>
Date: Fri, 5 Jul 2024 05:03:54 +0100
Subject: [PATCH 1/2] Weapons Component Fixes

---
 addons/weapons/CfgMagazineWells.hpp |  5 ----
 addons/weapons/CfgMagazines.hpp     | 10 --------
 addons/weapons/CfgSoundShaders.hpp  | 37 +++++++++++++++++++++++++++++
 addons/weapons/CfgWeapons.hpp       | 13 ----------
 addons/weapons/config.cpp           |  3 ++-
 5 files changed, 39 insertions(+), 29 deletions(-)

diff --git a/addons/weapons/CfgMagazineWells.hpp b/addons/weapons/CfgMagazineWells.hpp
index da74416b..54fb120c 100644
--- a/addons/weapons/CfgMagazineWells.hpp
+++ b/addons/weapons/CfgMagazineWells.hpp
@@ -1,9 +1,4 @@
 class CfgMagazineWells {
-    class CLASS(762x51_RFB) {
-        ADDON[] = {
-            QCLASS(20Rnd_762x51_RFB_Mag)
-        };
-    };
     class CLASS(Cylinder_357) {
         ADDON[] = {
             QCLASS(6Rnd_357)
diff --git a/addons/weapons/CfgMagazines.hpp b/addons/weapons/CfgMagazines.hpp
index e0a323af..088e1e93 100644
--- a/addons/weapons/CfgMagazines.hpp
+++ b/addons/weapons/CfgMagazines.hpp
@@ -37,14 +37,4 @@ class CfgMagazines {
         descriptionShort = "6.5x39mm EPR Tracer Every 4";
         displayName = "6.5mm 100Rnd Belt [TE4] (EPR)";
     };
-
-    // Keltec RFB
-    class 20Rnd_556x45_UW_mag;
-    class CLASS(20Rnd_762x51_RFB_Mag): 20Rnd_556x45_UW_mag {
-        author = ECSTRING(main,Author);
-        scope = 2;
-        displayName = "7.62mm 20Rnd RFB Mag (M80)";
-        mass = 11;
-        ammo = QCLASS(762x51_dual);
-    };
 };
diff --git a/addons/weapons/CfgSoundShaders.hpp b/addons/weapons/CfgSoundShaders.hpp
index 1343c1d8..8fbac81c 100644
--- a/addons/weapons/CfgSoundShaders.hpp
+++ b/addons/weapons/CfgSoundShaders.hpp
@@ -10,4 +10,41 @@ class CfgSoundShaders {
         range = 50;
         rangeCurve = "closeShotCurve";
     };
+    class Mk200_midShot_SoundShader {
+        samples[] = {
+            {"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_midShot_01", 1},
+            {"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_midShot_02", 1},
+            {"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_midShot_03", 1}
+        };
+        volume = 0.4; // Default: 0.5
+        range = 2000;
+        rangeCurve[] = {{0, 0.2}, {50, 1}, {300, 0}, {2000, 0}};
+    };
+    class Mk200_distShot_SoundShader {
+        samples[] = {
+            {"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_distShot_01", 1},
+            {"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_distShot_02", 1},
+            {"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_distShot_03", 1}
+        };
+        volume = 0.45; // Default: 1
+        range = 2000;
+        rangeCurve[] = {{0,0}, {50,0}, {300,1}, {2000,1}};
+    };
+    class Mk200_tailDistant_SoundShader {
+        samples[] = {{"\A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_taildistant", 1}};
+        volume = 0.45; // Default: 1
+        range = 2000;
+        rangeCurve[] = {{0, 0}, {600, 0.69}, {2000, 1}};
+        limitation = 1;
+    };
+    class Mk200_silencerShot_SoundShader {
+        samples[] = {
+            {"A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_silencerShot_01", 1},
+            {"A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_silencerShot_02", 1},
+            {"A3\Sounds_F\arsenal\weapons\Machineguns\Mk200\Mk200_silencerShot_03", 1}
+        };
+        volume = 0.45; // Default: 1
+        range = 150;
+        rangeCurve = "closeShotCurve";
+    };
 };
diff --git a/addons/weapons/CfgWeapons.hpp b/addons/weapons/CfgWeapons.hpp
index 645153ee..b6f82e80 100644
--- a/addons/weapons/CfgWeapons.hpp
+++ b/addons/weapons/CfgWeapons.hpp
@@ -118,19 +118,6 @@ class CfgWeapons {
         baseWeapon = QCLASS(LMG_LAMG);
     };
 
-    // Keltec RFB
-    class arifle_SDAR_F;
-    class CLASS(RFB_762_F): arifle_SDAR_F {
-        author = ECSTRING(main,Author);
-        scope = 2;
-        scopeArsenal = 2;
-        baseWeapon = QCLASS(RFB_762_F);
-        displayName = "Keltec RFB";
-        descriptionShort = "Underwater Rifle";
-        magazines[] = {QCLASS(20Rnd_762x51_RFB_Mag)};
-        magazineWell[] = {QCLASS(762x51_RFB)};
-    };
-
     // TAR-21 Black
     class arifle_TRG21_F;
     class CLASS(TAR21_Black): arifle_TRG21_F {
diff --git a/addons/weapons/config.cpp b/addons/weapons/config.cpp
index f2536fd1..593f1323 100644
--- a/addons/weapons/config.cpp
+++ b/addons/weapons/config.cpp
@@ -11,7 +11,6 @@ class CfgPatches {
             QCLASS(GTAR21_EGLM_Black),
             QCLASS(CTAR21_Black),
             QCLASS(LMG_LAMG),
-            QCLASS(RFB_762_F),
             QCLASS(Rhino_357),
             QCLASS(Rhino_44)
         };
@@ -32,7 +31,9 @@ class CfgPatches {
 class Mode_SemiAuto;
 class Mode_FullAuto;
 
+#include "CfgAmmo.hpp"
 #include "CfgMagazines.hpp"
 #include "CfgMagazineWells.hpp"
 #include "CfgRecoils.hpp"
+#include "CfgSoundShaders.hpp"
 #include "CfgWeapons.hpp"

From 08ab2b043da7f31d9b22255d174c872c0aaca035 Mon Sep 17 00:00:00 2001
From: Mike-MF <TyroneMF@hotmail.com>
Date: Fri, 5 Jul 2024 05:05:04 +0100
Subject: [PATCH 2/2] Remove Keltec ammo

---
 addons/weapons/CfgAmmo.hpp | 10 ----------
 addons/weapons/config.cpp  |  1 -
 2 files changed, 11 deletions(-)
 delete mode 100644 addons/weapons/CfgAmmo.hpp

diff --git a/addons/weapons/CfgAmmo.hpp b/addons/weapons/CfgAmmo.hpp
deleted file mode 100644
index a212074f..00000000
--- a/addons/weapons/CfgAmmo.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-class CfgAmmo {
-    // Keltec RFB
-    class B_556x45_dual;
-    class CLASS(762x51_dual): B_556x45_dual {
-        author = ECSTRING(main,Author);
-        hit = 11;
-        caliber = 1.1;
-        thrust = 225;
-    };
-};
diff --git a/addons/weapons/config.cpp b/addons/weapons/config.cpp
index 593f1323..0eb62510 100644
--- a/addons/weapons/config.cpp
+++ b/addons/weapons/config.cpp
@@ -31,7 +31,6 @@ class CfgPatches {
 class Mode_SemiAuto;
 class Mode_FullAuto;
 
-#include "CfgAmmo.hpp"
 #include "CfgMagazines.hpp"
 #include "CfgMagazineWells.hpp"
 #include "CfgRecoils.hpp"