Removed kneepad variants

Author: johnb432

addons/compat_spe/compat_spe_wardrobe/ACE_wardrobe.hpp

@@ -8,8 +8,6 @@ class ace_wardrobe {
     class ACEWARDROBE(base_H_goggles_off);
     class ACEWARDROBE(base_U_tie_on);
     class ACEWARDROBE(base_U_tie_off);
-    class ACEWARDROBE(base_U_kneepads_on);
-    class ACEWARDROBE(base_U_kneepads_off);
 
     #include "ACE_wardrobe_uniforms.hpp"
     #include "ACE_wardrobe_headgear.hpp"

addons/compat_spe/compat_spe_wardrobe/ACE_wardrobe_uniforms.hpp

@@ -81,60 +81,6 @@ UNIFORM_COLLARCLOSED_COLLAROPEN_SLEEVESUP(U_SPE_ST_Soldier_M40_Gaiters_closed,U_
 UNIFORM_COLLARCLOSED_COLLAROPEN_SLEEVESUP(U_SPE_ST_Soldier_Gaiters_closed,U_SPE_ST_Soldier_Gaiters,U_SPE_ST_Soldier_rolled);
 UNIFORM_COLLARCLOSED_COLLAROPEN_SLEEVESUP(U_SPE_ST_Soldier_Boots,U_SPE_ST_Soldier_Boots_open,U_SPE_ST_Soldier_Boots_rolled);
 
-// Paratrooper kneepads
-class U_SPE_FSJ_mk1: ACEWARDROBE(base_U_kneepads_off) {
-    class modifiableTo {
-        class U_SPE_FSJ_mk1_pads {
-            directionalActionName = ACEWARDROBE_CSTRING(kneepadsOn);
-        };
-    };
-};
-class U_SPE_FSJ_mk1_pads: ACEWARDROBE(base) {
-    class modifiableTo {
-        class U_SPE_FSJ_mk1 {};
-        class U_SPE_FSJ_mk1_gloves_pads {};
-    };
-};
-class U_SPE_FSJ_mk1_gloves_pads: ACEWARDROBE(base_U_gloves_on) {
-    class modifiableTo {
-        class U_SPE_FSJ_mk1_pads {
-            directionalActionName = ACEWARDROBE_CSTRING(glovesOff);
-        };
-    };
-};
-
-class U_SPE_FSJ_mk1_pads_roll: ACEWARDROBE(base_U_kneepads_on) {
-    class modifiableTo {
-        class U_SPE_FSJ_mk1_roll {
-            directionalActionName = ACEWARDROBE_CSTRING(kneepadsOff);
-        };
-    };
-};
-class U_SPE_FSJ_mk1_roll: ACEWARDROBE(base) {
-    class modifiableTo {
-        class U_SPE_FSJ_mk1_gloves {};
-        class U_SPE_FSJ_mk1_pads_roll {};
-    };
-};
-class U_SPE_FSJ_mk1_gloves: ACEWARDROBE(base_U_gloves_on) {
-    class modifiableTo {
-        class U_SPE_FSJ_mk1_roll {
-            directionalActionName = ACEWARDROBE_CSTRING(glovesOff);
-        };
-    };
-};
-
-UNIFORM_KNEEPADS(U_SPE_FSJ_mk2_split_pads,U_SPE_FSJ_mk2_split);
-
-UNIFORM_KNEEPADS(U_SPE_FSJ_mk3_split_pads,U_SPE_FSJ_mk3_split);
-UNIFORM_KNEEPADS(U_SPE_FSJ_mk3_split_pads_roll,U_SPE_FSJ_mk3_split_trop_roll);
-
-UNIFORM_KNEEPADS(U_SPE_FSJ_mk1_offz_pads,U_SPE_FSJ_mk1_offz);
-UNIFORM_KNEEPADS(U_SPE_FSJ_mk1_offz_gloves_pads,U_SPE_FSJ_mk1_offz_gloves);
-
-UNIFORM_KNEEPADS(U_SPE_FSJ_mk2_offz_pads,U_SPE_FSJ_mk2_offz);
-UNIFORM_KNEEPADS(U_SPE_FSJ_mk2_offz_gloves_pads,U_SPE_FSJ_mk2_offz_gloves);
-
 // Blouse pilot pants
 BASE_PAIR(U_SPE_GER_LW_pilot,U_SPE_GER_LW_pilot_alt);
 BASE_PAIR(U_SPE_GER_LW_pilot_trop,U_SPE_GER_LW_pilot_trop_alt);

addons/wardrobe/ACE_Wardrobe_BaseClasses.hpp

@@ -55,14 +55,6 @@ class GVAR(base_U_tie_off): GVAR(base) {
     alternativeActionName = CSTRING(tieOff);
 };
 
-// Common base class for uniforms with kneepads on/off variants
-class GVAR(base_U_kneepads_on): GVAR(base) {
-    alternativeActionName = CSTRING(kneepadsOn);
-};
-class GVAR(base_U_kneepads_off): GVAR(base) {
-    alternativeActionName = CSTRING(kneepadsOff);
-};
-
 // Common base class for uniforms who are open/closed in the front
 class GVAR(base_U_jacket_open): GVAR(base) {
     alternativeActionName = CSTRING(jacketOpen);

addons/wardrobe/script_macros_wardrobe.hpp

@@ -220,9 +220,6 @@ BASIC(variantHoodRaised,variantHoodLowered,ACEWARDROBE(base_U_hood_raised),ACEWA
 #define UNIFORM_TIE(varianTieOn,variantTieOff)\
 BASIC(varianTieOn,variantTieOff,ACEWARDROBE(base_U_tie_on),ACEWARDROBE(base_U_tie_off))
 
-#define UNIFORM_KNEEPADS(variantKneepadsOn,variantKneepadsOff)\
-BASIC(variantKneepadsOn,variantKneepadsOff,ACEWARDROBE(base_U_kneepads_on),ACEWARDROBE(base_U_kneepads_off))
-
 // Uniform with Variants for Gloves, Rolled Up and Combined Gloves+Rolled Up
 #define UNIFORM_GLOVES_ROLLED(UniformBase,UniformGloves,UniformRolled,UniformGlovesRolled)\
 class UniformBase: ACEWARDROBE(base) {\

addons/wardrobe/stringtable.xml

@@ -90,12 +90,6 @@
             <Russian>Растегнуть куртку</Russian>
             <Japanese>ジャケットを開く</Japanese>
         </Key>
-        <Key ID="STR_ACE_Wardrobe_kneepadsOff">
-            <English>Take kneepads off</English>
-        </Key>
-        <Key ID="STR_ACE_Wardrobe_kneepadsOn">
-            <English>Put kneepads on</English>
-        </Key>
         <Key ID="STR_ACE_Wardrobe_maskOff">
             <English>Take mask off</English>
             <French>Enlevez votre masque</French>