Skip to content

Commit

Permalink
Merge pull request #266 from folkarps/dev
Browse files Browse the repository at this point in the history
3.5.4 Release
SamLex authored Aug 28, 2019

Unverified

This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
2 parents b76ee84 + 58ddafd commit fa70671
Showing 49 changed files with 22,778 additions and 3,277 deletions.
24 changes: 17 additions & 7 deletions f/assignGear/f_assignGear_3IFB.sqf
Original file line number Diff line number Diff line change
@@ -101,6 +101,13 @@ _hg_attachments= []; // The default attachment set for handguns, overwritten in

// ====================================================================================

// ATTACHMENTS - LAUNCHER
_lau_attach1 = ""; // Empty by default, could be a scope in GM or a laser pointer for Titans

_lau_attachments = []; // The default attachment set for launchers, overwritten in the individual unitType

// ====================================================================================

// WEAPON SELECTION

// Standard Riflemen ( MMG Assistant Gunner, Assistant Automatic Rifleman, MAT Assistant Gunner, MTR Assistant Gunner, Rifleman)
@@ -183,15 +190,16 @@ _bagmtrg = "B_Mortar_01_weapon_F"; // used by Mortar gunner
_bagmtrag = "B_Mortar_01_support_F"; // used by Mortar assistant gunner
_baghsamg = "B_AA_01_weapon_F"; // used by Heavy SAM gunner
_baghsamag = "B_HMG_01_support_F"; // used by Heavy SAM assistant gunner **
_bagRadio = selectRandom ["B_RadioBag_01_eaf_F","B_RadioBag_01_black_F","B_RadioBag_01_digi_F","B_RadioBag_01_black_F"]; // cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.

// ====================================================================================

// UNIQUE, ROLE-SPECIFIC EQUIPMENT

// Automatic Rifleman
_AR = "LMG_03_F";
_ARmag = "200Rnd_556x45_Box_F";
_ARmag_tr = "200Rnd_556x45_Box_Tracer_F";
_AR = "arifle_RPK12_F";
_ARmag = "75Rnd_762x39_Mag_F";
_ARmag_tr = "75Rnd_762x39_Mag_Tracer_F";

// Medium MG
_MMG = "LMG_Zafir_F";
@@ -204,7 +212,7 @@ _DMriflemag = "20Rnd_762x51_Mag";
_DMriflemag_tr = "20Rnd_762x51_Mag";

// Rifleman AT
_RAT = "launch_RPG32_ghex_F";
_RAT = "launch_RPG32_green_F";
_RATmag1 = "RPG32_F";
_RATmag2 = "RPG32_HE_F";

@@ -252,7 +260,9 @@ _jet = ["jp"];

_baseUniform = ["U_BG_Guerrilla_6_1","U_BG_Guerilla2_2","U_BG_Guerilla2_1","U_BG_Guerilla2_3","U_BG_Guerilla1_1","U_BG_Guerilla1_2_F","U_BG_Leader",
"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_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"
];
_baseHelmet = ["H_Beret_Colonel"];
_baseGlasses = [];
@@ -261,8 +271,8 @@ _baseGlasses = [];
//
//_lightRig = ["V_TacVest_Camo","V_I_G_resistanceLeader_F","V_TacVest_oli","V_TacVest_khk"];
// ^^ Alternate Light Rigs ^^
_lightRig = ["V_PlateCarrier1_blk","V_PlateCarrier1_rgr_noflag_F","V_PlateCarrierIA1_dgtl"];
_standardRig = ["V_PlateCarrier1_blk","V_PlateCarrier1_rgr_noflag_F","V_PlateCarrierIA1_dgtl"];
_lightRig = ["V_PlateCarrier1_blk","V_PlateCarrier1_rgr_noflag_F","V_PlateCarrierIA1_dgtl","V_CarrierRigKBT_01_light_Olive_F","V_CarrierRigKBT_01_light_EAF_F"];
_standardRig = ["V_PlateCarrier1_blk","V_PlateCarrier1_rgr_noflag_F","V_PlateCarrierIA1_dgtl","V_CarrierRigKBT_01_light_Olive_F","V_CarrierRigKBT_01_light_EAF_F"];

