Skip to content

#782 - factored out binos into a variable for easy swapping #783

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

Open
darkChozo wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

#782 - factored out binos into a variable for easy swapping #783

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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_aaf.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ _chemred = "Chemlight_red";
_chemyellow = "Chemlight_yellow";
_chemblue = "Chemlight_blue";

// Binoculars
//_binoculars = "Binocular";
_binoculars = "Rangefinder";

// Standard Backpacks
_bag = "B_AssaultPack_dgtl"; // The standard bag for most classes
_bagLarge = "B_Kitbag_rgr"; // Larger bag for some special purpose classes
Expand Down
24 changes: 12 additions & 12 deletions f/assignGear/f_assignGear_aaf_light.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 5];
_unit addmagazines [_glsmokewhite, 3];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadegreen, 2];
};
// Squad Leader / DC Loadout:
Expand All @@ -80,7 +80,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glsmokewhite, 3];
_unit addmagazines [_pistolmag, 2];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadepurple, 3];
};
// Platoon CO Loadout:
Expand All @@ -99,7 +99,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glsmokered, 3];
_unit addmagazines [_pistolmag, 4];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadepurple, 3];
};
// JTAC Loadout:
Expand Down Expand Up @@ -165,7 +165,7 @@ switch (_typeofUnit) do
_unit addmagazines [_grenade, 1];
_unit addmagazines [_MMGmag, 1];
_unit addmagazines [_MMGmag, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy MG Gunner Loadout:
case "hmgg":
Expand All @@ -189,7 +189,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Medium AT Gunner Loadout:
case "matg":
Expand Down Expand Up @@ -217,7 +217,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addmagazines [_MATmag1, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy AT Gunner Loadout:
case "hatg":
Expand All @@ -244,7 +244,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addmagazines [_HATmag1, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Mortar Gunner Loadout:
case "mtrg":
Expand All @@ -268,7 +268,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Medium SAM Gunner Loadout:
case "msamg":
Expand All @@ -295,7 +295,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addmagazines [_SAMmag, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy SAM Gunner Loadout:
case "hsamg":
Expand All @@ -319,7 +319,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Sniper Loadout:
case "sn":
Expand All @@ -346,7 +346,7 @@ switch (_typeofUnit) do
_unit addmagazines [_grenade, 2];
_unit addmagazines [_SNrifleMag, 3];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addweapon "Rangefinder";
_unit addweapon _binoculars;
};
// Vehicle Commander Loadout:
case "vc":
Expand All @@ -356,7 +356,7 @@ switch (_typeofUnit) do
_unit addItem _firstaid ;
_unit addmagazines [_smokegrenadeblue, 4];
_unit addmagazines [_smgmag, 4];
_unit addweapon "Rangefinder";
_unit addweapon _binoculars;
};
// Vehicle Gunner Loadout:
case "vg":
Expand Down
24 changes: 12 additions & 12 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 @@ -62,7 +62,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 5];
_unit addmagazines [_glsmokewhite, 3];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadegreen, 2];
};
// Squad Leader / DC Loadout:
Expand All @@ -81,7 +81,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glsmokewhite, 3];
_unit addmagazines [_pistolmag, 2];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadepurple, 3];
};
// Platoon CO Loadout:
Expand All @@ -100,7 +100,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glsmokered, 3];
_unit addmagazines [_pistolmag, 4];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadepurple, 3];
};
// JTAC Loadout:
Expand Down Expand Up @@ -169,7 +169,7 @@ switch (_typeofUnit) do
_unit addmagazines [_grenade, 2];
_unit addmagazines [_MMGmag, 1];
_unit addmagazines [_MMGmag, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy MG Gunner Loadout:
case "hmgg":
Expand All @@ -193,7 +193,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 4];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Medium AT Gunner Loadout:
case "matg":
Expand Down Expand Up @@ -221,7 +221,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addmagazines [_MATmag1, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy AT Gunner Loadout:
case "hatg":
Expand Down Expand Up @@ -249,7 +249,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addmagazines [_HATmag1, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Mortar Gunner Loadout:
case "mtrg":
Expand All @@ -273,7 +273,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 4];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Medium SAM Gunner Loadout:
case "msamg":
Expand All @@ -300,7 +300,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addmagazines [_SAMmag, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy SAM Gunner Loadout:
case "hsamg":
Expand All @@ -324,7 +324,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 4];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Sniper Loadout:
case "sn":
Expand All @@ -351,7 +351,7 @@ switch (_typeofUnit) do
_unit addmagazines [_grenade, 2];
_unit addmagazines [_SNrifleMag, 3];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Vehicle Commander Loadout:
case "vc":
Expand All @@ -361,7 +361,7 @@ switch (_typeofUnit) do
_unit addItem _firstaid ;
_unit addmagazines [_smokegrenadeblue, 3];
_unit addmagazines [_smgmag, 4];
_unit addweapon "Rangefinder";
_unit addweapon _binoculars;
};
// Vehicle Gunner Loadout:
case "vg":
Expand Down
4 changes: 4 additions & 0 deletions f/assignGear/f_assignGear_csat.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,6 +163,10 @@ _chemred = "Chemlight_red";
_chemyellow = "Chemlight_yellow";
_chemblue = "Chemlight_blue";

