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

assignGear changes #215

Merged
merged 13 commits into from
Mar 16, 2019
Merged

assignGear changes #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
aa52823
assignGear: move selectRandom in FIA gear
shadow-fa Feb 9, 2019
99d21e3
assignGear: Fix discrepancies between unit loadouts (issue 213)
shadow-fa Feb 9, 2019
f8b87f3
assignGear: Fix case, HSAM bags, and variable definitions. (Issues #2…
shadow-fa Feb 10, 2019
2844fbf
assignGear give guerilla factions (at least) as many smokes as others
shadow-fa Mar 5, 2019
0edc111
assignGear: Normalize use of _DMriflemag_tr
shadow-fa Mar 6, 2019
7b79fd5
assignGear: R, CAR and SMG lose one frag to fit the scheme: [base]+[w…
shadow-fa Mar 6, 2019
89e0cef
assignGear: MATG/HATG/HMGG/MSAMG/HSAMG get +2 carbine mags to conform…
shadow-fa Mar 6, 2019
e764a50
assignGear: Normalised (smoke-)grenades of guerilla factions with non…
shadow-fa Mar 6, 2019
3069100
assignGear: CO gets 4/2/2 and JTAC 3/3/2 white/red/green gl smokes
shadow-fa Mar 7, 2019
f2e9acc
assignGear: Fix number of smokes for FIA, FIA AK, Syndikat
shadow-fa Mar 10, 2019
730018f
assignGear: Fix whitespace after addBackpack
shadow-fa Mar 10, 2019
4b45dde
assignGear: Fix header comments
shadow-fa Mar 10, 2019
b4fbbca
assignGear: Fixed: matg accidentally got an increase of _MATmag1 inst…
shadow-fa Mar 10, 2019
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
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 @@ -116,7 +116,6 @@ _carbinemag_tr = "30Rnd_556x45_Stanag_Tracer_Yellow";
// Standard Submachine Gun/Personal Defence Weapon (Aircraft Pilot, Submachinegunner)
_smg = "hgun_PDW2000_F";
_smgmag = "30Rnd_9x21_Mag";
_smgmag_tr = "30Rnd_9x21_Mag";

// Diver
_diverWep = "arifle_SDAR_F";
Expand Down Expand Up @@ -203,6 +202,7 @@ _MMGmag_tr = "150Rnd_762x54_Box_Tracer";
// Marksman rifle
_DMrifle = "srifle_EBR_F";
_DMriflemag = "20Rnd_762x51_Mag";
_DMriflemag_tr = "20Rnd_762x51_Mag";

// Rifleman AT
_RAT = "launch_MRAWS_olive_rail_F";
Expand Down
30 changes: 17 additions & 13 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 @@ -98,8 +98,9 @@ switch (_typeofUnit) do
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_glriflemag, 4];
_unit addmagazines [_glriflemag_tr, 2];
_unit addmagazines [_glsmokewhite, 3];
_unit addmagazines [_glsmokered, 3];
_unit addmagazines [_glsmokewhite, 4];
_unit addmagazines [_glsmokered, 2];
_unit addmagazines [_glsmokegreen, 2];
_unit addmagazines [_pistolmag, 4];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
Expand All @@ -117,7 +118,9 @@ switch (_typeofUnit) do
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_glriflemag, 4];
_unit addmagazines [_glriflemag_tr, 2];
_unit addmagazines [_glsmokered, 8];
_unit addmagazines [_glsmokewhite, 3];
_unit addmagazines [_glsmokered, 3];
_unit addmagazines [_glsmokegreen, 2];
_unit addmagazines [_pistolmag, 4];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addmagazines ["Laserbatteries", 1];
Expand Down Expand Up @@ -145,7 +148,8 @@ switch (_typeofUnit) do
_attachments = [_bipod1,_scope2]; // Overwrites default attachments to add a bipod and scope 2
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_DMriflemag, 6];
_unit addmagazines [_DMriflemag, 4];
_unit addmagazines [_DMriflemag_tr, 2];
_unit addmagazines [_grenade, 2];
};
// Medium MG Gunner Loadout:
Expand Down Expand Up @@ -197,7 +201,7 @@ switch (_typeofUnit) do
_unit addweapon _carbine;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
};
// Heavy MG Team Leader Loadout:
Expand All @@ -223,7 +227,7 @@ switch (_typeofUnit) do
_unit addweapon _MAT;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
_unit addmagazines [_MATmag1, 2];
};
Expand Down Expand Up @@ -264,7 +268,7 @@ switch (_typeofUnit) do
_unit addweapon _HAT;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
_unit addmagazines [_HATmag1, 1];
};
Expand Down Expand Up @@ -329,7 +333,7 @@ switch (_typeofUnit) do
_unit addweapon _SAM;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
};
// Medium SAM Assistant Loadout:
Expand Down Expand Up @@ -367,13 +371,13 @@ switch (_typeofUnit) do
_unit addweapon _carbine;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
};
// Heavy SAM Team Leader Loadout:
case "hsamag":
{
_unit addBackpack _baghmgag;
_unit addBackpack _baghsamag;
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addItem _firstaid;
Expand Down Expand Up @@ -530,7 +534,7 @@ switch (_typeofUnit) do
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 4];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 3];
_unit addmagazines [_grenade, 2];
};
// Carbineer Loadout:
case "car":
Expand All @@ -541,7 +545,7 @@ switch (_typeofUnit) do
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
_unit addmagazines [_grenade, 3];
_unit addmagazines [_grenade, 2];
};
// Submachinegunner Loadout:
case "smg":
Expand All @@ -551,7 +555,7 @@ switch (_typeofUnit) do
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_smgmag, 6];
_unit addmagazines [_grenade, 3];
_unit addmagazines [_grenade, 2];
};
// Grenadier Loadout:
case "gren":
Expand Down
34 changes: 19 additions & 15 deletions f/assignGear/f_assignGear_aaf_standard.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// F3 - Folk ARPS Assign Gear Script - AAF - Light Loadout
// F3 - Folk ARPS Assign Gear Script - AAF - Standard Loadout
// Credits: Please see the F3 online manual (http://www.ferstaberinde.com/f3/en/)
// ====================================================================================

