Merge branch 'main' into soldier-and-infantry-rewrite

.hemtt/project.toml

@@ -1,6 +1,6 @@
 name = "7th Cavalry Community Addon"
-prefix = "cav"
 author = "7th Cavalry S3 Mod Team"
+prefix = "cav"
 mainprefix = "z"
 
 [files]

addons/leaflets/$PBOPREFIX$

@@ -0,0 +1 @@
+z\cav\addons\leaflets

addons/leaflets/CfgLeaflets.hpp

@@ -0,0 +1,8 @@
+class CfgLeaflets {
+    scriptCav_Enlist = QPATHTOF(scripts\Cav_Enlist.sqf);
+    class Cav_Enlist {
+        text = "7TH CAVALRY GAMING<br /><br />WANTS YOU!<br />Enlist today<br />7cav.us<br /><br />More then just a clan, it's a way of life";
+        author = ECSTRING(main,cavmodteam);
+        texture = QPATHTOEF(textures,data\posters\cav_enlist_today_ca.paa);
+    };
+};

addons/leaflets/CfgMagazines.hpp

@@ -0,0 +1,13 @@
+class CfgMagazines {
+    class 1Rnd_Leaflets_West_F;
+    class Cav_1Rnd_Leaflets_Enlist_F: 1Rnd_Leaflets_West_F {
+        author = ECSTRING(main,cavmodteam);
+        leafletClass = "Cav_Enlist";
+    };
+
+    class Pylon_1Rnd_Leaflets_West_F;
+    class Cav_Pylon_1Rnd_Leaflets_Enlist_F: Pylon_1Rnd_Leaflets_West_F {
+        displayName = CSTRING(Cav_Pylon_1Rnd_Leaflets_Enlist_F);
+        leafletClass = "Cav_Enlist";
+    };
+};

addons/leaflets/CfgWeapons.hpp

@@ -0,0 +1,7 @@
+
+class CfgWeapons {
+    class Bomb_04_Plane_CAS_01_F;
+    class Bomb_Leaflets: Bomb_04_Plane_CAS_01_F {
+        magazines[] += {"cav_1Rnd_Leaflets_Enlist_F", "cav_Pylon_1Rnd_Leaflets_Enlist_F"};
+    };
+};

addons/leaflets/config.cpp

@@ -0,0 +1,23 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = COMPONENT_NAME;
+        units[] = {};
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "cav_main",
+            "cav_common",
+            "cav_textures"
+        };
+        author = ECSTRING(Main,ModTeam);
+        authors[] = {"Brostrom.A (Evul)"};
+        url = ECSTRING(Main,Url);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgLeaflets.hpp"
+#include "CfgMagazines.hpp"
+#include "CfgWeapons.hpp"

addons/leaflets/script_component.hpp

@@ -0,0 +1,6 @@
+#define COMPONENT leaflets
+#define COMPONENT_BEAUTIFIED Leaflets
+
+#include "\z\cav\addons\main\script_mod.hpp"
+#include "\z\cav\addons\main\script_macros.hpp"
+#include "script_macros.hpp"

addons/leaflets/scripts/Cav_Leaflet_Enlist.sqf

@@ -0,0 +1,3 @@
+if ((_this select 2) < 1) then {
+    ["init",[_this,"Cav_Enlist"]] remoteExec ["bis_fnc_initLeaflet"];
+};

addons/leaflets/stringtable.xml

@@ -0,0 +1,7 @@
+<Project name="Cav">
+    <Package name="Leaflets">
+        <Key ID="STR_Cav_Leaflets_Cav_Pylon_1Rnd_Leaflets_Enlist_F">
+            <English>Leaflets (Cav - Enlist Today)</English>
+        </Key>
+    </Package>
+</Project>

addons/main/CfgSettings.hpp

