diff --git a/.hemtt/project.toml b/.hemtt/project.toml index 65aea3cb..86f9ae3f 100644 --- a/.hemtt/project.toml +++ b/.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] diff --git a/addons/leaflets/$PBOPREFIX$ b/addons/leaflets/$PBOPREFIX$ new file mode 100644 index 00000000..8e1e0cfe --- /dev/null +++ b/addons/leaflets/$PBOPREFIX$ @@ -0,0 +1 @@ +z\cav\addons\leaflets \ No newline at end of file diff --git a/addons/leaflets/CfgLeaflets.hpp b/addons/leaflets/CfgLeaflets.hpp new file mode 100644 index 00000000..7b96bbd3 --- /dev/null +++ b/addons/leaflets/CfgLeaflets.hpp @@ -0,0 +1,8 @@ +class CfgLeaflets { + scriptCav_Enlist = QPATHTOF(scripts\Cav_Enlist.sqf); + class Cav_Enlist { + text = "7TH CAVALRY GAMING

WANTS YOU!
Enlist today
7cav.us

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); + }; +}; \ No newline at end of file diff --git a/addons/leaflets/CfgMagazines.hpp b/addons/leaflets/CfgMagazines.hpp new file mode 100644 index 00000000..d2abf629 --- /dev/null +++ b/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"; + }; +}; \ No newline at end of file diff --git a/addons/leaflets/CfgWeapons.hpp b/addons/leaflets/CfgWeapons.hpp new file mode 100644 index 00000000..f1ea720c --- /dev/null +++ b/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"}; + }; +}; \ No newline at end of file diff --git a/addons/leaflets/config.cpp b/addons/leaflets/config.cpp new file mode 100644 index 00000000..caeaf4f5 --- /dev/null +++ b/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" \ No newline at end of file diff --git a/addons/leaflets/script_component.hpp b/addons/leaflets/script_component.hpp new file mode 100644 index 00000000..4c00164c --- /dev/null +++ b/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" \ No newline at end of file diff --git a/addons/leaflets/script_macros.hpp b/addons/leaflets/script_macros.hpp new file mode 100644 index 00000000..e69de29b diff --git a/addons/leaflets/scripts/Cav_Leaflet_Enlist.sqf b/addons/leaflets/scripts/Cav_Leaflet_Enlist.sqf new file mode 100644 index 00000000..74ecccb9 --- /dev/null +++ b/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"]; +}; \ No newline at end of file diff --git a/addons/leaflets/stringtable.xml b/addons/leaflets/stringtable.xml new file mode 100644 index 00000000..5b9679d8 --- /dev/null +++ b/addons/leaflets/stringtable.xml @@ -0,0 +1,7 @@ + + + + Leaflets (Cav - Enlist Today) + + + diff --git a/addons/main/CfgSettings.hpp b/addons/main/CfgSettings.hpp index faf92e60..e79aaf47 100644 --- a/addons/main/CfgSettings.hpp +++ b/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)"}; diff --git a/addons/main/config.cpp b/addons/main/config.cpp index 5a7ff005..906afa9d 100644 --- a/addons/main/config.cpp +++ b/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"; diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp index d7ebb55a..5d45b7f3 100644 --- a/addons/main/script_mod.hpp +++ b/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) diff --git a/addons/objects/$PBOPREFIX$ b/addons/objects/$PBOPREFIX$ new file mode 100644 index 00000000..a423789f --- /dev/null +++ b/addons/objects/$PBOPREFIX$ @@ -0,0 +1 @@ +z\cav\addons\objects \ No newline at end of file diff --git a/addons/objects/CfgVehicles.hpp b/addons/objects/CfgVehicles.hpp new file mode 100644 index 00000000..c42f21b4 --- /dev/null +++ b/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)}; + }; +}; diff --git a/addons/objects/config.cpp b/addons/objects/config.cpp new file mode 100644 index 00000000..9e472a8e --- /dev/null +++ b/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" diff --git a/addons/objects/data/cav_leaflets_item_enlist_today_ca.paa b/addons/objects/data/cav_leaflets_item_enlist_today_ca.paa new file mode 100644 index 00000000..b5b2db7d Binary files /dev/null and b/addons/objects/data/cav_leaflets_item_enlist_today_ca.paa differ diff --git a/addons/objects/data/cav_poster_05_item_enlist_today_ca.paa b/addons/objects/data/cav_poster_05_item_enlist_today_ca.paa new file mode 100644 index 00000000..f06f6bc0 Binary files /dev/null and b/addons/objects/data/cav_poster_05_item_enlist_today_ca.paa differ diff --git a/addons/objects/script_component.hpp b/addons/objects/script_component.hpp new file mode 100644 index 00000000..b818626d --- /dev/null +++ b/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" diff --git a/addons/objects/stringtable.xml b/addons/objects/stringtable.xml new file mode 100644 index 00000000..ace19e47 --- /dev/null +++ b/addons/objects/stringtable.xml @@ -0,0 +1,10 @@ + + + + Leaflet (Cav - Enlist Today) + + + Poster (Cav - Enlist Today) + + + \ No newline at end of file diff --git a/addons/textures/data/posters/cav_enlist_today_ca.paa b/addons/textures/data/posters/cav_enlist_today_ca.paa new file mode 100644 index 00000000..d9334d36 Binary files /dev/null and b/addons/textures/data/posters/cav_enlist_today_ca.paa differ