Tagging - Improve: Rework Soundeffects and add Chalk Marker (#11297)

* Rework soundeffects based on item used

* add Cooldown

* add white chalk

* cleanup

* textures

* add chalk tags

* revert 1. -> 0.

* fix paa resolution (1500 -> 256)

* Update stringtable.xml

* add color chalk items

* Update config.cpp

* Update CfgVehicles.hpp

* cleanup

* QUOTE -> CSTRING

* mv define GLUE() to script_component

* avoid ## and cleanup

* sfx - finetuned random pitch

* Update addons/tagging/functions/fnc_tag.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Update addons/tagging/functions/fnc_createTag.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

Author: OverlordZorn

LICENSE

@@ -26,11 +26,16 @@ Some folders of this project may contain a separate LICENSE file. Should
 that be the case, everything in that folder and all subfolders is subject
 to that license instead.
 
- - ARMA PUBLIC LICENSE (\addons\apl)
- - CreativeCommons Attributions 3.0 (\addons\fastroping\data\sounds)
- - CreativeCommons Attributions 4.0 (\addons\refuel\sounds)
-
- - CreativeCommons Zero 1.0 Universal (\addons\wardrobe\data\sounds)
+ - ARMA PUBLIC LICENSE
+   - \addons\apl
+ - CreativeCommons Attributions 3.0
+   - \addons\fastroping\data\sounds
+   - \addons\tagging\sounds
+ - CreativeCommons Attributions 4.0
+   - \addons\refuel\sounds
+
+ - CreativeCommons Zero 1.0 Universal
+   - \addons\wardrobe\data\sounds
 
 ============================================================================
                    Full GNU General Public License Text

addons/tagging/ACE_Tags.hpp

@@ -1,118 +1,89 @@
-#define GLUE(g1,g2) g1##g2
-#define TAG(name,col) class TRIPLES(ACE,name,col) { \
-        displayName = CSTRING(name); \
-        requiredItem = QUOTE(GLUE(ACE_Spraypaint,col)); \
-        textures[] = {QPATHTOF(UI\tags\col\name.paa)}; \
-        icon = QPATHTOF(UI\tags\col\name.paa); \
-    }
+#define SPRAY_TAG(NAME,COL)\
+class TRIPLES(ACE,NAME,COL) {\
+    displayName = CSTRING(NAME);\
+    requiredItem = QUOTE(GLUE(ACE_Spraypaint,COL));\
+    textures[] = {QPATHTOF(UI\tags\COL\NAME.paa)};\
+    icon = QPATHTOF(UI\tags\COL\NAME.paa);\
+}
 