@@ -1,7 +1,7 @@
 class CfgSettings {
     class CBA {
         class Versioning {
-            class CavMod {
+            class cav {
                 class dependencies {
                     //Mod will hard exit if this is missing
                     CBA[] = {"cba_main", REQUIRED_CBA_VERSION, "(true)"};

addons/main/config.cpp

@@ -897,7 +897,7 @@ class CfgPatches {
 
 class CfgMods {
     class PREFIX {
-        dir = "@cavmod";
+        dir = "@7CavAddons";
         name = CSTRING(Name);
         picture = "A3\Ui_f\data\Logos\arma3_expansion_alpha_ca";
         hidePicture = "true";

addons/main/script_mod.hpp

@@ -10,8 +10,8 @@
 #define VERSION_AR  MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 2.02
-#define REQUIRED_CBA_VERSION {3,15,8}
+#define REQUIRED_VERSION 2.16
+#define REQUIRED_CBA_VERSION {3,16,0}
 
 #ifdef COMPONENT_BEAUTIFIED
     #define COMPONENT_NAME QUOTE(7th Cavalry Community Addon - COMPONENT_BEAUTIFIED)

addons/objects/$PBOPREFIX$

@@ -0,0 +1 @@
+z\cav\addons\objects

addons/objects/CfgVehicles.hpp

@@ -0,0 +1,16 @@
+class CfgVehicles {
+    class Land_Leaflet_03_F;
+    class Cav_Poster_Small_Enlist_Today_F: Land_Leaflet_03_F {
+        displayName = CSTRING(Cav_Poster_Small_Enlist_Today_F);
+        author = ECSTRING(main,cavmodteam);
+        editorPreview = QPATHTOEF(textures,data\posters\cav_enlist_today_ca.paa);
+        hiddenSelectionsTextures[] = {QPATHTOF(data\cav_leaflets_item_enlist_today_ca.paa)};
+    };
+    class Land_Poster_05_F;
+    class Cav_Poster_Big_Enlist_Today_F: Land_Poster_05_F {
+        displayName = CSTRING(Cav_Poster_Big_Enlist_Today_F);
+        author = ECSTRING(main,cavmodteam);
+        editorPreview = QPATHTOEF(textures,data\posters\cav_enlist_today_ca.paa);
+        hiddenSelectionsTextures[] = {QPATHTOF(data\cav_poster_05_item_enlist_today_ca.paa)};
+    };
+};

addons/objects/config.cpp

@@ -0,0 +1,24 @@
+#include "script_component.hpp"
+
+class CfgPatches {
+    class ADDON {
+        name = COMPONENT_NAME;
+        units[] = {
+            "Cav_Poster_Small_Enlist_Today_F",
+            "Cav_Poster_Big_Enlist_Today_F"
+        };
+        weapons[] = {};
+        requiredVersion = REQUIRED_VERSION;
+        requiredAddons[] = {
+            "cav_main",
+            "cav_common",
+            "cav_textures"
+        };
+        author = ECSTRING(Main,ModTeam);
+        authors[] = {"Brostrom.A (Evul)"};
+        url = ECSTRING(Main,Url);
+        VERSION_CONFIG;
+    };
+};
+
+#include "CfgVehicles.hpp"

addons/objects/script_component.hpp

@@ -0,0 +1,5 @@
+#define COMPONENT objects
+#define COMPONENT_BEAUTIFIED Objects
+
+#include "\z\cav\addons\main\script_mod.hpp"
+#include "\z\cav\addons\main\script_macros.hpp"

addons/objects/stringtable.xml

@@ -0,0 +1,10 @@
+<Project name="Cav">
+    <Package name="Objects">
+        <Key ID="STR_Cav_Objects_Cav_Poster_Small_Enlist_Today_F">
+            <English>Leaflet (Cav - Enlist Today)</English>
+        </Key>
+        <Key ID="STR_Cav_Objects_Cav_Poster_Big_Enlist_Today_F">
+            <English>Poster (Cav - Enlist Today)</English>
+        </Key>
+    </Package>
+</Project>