From 432f21488d191486df59963db1f443b18848f64d Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sat, 27 Jul 2019 12:54:12 +0200
Subject: [PATCH 1/2] add legacy JR component

---
 addons/jr/config.cpp                          |    2 +-
 addons/legacy_jr/$PBOPREFIX$                  |    1 +
 addons/legacy_jr/CfgWeapons.hpp               | 1091 +++++++++++++++++
 addons/legacy_jr/config.cpp                   |   16 +
 .../legacy_jr/legacy_jr_prep/CfgWeapons.hpp   |  173 +++
 addons/legacy_jr/legacy_jr_prep/config.cpp    |   16 +
 .../legacy_jr_prep/script_component.hpp       |    3 +
 addons/legacy_jr/script_component.hpp         |    3 +
 addons/legacy_jr/stringtable.xml              |    9 +
 9 files changed, 1313 insertions(+), 1 deletion(-)
 create mode 100644 addons/legacy_jr/$PBOPREFIX$
 create mode 100644 addons/legacy_jr/CfgWeapons.hpp
 create mode 100644 addons/legacy_jr/config.cpp
 create mode 100644 addons/legacy_jr/legacy_jr_prep/CfgWeapons.hpp
 create mode 100644 addons/legacy_jr/legacy_jr_prep/config.cpp
 create mode 100644 addons/legacy_jr/legacy_jr_prep/script_component.hpp
 create mode 100644 addons/legacy_jr/script_component.hpp
 create mode 100644 addons/legacy_jr/stringtable.xml

diff --git a/addons/jr/config.cpp b/addons/jr/config.cpp
index 71de78cfb..967a0635b 100644
--- a/addons/jr/config.cpp
+++ b/addons/jr/config.cpp
@@ -24,5 +24,5 @@ class CfgPatches {
 };
 
 #include "jr_classes.hpp"
-#include "cfgweapons.hpp"
+#include "CfgWeapons.hpp"
 #include "CfgFunctions.hpp"
