Merge branch 'main' into other-addon

7Cav · Jul 17, 2024 · 70118d8 · 70118d8
2 parents 2e22ff6 + d12e386
commit 70118d8
Show file tree

Hide file tree

Showing 10 changed files with 63 additions and 26 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,9 +12,14 @@ texHeaders.bin
 [Rr]elease/*
 @*
 *.zip
+tools/temp
+
+# Hemtt Build tool
 hemtt
 hemtt.exe
+hemtt-build.cmd
+hemtt-launch.cmd
 .hemttout
+
 ArmaScriptCompiler.exe
 sqfvm.exe
-tools/temp
diff --git a/README.md b/README.md
@@ -10,17 +10,41 @@
  <a href="https://github.com/7Cav/7CavAddon/issues"><img src="https://img.shields.io/github/issues-raw/7cav/7CavAddon.svg?style=for-the-badge&label=Issues" alt="7CavAddon Issues"></a>
 <a href="https://github.com/7Cav/7CavAddon/actions?query=workflow%3AArma"><img src="https://img.shields.io/github/actions/workflow/status/7Cav/7CavAddon/arma.yml?logo=GitHub&style=for-the-badge" alt="cScripts Build"></a>
 </p>
-The 7th Cavalry Community Addon is a mod for Arma 3 that adds new units, vehicles, groups, markers, objects, and functions tailored to fit the needs of the [7th Cavalry Gaming Community](https://7cav.us/).
+The 7th Cavalry Community Addon is as the name suggests a community mod containing units vehicles, markers, functions and textures tailored to our community.
 
-## Addons required
+## Required Addons
 - [CBA](https://github.com/CBATeam/CBA_A3)
+- [ACE3](https://github.com/acemod/ACE3)
 - [RHS: United States Armed Forces](http://www.rhsmods.org/)
 
-## What does the 7th Cavalry Community Addon provide?
-- Units and groups based on 7th Cavalry Platoon and Company naming and setup.
-- (Soon) Base and FOB compositions
-- Vehicles based on 7th Cavalry company setup.
-- 7th Cavalry themed flags
-- Custom texture database for mission makers
-- 7th Cavalry map markers
-- Close ties and integration with cScripts
+## Whats Added
+- New Units and Groups with company with callsign specific prefixes.
+- New vehicle the Dragoon (A retextured and reconfigured [AFV-4 Gorgon](https://community.bistudio.com/wiki/Arma_3:_Field_Manual_-_Vehicles_Info#AFV-4_Gorgon)).
+- 7th Cavalry themed spray tags using ACE3 tagging.
+- 7th Cavalry battalion company platoon and squad themed arm patches.
+- 7th Cavalry battalion company platoon and squad themed flags.
+- 7th Cavalry themed map markers and flags as well as cav gold map color.
+- Main menu buttons for quickly joining our servers.
+- [Experimental Prone Launchers](https://github.com/7Cav/7CavAddon/issues/161).
+- [Dynamic Objective mission training script system](https://github.com/7Cav/7CavAddon/tree/main/addons/dynobj).
+- [Some useful missions functions](https://github.com/7Cav/7CavAddon/wiki/Features#mission-makers)
+
+## Development
+This mod uses [HEMTT](https://github.com/BrettMayson/HEMTT/) build system.
+
+### Testing and Development
+```bash
+# Build and launch Arma with minimal required mods.
+hemtt launch
+
+# Build for manual launch
+hemtt dev
+```
+### Build and Release
+```bash
+# Build a test release build
+hemtt build
+
+# Build release
+./tools/deploy.ps1
+```
diff --git a/addons/insignia/CfgUnitInsignia.hpp b/addons/insignia/CfgUnitInsignia.hpp
@@ -14,6 +14,9 @@ class CfgUnitInsignia {
     //MACRO_UNITINSIGNIA(alpha_2_d);
 
 
+    // Bravo
+    MACRO_UNITINSIGNIA(bravo);
+
     // Bravo first platoon
     MACRO_UNITINSIGNIA(bravo_1);
     MACRO_UNITINSIGNIA(bravo_1_1);

diff --git a/addons/insignia/data/Bravo.paa b/addons/insignia/data/Bravo.paa
diff --git a/addons/insignia/stringtable.xml b/addons/insignia/stringtable.xml
@@ -35,6 +35,11 @@
             <English>[7CAV] Alpha Co. 2nd platoon - Delta Squad</English>
         </Key>
 
+
+        <Key ID="STR_cav_insignia_bravo">
+            <English>[7CAV] Bravo Co.</English>
+        </Key>
+
         <Key ID="STR_cav_insignia_bravo_1">
             <English>[7CAV] Bravo Co. 1st platoon</English>
         </Key>

diff --git a/addons/textures/CfgEditorSubcategories.hpp b/addons/textures/CfgEditorSubcategories.hpp
@@ -1,20 +1,20 @@
 class CfgEditorSubcategories {
     class Cav_EdSubcat_Callsigns_Black {
-        displayname = CSTRING(Cat_Callsigns_Black); 
+        displayname = CSTRING(Cav_EdSubcat_Callsigns_Black); 
     };
     class Cav_EdSubcat_Callsigns_White {
-        displayname = CSTRING(Cat_Callsigns_White); 
+        displayname = CSTRING(Cav_EdSubcat_Callsigns_White); 
     };
     class Cav_EdSubcat_Terrain_Black {
-        displayname = CSTRING(Cat_Terrain_Black); 
+        displayname = CSTRING(Cav_EdSubcat_Terrain_Black); 
     };
     class Cav_EdSubcat_Terrain_White {
-        displayname = CSTRING(Cat_Terrain_White); 
+        displayname = CSTRING(Cav_EdSubcat_Terrain_White); 
     };
     class Cav_EdSubcat_Arlington {
-        displayname = CSTRING(Cat_Arlington); 
+        displayname = CSTRING(Cav_EdSubcat_Arlington); 
     };
     class Cav_EdSubcat_Vehicle_Labels {
-        displayname = CSTRING(Cat_Vehicle_Labels); 
+        displayname = CSTRING(Cav_EdSubcat_Vehicle_Labels); 
     };
 };
diff --git a/addons/textures/data/arlington/Arlington_Macgehee_ca.paa b/addons/textures/data/arlington/Arlington_Macgehee_ca.paa
diff --git a/addons/textures/data/arlington/Arlington_Mcgehee_ca.paa b/addons/textures/data/arlington/Arlington_Mcgehee_ca.paa
diff --git a/addons/textures/data/arlington/CfgVehicles.inc.hpp b/addons/textures/data/arlington/CfgVehicles.inc.hpp
@@ -5,10 +5,10 @@ class var1: UserTexture1m_F { \
     scopeCurator = 2; \
     displayName = CSTRING(var1); \
     author = ECSTRING(main,modteam); \
-    editorPreview = QPATHTOF(data\arlington\var2.paa); \
-    \
+    editorPreview = QPATHTOF(data\arlington\var2); \
+    editorSubcategory = "Cav_EdSubcat_Arlington"; \
     hiddenSelectionsTextures[] = { \
-        QPATHTOF(data\arlington\var2.paa) \
+        QPATHTOF(data\arlington\var2) \
     };\
 }
 

diff --git a/addons/textures/stringtable.xml b/addons/textures/stringtable.xml
@@ -1,21 +1,21 @@
 <Project name="Cav">
     <Package name="Textures">
-        <Key ID="STR_Cav_Textures_Cat_Callsigns_Black">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Callsigns_Black">
             <English>7th Cavalry Callsigns Black</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Callsigns_White">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Callsigns_White">
             <English>7th Cavalry Callsigns White</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Terrain_Black">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Terrain_Black">
             <English>7th Cavalry Terrain Black</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Terrain_White">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Terrain_White">
             <English>7th Cavalry Terrain White</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Arlington">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Arlington">
             <English>7th Cavalry Arlington</English>
         </Key>
-        <Key ID="STR_Cav_Textures_Cat_Vehicle_Labels">
+        <Key ID="STR_Cav_Textures_Cav_EdSubcat_Vehicle_Labels">
             <English>7th Cavalry Vehicle Labels</English>
         </Key>