-class ACE_Tags {
-    class ACE_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(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(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(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);
-    };
+#define CHALK_TAG(NAME,COL)\
+class DOUBLES(TRIPLES(ACE,NAME,COL),chalk) {\
+    displayName = CSTRING(NAME);\
+    requiredItem = QUOTE(GLUE(ACE_Chalk,COL));\
+    textures[] = { QPATHTOF(UI\tags\COL\NAME.paa) };\
+    icon = QPATHTOF(UI\tags\COL\NAME.paa);\
+}
+
+#define SPRAY_TAG_X(COLOR,FOLDER)\
+class DOUBLES(ACE,COLOR) {\
+    displayName = CSTRING(x);\
+    requiredItem = QUOTE(GLUE(ACE_Spraypaint,COLOR));\
+    textures[] = { QPATHTOF(UI\tags\FOLDER\0.paa), QPATHTOF(UI\tags\FOLDER\1.paa), QPATHTOF(UI\tags\FOLDER\2.paa) };\
+    icon = QPATHTOF(UI\tags\FOLDER\0.paa);\
+}
+
+#define CHALK_TAG_X(COLOR,FOLDER)\
+class TRIPLES(ACE,COLOR,Chalk) {\
+    displayName = CSTRING(x);\
+    requiredItem = QUOTE(GLUE(ACE_Chalk,COLOR));\
+    textures[] = {QPATHTOF(UI\tags\FOLDER\0.paa), QPATHTOF(UI\tags\FOLDER\1.paa), QPATHTOF(UI\tags\FOLDER\2.paa)};\
+    icon = QPATHTOF(UI\tags\FOLDER\0.paa);\
+}
 
-    TAG(arrow_up,black);
-    TAG(arrow_down,black);
-    TAG(arrow_left,black);
-    TAG(arrow_right,black);
-    TAG(circle,black);
-    TAG(cross,black);
-    TAG(diamond,black);
-    TAG(square,black);
-    TAG(square_filled,black);
-    TAG(triangle,black);
-    TAG(triangle_inverted,black);
 
-    TAG(arrow_up,blue);
-    TAG(arrow_down,blue);
-    TAG(arrow_left,blue);
-    TAG(arrow_right,blue);
-    TAG(circle,blue);
-    TAG(cross,blue);
-    TAG(diamond,blue);
-    TAG(square,blue);
-    TAG(square_filled,blue);
-    TAG(triangle,blue);
-    TAG(triangle_inverted,blue);
+#define SPRAY_TAGS(COLOR)\
+SPRAY_TAG(arrow_up,COLOR);\
+SPRAY_TAG(arrow_down,COLOR);\
+SPRAY_TAG(arrow_left,COLOR);\
+SPRAY_TAG(arrow_right,COLOR);\
+SPRAY_TAG(circle,COLOR);\
+SPRAY_TAG(cross,COLOR);\
+SPRAY_TAG(diamond,COLOR);\
+SPRAY_TAG(square,COLOR);\
+SPRAY_TAG(square_filled,COLOR);\
+SPRAY_TAG(triangle,COLOR);\
+SPRAY_TAG(triangle_inverted,COLOR)
 
-    TAG(arrow_up,green);
-    TAG(arrow_down,green);
-    TAG(arrow_left,green);
-    TAG(arrow_right,green);
-    TAG(circle,green);
-    TAG(cross,green);
-    TAG(diamond,green);
-    TAG(square,green);
-    TAG(square_filled,green);
-    TAG(triangle,green);
-    TAG(triangle_inverted,green);
+#define CHALK_TAGS(COLOR)\
+CHALK_TAG(arrow_up,COLOR);\
+CHALK_TAG(arrow_down,COLOR);\
+CHALK_TAG(arrow_left,COLOR);\
+CHALK_TAG(arrow_right,COLOR);\
+CHALK_TAG(circle,COLOR);\
+CHALK_TAG(cross,COLOR);\
+CHALK_TAG(diamond,COLOR);\
+CHALK_TAG(square,COLOR);\
+CHALK_TAG(square_filled,COLOR);\
+CHALK_TAG(triangle,COLOR);\
+CHALK_TAG(triangle_inverted,COLOR)
+
+
+class ACE_Tags {
+    SPRAY_TAG_X(Black,black);
+    SPRAY_TAG_X(Blue,blue);
+    SPRAY_TAG_X(Green,green);
+    SPRAY_TAG_X(Red,red);
+    SPRAY_TAG_X(Yellow,yellow);
+    SPRAY_TAG_X(White,white);
 
-    TAG(arrow_up,red);
-    TAG(arrow_down,red);
-    TAG(arrow_left,red);
-    TAG(arrow_right,red);
-    TAG(circle,red);
-    TAG(cross,red);
-    TAG(diamond,red);
-    TAG(square,red);
-    TAG(square_filled,red);
-    TAG(triangle,red);
-    TAG(triangle_inverted,red);
+    SPRAY_TAGS(black);
+    SPRAY_TAGS(blue);
+    SPRAY_TAGS(green);
+    SPRAY_TAGS(red);
+    SPRAY_TAGS(yellow);
+    SPRAY_TAGS(white);
 
-    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);
+    CHALK_TAG_X(Black,black);
+    CHALK_TAG_X(Blue,blue);
+    CHALK_TAG_X(Green,green);
+    CHALK_TAG_X(Red,red);
+    CHALK_TAG_X(Yellow,yellow);
+    CHALK_TAG_X(White,white);
 
-    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);
+    CHALK_TAGS(black);
+    CHALK_TAGS(blue);
+    CHALK_TAGS(green);
+    CHALK_TAGS(red);
+    CHALK_TAGS(yellow);
+    CHALK_TAGS(white);
 };

