refactor to customGear

BourbonWarfare · Nov 13, 2024 · 8b778b8 · 8b778b8
1 parent 9167289
commit 8b778b8
Show file tree

Hide file tree

Showing 7 changed files with 107 additions and 99 deletions.
diff --git a/addons/customGear/CfgWeapons.hpp b/addons/customGear/CfgWeapons.hpp
@@ -1,87 +1,4 @@
-class Mode_FullAuto;
 class CfgWeapons {
-    // Adds C7, C7GL, and C7A2, C7A2
-    class CUP_arifle_M16A1E1;
-    class potato_fauxC7_c7: CUP_arifle_M16A1E1 {
-        author = "Potato";
-        displayName = "C7";
-        modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"};
-        class FullAuto: Mode_FullAuto {
-            class BaseSoundModeType;
-            class StandardSound: BaseSoundModeType {
-                soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"};
-            };
-            class SilencedSound: BaseSoundModeType {
-                soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"};
-            };
-            soundBurst = 0;
-            ffCount = 3;
-            dispersion = 0.0006;
-            reloadTime = 0.075;
-            minRange = 1;
-            minRangeProbab = 0.2;
-            midRange = 100;
-            midRangeProbab = 0.7;
-            maxRange = 300;
-            maxRangeProbab = 0.05;
-        };
-    };
-    class CUP_arifle_M16A1GL;
-    class potato_fauxC7_c7GL: CUP_arifle_M16A1GL {
-        author = "Potato";
-        displayName = "C7 M203";
-    };
-    class CUP_arifle_M16A4_Base;
-    class potato_fauxC7_c7a2: CUP_arifle_M16A4_Base {
-        author = "Potato";
-        displayName = "C7A2";
-        modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"};
-        class FullAuto: Mode_FullAuto {
-            class BaseSoundModeType;
-            class StandardSound: BaseSoundModeType {
-                soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"};
-            };
-            class SilencedSound: BaseSoundModeType {
-                soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"};
-            };
-            soundBurst = 0;
-            ffCount = 3;
-            dispersion = 0.0006;
-            reloadTime = 0.075;
-            minRange = 1;
-            minRangeProbab = 0.2;
-            midRange = 100;
-            midRangeProbab = 0.7;
-            maxRange = 300;
-            maxRangeProbab = 0.05;
-        };
-    };
-    class CUP_arifle_M16A4_GL;
-    class potato_fauxC7_c7a2GL: CUP_arifle_M16A4_GL {
-        author = "Potato";
-        displayName = "C7A2 M203";
-        modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"};
-        class FullAuto: Mode_FullAuto {
-            class BaseSoundModeType;
-            class StandardSound: BaseSoundModeType {
-                soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"};
-            };
-            class SilencedSound: BaseSoundModeType {
-                soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"};
-            };
-            soundBurst = 0;
-            ffCount = 3;
-            dispersion = 0.0006;
-            reloadTime = 0.075;
-            minRange = 1;
-            minRangeProbab = 0.2;
-            midRange = 100;
-            midRangeProbab = 0.7;
-            maxRange = 300;
-            maxRangeProbab = 0.05;
-        };
-    };
-
     // Adds MG5 in 7.62x51mm
     class MMG_01_tan_F;
     class potato_fauxMG5_MG5: MMG_01_tan_F {

diff --git a/addons/customGear/config.hpp b/addons/customGear/config.hpp
@@ -3,15 +3,14 @@
 class CfgPatches {
     class ADDON {
         units[] = {};
-        weapons[] = { "potato_fauxC7_c7", "potato_fauxC7_c7GL", "potato_fauxC7_c7a2", "potato_fauxC7_c7a2GL", "potato_fauxMG5_MG5" };
-        magazines[] = {};
+        weapons[] = { "potato_fauxMG5_MG5" };
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = { "potato_core" };
         author = "Potato";
-        authors[] = {"PabstMirror", "AACO"};
         authorUrl = "https://github.com/BourbonWarfare/POTATO";
         VERSION_CONFIG;
     };
 };
 
+#include "CfgWeapons.hpp"
 #include "CfgVehicles.hpp"
diff --git a/addons/customGear/fauxC7/CfgWeapons.hpp b/addons/customGear/fauxC7/CfgWeapons.hpp
@@ -0,0 +1,84 @@
+class Mode_FullAuto;
+class CfgWeapons {
+    // Adds C7, C7GL, and C7A2, C7A2
+    class CUP_arifle_M16A1E1;
+    class potato_fauxC7_c7: CUP_arifle_M16A1E1 {
+        author = "Potato";
+        displayName = "C7";
+        modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"};
+        class FullAuto: Mode_FullAuto {
+            class BaseSoundModeType;
+            class StandardSound: BaseSoundModeType {
+                soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"};
+            };
+            class SilencedSound: BaseSoundModeType {
+                soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"};
+            };
+            soundBurst = 0;
+            ffCount = 3;
+            dispersion = 0.0006;
+            reloadTime = 0.075;
+            minRange = 1;
+            minRangeProbab = 0.2;
+            midRange = 100;
+            midRangeProbab = 0.7;
+            maxRange = 300;
+            maxRangeProbab = 0.05;
+        };
+    };
+    class CUP_arifle_M16A1GL;
+    class potato_fauxC7_c7GL: CUP_arifle_M16A1GL {
+        author = "Potato";
+        displayName = "C7 M203";
+    };
+    class CUP_arifle_M16A4_Base;
+    class potato_fauxC7_c7a2: CUP_arifle_M16A4_Base {
+        author = "Potato";
+        displayName = "C7A2";
+        modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"};
+        class FullAuto: Mode_FullAuto {
+            class BaseSoundModeType;
+            class StandardSound: BaseSoundModeType {
+                soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"};
+            };
+            class SilencedSound: BaseSoundModeType {
+                soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"};
+            };
+            soundBurst = 0;
+            ffCount = 3;
+            dispersion = 0.0006;
+            reloadTime = 0.075;
+            minRange = 1;
+            minRangeProbab = 0.2;
+            midRange = 100;
+            midRangeProbab = 0.7;
+            maxRange = 300;
+            maxRangeProbab = 0.05;
+        };
+    };
+    class CUP_arifle_M16A4_GL;
+    class potato_fauxC7_c7a2GL: CUP_arifle_M16A4_GL {
+        author = "Potato";
+        displayName = "C7A2 M203";
+        modes[] = {"Single","FullAuto","Burst_medium","single_medium_optics1","single_medium_optics2"};
+        class FullAuto: Mode_FullAuto {
+            class BaseSoundModeType;
+            class StandardSound: BaseSoundModeType {
+                soundsetshot[] = {"jsrs_m16a4_shot_soundset","jsrs_5x56mm_reverb_soundset"};
+            };
+            class SilencedSound: BaseSoundModeType {
+                soundsetshot[] = {"jsrs_spar_shot_silenced_soundset","jsrs_5x56mm_sd_reverb_soundset"};
+            };
+            soundBurst = 0;
+            ffCount = 3;
+            dispersion = 0.0006;
+            reloadTime = 0.075;
+            minRange = 1;
+            minRangeProbab = 0.2;
+            midRange = 100;
+            midRangeProbab = 0.7;
+            maxRange = 300;
+            maxRangeProbab = 0.05;
+        };
+    };
+};
diff --git a/addons/customGear/fauxC7/config.cpp b/addons/customGear/fauxC7/config.cpp
@@ -0,0 +1,18 @@
+#include "\z\potato\addons\customGear\script_component.hpp"
+#undef COMPONENT
+#define COMPONENT customGear_fauxC7
+
+
+class CfgPatches {
+    class ADDON {
+        weapons[] = { "potato_fauxC7_c7", "potato_fauxC7_c7GL", "potato_fauxC7_c7a2", "potato_fauxC7_c7a2GL" };
+        units[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"potato_core", "CUP_Weapons_LoadOrder", "jsrs_soundmod_cup_weapons"};
+        skipWhenMissingDependencies = 1;
+        author = "Potato";
+        authors[] = {"AChesheireCat"};
+        authorUrl = "https://github.com/BourbonWarfare/POTATO";
+        VERSION_CONFIG;
+    };
+};
diff --git a/addons/miscFixes/fauxLAMG/CfgWeapons.hpp → addons/customGear/fauxLAMG/CfgWeapons.hpp b/addons/miscFixes/fauxLAMG/CfgWeapons.hpp → addons/customGear/fauxLAMG/CfgWeapons.hpp
diff --git a/addons/miscFixes/fauxLAMG/config.cpp → addons/customGear/fauxLAMG/config.cpp b/addons/miscFixes/fauxLAMG/config.cpp → addons/customGear/fauxLAMG/config.cpp
@@ -1,4 +1,6 @@
-#include "script_component.hpp"
+#include "\z\potato\addons\customGear\script_component.hpp"
+#undef COMPONENT
+#define COMPONENT customGear_fauxLAMG
 
 class CfgPatches {
     class ADDON {

diff --git a/addons/miscFixes/fauxLAMG/script_component.hpp b/addons/miscFixes/fauxLAMG/script_component.hpp