Tagging - Add new colors to sprays and new tag and tweak stringtables.

addons/tagging/ACE_Tags.hpp

@@ -8,29 +8,41 @@
 
 class ACE_Tags {
     class ACE_XBlack {
-        displayName = CSTRING(XBlack);
+        displayName = CSTRING(x);
         requiredItem = "ACE_SpraypaintBlack";
         textures[] = {QPATHTOF(UI\tags\black\0.paa), QPATHTOF(UI\tags\black\1.paa), QPATHTOF(UI\tags\black\2.paa)};
         icon = QPATHTOF(UI\tags\black\0.paa);
     };
     class ACE_XRed {
-        displayName = CSTRING(XRed);
+        displayName = CSTRING(x);
         requiredItem = "ACE_SpraypaintRed";
         textures[] = {QPATHTOF(UI\tags\red\0.paa), QPATHTOF(UI\tags\red\1.paa), QPATHTOF(UI\tags\red\2.paa)};
         icon = QPATHTOF(UI\tags\red\0.paa);
     };
     class ACE_XGreen {
-        displayName = CSTRING(XGreen);
+        displayName = CSTRING(x);
         requiredItem = "ACE_SpraypaintGreen";
         textures[] = {QPATHTOF(UI\tags\green\0.paa), QPATHTOF(UI\tags\green\1.paa), QPATHTOF(UI\tags\green\2.paa)};
         icon = QPATHTOF(UI\tags\green\0.paa);
     };
     class ACE_XBlue {
-        displayName = CSTRING(XBlue);
+        displayName = CSTRING(x);
         requiredItem = "ACE_SpraypaintBlue";
         textures[] = {QPATHTOF(UI\tags\blue\0.paa), QPATHTOF(UI\tags\blue\1.paa), QPATHTOF(UI\tags\blue\2.paa)};
         icon = QPATHTOF(UI\tags\blue\0.paa);
     };
+    class ACE_XYellow {
+        displayName = CSTRING(x);
+        requiredItem = "ACE_SpraypaintYellow";
+        textures[] = {QPATHTOF(UI\tags\yellow\0.paa), QPATHTOF(UI\tags\yellow\1.paa), QPATHTOF(UI\tags\yellow\2.paa)};
+        icon = QPATHTOF(UI\tags\yellow\0.paa);
+    };
+    class ACE_XWhite {
+        displayName = CSTRING(x);
+        requiredItem = "ACE_SpraypaintWhite";
+        textures[] = {QPATHTOF(UI\tags\white\0.paa), QPATHTOF(UI\tags\white\1.paa), QPATHTOF(UI\tags\white\2.paa)};
+        icon = QPATHTOF(UI\tags\white\0.paa);
+    };
 
     TAG(arrow_up,Black);
     TAG(arrow_down,Black);
@@ -40,6 +52,7 @@ class ACE_Tags {
     TAG(cross,Black);
     TAG(diamond,Black);
     TAG(square,Black);
+    TAG(square_filled,Black);
     TAG(triangle,Black);
     TAG(triangle_inverted,Black);
 
@@ -51,6 +64,7 @@ class ACE_Tags {
     TAG(cross,Blue);
     TAG(diamond,Blue);
     TAG(square,Blue);
+    TAG(square_filled,Blue);
     TAG(triangle,Blue);
     TAG(triangle_inverted,Blue);
 
@@ -62,6 +76,7 @@ class ACE_Tags {
     TAG(cross,Green);
     TAG(diamond,Green);
     TAG(square,Green);
+    TAG(square_filled,Green);
     TAG(triangle,Green);
     TAG(triangle_inverted,Green);
 
@@ -73,6 +88,31 @@ class ACE_Tags {
     TAG(cross,Red);
     TAG(diamond,Red);
     TAG(square,Red);
+    TAG(square_filled,Red);
     TAG(triangle,Red);
     TAG(triangle_inverted,Red);
+
+    TAG(arrow_up,Yellow);
+    TAG(arrow_down,Yellow);
+    TAG(arrow_left,Yellow);
+    TAG(arrow_right,Yellow);
+    TAG(circle,Yellow);
+    TAG(cross,Yellow);
+    TAG(diamond,Yellow);
+    TAG(square,Yellow);
+    TAG(square_filled,Yellow);
+    TAG(triangle,Yellow);
+    TAG(triangle_inverted,Yellow);
+
+    TAG(arrow_up,White);
+    TAG(arrow_down,White);
+    TAG(arrow_left,White);
+    TAG(arrow_right,White);
+    TAG(circle,White);
+    TAG(cross,White);
+    TAG(diamond,White);
+    TAG(square,White);
+    TAG(square_filled,White);
+    TAG(triangle,White);
+    TAG(triangle_inverted,White);
 };

addons/tagging/CfgVehicles.hpp

@@ -94,6 +94,18 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_SpraypaintBlue,1);
         };
     };
+    class ACE_Item_SpraypaintYellow: ACE_Item_SpraypaintBlack {
+        displayName = CSTRING(SpraypaintYellow);
+        class TransportItems {
+            MACRO_ADDITEM(ACE_SpraypaintYellow,1);
+        };
+    };
+    class ACE_Item_SpraypaintWhite: ACE_Item_SpraypaintBlack {
+        displayName = CSTRING(SpraypaintWhite);
+        class TransportItems {
+            MACRO_ADDITEM(ACE_SpraypaintWhite,1);
+        };
+    };
 
     class Box_NATO_Support_F;
     class ACE_Box_Misc: Box_NATO_Support_F {
@@ -102,6 +114,8 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_SpraypaintRed,5);
             MACRO_ADDITEM(ACE_SpraypaintBlue,5);
             MACRO_ADDITEM(ACE_SpraypaintGreen,5);
+            MACRO_ADDITEM(ACE_SpraypaintYellow,5);
+            MACRO_ADDITEM(ACE_SpraypaintWhite,5);
         };
     };
 };

addons/tagging/CfgWeapons.hpp

@@ -34,4 +34,16 @@ class CfgWeapons {
         hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanBlue_co.paa)};
         GVAR(textColor) = "0000FFFE";
     };
+    class ACE_SpraypaintYellow: ACE_SpraypaintBlack {
+        displayname = CSTRING(spraypaintYellow);
+        picture = QPATHTOF(UI\items\itemSpraypaintYellow.paa);
+        hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanYellow_co.paa)};
+        GVAR(textColor) = "FFFF00FE";
+    };
+    class ACE_SpraypaintWhite: ACE_SpraypaintBlack {
+        displayname = CSTRING(spraypaintWhite);
+        picture = QPATHTOF(UI\items\itemSpraypaintWhite.paa);
+        hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanWhite_co.paa)};
+        GVAR(textColor) = "FFFFFFFE";
+    };
 };