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

421 Gear updates alongside CDLC adoption #430

Merged
merged 10 commits into from
Nov 11, 2024
Merged

421 Gear updates alongside CDLC adoption #430

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5200c90
421 Gear updates alongside CDLC adoption
costno Apr 27, 2024
cbccd1f
Rev 1
costno Apr 27, 2024
3ba3b51
again, missed syndikat
costno Apr 27, 2024
cb42b78
Bias Galat for the Third
costno May 7, 2024
1031974
SLR DM for 3IFB
costno May 8, 2024
f6b8315
Default to no attachments for SMG people
costno May 26, 2024
c7bd97f
Green Titan for NPR and SPZ
costno Jul 17, 2024
dcce25a
LDF RPG32
costno Aug 18, 2024
186e9d4
bag randomization for irregular factions
costno Oct 5, 2024
c3e1e20
It's too cold to be sleeveless in Livonia
costno Oct 6, 2024
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
31 changes: 23 additions & 8 deletions f/assignGear/f_assignGear_3IFB.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ _silencer1 = "muzzle_snds_B"; // 7.62 suppressor
_silencer2 = "muzzle_snds_H"; // 6.5 suppressor

_scope1 = "optic_ACO"; // ACO
_scope2 = "optic_MRCO"; // MRCO Scope - 1x - 6x
_scope2 = "optic_VRCO"; // VRCO Scope - 1x - 6x
_scope3 = "optic_KHS_old"; // SOS Scope - 18x - 75x

_bipod1 = "bipod_01_F_mtp"; // Default bipod
Expand Down Expand Up @@ -134,7 +134,7 @@ _diverMag2 = "30Rnd_556x45_Stanag_Tracer_Yellow";
_diverMag3 = "20Rnd_556x45_UW_mag";

// Rifle with GL and HE grenades (CO, DC, FTLs)
_glrifle = "arifle_AK12_GL_F"; // Slight randomization, biased towards TRG
_glrifle = "arifle_AK12_GL_F";
_glriflemag = "30Rnd_762x39_Mag_F";
_glriflemag_tr = "30Rnd_762x39_Mag_Tracer_F";
_glmag = "1Rnd_HE_Grenade_shell";
Expand Down Expand Up @@ -187,8 +187,9 @@ _chemyellow = "Chemlight_yellow";
_chemblue = "Chemlight_blue";

