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

354 and 355 assignGear fixes #356

Merged
merged 4 commits into from
Dec 7, 2022
Merged

354 and 355 assignGear fixes #356

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b9f0365
Fix wrong Spetsnaz sniper rifle
NikkoJT Aug 13, 2021
5cf85ba
Change Spetsnaz ghillie to Pacific
NikkoJT Aug 13, 2021
aed2120
Force add traits to engineers
NikkoJT Aug 13, 2021
5631f95
Add radio backpacks to various factions
NikkoJT Aug 19, 2021
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
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_3IFB_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -519,6 +519,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -534,6 +536,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
2 changes: 1 addition & 1 deletion f/assignGear/f_assignGear_aaf.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,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";
_bagRadio = "B_RadioBag_01_digi_F"; // cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.

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

Expand Down
4 changes: 4 additions & 0 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 @@ -520,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -535,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
2 changes: 1 addition & 1 deletion f/assignGear/f_assignGear_csatPacific.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,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";
_bagRadio = "B_RadioBag_01_ghex_F"; // cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.

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

Expand Down
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_csatPacific_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -535,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_csat_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -535,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
1 change: 1 addition & 0 deletions f/assignGear/f_assignGear_ctrg.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ _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 = "B_RadioBag_01_black_F"; // cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.

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

Expand Down
7 changes: 7 additions & 0 deletions f/assignGear/f_assignGear_ctrg_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -517,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -532,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
1 change: 1 addition & 0 deletions f/assignGear/f_assignGear_fia.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,7 @@ _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 = "B_RadioBag_01_digi_F"; // cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.

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

Expand Down
7 changes: 7 additions & 0 deletions f/assignGear/f_assignGear_fia_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -517,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -532,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_ldf_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -535,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_natoPacific_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -535,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_natoWoodland_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -535,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_nato_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -535,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_npr_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -520,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -535,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
5 changes: 3 additions & 2 deletions f/assignGear/f_assignGear_spetsnaz.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,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_black_F"; // cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.

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

Expand Down Expand Up @@ -243,7 +244,7 @@ _HATmag1 = "Vorona_HEAT";
_HATmag2 = "Vorona_HE";

// Sniper
_SNrifle = "srifle_GM6_camo_F";
_SNrifle = "srifle_GM6_F";
_SNrifleMag = "5Rnd_127x108_Mag";

// Engineer items
Expand Down Expand Up @@ -314,7 +315,7 @@ _crewRig = ["V_Chestrig_rgr"];
_crewGlasses = [];

// Ghillie
_ghillieUniform = ["U_O_GhillieSuit"]; //DLC alternatives: ["U_O_FullGhillie_lsh","U_O_FullGhillie_ard","U_O_FullGhillie_sard"];
_ghillieUniform = ["U_O_T_Sniper_F"]; //DLC alternatives: ["U_O_FullGhillie_lsh","U_O_FullGhillie_ard","U_O_FullGhillie_sard"];
_ghillieHelmet = [];
_ghillieRig = ["V_Chestrig_rgr"];
_ghillieGlasses = [];
Expand Down
7 changes: 7 additions & 0 deletions f/assignGear/f_assignGear_spetsnaz_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ switch (_typeofUnit) do
// Squad Leader / DC Loadout:
case "dc":
{
_unit addBackpack _bagRadio;
_unit addVest _radioRig;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glmag, 1];
Expand All @@ -94,6 +95,7 @@ switch (_typeofUnit) do
// Platoon CO Loadout:
case "co":
{
_unit addBackpack _bagRadio;
_unit addVest _radioRig;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokewhite, 1];
Expand All @@ -115,6 +117,7 @@ switch (_typeofUnit) do
// JTAC Loadout:
case "jtac":
{
_unit addBackpack _bagRadio;
_unit addVest _radioRig;
_unit addmagazines [_glriflemag, 1];
_unit addmagazines [_glsmokered, 1];
Expand Down Expand Up @@ -521,6 +524,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -536,6 +541,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down
1 change: 1 addition & 0 deletions f/assignGear/f_assignGear_syndikat.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,6 +197,7 @@ _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 = "B_RadioBag_01_black_F"; // cosmetic, used by COs, DCs, and anybody who might possibly use CC in session.

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

Expand Down
7 changes: 7 additions & 0 deletions f/assignGear/f_assignGear_syndikat_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -517,6 +520,8 @@ switch (_typeofUnit) do
// Engineer (Demo) Loadout:
case "eng":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand All @@ -532,6 +537,8 @@ switch (_typeofUnit) do
// Engineer (Mines) Loadout:
case "engm":
{
_unit setUnitTrait ["engineer",true]; // Can repair
_unit setUnitTrait ["explosiveSpecialist",true]; // Can defuse explosives
_unit addBackpack _bagLarge;
_unit addmagazines [_carbinemag, 1];
_unit addweapon _carbine;
Expand Down