// Diver
_diverUniform = ["U_B_Wetsuit"];
3 changes: 3 additions & 0 deletions f/assignGear/f_assignGear_3IFB_light.sqf
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
_unit addweapon _glrifle;
@@ -89,6 +90,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
_unit addweapon _glrifle;
@@ -109,6 +111,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
_unit addweapon _glrifle;
3 changes: 3 additions & 0 deletions f/assignGear/f_assignGear_3IFB_standard.sqf
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
_unit addweapon _glrifle;
@@ -92,6 +93,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
_unit addweapon _glrifle;
@@ -112,6 +114,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
_unit addweapon _glrifle;
10 changes: 9 additions & 1 deletion f/assignGear/f_assignGear_aaf.sqf
Original file line number Diff line number Diff line change
@@ -101,6 +101,13 @@ _hg_attachments= []; // The default attachment set for handguns, overwritten in

// ====================================================================================

// ATTACHMENTS - LAUNCHER
_lau_attach1 = ""; // Empty by default, could be a scope in GM or a laser pointer for Titans

_lau_attachments = []; // The default attachment set for launchers, overwritten in the individual unitType

// ====================================================================================

// WEAPON SELECTION

// Standard Riflemen ( MMG Assistant Gunner, Assistant Automatic Rifleman, MAT Assistant Gunner, MTR Assistant Gunner, Rifleman)
@@ -184,6 +191,7 @@ _bagmtrg = "I_Mortar_01_weapon_F"; // used by Mortar gunner
_bagmtrag = "I_Mortar_01_support_F"; // used by Mortar assistant gunner
_baghsamg = "I_AA_01_weapon_F"; // used by Heavy SAM gunner
_baghsamag = "I_HMG_01_support_F"; // used by Heavy SAM assistant gunner
_bagRadio = "B_RadioBag_01_digi_F";

// ====================================================================================

@@ -206,7 +214,7 @@ _DMriflemag_tr = "20Rnd_762x51_Mag";

// Rifleman AT
_RAT = "launch_MRAWS_olive_rail_F";
_RATmag1 = "MRAWS_HEAT_F";
_RATmag1 = "MRAWS_HEAT55_F";
_RATmag2 = "MRAWS_HE_F";