// Backpacks
_bag = "B_FieldPack_khk"; // carries 160, weighs 20
_bag = selectRandom ["B_FieldPack_khk","B_FieldPack_oli","B_FieldPack_green_f","B_CivilianBackpack_01_Everyday_Black_F","B_AssaultPack_cbr","B_AssaultPack_khk"]; // carries 160, weighs 20
_baglarge = "B_Carryall_khk"; // carries 320, weighs 60
_bagmedic = "B_TacticalPack_oli"; // carries 240, weighs 40
_bagdiver = "B_AssaultPack_blk"; // used by divers
_baguav = "I_UAV_01_backpack_F"; // used by UAV operator
_baghmgg = "I_G_HMG_02_weapon_F"; // used by Heavy MG gunner
Expand All @@ -205,7 +206,7 @@ _bagRadio = selectRandom ["B_RadioBag_01_eaf_F","B_RadioBag_01_black_F","B_Radio
// UNIQUE, ROLE-SPECIFIC EQUIPMENT

// Automatic Rifleman
_AR = "arifle_RPK12_F";
_AR = selectRandom ["arifle_RPK12_F","arifle_Galat_lxWS","arifle_Galat_lxWS"];
_ARmag = "75Rnd_762x39_Mag_F";
_ARmag_tr = "75Rnd_762x39_Mag_Tracer_F";

Expand All @@ -215,9 +216,9 @@ _MMGmag = "150Rnd_762x54_Box";
_MMGmag_tr = "150Rnd_762x54_Box_Tracer";

// Marksman rifle
_DMrifle = "srifle_DMR_06_olive_F";
_DMriflemag = "20Rnd_762x51_Mag";
_DMriflemag_tr = "20Rnd_762x51_Mag";
_DMrifle = "arifle_SLR_V_lxWS";
_DMriflemag = "20Rnd_762x51_slr_reload_tracer_green_lxWS";
_DMriflemag_tr = "20Rnd_762x51_slr_tracer_green_lxWS";

// Rifleman AT
_RAT = "launch_RPG32_green_F";
Expand Down Expand Up @@ -271,7 +272,8 @@ _baseUniform = ["U_BG_Guerrilla_6_1","U_BG_Guerilla2_2","U_BG_Guerilla2_1","U_BG
"U_I_C_Soldier_Bandit_3_F","U_I_C_Soldier_Para_2_F","U_I_C_Soldier_Para_3_F","U_I_C_Soldier_Para_4_F","U_I_C_Soldier_Para_1_F",
"U_I_G_Story_Protagonist_F","U_I_G_resistanceLeader_F","U_C_WorkerCoveralls",
"U_C_Uniform_Farmer_01_F","U_I_L_Uniform_01_camo_F","U_I_L_Uniform_01_deserter_F","U_I_L_Uniform_01_tshirt_black_F","U_I_L_Uniform_01_tshirt_olive_F","U_I_L_Uniform_01_tshirt_skull_F",
"U_O_R_Gorka_01_black_F"
"U_O_R_Gorka_01_black_F","U_lxWS_Djella_02_Brown","U_lxWS_Djella_02_Grey","U_lxWS_Djella_03_Green","U_lxWS_Djella_02_Sand","U_lxWS_ION_Casual5","U_lxWS_SFIA_deserter","U_lxWS_SFIA_Tanker_O",
"U_SFIA_deserter_lxWS","U_C_PilotJacket_black_RF","U_C_PilotJacket_brown_RF","U_C_PilotJacket_lbrown_RF","U_BG_Guerrilla_RF","U_BG_leader_RF"
];
_baseHelmet = ["H_Beret_Colonel"];
_baseGlasses = [];
Expand Down Expand Up @@ -378,6 +380,19 @@ if (_isMan) then {
_unit addItem _bandage;
};
};

// Use this block if using with AI instead of the above FAK/Bandage assignment
/*
// AI have a random chance of receiving bandage
_roll = round random 10;
if (_roll >= 8) then {
_unit addItem "Bandage";
} else {
if (_roll == 0) then {
_unit addItem "FirstAidKit";
};
};
*/
};

// ====================================================================================
Expand Down
8 changes: 7 additions & 1 deletion f/assignGear/f_assignGear_3IFB_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ switch (_typeofUnit) do
case "m":
{
_unit setUnitTrait ["medic",true]; // Can use medkit
_unit addBackpack _bagLarge;
_unit addBackpack _bagMedic;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
_unit addmagazines [_smokegrenade, 6];
Expand Down Expand Up @@ -440,6 +440,7 @@ switch (_typeofUnit) do
{
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
_unit addweapon _binoculars;
Expand All @@ -449,6 +450,7 @@ switch (_typeofUnit) do
{
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
};
Expand All @@ -459,6 +461,7 @@ switch (_typeofUnit) do
_unit addBackpack _bag;
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
_unit addItem "ToolKit";
Expand All @@ -469,6 +472,7 @@ switch (_typeofUnit) do
_unit setUnitTrait ["engineer",true]; // Can repair
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 3];
};
Expand All @@ -481,6 +485,7 @@ switch (_typeofUnit) do
_unit addBackpack _bag;
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
_unit addItem "ToolKit";
Expand Down Expand Up @@ -566,6 +571,7 @@ switch (_typeofUnit) do
{
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_smgmag, 6];
_unit addmagazines [_grenade, 2];
Expand Down
26 changes: 20 additions & 6 deletions f/assignGear/f_assignGear_aaf.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ _chemblue = "Chemlight_blue";
// Backpacks
_bag = "B_AssaultPack_dgtl"; // The standard bag for most classes
_bagLarge = "B_Kitbag_rgr"; // Larger bag for some special purpose classes
_bagmedic = "B_TacticalPack_oli"; // Medium bag for medics
_bagdiver = "B_AssaultPack_blk"; // used by divers
_baguav = "I_UAV_01_backpack_F"; // used by UAV operator
_baghmgg = "I_HMG_02_weapon_F"; // used by Heavy MG gunner
Expand All @@ -211,19 +212,19 @@ _ARmag = "200Rnd_556x45_Box_F";
_ARmag_tr = "200Rnd_556x45_Box_Tracer_F";

