diff --git a/addons/textures/CfgVehicles.hpp b/addons/textures/CfgVehicles.hpp index 52ca92f5..2c928d2a 100644 --- a/addons/textures/CfgVehicles.hpp +++ b/addons/textures/CfgVehicles.hpp @@ -2812,161 +2812,7 @@ class CfgVehicles { //-----Arlington-----// - - - class Cav_Arlington_Left: UserTexture_1x2_F { - scope = 2; - scopeCurator = 2; - displayName = "Arlington Left"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Left.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Left.paa) - }; - }; - - class Cav_Arlington_Right: UserTexture_1x2_F { - scope = 2; - scopeCurator = 2; - displayName = "Arlington Right"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Right.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Right.paa) - }; - }; - - class Cav_Arlington_Britton: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Britton"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Britton.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Britton.paa) - }; - }; - - class Cav_Arlington_Carter: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Carter"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Carter.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Carter.paa) - }; - }; - - class Cav_Arlington_Krazee: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Krazee"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Krazee.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Krazee.paa) - }; - }; - - class Cav_Arlington_Mcgehee: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Mcgehee"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Mcgehee.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Mcgehee.paa) - }; - }; - - class Cav_Arlington_Novak: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Novak"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Novak.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Novak.paa) - }; - }; - - class Cav_Arlington_Raven: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Raven"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Raven.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Raven.paa) - }; - }; - - class Cav_Arlington_Ronnie: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Ronnie"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Ronnie.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Ronnie.paa) - }; - }; - - class Cav_Arlington_Tarkas: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Tarkas"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Tarkas.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Tarkas.paa) - }; - }; - - class Cav_Arlington_Traycer: UserTexture1m_F { - scope = 2; - scopeCurator = 2; - displayName = "Traycer"; //CSTRING(Arlington); - author = ECSTRING(main,cavmodteam); - editorPreview = QPATHTOF(data\arlington\Arlington_Traycer.paa); - - editorSubcategory = "Cav_EdSubcat_Arlington"; - - hiddenSelectionsTextures[] = { - QPATHTOF(data\arlington\Arlington_Traycer.paa) - }; - }; +#include "data/arlington/CfgVehicles.inc.hpp" //-----Vehicle Labels-----// diff --git a/addons/textures/data/arlington/Arlington_Bowman_ca.paa b/addons/textures/data/arlington/Arlington_Bowman_ca.paa new file mode 100644 index 00000000..55e36789 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Bowman_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Britton.paa b/addons/textures/data/arlington/Arlington_Britton.paa deleted file mode 100644 index 7d40c07e..00000000 Binary files a/addons/textures/data/arlington/Arlington_Britton.paa and /dev/null differ diff --git a/addons/textures/data/arlington/Arlington_Britton_ca.paa b/addons/textures/data/arlington/Arlington_Britton_ca.paa new file mode 100644 index 00000000..bebceeea Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Britton_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Carter.paa b/addons/textures/data/arlington/Arlington_Carter.paa deleted file mode 100644 index ef1c6b7f..00000000 Binary files a/addons/textures/data/arlington/Arlington_Carter.paa and /dev/null differ diff --git a/addons/textures/data/arlington/Arlington_Carter_ca.paa b/addons/textures/data/arlington/Arlington_Carter_ca.paa new file mode 100644 index 00000000..4debcc94 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Carter_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Cooper_ca.paa b/addons/textures/data/arlington/Arlington_Cooper_ca.paa new file mode 100644 index 00000000..d1683c47 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Cooper_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Dornbierer_ca.paa b/addons/textures/data/arlington/Arlington_Dornbierer_ca.paa new file mode 100644 index 00000000..a0a0494b Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Dornbierer_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Krazee.paa b/addons/textures/data/arlington/Arlington_Krazee.paa deleted file mode 100644 index 7bd5f892..00000000 Binary files a/addons/textures/data/arlington/Arlington_Krazee.paa and /dev/null differ diff --git a/addons/textures/data/arlington/Arlington_Krazee_ca.paa b/addons/textures/data/arlington/Arlington_Krazee_ca.paa new file mode 100644 index 00000000..79394d43 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Krazee_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Left.paa b/addons/textures/data/arlington/Arlington_Left_ca.paa similarity index 100% rename from addons/textures/data/arlington/Arlington_Left.paa rename to addons/textures/data/arlington/Arlington_Left_ca.paa diff --git a/addons/textures/data/arlington/Arlington_Long_ca.paa b/addons/textures/data/arlington/Arlington_Long_ca.paa new file mode 100644 index 00000000..e2109b83 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Long_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Macgehee_ca.paa b/addons/textures/data/arlington/Arlington_Macgehee_ca.paa new file mode 100644 index 00000000..759eaae2 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Macgehee_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Mcgehee.paa b/addons/textures/data/arlington/Arlington_Mcgehee_ca.paa similarity index 100% rename from addons/textures/data/arlington/Arlington_Mcgehee.paa rename to addons/textures/data/arlington/Arlington_Mcgehee_ca.paa diff --git a/addons/textures/data/arlington/Arlington_MillerDC_ca.paa b/addons/textures/data/arlington/Arlington_MillerDC_ca.paa new file mode 100644 index 00000000..02caa44b Binary files /dev/null and b/addons/textures/data/arlington/Arlington_MillerDC_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Muska_ca.paa b/addons/textures/data/arlington/Arlington_Muska_ca.paa new file mode 100644 index 00000000..0ed1d4b2 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Muska_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Novak.paa b/addons/textures/data/arlington/Arlington_Novak.paa deleted file mode 100644 index 3cab8615..00000000 Binary files a/addons/textures/data/arlington/Arlington_Novak.paa and /dev/null differ diff --git a/addons/textures/data/arlington/Arlington_Novak_ca.paa b/addons/textures/data/arlington/Arlington_Novak_ca.paa new file mode 100644 index 00000000..86a24887 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Novak_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Raven.paa b/addons/textures/data/arlington/Arlington_Raven.paa deleted file mode 100644 index 086a14b6..00000000 Binary files a/addons/textures/data/arlington/Arlington_Raven.paa and /dev/null differ diff --git a/addons/textures/data/arlington/Arlington_Raven_ca.paa b/addons/textures/data/arlington/Arlington_Raven_ca.paa new file mode 100644 index 00000000..7e3dab1c Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Raven_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Right.paa b/addons/textures/data/arlington/Arlington_Right_ca.paa similarity index 100% rename from addons/textures/data/arlington/Arlington_Right.paa rename to addons/textures/data/arlington/Arlington_Right_ca.paa diff --git a/addons/textures/data/arlington/Arlington_Ronnie.paa b/addons/textures/data/arlington/Arlington_Ronnie.paa deleted file mode 100644 index f7c792c5..00000000 Binary files a/addons/textures/data/arlington/Arlington_Ronnie.paa and /dev/null differ diff --git a/addons/textures/data/arlington/Arlington_Ronnie_ca.paa b/addons/textures/data/arlington/Arlington_Ronnie_ca.paa new file mode 100644 index 00000000..15127a75 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Ronnie_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Tarkas.paa b/addons/textures/data/arlington/Arlington_Tarkas.paa deleted file mode 100644 index dd691578..00000000 Binary files a/addons/textures/data/arlington/Arlington_Tarkas.paa and /dev/null differ diff --git a/addons/textures/data/arlington/Arlington_Tarkas_ca.paa b/addons/textures/data/arlington/Arlington_Tarkas_ca.paa new file mode 100644 index 00000000..fde0f6b0 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Tarkas_ca.paa differ diff --git a/addons/textures/data/arlington/Arlington_Traycer.paa b/addons/textures/data/arlington/Arlington_Traycer.paa deleted file mode 100644 index 7ca45076..00000000 Binary files a/addons/textures/data/arlington/Arlington_Traycer.paa and /dev/null differ diff --git a/addons/textures/data/arlington/Arlington_Traycer_ca.paa b/addons/textures/data/arlington/Arlington_Traycer_ca.paa new file mode 100644 index 00000000..a32796e8 Binary files /dev/null and b/addons/textures/data/arlington/Arlington_Traycer_ca.paa differ diff --git a/addons/textures/data/arlington/CfgVehicles.inc.hpp b/addons/textures/data/arlington/CfgVehicles.inc.hpp new file mode 100644 index 00000000..a8f5edd3 --- /dev/null +++ b/addons/textures/data/arlington/CfgVehicles.inc.hpp @@ -0,0 +1,73 @@ +#define MACRO_ARLINGTON(var1,var2) \ +class var1: UserTexture1m_F { \ + _generalMacro = QUOTE(var1); \ + scope = 2; \ + scopeCurator = 2; \ + displayName = CSTRING(var1); \ + author = ECSTRING(main,modteam); \ + editorPreview = QPATHTOF(data\arlington\var2.paa); \ + \ + hiddenSelectionsTextures[] = { \ + QPATHTOF(data\arlington\var2.paa) \ + };\ +} + +// Side Labels +class Cav_Arlington_Left_F: UserTexture_1x2_F { + scope = 2; + scopeCurator = 2; + displayName = CSTRING(Cav_Arlington_Left_F); + author = ECSTRING(main,modteam); + editorPreview = QPATHTOF(data\arlington\Arlington_Left.paa); + + editorSubcategory = "Cav_EdSubcat_Arlington"; + + hiddenSelectionsTextures[] = { + QPATHTOF(data\arlington\Arlington_Left.paa) + }; +}; +class Cav_Arlington_Right_F: UserTexture_1x2_F { + scope = 2; + scopeCurator = 2; + displayName = CSTRING(Cav_Arlington_Right_F); + author = ECSTRING(main,modteam); + editorPreview = QPATHTOF(data\arlington\Arlington_Right.paa); + + editorSubcategory = "Cav_EdSubcat_Arlington"; + + hiddenSelectionsTextures[] = { + QPATHTOF(data\arlington\Arlington_Right.paa) + }; +}; + +// Arlington Textures +MACRO_ARLINGTON(Cav_Arlington_Bowman_F,Arlington_Bowman_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Britton_F,Arlington_Britton_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Carter_F,Arlington_Carter_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Cooper_F,Arlington_Cooper_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Dornbierer_F,Arlington_Dornbierer_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Krazee_F,Arlington_Krazee_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Long_F,Arlington_Long_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Mcgehee_F,Arlington_Mcgehee_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_MillerDC_F,Arlington_MillerDC_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Muska_F,Arlington_Muska_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Novak_F,Arlington_Novak_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Raven_F,Arlington_Raven_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Ronnie_F,Arlington_Ronnie_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Tarkas_F,Arlington_Tarkas_ca.paa); +MACRO_ARLINGTON(Cav_Arlington_Traycer_F,Arlington_Traycer_ca.paa); + + +// Backwards compatability +class Cav_Arlington_Left: Cav_Arlington_Left_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Right: Cav_Arlington_Right_F { scope = 1; scopeCurator = 1; }; + +class Cav_Arlington_Britton: Cav_Arlington_Britton_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Carter: Cav_Arlington_Carter_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Krazee: Cav_Arlington_Krazee_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Mcgehee: Cav_Arlington_Mcgehee_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Novak: Cav_Arlington_Novak_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Raven: Cav_Arlington_Raven_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Ronnie: Cav_Arlington_Ronnie_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Tarkas: Cav_Arlington_Tarkas_F { scope = 1; scopeCurator = 1; }; +class Cav_Arlington_Traycer: Cav_Arlington_Traycer_F { scope = 1; scopeCurator = 1; }; diff --git a/addons/textures/stringtable.xml b/addons/textures/stringtable.xml index 08b71357..8709cd82 100644 --- a/addons/textures/stringtable.xml +++ b/addons/textures/stringtable.xml @@ -18,5 +18,60 @@ 7th Cavalry Vehicle Labels + + + + Arlington Label (Left) + + + Arlington Label (Right) + + + + Bowman + + + Britton + + + Carter + + + Cooper + + + Dornbierer + + + Krazee + + + Long + + + Mcgehee + + + MillerDC + + + Muska + + + Novak + + + Raven + + + Ronnie + + + Tarkas + + + Traycer + +