// Medium AT
3 changes: 3 additions & 0 deletions f/assignGear/f_assignGear_aaf_light.sqf
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
_unit addweapon _glrifle;
@@ -89,6 +90,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
_unit addweapon _glrifle;
@@ -109,6 +111,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
_unit addweapon _glrifle;
3 changes: 3 additions & 0 deletions f/assignGear/f_assignGear_aaf_standard.sqf
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
_unit addweapon _glrifle;
@@ -92,6 +93,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
_unit addweapon _glrifle;
@@ -112,6 +114,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
_unit addweapon _glrifle;
15 changes: 13 additions & 2 deletions f/assignGear/f_assignGear_attachments.sqf
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
if (_attachments isEqualType []) then {
removeAllPrimaryWeaponItems _unit;
{
// loop trough the attachments and add them to the weapon
// loop through the attachments and add them to the weapon
_unit addPrimaryWeaponItem _x;
} foreach _attachments;
};
@@ -10,7 +10,18 @@ if (_attachments isEqualType []) then {
if (_hg_attachments isEqualType []) then {
removeAllHandgunItems _unit;
{
// loop trough the attachments and add them to the weapon
// loop through the attachments and add them to the weapon
_unit addHandgunItem _x;
} foreach _hg_attachments;
};

// Handle launcher attachments
if (_lau_attachments isEqualType []) then {
{
_unit removeSecondaryWeaponItem _x;
} forEach secondaryWeaponItems _unit;
{
// loop through the attachments and add them to the weapon
_unit addSecondaryWeaponItem _x;
} foreach _lau_attachments;
};
9 changes: 8 additions & 1 deletion f/assignGear/f_assignGear_csat.sqf
Original file line number Diff line number Diff line change
@@ -101,6 +101,13 @@ _hg_attachments= []; // The default attachment set for handguns, overwritten in

// ====================================================================================

// ATTACHMENTS - LAUNCHER
_lau_attach1 = ""; // Empty by default, could be a scope in GM or a laser pointer for Titans

_lau_attachments = []; // The default attachment set for launchers, overwritten in the individual unitType

// ====================================================================================

// WEAPON SELECTION

// Standard Riflemen ( MMG Assistant Gunner, Assistant Automatic Rifleman, MAT Assistant Gunner, MTR Assistant Gunner, Rifleman)
@@ -185,7 +192,7 @@ _bagmtrg = "O_Mortar_01_weapon_F"; // used by Mortar gunner
_bagmtrag = "O_Mortar_01_support_F"; // used by Mortar assistant gunner
_baghsamg = "O_AA_01_weapon_F"; // used by Heavy SAM gunner
_baghsamag = "O_HMG_01_support_F"; // used by Heavy SAM assistant gunner

_bagRadio = "B_RadioBag_01_hex_F";
// ====================================================================================

// UNIQUE, ROLE-SPECIFIC EQUIPMENT
8 changes: 8 additions & 0 deletions f/assignGear/f_assignGear_csatPacific.sqf
Original file line number Diff line number Diff line change
@@ -101,6 +101,13 @@ _hg_attachments= []; // The default attachment set for handguns, overwritten in

// ====================================================================================

// ATTACHMENTS - LAUNCHER
_lau_attach1 = ""; // Empty by default, could be a scope in GM or a laser pointer for Titans

_lau_attachments = []; // The default attachment set for launchers, overwritten in the individual unitType

// ====================================================================================

// WEAPON SELECTION

// Standard Riflemen ( MMG Assistant Gunner, Assistant Automatic Rifleman, MAT Assistant Gunner, MTR Assistant Gunner, Rifleman)
@@ -184,6 +191,7 @@ _bagmtrg = "O_Mortar_01_weapon_F"; // used by Mortar gunner
_bagmtrag = "O_Mortar_01_support_F"; // used by Mortar assistant gunner
_baghsamg = "O_AA_01_weapon_F"; // used by Heavy SAM gunner
_baghsamag = "O_HMG_01_support_F"; // used by Heavy SAM assistant gunner
_bagRadio = "B_RadioBag_01_ghex_F";

// ====================================================================================

3 changes: 3 additions & 0 deletions f/assignGear/f_assignGear_csatPacific_light.sqf
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
_unit addweapon _glrifle;
@@ -89,6 +90,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
_unit addweapon _glrifle;
@@ -109,6 +111,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
_unit addweapon _glrifle;
3 changes: 3 additions & 0 deletions f/assignGear/f_assignGear_csatPacific_standard.sqf
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
_unit addweapon _glrifle;
@@ -92,6 +93,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
_unit addweapon _glrifle;
@@ -112,6 +114,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
_unit addweapon _glrifle;
3 changes: 3 additions & 0 deletions f/assignGear/f_assignGear_csat_light.sqf
Original file line number Diff line number Diff line change
@@ -69,6 +69,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
_unit addweapon _glrifle;
@@ -89,6 +90,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
_unit addweapon _glrifle;
@@ -109,6 +111,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
_unit addweapon _glrifle;
3 changes: 3 additions & 0 deletions f/assignGear/f_assignGear_csat_standard.sqf
Original file line number Diff line number Diff line change
@@ -72,6 +72,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
_unit addweapon _glrifle;
@@ -92,6 +93,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
_unit addweapon _glrifle;
@@ -112,6 +114,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
_unit addweapon _glrifle;
7 changes: 7 additions & 0 deletions f/assignGear/f_assignGear_ctrg.sqf
Original file line number Diff line number Diff line change
@@ -101,6 +101,13 @@ _hg_attachments= []; // The default attachment set for handguns, overwritten in

// ====================================================================================

// ATTACHMENTS - LAUNCHER
_lau_attach1 = ""; // Empty by default, could be a scope in GM or a laser pointer for Titans

_lau_attachments = []; // The default attachment set for launchers, overwritten in the individual unitType

// ====================================================================================

// WEAPON SELECTION

// Standard Riflemen ( MMG Assistant Gunner, Assistant Automatic Rifleman, MAT Assistant Gunner, MTR Assistant Gunner, Rifleman)
9 changes: 8 additions & 1 deletion f/assignGear/f_assignGear_fia.sqf
Original file line number Diff line number Diff line change
@@ -101,6 +101,13 @@ _hg_attachments= []; // The default attachment set for handguns, overwritten in

// ====================================================================================

// ATTACHMENTS - LAUNCHER
_lau_attach1 = ""; // Empty by default, could be a scope in GM or a laser pointer for Titans

_lau_attachments = []; // The default attachment set for launchers, overwritten in the individual unitType

// ====================================================================================

// WEAPON SELECTION

// Standard Riflemen ( MMG Assistant Gunner, Assistant Automatic Rifleman, MAT Assistant Gunner, MTR Assistant Gunner, Rifleman)
@@ -213,7 +220,7 @@ _DMriflemag_tr = "20Rnd_762x51_Mag";

// Rifleman AT
_RAT = "launch_MRAWS_olive_rail_F";
_RATmag1 = "MRAWS_HEAT_F";
_RATmag1 = "MRAWS_HEAT55_F";
_RATmag2 = "MRAWS_HE_F";

// Medium AT
Loading

0 comments on commit fa70671

Please sign in to comment.