// Medium MG
_MMG = "LMG_Zafir_F";
_MMGmag = "150Rnd_762x54_Box";
_MMGmag_tr = "150Rnd_762x54_Box_Tracer";
_MMG = "LMG_S77_AAF_lxWS";
_MMGmag = "100Rnd_762x51_S77_Yellow_lxWS";
_MMGmag_tr = "100Rnd_762x51_S77_Yellow_Tracer_lxWS";

// Marksman rifle
_DMrifle = "srifle_EBR_F";
_DMriflemag = "20Rnd_762x51_Mag";
_DMriflemag_tr = "20Rnd_762x51_Mag";

// Rifleman AT
_RAT = "launch_MRAWS_olive_rail_F";
_RATmag1 = "MRAWS_HEAT55_F";
_RATmag2 = "MRAWS_HE_F";
_RAT = "launch_RPG32_green_F";
_RATmag1 = "RPG32_F";
_RATmag2 = "RPG32_HE_F";

// Medium AT
_MAT = "launch_MRAWS_olive_rail_F";
Expand Down Expand Up @@ -371,6 +372,19 @@ if (_isMan) then {
_unit addItem _bandage;
};
};

// Use this block if using with AI instead of the above FAK/Bandage assignment
/*
// AI have a random chance of receiving bandage
_roll = round random 10;
if (_roll >= 8) then {
_unit addItem "Bandage";
} else {
if (_roll == 0) then {
_unit addItem "FirstAidKit";
};
};
*/
};

// ====================================================================================
Expand Down
14 changes: 10 additions & 4 deletions f/assignGear/f_assignGear_aaf_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ switch (_typeofUnit) do
case "m":
{
_unit setUnitTrait ["medic",true]; // Can use medkit
_unit addBackpack _bagLarge;
_unit addBackpack _bagMedic;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
_unit addmagazines [_smokegrenade, 6];
Expand Down Expand Up @@ -178,7 +178,7 @@ switch (_typeofUnit) do
_unit addweapon _MMG;
_attachments pushback (_bipod1); // Adds the bipod
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_MMGmag, 1];
_unit addmagazines [_MMGmag, 2];
_unit addmagazines [_MMGmag_tr, 1];
};
// Medium MG Assistant Loadout:
Expand All @@ -191,7 +191,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 4];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addmagazines [_MMGmag, 2];
_unit addmagazines [_MMGmag, 3];
_unit addmagazines [_MMGmag_tr, 1];
};
// Medium MG Team Leader Loadout:
Expand All @@ -204,7 +204,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 4];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addmagazines [_MMGmag, 2];
_unit addmagazines [_MMGmag, 3];
_unit addmagazines [_MMGmag_tr, 1];
_unit addWeapon _binoculars;
};
Expand Down Expand Up @@ -441,6 +441,7 @@ switch (_typeofUnit) do
{
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
_unit addweapon _binoculars;
Expand All @@ -450,6 +451,7 @@ switch (_typeofUnit) do
{
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
};
Expand All @@ -460,6 +462,7 @@ switch (_typeofUnit) do
_unit addBackpack _bag;
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
_unit addItem "ToolKit";
Expand All @@ -470,6 +473,7 @@ switch (_typeofUnit) do
_unit setUnitTrait ["engineer",true]; // Can repair
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 3];
};
Expand All @@ -482,6 +486,7 @@ switch (_typeofUnit) do
_unit addBackpack _bag;
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
_unit addItem "ToolKit";
Expand Down Expand Up @@ -567,6 +572,7 @@ switch (_typeofUnit) do
{
_unit addmagazines [_smgmag, 1];
_unit addweapon _smg;
_attachments = []; // no attachments for smg.
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_smgmag, 6];
_unit addmagazines [_grenade, 2];
Expand Down
20 changes: 17 additions & 3 deletions f/assignGear/f_assignGear_csat.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,6 +190,7 @@ _chemblue = "Chemlight_blue";
// Backpacks
_bag = "B_AssaultPack_ocamo"; // carries 120, weighs 20
_bagLarge = "B_Carryall_ocamo"; // carries 320, weighs 40
_bagmedic = "B_TacticalPack_ocamo"; // Medium bag for medics
_bagdiver = "B_AssaultPack_rgr"; // used by divers
_baguav = "O_UAV_01_backpack_F"; // used by UAV operator
_baghmgg = "O_HMG_01_weapon_F"; // used by Heavy MG gunner
Expand Down Expand Up @@ -288,8 +289,8 @@ _baseGlasses = [];
//_baseHelmet = ["H_HelmetO_oucamo"];