Expand Down Expand Up @@ -101,8 +101,9 @@ switch (_typeofUnit) do
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_glriflemag, 4];
_unit addmagazines [_glriflemag_tr, 2];
_unit addmagazines [_glsmokewhite, 3];
_unit addmagazines [_glsmokered, 3];
_unit addmagazines [_glsmokewhite, 4];
_unit addmagazines [_glsmokered, 2];
_unit addmagazines [_glsmokegreen, 2];
_unit addmagazines [_pistolmag, 4];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
Expand All @@ -120,7 +121,9 @@ switch (_typeofUnit) do
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_glriflemag, 4];
_unit addmagazines [_glriflemag_tr, 2];
_unit addmagazines [_glsmokered, 8];
_unit addmagazines [_glsmokewhite, 3];
_unit addmagazines [_glsmokered, 3];
_unit addmagazines [_glsmokegreen, 2];
_unit addmagazines [_pistolmag, 4];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addmagazines ["Laserbatteries", 1];
Expand Down Expand Up @@ -148,7 +151,8 @@ switch (_typeofUnit) do
_attachments = [_bipod1,_scope2]; // Overwrites default attachments to add a bipod and scope 2
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_DMriflemag, 6];
_unit addmagazines [_DMriflemag, 4];
_unit addmagazines [_DMriflemag_tr, 2];
_unit addmagazines [_grenade, 2];
};
// Medium MG Gunner Loadout:
Expand Down Expand Up @@ -200,7 +204,7 @@ switch (_typeofUnit) do
_unit addweapon _carbine;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
};
// Heavy MG Team Leader Loadout:
Expand All @@ -226,7 +230,7 @@ switch (_typeofUnit) do
_unit addweapon _MAT;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
_unit addmagazines [_MATmag1, 2];
_unit addmagazines [_MATmag2, 1];
Expand Down Expand Up @@ -270,7 +274,7 @@ switch (_typeofUnit) do
_unit addweapon _HAT;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
_unit addmagazines [_HATmag1, 1];
};
Expand Down Expand Up @@ -335,7 +339,7 @@ switch (_typeofUnit) do
_unit addweapon _SAM;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
};
// Medium SAM Assistant Loadout:
Expand Down Expand Up @@ -373,13 +377,13 @@ switch (_typeofUnit) do
_unit addweapon _carbine;
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 2];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
};
// Heavy SAM Team Leader Loadout:
case "hsamag":
{
_unit addBackpack _baghmgag;
_unit addBackpack _baghsamag;
_unit addmagazines [_riflemag, 1];
_unit addweapon _rifle;
_unit addItem _firstaid;
Expand Down Expand Up @@ -412,9 +416,9 @@ switch (_typeofUnit) do
_unit addmagazines [_riflemag, 4];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 2];
_unit addmagazines [_SNrifleMag, 3];
_attachments pushback (_attach1); // Adds laser pointer, keeps default scope
_unit addWeapon "Rangefinder";
_unit addmagazines [_SNrifleMag, 3];
};
// Vehicle Commander Loadout:
case "vc":
Expand Down Expand Up @@ -536,7 +540,7 @@ switch (_typeofUnit) do
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_riflemag, 4];
_unit addmagazines [_riflemag_tr, 2];
_unit addmagazines [_grenade, 3];
_unit addmagazines [_grenade, 2];
};
// Carbineer Loadout:
case "car":
Expand All @@ -547,7 +551,7 @@ switch (_typeofUnit) do
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_carbinemag, 4];
_unit addmagazines [_carbinemag_tr, 2];
_unit addmagazines [_grenade, 3];
_unit addmagazines [_grenade, 2];
};
// Submachinegunner Loadout:
case "smg":
Expand All @@ -557,7 +561,7 @@ switch (_typeofUnit) do
_unit addItem _firstaid;
_unit addmagazines [_smokegrenade, 3];
_unit addmagazines [_smgmag, 6];
_unit addmagazines [_grenade, 3];
_unit addmagazines [_grenade, 2];
};
// Grenadier Loadout:
case "gren":
Expand Down
3 changes: 2 additions & 1 deletion f/assignGear/f_assignGear_csat.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,6 @@ _carbinemag_tr = "30Rnd_65x39_caseless_green_mag_Tracer";
// Standard Submachine Gun/Personal Defence Weapon (Aircraft Pilot, Submachinegunner)
_smg = "SMG_02_F";
_smgmag = "30Rnd_9x21_Mag";
_smgmag_tr = "30Rnd_9x21_Mag";

