Tagging - Add new colors and filled square tag (#9443)

* Adds yellow and white tags and filled square tag

Add:
Yellow Splay
White Splay
Filled Square tag for all colors

Change (and remove):
Remove color variations from the "X" strings and unify it.
Tweak some Japanese strings.

* tweak japanese

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

addons/tagging/stringtable.xml

@@ -20,7 +20,7 @@
         <Key ID="STR_ACE_Tagging_ModuleDesc">
             <English>Configure how the tagging system will operate by default.</English>
             <Russian>Настройка работы системы спрей-маркеров по умолчанию.</Russian>
-            <Japanese>標準で開くタグ付けシステムの設定を行います。</Japanese>
+            <Japanese>タグ付けシステムの標準動作を設定します。</Japanese>
             <Polish>Skonfiguruj zachowanie systemu tagowania.</Polish>
             <German>Konfiguriert, wie das Markieren standardmäßig funktioniert.</German>
             <Korean>태그 시스템의 기본사항을 설정합니다.</Korean>
@@ -35,7 +35,7 @@
         <Key ID="STR_ACE_Tagging_QuickTag">
             <English>Spray Paint - Quick Tag</English>
             <Russian>Быстрый маркер</Russian>
-            <Japanese>クイック タグ</Japanese>
+            <Japanese>スプレーペイント - クイックタグ</Japanese>
             <Polish>Szybkie tagowanie</Polish>
             <German>Schnelle Markierung (Spraydose)</German>
             <Korean>스프레이 페인트 - 빠른 태그</Korean>
@@ -51,7 +51,7 @@
         <Key ID="STR_ACE_Tagging_QuickTagDesc">
             <English>Action performed on main tag interaction point.</English>
             <Russian>Действие, выполняемое при выборе главного пункта меню маркировки.</Russian>
-            <Japanese>インタラクション ポイントにむけてタグ付けをします。</Japanese>
+            <Japanese>メインのインタラクションポイント(タグ)を選択した際に行われる動作。</Japanese>
             <Polish>Akcja wykonywana na głównym punkcie interakcji tagu.</Polish>
             <German>Aktion, die am Haupt-Interaktionspunkt ausgeführt werden soll.</German>
             <Korean>상호작용 시 표시할 낙서를 고릅니다.</Korean>
@@ -66,7 +66,7 @@
         <Key ID="STR_ACE_Tagging_LastUsed">
             <English>Last Used</English>
             <Russian>Повторить последний</Russian>
-            <Japanese>前回と同じ</Japanese>
+            <Japanese>最後に使用したタグ</Japanese>
             <Polish>Ostatnio użyte</Polish>
             <German>Zuletzt benutzt</German>
             <Korean>최근 사용</Korean>
@@ -120,80 +120,32 @@
             <Czech>Označit</Czech>
             <Portuguese>Marcar</Portuguese>
             <Russian>Маркер</Russian>
-            <Japanese>タグ</Japanese>
+            <Japanese>タグ (スプレーペイント)</Japanese>
             <Korean>태그</Korean>
             <French>Tag</French>
             <Chinesesimp>喷漆</Chinesesimp>
             <Chinese>噴漆</Chinese>
             <Turkish>Işaretle</Turkish>
         </Key>
-        <Key ID="STR_ACE_Tagging_XBlack">
-            <English>X black</English>
-            <German>Schwarz X</German>
-            <Spanish>X en negro</Spanish>
-            <Polish>X na czarno</Polish>
-            <French>X noir</French>
-            <Italian>X nero</Italian>
-            <Czech>X černě</Czech>
-            <Portuguese>X em preto</Portuguese>
-            <Russian>Черный Х</Russian>
+        <Key ID="STR_ACE_Tagging_x">
+            <English>X</English>
+            <German>X</German>
+            <Spanish>X</Spanish>
+            <Polish>X</Polish>
+            <French>X</French>
+            <Italian>X</Italian>
+            <Czech>X</Czech>
+            <Portuguese>X</Portuguese>
+            <Russian>Х</Russian>
             <Japanese>X印</Japanese>
-            <Korean>검정 X</Korean>
-            <Chinesesimp>黑色X标记</Chinesesimp>
-            <Chinese>黑色X標記</Chinese>
-            <Turkish>X Siyah</Turkish>
-        </Key>
-        <Key ID="STR_ACE_Tagging_XRed">
-            <English>X red</English>
-            <German>Rot X</German>
-            <Spanish>X en rojo</Spanish>
-            <Polish>X na czerwono</Polish>
-            <French>X rouge</French>
-            <Italian>X rosso</Italian>
-            <Czech>X červeně</Czech>
-            <Portuguese>X em vermelho</Portuguese>
-            <Russian>Красный Х</Russian>
-            <Japanese>X印</Japanese>
-            <Korean>빨간 X</Korean>
-            <Chinesesimp>红色X标记</Chinesesimp>
-            <Chinese>紅色X標記</Chinese>
-            <Turkish>X Red</Turkish>
-        </Key>
-        <Key ID="STR_ACE_Tagging_XGreen">
-            <English>X green</English>
-            <German>Grün X</German>
-            <Spanish>X en verde</Spanish>
-            <Polish>X na zielono</Polish>
-            <French>X vert</French>
-            <Italian>X verde</Italian>
-            <Czech>X zeleně</Czech>
-            <Portuguese>X em verde</Portuguese>
-            <Russian>Зелёный Х</Russian>
-            <Japanese>X印</Japanese>
-            <Korean>초록 X</Korean>
-            <Chinesesimp>绿色X标记</Chinesesimp>
-            <Chinese>綠色X標記</Chinese>
-            <Turkish>X Yeşil</Turkish>
-        </Key>
-        <Key ID="STR_ACE_Tagging_XBlue">
-            <English>X blue</English>
-            <German>Blau X</German>
-            <Spanish>X en azul</Spanish>
-            <Polish>X na niebiesko</Polish>
-            <French>X bleu</French>
-            <Italian>X blu</Italian>
-            <Czech>X modře</Czech>
-            <Portuguese>X em azul</Portuguese>
-            <Russian>Синий Х</Russian>
-            <Japanese>X印</Japanese>
-            <Korean>파랑 X</Korean>
-            <Chinesesimp>蓝色X标记</Chinesesimp>
-            <Chinese>藍色X標記</Chinese>
-            <Turkish>X Mavi</Turkish>
+            <Korean>X</Korean>
+            <Chinesesimp>X标记</Chinesesimp>
+            <Chinese>X標記</Chinese>
+            <Turkish>X</Turkish>
         </Key>
         <Key ID="STR_ACE_Tagging_arrow_up">
             <English>Up Arrow</English>
-            <Japanese>上矢印</Japanese>
+            <Japanese>矢印 (上)</Japanese>
             <Polish>Strzałka w górę</Polish>
             <Korean>화살표(위)</Korean>
             <Russian>Стрелка вверх</Russian>
@@ -202,7 +154,7 @@
         </Key>
         <Key ID="STR_ACE_Tagging_arrow_down">
             <English>Down Arrow</English>
-            <Japanese>下矢印</Japanese>
+            <Japanese>矢印 (下)</Japanese>
             <Polish>Strzałka w dół</Polish>
             <Korean>화살표(아래)</Korean>
             <Russian>Стрелка вниз</Russian>
@@ -211,7 +163,7 @@
         </Key>
         <Key ID="STR_ACE_Tagging_arrow_left">
             <English>Left Arrow</English>
-            <Japanese>左矢印</Japanese>
+            <Japanese>矢印 (左)</Japanese>
             <Polish>Strzałka w lewo</Polish>
             <Korean>화살표(왼쪽)</Korean>
             <Russian>Стрелка влево</Russian>
@@ -220,7 +172,7 @@
         </Key>
         <Key ID="STR_ACE_Tagging_arrow_right">
             <English>Right Arrow</English>
-            <Japanese>右矢印</Japanese>
+            <Japanese>矢印 (右)</Japanese>
             <Polish>Strzałka w prawo</Polish>
             <Korean>화살표(오른쪽)</Korean>
             <Russian>Стрелка вправо</Russian>
@@ -263,9 +215,18 @@
             <Spanish>Cuadrado</Spanish>
             <German>Quadrat</German>
         </Key>
+        <Key ID="STR_ACE_Tagging_Custom_square_filled">
+            <English>Filled Square</English>
+            <Japanese>四角 (塗りつぶし)</Japanese>
+            <Polish>Wypełniony Kwadrat</Polish>
+            <Korean>채워진 사각형</Korean>
+            <Russian>Заполненный Квадрат</Russian>
+            <Spanish>Cuadrado Lleno</Spanish>
+            <German>Gefülltes Quadrat</German>
+        </Key>
         <Key ID="STR_ACE_Tagging_triangle">
             <English>Triangle</English>
-            <Japanese>三角形</Japanese>
+            <Japanese>三角</Japanese>
             <Polish>Trójkąt</Polish>
             <Korean>삼각형</Korean>
             <Russian>Треугольник</Russian>
@@ -274,7 +235,7 @@
         </Key>
         <Key ID="STR_ACE_Tagging_triangle_inverted">
             <English>Triangle Inverted</English>
-            <Japanese>三角形 (反転)</Japanese>
+            <Japanese>三角 (反転)</Japanese>
             <Polish>Odwrócony trójkąt</Polish>
             <Korean>역삼각형</Korean>
             <Russian>Обратный треугольник</Russian>
@@ -291,7 +252,7 @@
             <Czech>Černý sprej</Czech>
             <Portuguese>Spray de tinta preta</Portuguese>
             <Russian>Черный спрей</Russian>
-            <Japanese>スプレー缶 (黒)</Japanese>
+            <Japanese>ペイントスプレー缶 (黒色)</Japanese>
             <Korean>검정 스프레이</Korean>
             <Chinesesimp>黑色喷漆</Chinesesimp>
             <Chinese>黑色噴漆</Chinese>
@@ -307,7 +268,7 @@
             <Czech>Červený sprej</Czech>
             <Portuguese>Spray de tinta vermelha</Portuguese>
             <Russian>Красный спрей</Russian>
-            <Japanese>スプレー缶 (赤)</Japanese>
+            <Japanese>ペイントスプレー缶 (赤色)</Japanese>
             <Korean>빨강 스프레이</Korean>
             <Chinesesimp>红色喷漆</Chinesesimp>
             <Chinese>紅色噴漆</Chinese>
@@ -323,7 +284,7 @@
             <Czech>Zelený sprej</Czech>
             <Portuguese>Spray de tinta verde</Portuguese>
             <Russian>Зелёный спрей</Russian>
-            <Japanese>スプレー缶 (緑)</Japanese>
+            <Japanese>ペイントスプレー缶 (緑色)</Japanese>
             <Korean>초록 스프레이</Korean>
             <Chinesesimp>绿色喷漆</Chinesesimp>
             <Chinese>綠色噴漆</Chinese>
@@ -339,12 +300,44 @@
             <Czech>Modrý sprej</Czech>
             <Portuguese>Spray de tinta azul</Portuguese>
             <Russian>Синий спрей</Russian>
-            <Japanese>スプレー缶 (青)</Japanese>
+            <Japanese>ペイントスプレー缶 (青色)</Japanese>
             <Korean>파랑 스프레이</Korean>
             <Chinesesimp>蓝色喷漆</Chinesesimp>
             <Chinese>藍色噴漆</Chinese>
             <Turkish>Sprey Boya (Mavi)</Turkish>
         </Key>
+        <Key ID="STR_ACE_Tagging_SpraypaintYellow">
+            <English>Spray Paint (Yellow)</English>
+            <German>Sprühfarbe (Gelb)</German>
+            <Spanish>Pintura amarilla</Spanish>
+            <Polish>Farba w Sprayu (Żółta)</Polish>
+            <French>Peinture en spray (Jaune)</French>
+            <Italian>Bomboletta spray gialla</Italian>
+            <Czech>Žlutý sprej</Czech>
+            <Portuguese>Spray de tinta amarela</Portuguese>
+            <Russian>Желтый спрей</Russian>
+            <Japanese>ペイントスプレー缶 (黄色)</Japanese>
+            <Korean>노랑 스프레이</Korean>
+            <Chinesesimp>黄色喷漆</Chinesesimp>
+            <Chinese>黃色噴漆</Chinese>
+            <Turkish>Sprey Boya (Sarı)</Turkish>
+        </Key>
+        <Key ID="STR_ACE_Tagging_SpraypaintWhite">
+            <English>Spray Paint (White)</English>
+            <German>Sprühfarbe (Weiß)</German>
+            <Spanish>Pintura blanca</Spanish>
+            <Polish>Farba w Sprayu (Biała)</Polish>
+            <French>Peinture en spray (Blanc)</French>
+            <Italian>Bomboletta spray bianca</Italian>
+            <Czech>Bílý sprej</Czech>
+            <Portuguese>Spray de tinta branca</Portuguese>
+            <Russian>Белый спрей</Russian>
+            <Japanese>ペイントスプレー缶 (白色)</Japanese>
+            <Korean>하양 스프레이</Korean>
+            <Chinesesimp>白色喷漆</Chinesesimp>
+            <Chinese>白色噴漆</Chinese>
+            <Turkish>Sprey Boya (Beyaz)</Turkish>
+        </Key>
         <Key ID="STR_ACE_Tagging_descSpraypaint">
             <English>A can of spray paint for tagging walls.</English>
             <German>Eine Farbsprühdose um Wände zu markieren.</German>
@@ -355,7 +348,7 @@
             <Czech>Plechovka se sprejem k vytváření značek.</Czech>
             <Portuguese>Uma lata de tinta spray para marcar paredes.</Portuguese>
             <Russian>Балончик спрея для рисования маркеров на стенах.</Russian>
-            <Japanese>スプレー缶は壁にタグ付できます。</Japanese>
+            <Japanese>壁にタグを描くためのペイントスプレー缶。</Japanese>
             <Korean>벽에 낙서할 수 있는 스프레이캔 입니다.</Korean>
             <Chinesesimp>喷漆可喷涂在墙壁上</Chinesesimp>
             <Chinese>噴漆可噴塗在牆壁上</Chinese>