// Vests
_lightRig = ["V_TacVest_khk"];
_standardRig = ["V_TacVest_khk"];
_lightRig = ["V_TacVest_brn"];
_standardRig = ["V_TacVest_brn"];
// Consider changing to "V_HarnessO_brn" if using this with assignGear AI.

// Urban Vests
Expand Down Expand Up @@ -330,7 +331,7 @@ _ghillieGlasses = [];
// Spec Op
_sfuniform = ["U_O_SpecopsUniform_ocamo"]; // Viper: ["U_O_V_Soldier_Viper_hex_F"];
_sfhelmet = ["H_HelmetSpecO_ocamo"]; //Viper: ["H_HelmetO_ViperSP_hex_F"]; IMPORTANT: Will be overriden if nvg is added afterwards
_sfRig = _standardRig;
_sfRig = ["V_TacVest_brn"];
_sfGlasses = [];

// VIP/Officer
Expand Down Expand Up @@ -392,6 +393,19 @@ if (_isMan) then {
_unit addItem _bandage;
};
};

// Use this block if using with AI instead of the above FAK/Bandage assignment
/*
// AI have a random chance of receiving bandage
_roll = round random 10;
if (_roll >= 8) then {
_unit addItem "Bandage";
} else {
if (_roll == 0) then {
_unit addItem "FirstAidKit";
};
};
*/
};

// ====================================================================================
Expand Down
14 changes: 14 additions & 0 deletions f/assignGear/f_assignGear_csatPacific.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ _chemblue = "Chemlight_blue";
// Backpacks
_bag = "B_FieldPack_ghex_F"; // carries 120, weighs 20
_bagLarge = "B_Carryall_ghex_F"; // carries 320, weighs 40
_bagMedic = "B_ViperLightHarness_ghex_F"; // Medium bag for medics
_bagdiver = "B_AssaultPack_rgr"; // used by divers
_baguav = "O_UAV_01_backpack_F"; // used by UAV operator
_baghmgg = "O_HMG_01_weapon_F"; // used by Heavy MG gunner
Expand Down Expand Up @@ -392,6 +393,19 @@ if (_isMan) then {
_unit addItem _bandage;
};
};

// Use this block if using with AI instead of the above FAK/Bandage assignment
/*
// AI have a random chance of receiving bandage
_roll = round random 10;
if (_roll >= 8) then {
_unit addItem "Bandage";
} else {
if (_roll == 0) then {
_unit addItem "FirstAidKit";
};
};
*/
};

// ====================================================================================
Expand Down
Loading