Merge branch 'master' into weapons-fix

Theseus-Aegis · Jul 5, 2024 · 505ccb5 · 505ccb5
2 parents 08ab2b0 + 043c9b0
commit 505ccb5
Show file tree

Hide file tree

Showing 8 changed files with 198 additions and 210 deletions.
diff --git a/addons/hidden_units/CfgVehicles_Baseclasses.hpp b/addons/hidden_units/CfgVehicles_Baseclasses.hpp
@@ -39,14 +39,11 @@ class CUP_B_CZ_Soldier_DST_Base;
 class CUP_B_CZ_Soldier_WDL_Base;
 class CUP_B_CZ_SpecOp_DST_Base;
 class CUP_B_CZ_SpecOp_WDL_Base;
-class CUP_B_GER_Fleck_Crye2;
-class CUP_B_GER_Fleck_Crye;
 class CUP_B_GER_Soldier_01;
 class CUP_B_GER_Soldier_02;
 class CUP_B_GER_Soldier_03;
 class CUP_B_GER_Soldier_04;
 class CUP_B_GER_Soldier_07;
-class CUP_B_GER_Soldier_Fleck_Overalls_Tank;
 class CUP_B_GER_Soldier_Overalls_Pilot;
 class CUP_B_GER_Soldier_Overalls_Tank;
 class CUP_B_USArmy_OCP_Soldier_01;

diff --git a/addons/hlc_tweaks/CfgWeapons.hpp b/addons/hlc_tweaks/CfgWeapons.hpp
@@ -6,12 +6,189 @@ class CfgWeapons {
     class hlc_rifle_honeybase;
     class hlc_aug_base;
     class hlc_rifle_auga2carb;
-    class hlc_rifle_auga2;
-    class hlc_rifle_auga2lsw;
 
     #include "hidden_attachments.hpp"
-    #include "hidden_augRifles.hpp"
-    #include "singleFire_AUG.hpp"
+
+    // Some cause pop-up errors.
+    class hlc_rifle_aug: hlc_aug_base {
+        scope = 1;
+        scopeArsenal = 1;
+        class Single: Single {
+            showToPlayer = 1;
+        };
+    };
+
+    // HBAR semi-auto, isn't not using inheritance fun guys?
+    class hlc_rifle_aughbar: hlc_rifle_aug {
+        scope = 2;
+        scopeArsenal = 2;
+        modes[] = {
+            "Single",
+            "FullAuto",
+            "50",
+            "AI_long",
+            "AI_close",
+            "AI_short",
+            "AI_far",
+            "AI_toofar",
+            "AI_far_optic1"
+        };
+        class Single: Single {
+            showToPlayer = 1;
+        };
+    };
+
+    class hlc_rifle_aughbar_b: hlc_rifle_aughbar {
+        modes[] = {
+            "Single",
+            "FullAuto",
+            "fullauto_medium",
+            "single_medium_optics1",
+            "single_far_optics2"
+        };
+    };
+
+    class hlc_rifle_aughbar_t: hlc_rifle_aughbar {
+        modes[] = {
+            "Single",
+            "FullAuto",
+            "fullauto_medium",
+            "single_medium_optics1",
+            "single_far_optics2"
+        };
+    };
+
+    class hlc_rifle_auga1_t: hlc_rifle_aug {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_auga1_b: hlc_rifle_aug {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+
+    class hlc_rifle_auga1carb: hlc_rifle_aug {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_auga1carb_B: hlc_rifle_auga1carb {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_auga1carb_t: hlc_rifle_auga1carb {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+
+    // Enable Semi-Auto for AUGs
+    class hlc_rifle_auga2: hlc_rifle_aug {
+        class Single: Single {
+            showToPlayer = 1;
+        };
+    };
+
+    class hlc_rifle_auga3: hlc_rifle_aug {
+        scope = 2;
+        scopeArsenal = 2;
+        class Single: Single {
+            showToPlayer = 1;
+        };
+        class LinkedItems {
+            delete LinkedItemsMuzzle;
+        };
+    };
+    class hlc_rifle_auga3_b: hlc_rifle_auga3 {
+        class LinkedItems {
+            delete LinkedItemsMuzzle;
+        };
+    };
+
+    class hlc_rifle_auga3_bl: hlc_rifle_auga3 {
+        class LinkedItems {
+            delete LinkedItemsMuzzle;
+        };
+    };
+
+    class hlc_rifle_augsr: hlc_rifle_auga2 {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_augsr_t: hlc_rifle_augsr {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_augsr_b: hlc_rifle_augsr {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+
+    class hlc_rifle_augsrcarb: hlc_rifle_auga2carb {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_augsrcarb_t: hlc_rifle_augsrcarb {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_augsrcarb_b: hlc_rifle_augsrcarb {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+
+    class hlc_rifle_auga2lsw: hlc_rifle_aughbar {
+        modes[] = {
+            "Single",
+            "FullAuto",
+            "50",
+            "AI_long",
+            "AI_close",
+            "AI_short",
+            "AI_far",
+            "AI_toofar",
+            "AI_far_optic1"
+        };
+    };
+
+    class hlc_rifle_augsrhbar: hlc_rifle_auga2lsw {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_augsrhbar_t: hlc_rifle_augsrhbar {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_augsrhbar_b: hlc_rifle_augsrhbar {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+
+    class hlc_rifle_augpara: hlc_aug_base {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_augpara_b: hlc_rifle_augpara {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_augpara_t: hlc_rifle_augpara {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+
+    class hlc_rifle_auga2para: hlc_aug_base {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_auga2para_t: hlc_rifle_auga2para {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+    class hlc_rifle_auga2para_b: hlc_rifle_auga2para {
+        scope = 1;
+        scopeArsenal = 1;
+    };
+
+
 
     class hlc_acc_DBALPL_FL: ItemCore {
         scope = 1;

diff --git a/addons/hlc_tweaks/hidden_augRifles.hpp b/addons/hlc_tweaks/hidden_augRifles.hpp
diff --git a/addons/hlc_tweaks/singleFire_AUG.hpp b/addons/hlc_tweaks/singleFire_AUG.hpp
diff --git a/addons/recoils/bohemia/baseclasses.hpp b/addons/recoils/bohemia/baseclasses.hpp
@@ -30,8 +30,6 @@ class arifle_SPAR_01_base_F;
 class arifle_SPAR_01_GL_base_F;
 class arifle_SPAR_02_base_F;
 class arifle_SPAR_03_base_F;
-class arifle_TRG20_F;
-class arifle_TRG21_F;
 class DMR_02_base_F;
 class DMR_03_base_F;
 class DMR_06_base_F;