addons/tagging/CfgSounds.hpp

@@ -0,0 +1,18 @@
+#define SOUNDEFFECT(NAME,VOLUME)\
+class GVAR(NAME) {\
+    sound[] = { QUOTE(PATHTO_R(sounds\NAME.ogg)), VOLUME, 1, 25 };\
+    titles[] = {};\
+}
+
+class CfgSounds {
+    SOUNDEFFECT(spray,5);
+    SOUNDEFFECT(spray01,5);
+    SOUNDEFFECT(spray02,5);
+
+    SOUNDEFFECT(chalk01,5);
+    SOUNDEFFECT(chalk02,5);
+    SOUNDEFFECT(chalk03,5);
+    SOUNDEFFECT(chalk04,5);
+    SOUNDEFFECT(chalk05,5);
+    SOUNDEFFECT(chalk06,5);
+};

addons/tagging/CfgVehicles.hpp

@@ -120,6 +120,12 @@ class CfgVehicles {
             MACRO_ADDITEM(ACE_SpraypaintGreen,5);
             MACRO_ADDITEM(ACE_SpraypaintYellow,5);
             MACRO_ADDITEM(ACE_SpraypaintWhite,5);
+            MACRO_ADDITEM(ACE_ChalkBlack,5);
+            MACRO_ADDITEM(ACE_ChalkRed,5);
+            MACRO_ADDITEM(ACE_ChalkBlue,5);
+            MACRO_ADDITEM(ACE_ChalkGreen,5);
+            MACRO_ADDITEM(ACE_ChalkYellow,5);
+            MACRO_ADDITEM(ACE_ChalkWhite,5);
         };
     };
 };

addons/tagging/CfgWeapons.hpp

@@ -2,6 +2,7 @@ class CfgWeapons {
     class ACE_ItemCore;
     class CBA_MiscItem_ItemInfo;
 
+    //Spraypaints
     class ACE_SpraypaintBlack: ACE_ItemCore {
         author = "jokoho48";
         displayname = CSTRING(spraypaintBlack);
@@ -15,6 +16,11 @@ class CfgWeapons {
             mass = 10;
         };
         GVAR(textColor) = "000000FE";
+        sounds[] = {
+            QGVAR(spray),
+            QGVAR(spray01),
+            QGVAR(spray02)
+        };
     };
     class ACE_SpraypaintRed: ACE_SpraypaintBlack {
         displayname = CSTRING(spraypaintRed);
@@ -46,4 +52,37 @@ class CfgWeapons {
         hiddenSelectionsTextures[] = {QPATHTOF(data\spraycanWhite_co.paa)};
         GVAR(textColor) = "FFFFFFFE";
     };
+
+    // Chalks
+    class ACE_ChalkWhite: ACE_SpraypaintWhite {
+        author = "zorn";
+        displayname = CSTRING(chalkWhite);
+        descriptionShort = CSTRING(descSpraypaint);
+        model = "\A3\weapons_F\ammo\mag_univ.p3d";
+        scope = 2;
+        picture = QPATHTOF(UI\items\itemChalkWhite.paa);
+        GVAR(textColor) = "FFFFFFFE";
+        sounds[] = { 
+            QGVAR(chalk01),
+            QGVAR(chalk02),
+            QGVAR(chalk03),
+            QGVAR(chalk04),
+            QGVAR(chalk05),
+            QGVAR(chalk06)
+        };
+    };
+
+    #define ACE_CHALK(COLOR,HEX)\
+    class GLUE(ACE_Chalk,COLOR): ACE_ChalkWhite {\
+        displayName = CSTRING(GLUE(chalk,COLOR));\
+        picture = QPATHTOF(UI\items\GLUE(itemChalk,COLOR).paa);\
+        GVAR(textColor) = QUOTE(HEX);\
+    }
+
+    ACE_CHALK(Black,000000FE);
+    ACE_CHALK(Blue,0000FFFE);
+    ACE_CHALK(Red,FF0000FE);
+    ACE_CHALK(Green,00FF00FE);
+    ACE_CHALK(Yellow,FFFF00FE);
+
 };