// Diver
_diverWep = "arifle_SDAR_F";
Expand Down Expand Up @@ -209,10 +208,12 @@ _MMGmag_tr = "150Rnd_93x64_Mag";
// Marksman rifle
_DMrifle = "srifle_DMR_01_F";
_DMriflemag = "10Rnd_762x54_Mag";
_DMriflemag_tr = "10Rnd_762x54_Mag";

// ASP1-KIR
// _DMrifle = "srifle_DMR_04_F";
// _DMriflemag = "10Rnd_127x54_Mag";
// _DMriflemag_tr = "10Rnd_127x54_Mag";

// Rifleman AT
_RAT = "launch_RPG32_F";
Expand Down
3 changes: 2 additions & 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 @@ -116,7 +116,6 @@ _carbinemag_tr = "30Rnd_580x42_Mag_Tracer_F";
// Standard Submachine Gun/Personal Defence Weapon (Aircraft Pilot, Submachinegunner)
_smg = "SMG_02_F";
_smgmag = "30Rnd_9x21_Mag";
_smgmag_tr = "30Rnd_9x21_Mag";

// Diver
_diverWep = "arifle_SDAR_F";
Expand Down Expand Up @@ -208,10 +207,12 @@ _MMGmag_tr = "150Rnd_93x64_Mag";
// Marksman rifle
_DMrifle = "srifle_DMR_07_blk_F";
_DMriflemag = "20Rnd_650x39_Cased_Mag_F";
_DMriflemag_tr = "20Rnd_650x39_Cased_Mag_F";

// ASP1-KIR
// _DMrifle = "srifle_DMR_04_F";
// _DMriflemag = "10Rnd_127x54_Mag";
// _DMriflemag_tr = "10Rnd_127x54_Mag";

// Rifleman AT
_RAT = "launch_RPG32_ghex_F";
Expand Down
Loading