Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Factions - CDF Modern #1023

Merged
merged 7 commits into from
Dec 29, 2023
Merged

Factions - CDF Modern #1023

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
16ac2c8
cdf initial commit
AnAngrySalad1 Dec 27, 2023
021a191
fix weapon slots for CUP weapons
AnAngrySalad1 Dec 27, 2023
f309c01
update jet_pilot
AnAngrySalad1 Dec 29, 2023
7985864
Clean up some old bits and use newer standards
tbeswick96 Dec 29, 2023
1c7ce99
Merge branch 'feature/cdfModern' of https://github.com/uksf/modpack i…
tbeswick96 Dec 29, 2023
53416f9
Remove leftover rifle on respawn for jet pilot
tbeswick96 Dec 29, 2023
aaf016a
Merge branch 'main' into feature/cdfModern
tbeswick96 Dec 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion addons/acr/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
// #define CBA_DEBUG_SYNCHRONOUS

#include "\u\uksf\addons\main\script_macros.hpp"
#include "\z\ace\addons\medical_engine\script_macros_config.hpp"
14 changes: 7 additions & 7 deletions addons/acr/units/CfgUnits.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,15 +66,15 @@ class GVAR(Armour_Crewman) : GVAR(Rifleman) {
linkedItems[] = { "ItemMap", "ItemCompass", "CUP_NVG_PVS15_green_WP", "H_Tank_black_F", "CUP_V_CZ_vest04", "CUP_NVG_PVS15_green_WP" };
respawnLinkedItems[] = { "ItemMap", "ItemCompass", "CUP_NVG_PVS15_green_WP", "H_Tank_black_F", "CUP_V_CZ_vest04", "CUP_NVG_PVS15_green_WP" };
backpack = "";
uksf_equipment_skipRandomization = 1;
EGVAR(equipment,skipRandomization) = 1;
};
class GVAR(Officer) : GVAR(Rifleman) {
displayName = "Officer";
uniformClass = "CUP_U_B_CZ_WDL_NoKneepads";
linkedItems[] = { "ItemMap", "ItemCompass", "CUP_H_CZ_Patrol_Cap", "CUP_V_CZ_NPP2006_co_vz95" };
respawnLinkedItems[] = { "ItemMap", "ItemCompass", "CUP_H_CZ_Patrol_Cap", "CUP_V_CZ_NPP2006_co_vz95" };
backpack = "";
uksf_equipment_skipRandomization = 1;
EGVAR(equipment,skipRandomization) = 1;
icon = "iconManOfficer";
};
class GVAR(Signaller) : GVAR(Rifleman) {
Expand All @@ -94,7 +94,7 @@ class GVAR(Heli_Pilot) : GVAR(Rifleman) {
linkedItems[] = { "ItemMap", "ItemCompass", "ItemWatch", "H_PilotHelmetHeli_B", "CUP_V_CZ_NPP2006_nk_black" };
respawnLinkedItems[] = { "ItemMap", "ItemCompass", "ItemWatch", "H_PilotHelmetHeli_B", "CUP_V_CZ_NPP2006_nk_black" };
backpack = "";
uksf_equipment_skipRandomization = 1;
EGVAR(equipment,skipRandomization) = 1;
};
class GVAR(Sniper) : GVAR(Rifleman) {
displayName = "Sniper";
Expand All @@ -106,7 +106,7 @@ class GVAR(Sniper) : GVAR(Rifleman) {
linkedItems[] = { "ItemMap", "ItemCompass", "CUP_NVG_PVS15_green_WP", "CUP_H_CZ_Helmet03", "CUP_V_CZ_vest02", "G_Bandanna_oli", "CUP_NVG_PVS15_green_WP" };
respawnLinkedItems[] = { "ItemMap", "ItemCompass", "CUP_NVG_PVS15_green_WP", "CUP_H_CZ_Helmet03", "CUP_V_CZ_vest02", "G_Bandanna_oli", "CUP_NVG_PVS15_green_WP" };
backpack = "";
uksf_equipment_skipRandomization = 1;
EGVAR(equipment,skipRandomization) = 1;
};
class GVAR(Crewman) : GVAR(Rifleman) {
displayName = "Crewman";
Expand All @@ -116,7 +116,7 @@ class GVAR(Crewman) : GVAR(Rifleman) {
magazines[] = { "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag_Tracer_Green", "CUP_30Rnd_556x45_Stanag_Tracer_Green", "CUP_30Rnd_556x45_Stanag_Tracer_Green", "SmokeShell", "SmokeShell", "SmokeShell", "CUP_HandGrenade_RGD5", "CUP_HandGrenade_RGD5" };
respawnMagazines[] = { "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag", "CUP_30Rnd_556x45_Stanag_Tracer_Green", "CUP_30Rnd_556x45_Stanag_Tracer_Green", "CUP_30Rnd_556x45_Stanag_Tracer_Green", "SmokeShell", "SmokeShell", "SmokeShell", "CUP_HandGrenade_RGD5", "CUP_HandGrenade_RGD5" };
backpack = "";
uksf_equipment_skipRandomization = 1;
EGVAR(equipment,skipRandomization) = 1;
};
class GVAR(Jet_Pilot) : GVAR(Rifleman) {
displayName = "Jet Pilot";
Expand All @@ -128,7 +128,7 @@ class GVAR(Jet_Pilot) : GVAR(Rifleman) {
linkedItems[] = { "ItemMap", "ItemCompass", "ItemWatch", "H_PilotHelmetFighter_O", "CUP_V_CZ_NPP2006_nk_black" };
respawnLinkedItems[] = { "ItemMap", "ItemCompass", "ItemWatch", "H_PilotHelmetFighter_O", "CUP_V_CZ_NPP2006_nk_black" };
backpack = "";
uksf_equipment_skipRandomization = 1;
EGVAR(equipment,skipRandomization) = 1;
};
class GVAR(Rifleman_AA) : GVAR(Rifleman) {
displayName = "Rifleman AA";
Expand Down Expand Up @@ -176,5 +176,5 @@ class GVAR(Operator) : GVAR(Rifleman) {
respawnMagazines[] = { "CUP_30Rnd_556x45_PMAG_QP", "CUP_30Rnd_556x45_PMAG_QP", "CUP_30Rnd_556x45_PMAG_QP", "CUP_30Rnd_556x45_PMAG_QP", "CUP_30Rnd_556x45_PMAG_QP", "CUP_30Rnd_556x45_PMAG_QP", "CUP_30Rnd_556x45_PMAG_QP", "CUP_30Rnd_556x45_PMAG_QP", "CUP_HandGrenade_RGO", "CUP_HandGrenade_RGO", "SmokeShell", "SmokeShell", "SmokeShell" };
linkedItems[] = { "ItemMap", "ItemCompass", "CUP_NVG_GPNVG_black", "CUP_H_OpsCore_Black", "CUP_V_CZ_NPP2006_ok_black", "CUP_G_Scarf_Face_Blk" };
backpack = QGVAR(Operator_Pack);
uksf_equipment_skipRandomization = 1;
EGVAR(equipment,skipRandomization) = 1;
};
1 change: 0 additions & 1 deletion addons/cartel/script_component.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@
// #define CBA_DEBUG_SYNCHRONOUS

#include "\u\uksf\addons\main\script_macros.hpp"
#include "\z\ace\addons\medical_engine\script_macros_config.hpp"
1 change: 1 addition & 0 deletions addons/cdf/$PBOPREFIX$
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
u\uksf\addons\cdf
8 changes: 8 additions & 0 deletions addons/cdf/CfgFactionClasses.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
class CfgFactionClasses {
class ADDON {
displayName = "Cherno Defence Force (Modern)";
icon = QPATHTOF(data\CDF_Flag.png);
priority = 1;
side = 0;
};
};
250 changes: 250 additions & 0 deletions addons/cdf/CfgGroups.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,250 @@
class cfgGroups {
class EAST {
name = "OPFOR";
class CDF {
name = "Cherno Defence Forces (Modern)";
class Infantry {
name = "Infantry";
class GVAR(Sniper_Pair) {
name = "Sniper Pair";
faction = QUOTE(ADDON);
side = 0;
class Unit0 {
side = 0;
vehicle = QGVAR(Sniper);
rank = "PRIVATE";
position[] = { 0, -0, 0 };
};
class Unit1 {
side = 0;
vehicle = QGVAR(Sniper);
rank = "PRIVATE";
position[] = { 0, -5, 0 };
};
};
class GVAR(HQ) {
name = "HQ";
faction = QUOTE(ADDON);
side = 0;
class Unit0 {
side = 0;
vehicle = QGVAR(Officer);
rank = "PRIVATE";
position[] = { 0, -0, 0 };
};
class Unit1 {
side = 0;
vehicle = QGVAR(Rifleman);
rank = "PRIVATE";
position[] = { 0, -5, 0 };
};
class Unit2 {
side = 0;
vehicle = QGVAR(Signaller);
rank = "PRIVATE";
position[] = { 0, -10, 0 };
};
class Unit3 {
side = 0;
vehicle = QGVAR(Signaller);
rank = "PRIVATE";
position[] = { 0, -15, 0 };
};
};
class GVAR(2_Man_Team) {
name = "2 Man Team";
faction = QUOTE(ADDON);
side = 0;
class Unit0 {
side = 0;
vehicle = QGVAR(Rifleman);
rank = "PRIVATE";
position[] = { 0, -0, 0 };
};
class Unit1 {
side = 0;
vehicle = QGVAR(Squad_Leader);
rank = "PRIVATE";
position[] = { 0, -5, 0 };
};
};
class GVAR(Fireteam) {
name = "Fireteam";
faction = QUOTE(ADDON);
side = 0;
class Unit0 {
side = 0;
vehicle = QGVAR(Squad_Leader);
rank = "PRIVATE";
position[] = { 0, -0, 0 };
};
class Unit1 {
side = 0;
vehicle = QGVAR(Rifleman);
rank = "PRIVATE";
position[] = { 0, -5, 0 };
};
class Unit2 {
side = 0;
vehicle = QGVAR(Rifleman_LAT);
rank = "PRIVATE";
position[] = { 0, -10, 0 };
};
class Unit3 {
side = 0;
vehicle = QGVAR(Machine_Gunner);
rank = "PRIVATE";
position[] = { 0, -15, 0 };
};
};
class GVAR(Section) {
name = "Section";
faction = QUOTE(ADDON);
side = 0;
class Unit0 {
side = 0;
vehicle = QGVAR(Squad_Leader);
rank = "PRIVATE";
position[] = { 0, -0, 0 };
};
class Unit1 {
side = 0;
vehicle = QGVAR(Rifleman);
rank = "PRIVATE";
position[] = { 0, -5, 0 };
};
class Unit2 {
side = 0;
vehicle = QGVAR(Machine_Gunner);
rank = "PRIVATE";
position[] = { 0, -10, 0 };
};
class Unit3 {
side = 0;
vehicle = QGVAR(Rifleman);
rank = "PRIVATE";
position[] = { 0, -15, 0 };
};
class Unit4 {
side = 0;
vehicle = QGVAR(Rifleman_LAT);
rank = "PRIVATE";
position[] = { 0, -20, 0 };
};
class Unit5 {
side = 0;
vehicle = QGVAR(Rifleman);
rank = "PRIVATE";
position[] = { 0, -25, 0 };
};
class Unit6 {
side = 0;
vehicle = QGVAR(Sharpshooter);
rank = "PRIVATE";
position[] = { 0, -30, 0 };
};
class Unit7 {
side = 0;
vehicle = QGVAR(Rifleman);
rank = "PRIVATE";
position[] = { 0, -35, 0 };
};
};
class GVAR(AT_Section) {
name = "AT Section";
faction = QUOTE(ADDON);
side = 0;
class Unit0 {
side = 0;
vehicle = QGVAR(Squad_Leader);
rank = "PRIVATE";
position[] = { 0, -0, 0 };
};
class Unit1 {
side = 0;
vehicle = QGVAR(Rifleman_HAT);
rank = "PRIVATE";
position[] = { 0, -5, 0 };
};
class Unit2 {
side = 0;
vehicle = QGVAR(Rifleman_HAT);
rank = "PRIVATE";
position[] = { 0, -10, 0 };
};
class Unit3 {
side = 0;
vehicle = QGVAR(Rifleman_LAT);
rank = "PRIVATE";
position[] = { 0, -15, 0 };
};
class Unit4 {
side = 0;
vehicle = QGVAR(Rifleman_LAT);
rank = "PRIVATE";
position[] = { 0, -20, 0 };
};
class Unit5 {
side = 0;
vehicle = QGVAR(Sharpshooter);
rank = "PRIVATE";
position[] = { 0, -25, 0 };
};
class Unit6 {
side = 0;
vehicle = QGVAR(Machine_Gunner);
rank = "PRIVATE";
position[] = { 0, -30, 0 };
};
};
class GVAR(MG_Section) {
name = "MG Section";
faction = QUOTE(ADDON);
side = 0;
class Unit0 {
side = 0;
vehicle = QGVAR(Squad_Leader);
rank = "PRIVATE";
position[] = { 0, -0, 0 };
};
class Unit1 {
side = 0;
vehicle = QGVAR(Machine_Gunner);
rank = "PRIVATE";
position[] = { 0, -5, 0 };
};
class Unit2 {
side = 0;
vehicle = QGVAR(Machine_Gunner);
rank = "PRIVATE";
position[] = { 0, -10, 0 };
};
class Unit3 {
side = 0;
vehicle = QGVAR(Machine_Gunner);
rank = "PRIVATE";
position[] = { 0, -15, 0 };
};
class Unit4 {
side = 0;
vehicle = QGVAR(Rifleman);
rank = "PRIVATE";
position[] = { 0, -20, 0 };
};
class Unit5 {
side = 0;
vehicle = QGVAR(Sharpshooter);
rank = "PRIVATE";
position[] = { 0, -25, 0 };
};
class Unit6 {
side = 0;
vehicle = QGVAR(Rifleman_LAT);
rank = "PRIVATE";
position[] = { 0, -30, 0 };
};
};
};
};
};
};
Loading