Merge branch 'main' of https://github.com/7Cav/7CavAddon into HEI-Add…

…ed-to-turret
7Cav · Feb 7, 2024 · 6db017d · 6db017d
2 parents 4629d05 + 9219142
commit 6db017d
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 0 deletions.
diff --git a/.hemtt/project.toml b/.hemtt/project.toml
@@ -31,4 +31,13 @@ preset = "Hemtt"
 [hemtt.launch]
 workshop = [
     "450814997", # CBA_A3's Workshop ID
+    "463939057", # ACE3
+    "843577117", # RHS USAF
+]
+parameters = [
+    "-skipIntro",           # These parameters are passed to the Arma 3 executable
+    "-noSplash",            # They do not need to be added to your list
+    "-showScriptErrors",    # You can add additional parameters here
+    "-debug",
+    "-filePatching"
 ]
diff --git a/addons/insignia/CfgUnitInsignia.hpp b/addons/insignia/CfgUnitInsignia.hpp
@@ -51,6 +51,7 @@ class CfgUnitInsignia {
     MACRO_UNITINSIGNIA(charlie_1_2);
     MACRO_UNITINSIGNIA(charlie_1_3);
     MACRO_UNITINSIGNIA(charlie_1_4);
+    MACRO_UNITINSIGNIA(charlie_1_4_colored);
 
     // Charlie second platoon
     MACRO_UNITINSIGNIA(charlie_2);

diff --git a/addons/insignia/data/Charlie_1_4.paa b/addons/insignia/data/Charlie_1_4.paa
diff --git a/addons/insignia/data/Charlie_1_4_Colored.paa b/addons/insignia/data/Charlie_1_4_Colored.paa
diff --git a/addons/insignia/stringtable.xml b/addons/insignia/stringtable.xml
@@ -108,6 +108,9 @@
         <Key ID="str_cav_insignia_charlie_1_4">
             <English>[7CAV] Charlie Co. 1st platoon - 4th Squad</English>
         </Key>
+        <Key ID="str_cav_insignia_charlie_1_4_colored">
+            <English>[7CAV] Charlie Co. 1st platoon - 4th Squad (Colored)</English>
+        </Key>
 
         <Key ID="str_cav_insignia_charlie_2">
             <English>[7CAV] Charlie Co. 2nd platoon</English>

diff --git a/addons/markers/CfgMarkerColors.hpp b/addons/markers/CfgMarkerColors.hpp
@@ -0,0 +1,7 @@
+class CfgMarkerColors {
+    class cav_Color_Yellow {
+        color[] = {1.0,0.776470,0.101960,1};
+        name = CSTRING(Color_Yellow);
+        scope = 2;
+    };
+};
diff --git a/addons/markers/config.cpp b/addons/markers/config.cpp
@@ -17,4 +17,5 @@ class CfgPatches {
     };
 };
 
+#include "CfgMarkerColors.hpp"
 #include "CfgMarkers.hpp"
diff --git a/addons/markers/stringtable.xml b/addons/markers/stringtable.xml
@@ -12,5 +12,8 @@
         <Key ID="STR_Cav_Markers_military_cav">
             <English>7th Cavalry</English>
         </Key>
+       <Key ID="STR_Cav_Markers_Color_Yellow">
+            <English>Cav Yellow</English>
+        </Key>
     </Package>
 </Project>
-Original file line number
+Diff line change
@@ Expand Up / @@ -17,4 +17,5 @@ class CfgPatches { @@
         };
     };
+    #include "CfgMarkerColors.hpp"
     #include "CfgMarkers.hpp"