WS Compat - Rename WS weapon holders when realistic names is loaded (#10240)

Rename WS weapon holders

addons/compat_ws/compat_ws_realisticnames/CfgVehicles.hpp

@@ -57,4 +57,173 @@ class CfgVehicles {
     class B_ION_Heli_Light_02_unarmed_lxWS: O_Heli_Light_02_unarmed_F {
         displayName = SUBCSTRING(heli_light_02_unarmed_Name);
     };
+
+    #include "CfgVehiclesAttachments.hpp"
+
+    // AA12
+    class Weapon_Base_F;
+    class Weapon_sgun_aa40_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(AA40_Name);
+    };
+    class Weapon_sgun_aa40_tan_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(AA40_Tan_Name);
+    };
+    class Weapon_sgun_aa40_snake_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(AA40_Snake_Name);
+    };
+
+    // Galil ARM
+    class Weapon_arifle_Galat_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(Galat_Name);
+    };
+    class Weapon_arifle_Galat_worn_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(Galat_Old_Name);
+    };
+
+    // GLX 160
+    class Weapon_glaunch_GLX_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(GLX_Name);
+    };
+    class Weapon_glaunch_GLX_snake_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(GLX_Snake_Name);
+    };
+    class Weapon_glaunch_GLX_hex_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(GLX_Hex_Name);
+    };
+    class Weapon_glaunch_GLX_ghex_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(GLX_GreenHex_Name);
+    };
+    class Weapon_glaunch_GLX_camo_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(GLX_Camo_Name);
+    };
+    class Weapon_glaunch_GLX_tan_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(GLX_Tan_Name);
+    };
+
+    // Mk14 Mod 1 EBR
+    class Weapon_srifle_EBR_blk_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(EBR_Black_Name);
+    };
+    class Weapon_srifle_EBR_snake_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(EBR_Snake_Name);
+    };
+
+    // Vektor SS-77
+    class Weapon_LMG_S77_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(S77_Name);
+    };
+    class Weapon_LMG_S77_AAF_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(S77_AAF_Name);
+    };
+    class Weapon_LMG_S77_Hex_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(S77_Hex_Name);
+    };
+    class Weapon_LMG_S77_GHex_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(S77_GreenHex_Name);
+    };
+    class Weapon_LMG_S77_Desert_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(S77_Desert_Name);
+    };
+
+    // Vektor SS-77 (Compact)
+    class Weapon_LMG_S77_Compact_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(S77_Compact_Name);
+    };
+    class Weapon_LMG_S77_Compact_Snakeskin_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(S77_Compact_Snake_Name);
+    };
+
+    // FN FAL (Wood) - Closest match is the 50.00
+    class Weapon_arifle_SLR_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(SLR_Wood_Name);
+    };
+    class Weapon_arifle_SLR_GL_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(SLR_GL_Wood_Name);
+    };
+
+    // FN FAL
+    class Weapon_arifle_SLR_V_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(SLR_Name);
+    };
+    class Weapon_arifle_SLR_V_GL_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(SLR_GL_Name);
+    };
+    class Weapon_arifle_SLR_D_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(SLR_Desert_Name);
+    };
+    class Weapon_arifle_SLR_V_camo_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(SLR_Camo_Name);
+    };
+    class Weapon_arifle_SLR_Para_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(SLR_Para_Name);
+    };
+    class Weapon_arifle_SLR_Para_snake_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(SLR_Para_Snake_Name);
+    };
+
+    // Vektor R4/R5
+    class Weapon_arifle_Velko_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(Velko_R4_Name);
+    };
+    class Weapon_arifle_VelkoR5_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(Velko_R5_Name);
+    };
+    class Weapon_arifle_VelkoR5_GL_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(Velko_R5_GL_Name);
+    };
+    class Weapon_arifle_VelkoR5_snake_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(Velko_R5_Snake_Name);
+    };
+    class Weapon_arifle_VelkoR5_GL_snake_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(Velko_R5_GL_Snake_Name);
+    };
+
+    // XMS has no realistic name as it's a make believe hybrid of the XM8/VHS-K2: XM8+VHS = XMS, this just removes the 5.56 mm from the name.
+    class Weapon_arifle_XMS_Base_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_Name);
+    };
+    class Weapon_arifle_XMS_Base_khk_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_Khaki_Name);
+    };
+    class Weapon_arifle_XMS_Base_Sand_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_Sand_Name);
+    };
+    class Weapon_arifle_XMS_GL_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_GL_Name);
+    };
+    class Weapon_arifle_XMS_GL_khk_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_GL_Khaki_Name);
+    };
+    class Weapon_arifle_XMS_GL_Sand_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_GL_Sand_Name);
+    };
+    class Weapon_arifle_XMS_Shot_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_SG_Name);
+    };
+    class Weapon_arifle_XMS_Shot_khk_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_SG_Khaki_Name);
+    };
+    class Weapon_arifle_XMS_Shot_Sand_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_SG_Sand_Name);
+    };
+    class Weapon_arifle_XMS_M_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_SW_Name);
+    };
+    class arifle_XMS_M_khk_lxWS: Weapon_Base_F {
+        diWeapon_splayName = SUBCSTRING(XMS_SW_Khaki_Name);
+    };
+    class Weapon_arifle_XMS_M_Sand_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(XMS_SW_Sand_Name);
+    };
+
+    // GM6 Lynx
+    class Weapon_srifle_GM6_snake_lxWS: Weapon_Base_F {
+        displayName = SUBCSTRING(gm6_snake_Name);
+    };
+
+    // RPG-32
+    class Launcher_Base_F;
+    class Weapon_launch_RPG32_tan_lxWS: Launcher_Base_F {
+        displayName = SUBCSTRING(rpg32_tan_Name);
+    };
 };

