Merge branch 'main' into other-addon

.editorconfig

@@ -10,3 +10,18 @@ trim_trailing_whitespace = true
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2
+
+[*.hpp]
+indent_style = space
+indent_size = 4
+
+[*.cpp]
+indent_style = space
+indent_size = 4
+
+[*.sqf]
+indent_style = space
+indent_size = 4

addons/optionsmenu/gui/mainMenu.hpp

@@ -8,7 +8,7 @@ class RscDisplayMain : RscStandardDisplay {
             class Controls;
         };
         class GroupMultiplayer: GroupSingleplayer {
-            h = "(9 *     1.5) *     (pixelH * pixelGrid * 2)";
+            h = "(8 *     1.5) *     (pixelH * pixelGrid * 2)";
             class Controls : Controls {
                 class Campaigns;
                 class joinTac2 : Campaigns {
@@ -36,12 +36,6 @@ class RscDisplayMain : RscStandardDisplay {
                     y = "(6 *     1.5) *     (pixelH * pixelGrid * 2) +     (pixelH)";
                     onbuttonclick = "connectToServer ['75.6.53.50', 2602, ''];";
                 };
-                class joinTSE : joinTS1 {
-                    text = CSTRING(joinTSE_text);
-                    tooltip = CSTRING(joinTSE_tooltip);
-                    y = "(7 *     1.5) *     (pixelH * pixelGrid * 2) +     (pixelH)";
-                    onbuttonclick = "connectToServer ['75.6.53.50', 2902, ''];";
-                };
             };
         };
 

addons/optionsmenu/stringtable.xml

@@ -19,12 +19,6 @@
         <Key ID="STR_cav_optionsmenu_joinTS3_text">
             <English>Join Training Server 3</English>
         </Key>
-        <Key ID="STR_cav_optionsmenu_joinTSE_text">
-            <English>Join Event Server</English>
-        </Key>
-        <Key ID="STR_cav_optionsmenu_joinTSE_tooltip">
-            <English>Join the 7Cav Event Server!</English>
-        </Key>
 
         <Key ID="STR_cav_optionsmenu_CavJoin_tooltip">
             <English>Enlist Today!</English>

addons/tagging/$PBOPREFIX$

@@ -0,0 +1 @@
+z\cav\addons\tagging

addons/tagging/ACE_Tags.hpp

@@ -0,0 +1,16 @@
+#define MACRO_GLUE(g1,g2) g1##g2
+#define MACRO_TAG(name,col) class TRIPLES(Cav_Tagging,##name##_##col##,F) { \
+        displayName = CSTRING(TRIPLES(name,col,F)); \
+        requiredItem = QUOTE(MACRO_GLUE(ACE_Spraypaint,col)); \
+        textures[] = {QPATHTOF(UI\tags\tag_##name##_##col##_ca.paa)}; \
+        icon = QPATHTOF(UI\icons\icon_action_##name##_##col##_ca.paa); \
+    }
+
+class ACE_Tags {
+    MACRO_TAG(Cav,Black);
+    MACRO_TAG(Cav,Blue);
+    MACRO_TAG(Cav,Green);
+    MACRO_TAG(Cav,Red);
+    MACRO_TAG(Cav,White);
+    MACRO_TAG(Cav,Yellow);
+};

addons/tagging/config.cpp

@@ -0,0 +1,20 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "cav_main",
+            "cav_common"
+        };
+        author = ECSTRING(Main,ModTeam);
+        authors[] = {"Brostrom.A (Evul)"};
+        url = ECSTRING(Main,Url);
+        VERSION_CONFIG;
+    };
+};
+
+#include "ACE_Tags.hpp"

addons/tagging/script_component.hpp

@@ -0,0 +1,5 @@
+#define COMPONENT tagging
+#define COMPONENT_BEAUTIFIED Tagging
+
+#include "\z\cav\addons\main\script_mod.hpp"
+#include "\z\cav\addons\main\script_macros.hpp"

addons/tagging/stringtable.xml

@@ -0,0 +1,22 @@
+<Project name="Cav">
+    <Package name="Tagging">
+        <Key ID="STR_Cav_Tagging_Cav_Black_F">
+            <English>Cav</English>
+        </Key>
+        <Key ID="STR_Cav_Tagging_Cav_Blue_F">
+            <English>Cav</English>
+        </Key>
+        <Key ID="STR_Cav_Tagging_Cav_Green_F">
+            <English>Cav</English>
+        </Key>
+        <Key ID="STR_Cav_Tagging_Cav_Red_F">
+            <English>Cav</English>
+        </Key>
+        <Key ID="STR_Cav_Tagging_Cav_White_F">
+            <English>Cav</English>
+        </Key>
+        <Key ID="STR_Cav_Tagging_Cav_Yellow_F">
+            <English>Cav</English>
+        </Key>
+    </Package>
+</Project>

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-----//

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; };