// Binoculars
//_binoculars = "Binocular";
_binoculars = "Rangefinder";

// Backpacks
_bag = "B_AssaultPack_ocamo"; // carries 120, weighs 20
_baglarge = "B_Carryall_ocamo"; // carries 320, weighs 40
Expand Down
4 changes: 4 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 @@ -162,6 +162,10 @@ _chemred = "Chemlight_red";
_chemyellow = "Chemlight_yellow";
_chemblue = "Chemlight_blue";

// Binoculars
//_binoculars = "Binocular";
_binoculars = "Rangefinder";

// Backpacks
_bag = "B_FieldPack_ghex_F"; // carries 120, weighs 20
_baglarge = "B_Carryall_ghex_F"; // carries 320, weighs 40
Expand Down
24 changes: 12 additions & 12 deletions f/assignGear/f_assignGear_csatPacific_light.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glmag, 5];
_unit addmagazines [_glsmokewhite, 3];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadegreen, 2];
};
// Squad Leader / DC Loadout:
Expand All @@ -81,7 +81,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glsmokewhite, 3];
_unit addmagazines [_pistolmag, 2];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadepurple, 3];
};
// Platoon CO Loadout:
Expand All @@ -100,7 +100,7 @@ switch (_typeofUnit) do
_unit addmagazines [_glsmokered, 3];
_unit addmagazines [_pistolmag, 4];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_smokegrenadepurple, 3];
};
// JTAC Loadout:
Expand Down Expand Up @@ -166,7 +166,7 @@ switch (_typeofUnit) do
_unit addmagazines [_grenade, 1];
_unit addmagazines [_MMGmag, 1];
_unit addmagazines [_MMGmag, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy MG Gunner Loadout:
case "hmgg":
Expand All @@ -190,7 +190,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Medium AT Gunner Loadout:
case "matg":
Expand Down Expand Up @@ -218,7 +218,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addmagazines [_MATmag1, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy AT Gunner Loadout:
case "hatg":
Expand All @@ -245,7 +245,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addmagazines [_HATmag1, 2];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Mortar Gunner Loadout:
case "mtrg":
Expand All @@ -269,7 +269,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Medium SAM Gunner Loadout:
case "msamg":
Expand All @@ -296,7 +296,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addmagazines [_SAMmag, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Heavy SAM Gunner Loadout:
case "hsamg":
Expand All @@ -320,7 +320,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 2];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 1];
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
};
// Sniper Loadout:
case "sn":
Expand All @@ -346,7 +346,7 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addWeapon _binoculars;
_unit addmagazines [_SNrifleMag, 3];
};
// Vehicle Commander Loadout:
Expand All @@ -357,7 +357,7 @@ switch (_typeofUnit) do
_unit addItem _firstaid;
_unit addmagazines [_smokegrenadeblue, 4];
_unit addmagazines [_smgmag, 4];
_unit addweapon "Rangefinder";
_unit addweapon _binoculars;
};
// Vehicle Gunner Loadout:
case "vg":
Expand Down
Loading