addons/compat_ws/compat_ws_realisticnames/CfgVehiclesAttachments.hpp

@@ -0,0 +1,71 @@
+// Attachments
+class Item_Base_F;
+class Item_optic_arco_hex_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(arco_hex_Name);
+};
+
+class Item_optic_Holosight_snake_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(holosight_snake_Name);
+};
+
+class Item_optic_Holosight_smg_snake_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(holosight_snake_smg_Name);
+};
+
+class Item_optic_Hamr_arid_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(hamr_arid_Name);
+};
+class Item_optic_Hamr_lush_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(hamr_lush_Name);
+};
+class Item_optic_Hamr_sand_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(hamr_sand_Name);
+};
+class Item_optic_Hamr_snake_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(hamr_snake_Name);
+};
+
+class Item_optic_r1_high_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_high_black_Name);
+};
+class Item_optic_r1_high_khaki_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_high_khaki_Name);
+};
+class Item_optic_r1_high_sand_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_high_sand_Name);
+};
+class Item_optic_r1_high_snake_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_high_snake_Name);
+};
+class Item_optic_r1_high_arid_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_high_arid_Name);
+};
+class Item_optic_r1_high_lush_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_high_lush_Name);
+};
+class Item_optic_r1_high_black_sand_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_high_black_sand_Name);
+};
+
+class Item_optic_r1_low_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_low_black_Name);
+};
+class Item_optic_r1_low_khaki_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_low_khaki_Name);
+};
+class Item_optic_r1_low_sand_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_low_sand_Name);
+};
+class Item_optic_r1_low_snake_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_low_snake_Name);
+};
+class Item_optic_r1_low_arid_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_low_arid_Name);
+};
+class Item_optic_r1_low_lush_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(r1_low_lush_Name);
+};
+
+class Item_optic_DMS_snake_lxWS: Item_Base_F {
+    displayName = SUBCSTRING(dms_snake_Name);
+};

addons/compat_ws/compat_ws_realisticnames/CfgWeapons.hpp

@@ -1,5 +1,5 @@
 class CfgWeapons {
-    #include "Attachments.hpp"
+    #include "CfgWeaponsAttachments.hpp"
 
     // AA12
     class sgun_aa40_base_lxWS;

addons/compat_ws/compat_ws_realisticnames/CfgWeaponsAttachments.hpp

@@ -1,3 +1,4 @@
+// Attachments
 class optic_Arco;
 class optic_arco_hex_lxWS: optic_Arco {
     displayName = SUBCSTRING(arco_hex_Name);

addons/compat_ws/compat_ws_realisticnames/config.cpp

@@ -15,6 +15,8 @@ class CfgPatches {
         authors[] = {"Mike"};
         url = ECSTRING(main,URL);
         VERSION_CONFIG;
+
+        addonRootClass = QUOTE(ADDON);
     };
 };