diff --git a/addons/legacy_jr/$PBOPREFIX$ b/addons/legacy_jr/$PBOPREFIX$
new file mode 100644
index 000000000..6ab615799
--- /dev/null
+++ b/addons/legacy_jr/$PBOPREFIX$
@@ -0,0 +1 @@
+x\cba\addons\legacy_jr
diff --git a/addons/legacy_jr/CfgWeapons.hpp b/addons/legacy_jr/CfgWeapons.hpp
new file mode 100644
index 000000000..ff2fde4b6
--- /dev/null
+++ b/addons/legacy_jr/CfgWeapons.hpp
@@ -0,0 +1,1091 @@
+class asdg_MuzzleSlot;
+class asdg_MuzzleSlot_762R: asdg_MuzzleSlot {
+    class compatibleItems {};
+};
+
+class asdg_OpticRail1913;
+class asdg_UnderSlot;
+
+class CfgWeapons {
+    class Rifle;
+    class Rifle_Base_F: Rifle {
+        class WeaponSlotsInfo;
+    };
+    class Rifle_Long_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class arifle_AK12_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762R {
+                iconPosition[] = {0,0.35};
+                iconScale = 0.2;
+
+                class compatibleItems: compatibleItems {
+                    muzzle_snds_B = 1;
+                    muzzle_snds_B_khk_F = 1;
+                    muzzle_snds_B_snd_F = 1;
+                    muzzle_snds_B_arid_F = 1;
+                    muzzle_snds_B_lush_F = 1;
+                };
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.25};
+                iconScale = 0.2;
+            };
+            //class UnderBarrelSlot: asdg_UnderSlot {
+            //    iconPosition[] = {0.35,0.7};
+            //    iconScale = 0.3;
+            //};
+        };
+    };
+    class arifle_AK12_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.35,0.7};
+                iconScale = 0.3;
+            };
+        };
+    };
+    class arifle_AK12_lush_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.35,0.7};
+                iconScale = 0.3;
+            };
+        };
+    };
+    class arifle_AK12_arid_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.35,0.7};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class arifle_AK12U_base_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: CowsSlot {
+                iconPosition[] = {0.4,0.25};
+                iconScale = 0.2;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.24,0.7};
+                iconScale = 0.3;
+            };
+        };
+    };
+    class arifle_RPK12_base_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: CowsSlot {
+                iconPosition[] = {0.57,0.31};
+                iconScale = 0.17;
+            };
+        };
+    };
+};
+
+
+
+
+/*class CfgWeapons {
+    class Rifle;
+    class Rifle_Base_F: Rifle {
+        class WeaponSlotsInfo;
+    };
+
+    class Rifle_Short_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class Rifle_Long_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class Launcher;
+    class Launcher_Base_F: Launcher {
+        class WeaponSlotsInfo;
+    };
+
+    class launch_Titan_base: Launcher_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.2,0.45};
+                iconScale = 0.25;
+            };
+        };
+    };
+    class launch_MRAWS_base_F: Launcher_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.15, 0.5};
+                iconScale = 0.25;
+            };
+        };
+    };
+
+    class EBR_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class srifle_EBR_F: EBR_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762 {
+                iconPosition[] = {0.05,0.38};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.3};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.4};
+                iconScale = 0.25;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.3,0.65};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class GM6_base_F: Rifle_Long_Base_F {};
+
+    class srifle_GM6_F: GM6_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.55,0.3};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class LRR_base_F: Rifle_Long_Base_F {};
+
+    class srifle_LRR_F: LRR_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.6,0.35};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class DMR_01_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class srifle_DMR_01_F: DMR_01_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.38};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.5};
+                iconScale = 0.25;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.4,0.7};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class DMR_02_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class srifle_DMR_02_F: DMR_02_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_338 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913_long {
+                iconPosition[] = {0.5,0.36};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.22,0.42};
+                iconScale = 0.25;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class DMR_03_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class srifle_DMR_03_F: DMR_03_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762 {
+                iconPosition[] = {0.12,0.431};
+                iconScale = 0.15;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.36};
+                iconScale = 0.15;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.33,0.4};
+                iconScale = 0.2;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.3,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class DMR_04_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class srifle_DMR_04_F: DMR_04_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.52,0.38};
+                iconScale = 0.15;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.3,0.43};
+                iconScale = 0.2;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.3,0.7};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class DMR_05_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class srifle_DMR_05_blk_F: DMR_05_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_93x64 {
+                iconPosition[] = {0,0.43};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913_long {
+                iconPosition[] = {0.5,0.38};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.22,0.43};
+                iconScale = 0.25;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class DMR_06_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class srifle_DMR_06_camo_F: DMR_06_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762 {
+                iconPosition[] = {0.06,0.4};
+                iconScale = 0.15;
+            };
+            class CowsSlot: asdg_OpticRail1913_short {
+                iconPosition[] = {0.52,0.36};
+                iconScale = 0.15;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.32,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class LMG_Mk200_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762MG {
+                iconPosition[] = {0.1,0.5};
+                iconScale = 0.2;
+                class compatibleItems: compatibleItems {
+                    muzzle_snds_h = 1;
+                    muzzle_snds_h_khk_F = 1;
+                    muzzle_snds_h_snd_F = 1;
+                };
+            };
+            class CowsSlot: asdg_OpticRail1913_short_MG {
+                iconPosition[] = {0.6,0.45};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.5};
+                iconScale = 0.25;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.35,0.8};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class LMG_Zafir_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+/*            class MuzzleSlot: asdg_MuzzleSlot_762MG { // this would work but there is no sound config for a suppressed variant
+                iconPosition[] = {0.05,0.4};
+                iconScale = 0.2;
+            };
+*//*
+            class CowsSlot: asdg_OpticRail1913_short_MG {
+                iconPosition[] = {0.6,0.35};
+                iconScale = 0.15;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.4,0.4};
+                iconScale = 0.15;
+            };
+        };
+    };
+
+    class MMG_01_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class MMG_01_hex_F: MMG_01_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_93x64 {
+                iconPosition[] = {0.06,0.4};
+                iconScale = 0.15;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.57,0.28};
+                iconScale = 0.15;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.38,0.42};
+                iconScale = 0.2;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.35,0.85};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class MMG_02_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class MMG_02_camo_F: MMG_02_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_338 {
+                iconPosition[] = {0.06,0.42};
+                iconScale = 0.15;
+            };
+            class CowsSlot: asdg_OpticRail1913_short_MG {
+                iconPosition[] = {0.62,0.32};
+                iconScale = 0.15;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.38,0.42};
+                iconScale = 0.2;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.35,0.85};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class arifle_Katiba_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class arifle_Katiba_F: arifle_Katiba_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_Katiba_C_F: arifle_Katiba_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0.1,0.45};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_Katiba_GL_F: arifle_Katiba_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class mk20_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class arifle_Mk20_F: mk20_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0,0.36};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.25};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.35};
+                iconScale = 0.25;
+            };
+        };
+    };
+
+    class arifle_Mk20C_F: mk20_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0.1,0.36};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.35};
+                iconScale = 0.25;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.25};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_Mk20_GL_F: mk20_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0.1,0.36};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.35};
+                iconScale = 0.25;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.25};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_MX_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class arifle_MXC_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.3};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.2,0.4};
+                iconScale = 0.25;
+            };
+        };
+    };
+
+    class arifle_MX_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.35};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.2,0.45};
+                iconScale = 0.25;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.7};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_MX_GL_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.35};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.2,0.45};
+                iconScale = 0.25;
+            };
+        };
+    };
+
+    class arifle_MX_SW_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.35};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.2,0.45};
+                iconScale = 0.25;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.7};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_MXM_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.35};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.2,0.45};
+                iconScale = 0.25;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.7};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class Tavor_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class arifle_TRG21_F: Tavor_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913_short {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.25,0.4};
+                iconScale = 0.25;
+            };
+        };
+    };
+
+    class arifle_TRG20_F: Tavor_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0.1,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913_short {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.25,0.4};
+                iconScale = 0.25;
+            };
+        };
+    };
+
+    class SMG_01_Base: Rifle_Short_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class SMG_01_F: SMG_01_Base {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_45ACP_SMG {
+                iconPosition[] = {0.1,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.4,0.3};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class SMG_02_base_F: Rifle_Short_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class SMG_02_F: SMG_02_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_9MM_SMG {
+                iconPosition[] = {0.08,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.27};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.28,0.4};
+                iconScale = 0.25;
+            };
+        };
+    };
+
+    class pdw2000_base_F: Rifle_Short_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class hgun_PDW2000_F: pdw2000_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_9MM_SMG {
+                iconPosition[] = {0.1,0.41};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.4,0.32};
+                iconScale = 0.15;
+            };
+        };
+    };
+
+    class LMG_03_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762MG {
+                class compatibleItems: compatibleItems {
+                    muzzle_snds_M = 1;
+                    muzzle_snds_m_khk_F = 1;
+                    muzzle_snds_m_snd_F = 1;
+                };
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913_short_MG {
+                iconPosition[] = {0.57,0.28};
+                iconScale = 0.15;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.38,0.42};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class DMR_07_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913_short {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class SMG_05_base_F: Rifle_Short_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_9MM_SMG {
+                iconPosition[] = {0.05,0.35};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913_short {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.25,0.35};
+                iconScale = 0.25;
+            };
+        };
+    };
+/*
+    class arifle_AKS_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo {
+            class CowsSlot: asdg_OpticSideMount {};
+            class MuzzleSlot: asdg_MuzzleSlot_545R {};
+        };
+    };
+*//*
+    class arifle_AK12_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762R {
+                iconPosition[] = {0,0.35};
+                iconScale = 0.2;
+                class compatibleItems: compatibleItems {
+                    muzzle_snds_B = 1;
+                    muzzle_snds_B_khk_F = 1;
+                    muzzle_snds_B_snd_F = 1;
+                };
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.5,0.25};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.3,0.35};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_AK12_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.35,0.7};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class arifle_SPAR_01_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_SPAR_01_blk_F: arifle_SPAR_01_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+    class arifle_SPAR_01_khk_F: arifle_SPAR_01_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+    class arifle_SPAR_01_snd_F: arifle_SPAR_01_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class arifle_SPAR_02_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class arifle_SPAR_03_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_762 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913_long {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class arifle_CTAR_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_58 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_CTARS_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_58 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class arifle_ARX_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.4};
+                iconScale = 0.2;
+            };
+            class CowsSlot: asdg_OpticRail1913 {
+                iconPosition[] = {0.45,0.28};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.35,0.45};
+                iconScale = 0.2;
+            };
+            class UnderBarrelSlot: asdg_UnderSlot {
+                iconPosition[] = {0.2,0.8};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class Pistol;
+    class Pistol_Base_F: Pistol {
+        class WeaponSlotsInfo;
+    };
+
+    class hgun_ACPC2_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_45ACP {
+                iconPosition[] = {0.25,0.4};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_PistolUnderRail {
+                iconPosition[] = {0.48,0.54};
+                iconScale = 0.25;
+            };
+        };
+   };
+
+    class hgun_P07_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_9MM {
+                iconPosition[] = {0.24,0.35};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class hgun_Pistol_heavy_01_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: asdg_PistolOpticMount {
+                iconPosition[] = {0.6,0.27};
+                iconScale = 0.15;
+            };
+            class MuzzleSlot: asdg_MuzzleSlot_45ACP {
+                iconPosition[] = {0.24,0.35};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_PistolUnderRail {
+                iconPosition[] = {0.47,0.55};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class hgun_Pistol_heavy_02_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: asdg_PistolOpticRail1913 {
+                iconPosition[] = {0.4,0.3};
+                iconScale = 0.15;
+            };
+            class PointerSlot: asdg_PistolUnderRail {
+                iconPosition[] = {0.35,0.6};
+                iconScale = 0.3;
+            };
+        };
+    };
+
+    class hgun_Rook40_F: Pistol_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_9MM {
+                iconPosition[] = {0.3,0.38};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class muzzle_snds_H;
+    class muzzle_snds_H_MG: muzzle_snds_H { // we were seriously lacking a MG suppressor since BI hid these (1.64)
+        scope = 2;
+        displayName = "$STR_CBA_JR_cfgweapons_muzzle_snds_h_mg"; // 7.62 MG, can also be used on 6.5 and 5.56 MGs
+        model = "\a3\weapons_f\acc\acca_snds_338_tan_F";
+    };
+    class muzzle_snds_H_MG_blk_F: muzzle_snds_H_MG {
+        displayName = "$STR_CBA_JR_cfgweapons_muzzle_snds_h_mg"; // 7.62 MG, can also be used on 6.5 and 5.56 MGs
+        model = "\a3\weapons_f\acc\acca_snds_338_black_F";
+    };
+    class muzzle_snds_H_MG_khk_F: muzzle_snds_H_MG {
+        displayName = "$STR_CBA_JR_cfgweapons_muzzle_snds_h_mg"; // 7.62 MG, can also be used on 6.5 and 5.56 MGs
+        model = "\a3\weapons_f\acc\acca_snds_338_green_F";
+    };
+
+    class SMG_03_TR_BASE: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+    class SMG_03C_BASE: SMG_03_TR_BASE {};
+    class SMG_03_TR_black: SMG_03_TR_BASE {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: asdg_OpticRail1913_short {
+                iconPosition[] = {0.4, 0.3};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.33, 0.37};
+                iconScale = 0.25;
+            };
+        };
+    };
+    class SMG_03_TR_hex: SMG_03_TR_BASE {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: asdg_OpticRail1913_short {
+                iconPosition[] = {0.4, 0.3};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.33, 0.37};
+                iconScale = 0.25;
+            };
+        };
+    };
+    class SMG_03C_TR_black: SMG_03C_BASE {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class CowsSlot: asdg_OpticRail1913_short {
+                iconPosition[] = {0.4, 0.3};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.33, 0.37};
+                iconScale = 0.25;
+            };
+        };
+    };
+
+    // Contact DLC dummies
+    class acc_flashlight;
+    class acc_flashlight_broken: acc_flashlight {
+        scope = 1; // Optional protected class inheriting from a public base class.
+    };
+
+    class acc_pointer_IR;
+    class acc_pointer_IR_broken: acc_pointer_IR {
+        scope = 1;
+    };
+
+    class optic_Aco;
+    class optic_Aco_broken: optic_Aco {
+        scope = 1;
+    };
+
+    class optic_Hamr;
+    class optic_Hamr_broken: optic_Hamr {
+        scope = 1;
+    };
+
+    class optic_MRCO;
+    class optic_MRCO_broken: optic_MRCO {
+        scope = 1;
+    };
+};
diff --git a/addons/legacy_jr/config.cpp b/addons/legacy_jr/config.cpp
new file mode 100644
index 000000000..dbbcadeca
--- /dev/null
+++ b/addons/legacy_jr/config.cpp
@@ -0,0 +1,16 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = "$STR_CBA_Author";
+        name = CSTRING(component);
+        url = "$STR_CBA_URL";
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"cba_legacy_jr_prep"};
+        version = VERSION;
+    };
+};
+
+#include "CfgWeapons.hpp"
diff --git a/addons/legacy_jr/legacy_jr_prep/CfgWeapons.hpp b/addons/legacy_jr/legacy_jr_prep/CfgWeapons.hpp
new file mode 100644
index 000000000..0ba0aff2e
--- /dev/null
+++ b/addons/legacy_jr/legacy_jr_prep/CfgWeapons.hpp
@@ -0,0 +1,173 @@
+class CfgWeapons {
+    class Rifle;
+    class Rifle_Base_F: Rifle {
+        class WeaponSlotsInfo;
+    };
+    class Rifle_Long_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo;
+    };
+
+    class arifle_MX_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete PointerSlot;
+        };
+    };
+    class arifle_MXC_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete PointerSlot;
+        };
+    };
+    class arifle_MX_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete PointerSlot;
+        };
+    };
+    class arifle_MX_GL_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete PointerSlot;
+        };
+    };
+    class arifle_MX_SW_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete PointerSlot;
+        };
+    };
+    class arifle_MXM_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete PointerSlot;
+        };
+    };
+
+    class arifle_Katiba_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+    class mk20_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+    class Tavor_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+//////////
+    class arifle_AK12_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+
+            // Cannot 'delete' class, because it is inherited by child classes.
+            //delete UnderBarrelSlot;
+        };
+    };
+    class arifle_AK12_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+            delete UnderBarrelSlot;
+        };
+    };
+    class arifle_AK12_lush_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+            delete UnderBarrelSlot;
+        };
+    };
+    class arifle_AK12_arid_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+            delete UnderBarrelSlot;
+        };
+    };
+
+    class arifle_AK12_GL_base_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {};
+    };
+    class arifle_AK12_GL_F: arifle_AK12_GL_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+        };
+    };
+    class arifle_AK12_GL_lush_F: arifle_AK12_GL_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+        };
+    };
+    class arifle_AK12_GL_arid_F: arifle_AK12_GL_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+        };
+    };
+
+    class arifle_AK12U_base_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+            delete UnderBarrelSlot;
+        };
+    };
+    class arifle_RPK12_base_F: arifle_AK12_base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+            delete CowsSlot;
+        };
+    };
+
+//////////
+
+
+
+
+
+
+
+
+
+
+    class LMG_Mk200_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+    class DMR_01_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+    class EBR_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+    class DMR_03_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+
+    class DMR_06_base_F: Rifle_Long_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            delete MuzzleSlot;
+        };
+    };
+};
diff --git a/addons/legacy_jr/legacy_jr_prep/config.cpp b/addons/legacy_jr/legacy_jr_prep/config.cpp
new file mode 100644
index 000000000..1f453453e
--- /dev/null
+++ b/addons/legacy_jr/legacy_jr_prep/config.cpp
@@ -0,0 +1,16 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        author = "$STR_CBA_Author";
+        name = ECSTRING(legacy_jr,component);
+        url = "$STR_CBA_URL";
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {"cba_jr"};
+        version = VERSION;
+    };
+};
+
+#include "CfgWeapons.hpp"
diff --git a/addons/legacy_jr/legacy_jr_prep/script_component.hpp b/addons/legacy_jr/legacy_jr_prep/script_component.hpp
new file mode 100644
index 000000000..01632962f
--- /dev/null
+++ b/addons/legacy_jr/legacy_jr_prep/script_component.hpp
@@ -0,0 +1,3 @@
+#define COMPONENT legacy_jr_prep
+#include "\x\cba\addons\main\script_mod.hpp"
+#include "\x\cba\addons\main\script_macros.hpp"
diff --git a/addons/legacy_jr/script_component.hpp b/addons/legacy_jr/script_component.hpp
new file mode 100644
index 000000000..87ad65124
--- /dev/null
+++ b/addons/legacy_jr/script_component.hpp
@@ -0,0 +1,3 @@
+#define COMPONENT legacy_jr
+#include "\x\cba\addons\main\script_mod.hpp"
+#include "\x\cba\addons\main\script_macros.hpp"
diff --git a/addons/legacy_jr/stringtable.xml b/addons/legacy_jr/stringtable.xml
new file mode 100644
index 000000000..0d5c360ea
--- /dev/null
+++ b/addons/legacy_jr/stringtable.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project name="CBA_A3">
+    <Package name="Legacy_JR">
+        <Key ID="STR_CBA_Legacy_JR_Component">
+            <English>Community Base Addons - Legacy Joint Rails</English>
+            <German>Community Base Addons - Legacy-Joint Rails</German>
+        </Key>
+    </Package>
+</Project>

From c9473eced5fc5ed83a944a40b80f2b2f0c17928b Mon Sep 17 00:00:00 2001
From: commy2 <commy-2@gmx.de>
Date: Sat, 27 Jul 2019 22:23:48 +0200
Subject: [PATCH 2/2] legacy jr for mx and the rest

---
 addons/legacy_jr/CfgWeapons.hpp               | 1054 ++---------------
 .../legacy_jr/legacy_jr_prep/CfgWeapons.hpp   |   12 -
 2 files changed, 85 insertions(+), 981 deletions(-)

diff --git a/addons/legacy_jr/CfgWeapons.hpp b/addons/legacy_jr/CfgWeapons.hpp
index ff2fde4b6..8ed5d5ae8 100644
--- a/addons/legacy_jr/CfgWeapons.hpp
+++ b/addons/legacy_jr/CfgWeapons.hpp
@@ -1,10 +1,18 @@
+class asdg_OpticRail1913;
+class asdg_FrontSideRail;
+class asdg_UnderSlot;
 class asdg_MuzzleSlot;
-class asdg_MuzzleSlot_762R: asdg_MuzzleSlot {
-    class compatibleItems {};
+class asdg_MuzzleSlot_65;
+class asdg_MuzzleSlot_556;
+class asdg_MuzzleSlot_762;
+
+class asdg_MuzzleSlot_762MG: asdg_MuzzleSlot {
+    class compatibleItems;
 };
 
-class asdg_OpticRail1913;
-class asdg_UnderSlot;
+class asdg_MuzzleSlot_762R: asdg_MuzzleSlot {
+    class compatibleItems;
+};
 
 class CfgWeapons {
     class Rifle;
@@ -15,6 +23,63 @@ class CfgWeapons {
         class WeaponSlotsInfo;
     };
 
+    class arifle_MX_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+            class PointerSlot: asdg_FrontSideRail {
+                iconPosition[] = {0.2,0.45};
+                iconScale = 0.25;
+            };
+        };
+    };
+    class arifle_MXC_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                iconPosition[] = {0,0.4};
+            };
+            class PointerSlot: PointerSlot {
+                iconPosition[] = {0.2,0.4};
+            };
+        };
+    };
+    class arifle_MXM_F: arifle_MX_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: MuzzleSlot {
+                iconPosition[] = {0,0.4};
+            };
+        };
+    };
+
+    class arifle_Katiba_Base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_65 {
+                iconPosition[] = {0,0.45};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class mk20_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0,0.36};
+                iconScale = 0.2;
+            };
+        };
+    };
+
+    class Tavor_base_F: Rifle_Base_F {
+        class WeaponSlotsInfo: WeaponSlotsInfo {
+            class MuzzleSlot: asdg_MuzzleSlot_556 {
+                iconPosition[] = {0.1,0.36};
+                iconScale = 0.2;
+            };
+        };
+    };
+
     class arifle_AK12_base_F: Rifle_Base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
             class MuzzleSlot: asdg_MuzzleSlot_762R {
@@ -33,6 +98,7 @@ class CfgWeapons {
                 iconPosition[] = {0.5,0.25};
                 iconScale = 0.2;
             };
+            // Cannot 'delete' class, because it is inherited by child classes.
             //class UnderBarrelSlot: asdg_UnderSlot {
             //    iconPosition[] = {0.35,0.7};
             //    iconScale = 0.3;
@@ -63,12 +129,10 @@ class CfgWeapons {
             };
         };
     };
-
     class arifle_AK12U_base_F: arifle_AK12_base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
             class CowsSlot: CowsSlot {
                 iconPosition[] = {0.4,0.25};
-                iconScale = 0.2;
             };
             class UnderBarrelSlot: asdg_UnderSlot {
                 iconPosition[] = {0.24,0.7};
@@ -84,1008 +148,60 @@ class CfgWeapons {
             };
         };
     };
-};
-
-
-
-
-/*class CfgWeapons {
-    class Rifle;
-    class Rifle_Base_F: Rifle {
-        class WeaponSlotsInfo;
-    };
-
-    class Rifle_Short_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class Rifle_Long_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class Launcher;
-    class Launcher_Base_F: Launcher {
-        class WeaponSlotsInfo;
-    };
-
-    class launch_Titan_base: Launcher_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.2,0.45};
-                iconScale = 0.25;
-            };
-        };
-    };
-    class launch_MRAWS_base_F: Launcher_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.15, 0.5};
-                iconScale = 0.25;
-            };
-        };
-    };
-
-    class EBR_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class srifle_EBR_F: EBR_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                iconPosition[] = {0.05,0.38};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.5,0.3};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.4};
-                iconScale = 0.25;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.3,0.65};
-                iconScale = 0.2;
-            };
-        };
-    };
 
-    class GM6_base_F: Rifle_Long_Base_F {};
-
-    class srifle_GM6_F: GM6_base_F {
+    class LMG_Mk200_F: Rifle_Long_Base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.55,0.3};
+            class MuzzleSlot: asdg_MuzzleSlot_762MG {
+                iconPosition[] = {0.1,0.5};
                 iconScale = 0.2;
-            };
-        };
-    };
 
-    class LRR_base_F: Rifle_Long_Base_F {};
+                class compatibleItems: compatibleItems {
+                    muzzle_snds_h = 1;
+                    muzzle_snds_h_khk_F = 1;
+                    muzzle_snds_h_snd_F = 1;
+                    muzzle_snds_H_SW = 1;
+                    muzzle_snds_H_MG = 1;
+                    muzzle_snds_H_MG_blk_F = 1;
+                    muzzle_snds_H_MG_khk_F = 1;
 
-    class srifle_LRR_F: LRR_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.6,0.35};
-                iconScale = 0.2;
+                };
             };
         };
     };
 
     class DMR_01_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class srifle_DMR_01_F: DMR_01_base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
             class MuzzleSlot: asdg_MuzzleSlot_762 {
                 iconPosition[] = {0,0.45};
                 iconScale = 0.2;
             };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.38};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.5};
-                iconScale = 0.25;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.4,0.7};
-                iconScale = 0.2;
-            };
         };
     };
 
-    class DMR_02_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class srifle_DMR_02_F: DMR_02_base_F {
+    class EBR_base_F: Rifle_Long_Base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_338 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913_long {
-                iconPosition[] = {0.5,0.36};
+            class MuzzleSlot: asdg_MuzzleSlot_762 {
+                iconPosition[] = {0.05,0.38};
                 iconScale = 0.2;
             };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.22,0.42};
-                iconScale = 0.25;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.8};
-                iconScale = 0.3;
-            };
         };
     };
 
     class DMR_03_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class srifle_DMR_03_F: DMR_03_base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
             class MuzzleSlot: asdg_MuzzleSlot_762 {
                 iconPosition[] = {0.12,0.431};
                 iconScale = 0.15;
             };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.5,0.36};
-                iconScale = 0.15;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.33,0.4};
-                iconScale = 0.2;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.3,0.8};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class DMR_04_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class srifle_DMR_04_F: DMR_04_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.52,0.38};
-                iconScale = 0.15;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.3,0.43};
-                iconScale = 0.2;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.3,0.7};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class DMR_05_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class srifle_DMR_05_blk_F: DMR_05_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_93x64 {
-                iconPosition[] = {0,0.43};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913_long {
-                iconPosition[] = {0.5,0.38};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.22,0.43};
-                iconScale = 0.25;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.8};
-                iconScale = 0.3;
-            };
         };
     };
 
     class DMR_06_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class srifle_DMR_06_camo_F: DMR_06_base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
             class MuzzleSlot: asdg_MuzzleSlot_762 {
                 iconPosition[] = {0.06,0.4};
                 iconScale = 0.15;
             };
-            class CowsSlot: asdg_OpticRail1913_short {
-                iconPosition[] = {0.52,0.36};
-                iconScale = 0.15;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.32,0.8};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class LMG_Mk200_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762MG {
-                iconPosition[] = {0.1,0.5};
-                iconScale = 0.2;
-                class compatibleItems: compatibleItems {
-                    muzzle_snds_h = 1;
-                    muzzle_snds_h_khk_F = 1;
-                    muzzle_snds_h_snd_F = 1;
-                };
-            };
-            class CowsSlot: asdg_OpticRail1913_short_MG {
-                iconPosition[] = {0.6,0.45};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.5};
-                iconScale = 0.25;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.35,0.8};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class LMG_Zafir_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-/*            class MuzzleSlot: asdg_MuzzleSlot_762MG { // this would work but there is no sound config for a suppressed variant
-                iconPosition[] = {0.05,0.4};
-                iconScale = 0.2;
-            };
-*//*
-            class CowsSlot: asdg_OpticRail1913_short_MG {
-                iconPosition[] = {0.6,0.35};
-                iconScale = 0.15;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.4,0.4};
-                iconScale = 0.15;
-            };
         };
     };
-
-    class MMG_01_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class MMG_01_hex_F: MMG_01_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_93x64 {
-                iconPosition[] = {0.06,0.4};
-                iconScale = 0.15;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.57,0.28};
-                iconScale = 0.15;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.38,0.42};
-                iconScale = 0.2;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.35,0.85};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class MMG_02_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class MMG_02_camo_F: MMG_02_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_338 {
-                iconPosition[] = {0.06,0.42};
-                iconScale = 0.15;
-            };
-            class CowsSlot: asdg_OpticRail1913_short_MG {
-                iconPosition[] = {0.62,0.32};
-                iconScale = 0.15;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.38,0.42};
-                iconScale = 0.2;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.35,0.85};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class arifle_Katiba_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class arifle_Katiba_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.45};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_Katiba_C_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0.1,0.45};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_Katiba_GL_F: arifle_Katiba_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.45};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class mk20_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class arifle_Mk20_F: mk20_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_556 {
-                iconPosition[] = {0,0.36};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.25};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.35};
-                iconScale = 0.25;
-            };
-        };
-    };
-
-    class arifle_Mk20C_F: mk20_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_556 {
-                iconPosition[] = {0.1,0.36};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.35};
-                iconScale = 0.25;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.25};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_Mk20_GL_F: mk20_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_556 {
-                iconPosition[] = {0.1,0.36};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.35};
-                iconScale = 0.25;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.25};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_MX_Base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class arifle_MXC_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.5,0.3};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.2,0.4};
-                iconScale = 0.25;
-            };
-        };
-    };
-
-    class arifle_MX_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.45};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.5,0.35};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.2,0.45};
-                iconScale = 0.25;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.7};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_MX_GL_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.45};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.5,0.35};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.2,0.45};
-                iconScale = 0.25;
-            };
-        };
-    };
-
-    class arifle_MX_SW_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.45};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.5,0.35};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.2,0.45};
-                iconScale = 0.25;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.7};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_MXM_F: arifle_MX_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.5,0.35};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.2,0.45};
-                iconScale = 0.25;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.7};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class Tavor_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class arifle_TRG21_F: Tavor_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_556 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913_short {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.25,0.4};
-                iconScale = 0.25;
-            };
-        };
-    };
-
-    class arifle_TRG20_F: Tavor_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_556 {
-                iconPosition[] = {0.1,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913_short {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.25,0.4};
-                iconScale = 0.25;
-            };
-        };
-    };
-
-    class SMG_01_Base: Rifle_Short_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class SMG_01_F: SMG_01_Base {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_45ACP_SMG {
-                iconPosition[] = {0.1,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.4,0.3};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class SMG_02_base_F: Rifle_Short_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class SMG_02_F: SMG_02_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_9MM_SMG {
-                iconPosition[] = {0.08,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.27};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.28,0.4};
-                iconScale = 0.25;
-            };
-        };
-    };
-
-    class pdw2000_base_F: Rifle_Short_Base_F {
-        class WeaponSlotsInfo;
-    };
-
-    class hgun_PDW2000_F: pdw2000_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_9MM_SMG {
-                iconPosition[] = {0.1,0.41};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.4,0.32};
-                iconScale = 0.15;
-            };
-        };
-    };
-
-    class LMG_03_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762MG {
-                class compatibleItems: compatibleItems {
-                    muzzle_snds_M = 1;
-                    muzzle_snds_m_khk_F = 1;
-                    muzzle_snds_m_snd_F = 1;
-                };
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913_short_MG {
-                iconPosition[] = {0.57,0.28};
-                iconScale = 0.15;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.38,0.42};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class DMR_07_base_F: Rifle_Long_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.45};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913_short {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class SMG_05_base_F: Rifle_Short_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_9MM_SMG {
-                iconPosition[] = {0.05,0.35};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913_short {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.25,0.35};
-                iconScale = 0.25;
-            };
-        };
-    };
-/*
-    class arifle_AKS_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo {
-            class CowsSlot: asdg_OpticSideMount {};
-            class MuzzleSlot: asdg_MuzzleSlot_545R {};
-        };
-    };
-*//*
-    class arifle_AK12_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762R {
-                iconPosition[] = {0,0.35};
-                iconScale = 0.2;
-                class compatibleItems: compatibleItems {
-                    muzzle_snds_B = 1;
-                    muzzle_snds_B_khk_F = 1;
-                    muzzle_snds_B_snd_F = 1;
-                };
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.5,0.25};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.3,0.35};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_AK12_F: arifle_AK12_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.35,0.7};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class arifle_SPAR_01_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_556 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_SPAR_01_blk_F: arifle_SPAR_01_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.8};
-                iconScale = 0.3;
-            };
-        };
-    };
-    class arifle_SPAR_01_khk_F: arifle_SPAR_01_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.8};
-                iconScale = 0.3;
-            };
-        };
-    };
-    class arifle_SPAR_01_snd_F: arifle_SPAR_01_base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.8};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class arifle_SPAR_02_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_556 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.8};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class arifle_SPAR_03_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_762 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913_long {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.8};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class arifle_CTAR_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_58 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_CTARS_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_58 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class arifle_ARX_base_F: Rifle_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_65 {
-                iconPosition[] = {0,0.4};
-                iconScale = 0.2;
-            };
-            class CowsSlot: asdg_OpticRail1913 {
-                iconPosition[] = {0.45,0.28};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.35,0.45};
-                iconScale = 0.2;
-            };
-            class UnderBarrelSlot: asdg_UnderSlot {
-                iconPosition[] = {0.2,0.8};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class Pistol;
-    class Pistol_Base_F: Pistol {
-        class WeaponSlotsInfo;
-    };
-
-    class hgun_ACPC2_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_45ACP {
-                iconPosition[] = {0.25,0.4};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_PistolUnderRail {
-                iconPosition[] = {0.48,0.54};
-                iconScale = 0.25;
-            };
-        };
-   };
-
-    class hgun_P07_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_9MM {
-                iconPosition[] = {0.24,0.35};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class hgun_Pistol_heavy_01_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class CowsSlot: asdg_PistolOpticMount {
-                iconPosition[] = {0.6,0.27};
-                iconScale = 0.15;
-            };
-            class MuzzleSlot: asdg_MuzzleSlot_45ACP {
-                iconPosition[] = {0.24,0.35};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_PistolUnderRail {
-                iconPosition[] = {0.47,0.55};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class hgun_Pistol_heavy_02_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class CowsSlot: asdg_PistolOpticRail1913 {
-                iconPosition[] = {0.4,0.3};
-                iconScale = 0.15;
-            };
-            class PointerSlot: asdg_PistolUnderRail {
-                iconPosition[] = {0.35,0.6};
-                iconScale = 0.3;
-            };
-        };
-    };
-
-    class hgun_Rook40_F: Pistol_Base_F {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class MuzzleSlot: asdg_MuzzleSlot_9MM {
-                iconPosition[] = {0.3,0.38};
-                iconScale = 0.2;
-            };
-        };
-    };
-
-    class muzzle_snds_H;
-    class muzzle_snds_H_MG: muzzle_snds_H { // we were seriously lacking a MG suppressor since BI hid these (1.64)
-        scope = 2;
-        displayName = "$STR_CBA_JR_cfgweapons_muzzle_snds_h_mg"; // 7.62 MG, can also be used on 6.5 and 5.56 MGs
-        model = "\a3\weapons_f\acc\acca_snds_338_tan_F";
-    };
-    class muzzle_snds_H_MG_blk_F: muzzle_snds_H_MG {
-        displayName = "$STR_CBA_JR_cfgweapons_muzzle_snds_h_mg"; // 7.62 MG, can also be used on 6.5 and 5.56 MGs
-        model = "\a3\weapons_f\acc\acca_snds_338_black_F";
-    };
-    class muzzle_snds_H_MG_khk_F: muzzle_snds_H_MG {
-        displayName = "$STR_CBA_JR_cfgweapons_muzzle_snds_h_mg"; // 7.62 MG, can also be used on 6.5 and 5.56 MGs
-        model = "\a3\weapons_f\acc\acca_snds_338_green_F";
-    };
-
-    class SMG_03_TR_BASE: Rifle_Base_F {
-        class WeaponSlotsInfo;
-    };
-    class SMG_03C_BASE: SMG_03_TR_BASE {};
-    class SMG_03_TR_black: SMG_03_TR_BASE {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class CowsSlot: asdg_OpticRail1913_short {
-                iconPosition[] = {0.4, 0.3};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.33, 0.37};
-                iconScale = 0.25;
-            };
-        };
-    };
-    class SMG_03_TR_hex: SMG_03_TR_BASE {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class CowsSlot: asdg_OpticRail1913_short {
-                iconPosition[] = {0.4, 0.3};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.33, 0.37};
-                iconScale = 0.25;
-            };
-        };
-    };
-    class SMG_03C_TR_black: SMG_03C_BASE {
-        class WeaponSlotsInfo: WeaponSlotsInfo {
-            class CowsSlot: asdg_OpticRail1913_short {
-                iconPosition[] = {0.4, 0.3};
-                iconScale = 0.2;
-            };
-            class PointerSlot: asdg_FrontSideRail {
-                iconPosition[] = {0.33, 0.37};
-                iconScale = 0.25;
-            };
-        };
-    };
-
-    // Contact DLC dummies
-    class acc_flashlight;
-    class acc_flashlight_broken: acc_flashlight {
-        scope = 1; // Optional protected class inheriting from a public base class.
-    };
-
-    class acc_pointer_IR;
-    class acc_pointer_IR_broken: acc_pointer_IR {
-        scope = 1;
-    };
-
-    class optic_Aco;
-    class optic_Aco_broken: optic_Aco {
-        scope = 1;
-    };
-
-    class optic_Hamr;
-    class optic_Hamr_broken: optic_Hamr {
-        scope = 1;
-    };
-
-    class optic_MRCO;
-    class optic_MRCO_broken: optic_MRCO {
-        scope = 1;
-    };
 };
diff --git a/addons/legacy_jr/legacy_jr_prep/CfgWeapons.hpp b/addons/legacy_jr/legacy_jr_prep/CfgWeapons.hpp
index 0ba0aff2e..0d066ad69 100644
--- a/addons/legacy_jr/legacy_jr_prep/CfgWeapons.hpp
+++ b/addons/legacy_jr/legacy_jr_prep/CfgWeapons.hpp
@@ -62,7 +62,6 @@ class CfgWeapons {
         };
     };
 
-//////////
     class arifle_AK12_base_F: Rifle_Base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
             delete MuzzleSlot;
@@ -130,17 +129,6 @@ class CfgWeapons {
         };
     };
 
-//////////
-
-
-
-
-
-
-
-
-
-
     class LMG_Mk200_F: Rifle_Long_Base_F {
         class WeaponSlotsInfo: WeaponSlotsInfo {
             delete MuzzleSlot;