Skip to content

Commit

Permalink
hotfixed pistol stuff and added marksman ammo to large supply crate
Browse files Browse the repository at this point in the history
  • Loading branch information
@G3rrus
G3rrus committed Jan 10, 2019
1 parent c70d7bd commit 869a912
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 31 deletions.
1 change: 1 addition & 0 deletions LMF_R.VR/framework/player/fn_initPlayerSupp.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ if (typeOf _supp == var_supLarge) exitWith {
if (_Carbine_Ammo != "") then {_supp addMagazineCargoGlobal [_Carbine_Ammo, 40];};
if (_Rifle_Ammo != "") then {_supp addMagazineCargoGlobal [_Rifle_Ammo, 40];};
if (_Rifle_GL_Ammo != "") then {_supp addMagazineCargoGlobal [_Rifle_GL_Ammo, 40];};
if (_DMR_Ammo != "") then {_supp addMagazineCargoGlobal [_DMR_Ammo, 10];};
if (_LMG_Ammo != "") then {_supp addMagazineCargoGlobal [_LMG_Ammo, 10];};
if (_MMG_Ammo != "") then {_supp addMagazineCargoGlobal [_MMG_Ammo, 10];};
if (_MAT_Ammo != "") then {_supp addMagazineCargoGlobal [_MAT_Ammo, 10];};
Expand Down
12 changes: 6 additions & 6 deletions LMF_R.VR/framework/player/loadouts/fn_machineGunner.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,21 +29,15 @@ _unit forceAddUniform selectRandom _Uniform;

_unit addVest selectRandom _Vest_MG;
_unit addItemToVest _MMG_Ammo;
for "_i" from 1 to 2 do {_unit addItemToVest _Pistol_Ammo;};
for "_i" from 1 to 2 do {_unit addItemToVest _Grenade;};
_unit addItemToVest _Grenade_Smoke;

_unit addBackpack selectRandom _Backpack_AR_MMG;
for "_i" from 1 to 2 do {_unit addItemToBackpack _MMG_Ammo;};
_unit addItemToBackpack _Pistol_Ammo;

_unit addHeadgear selectRandom _Headgear;
_unit addGoggles selectRandom _Goggles;

_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;

_unit linkItem "ItemWatch";
_unit linkItem "ItemRadioAcreFlagged";

Expand All @@ -63,6 +57,12 @@ for "_i" from 1 to 2 do {_unit addItem "FirstAidKit"};
//NVG
if (var_playerNVG == 0) then {_unit linkItem _NVG};

//PISTOL
_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
for "_i" from 1 to 3 do {_unit addItem _Pistol_Ammo};

//TRAITS
_unit setUnitTrait ["medic",false];
_unit setUnitTrait ["engineer",false];
Expand Down
14 changes: 4 additions & 10 deletions LMF_R.VR/framework/player/loadouts/fn_marksman.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,12 @@ _unit forceAddUniform selectRandom _Uniform;

_unit addVest selectRandom _Vest;
for "_i" from 1 to 8 do {_unit addItemToVest _DMR_Ammo;};
for "_i" from 1 to 3 do {_unit addItemToVest _Pistol_Ammo;};
for "_i" from 1 to 2 do {_unit addItemToVest _Grenade;};
_unit addItemToVest _Grenade_Smoke;

_unit addHeadgear selectRandom _Headgear;
_unit addGoggles selectRandom _Goggles;

_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
_unit addWeapon _Binocular;

_unit linkItem "ItemWatch";
Expand Down Expand Up @@ -66,12 +62,10 @@ for "_i" from 1 to 2 do {_unit addItem "FirstAidKit"};
if (var_playerNVG == 0) then {_unit linkItem _NVG};

//PISTOL
if (var_pistolAll) then {
_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
for "_i" from 1 to 3 do {_unit addItem _Pistol_Ammo};
};
_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
for "_i" from 1 to 3 do {_unit addItem _Pistol_Ammo};

//TRAITS
_unit setUnitTrait ["medic",false];
Expand Down
11 changes: 6 additions & 5 deletions LMF_R.VR/framework/player/loadouts/fn_pilot.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,17 +22,12 @@ removeGoggles _unit;
_unit forceAddUniform selectRandom _Plane_Uniform;

_unit addVest selectRandom _Plane_Vest;
for "_i" from 1 to 3 do {_unit addItemToVest _Pistol_Ammo;};
for "_i" from 1 to 4 do {_unit addItemToVest _FlareGun_Ammo;};

_unit addBackpack selectRandom _Backpack_Pilot;
_unit addItemToBackpack _ACRE_ITR;
_unit addItemToBackpack _FlareGun;

_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;

_unit addHeadgear selectRandom _Plane_Headgear;
_unit addGoggles selectRandom _Goggles;

Expand All @@ -53,6 +48,12 @@ for "_i" from 1 to 2 do {_unit addItem "FirstAidKit"};
//NVG
if (var_playerNVG != 2) then {_unit linkItem _NVG_Pilot};

//PISTOL
_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
for "_i" from 1 to 3 do {_unit addItem _Pistol_Ammo};

//TRAITS
_unit setUnitTrait ["medic",false];
_unit setUnitTrait ["engineer",true];
Expand Down
10 changes: 5 additions & 5 deletions LMF_R.VR/framework/player/loadouts/fn_platoonLeader.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ _unit forceAddUniform selectRandom _Uniform;
_unit addVest selectRandom _Vest;
for "_i" from 1 to 2 do {_unit addItemToVest _Rifle_Ammo;};
for "_i" from 1 to 2 do {_unit addItemToVest _Rifle_Ammo_T;};
for "_i" from 1 to 2 do {_unit addItemToVest _Pistol_Ammo;};
for "_i" from 1 to 2 do {_unit addItemToVest _Grenade;};
_unit addItemToVest _Grenade_Smoke;
for "_i" from 1 to 2 do {_unit addItemToVest _Grenade_Smoke_Grn;};
Expand All @@ -39,14 +38,10 @@ _unit addBackpack selectRandom _Backpack_Leader;
_unit addItemToBackpack _ACRE_ITR;
for "_i" from 1 to 3 do {_unit addItemToBackpack _Rifle_Ammo;};
_unit addItemToBackpack _Rifle_Ammo_T;
_unit addItemToBackpack _Pistol_Ammo;

_unit addHeadgear selectRandom _Headgear_L;
_unit addGoggles selectRandom _Goggles;

_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
_unit addWeapon _Binocular;

_unit linkItem "ItemWatch";
Expand All @@ -68,6 +63,11 @@ for "_i" from 1 to 2 do {_unit addItem "FirstAidKit"};
//NVG
if (var_playerNVG == 0) then {_unit linkItem _NVG};

_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
for "_i" from 1 to 3 do {_unit addItem _Pistol_Ammo};

//TRAITS
_unit setUnitTrait ["medic",false];
_unit setUnitTrait ["engineer",false];
Expand Down
10 changes: 5 additions & 5 deletions LMF_R.VR/framework/player/loadouts/fn_platoonSergeant.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ _unit forceAddUniform selectRandom _Uniform;
_unit addVest selectRandom _Vest;
for "_i" from 1 to 2 do {_unit addItemToVest _Rifle_Ammo;};
for "_i" from 1 to 2 do {_unit addItemToVest _Rifle_Ammo_T;};
for "_i" from 1 to 2 do {_unit addItemToVest _Pistol_Ammo;};
for "_i" from 1 to 2 do {_unit addItemToVest _Grenade;};
_unit addItemToVest _Grenade_Smoke;
for "_i" from 1 to 2 do {_unit addItemToVest _Grenade_Smoke_Grn;};
Expand All @@ -39,14 +38,10 @@ _unit addBackpack selectRandom _Backpack_Leader;
_unit addItemToBackpack _ACRE_ITR;
for "_i" from 1 to 3 do {_unit addItemToBackpack _Rifle_Ammo;};
_unit addItemToBackpack _Rifle_Ammo_T;
_unit addItemToBackpack _Pistol_Ammo;

_unit addHeadgear selectRandom _Headgear_L;
_unit addGoggles selectRandom _Goggles;

_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
_unit addWeapon _Binocular;

_unit linkItem "ItemWatch";
Expand All @@ -68,6 +63,11 @@ for "_i" from 1 to 2 do {_unit addItem "FirstAidKit"};
//NVG
if (var_playerNVG == 0) then {_unit linkItem _NVG};

_unit addWeapon _Pistol;
_unit addHandgunItem _Pistol_Attach1;
_unit addHandgunItem _Pistol_Attach2;
for "_i" from 1 to 3 do {_unit addItem _Pistol_Ammo};

//TRAITS
_unit setUnitTrait ["medic",false];
_unit setUnitTrait ["engineer",false];
Expand Down

0 comments on commit 869a912

Please sign in to comment.