Skip to content

Commit

Permalink
Merge pull request #699 from ColdEvul/TF47-Re-Add-BroVersion
Browse files Browse the repository at this point in the history 
Tf47 re add bro version
  • Loading branch information
@AndreasBrostrom
AndreasBrostrom authored Feb 2, 2021
2 parents 6048b77 + a6cae09 commit bcc6a9d
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 18 deletions.
25 changes: 13 additions & 12 deletions cScripts/CavFnc/functions/logistics/fn_doStarterCrateSupplies.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,9 @@ if !(_companySelector == 'NONE') then {
// _crate addMagazineCargoGlobal ["rhs_mag_M433_HEDP",50];
// _crate addMagazineCargoGlobal ["rhs_mag_M397_HET",50];

// _crate addMagazineCargoGlobal ["rhs_mag_M585_white",50];
// _crate addMagazineCargoGlobal ["rhs_mag_m661_green",50];
// _crate addMagazineCargoGlobal ["rhs_mag_m662_red",50];
// _crate addMagazineCargoGlobal ["ACE_40mm_Flare_white",50];
// _crate addMagazineCargoGlobal ["ACE_40mm_Flare_green",50];
// _crate addMagazineCargoGlobal ["ACE_40mm_Flare_red",50];
// _crate addMagazineCargoGlobal ["rhs_mag_m713_Red",50];
// _crate addMagazineCargoGlobal ["rhs_mag_m714_White",50];
// _crate addMagazineCargoGlobal ["rhs_mag_m715_Green",50];
Expand Down Expand Up @@ -184,8 +184,7 @@ if (_companySelector in _alpha or _alwaysAvalible) then {
_crate addMagazineCargoGlobal ["rhs_mag_m716_yellow",25];
_crate addMagazineCargoGlobal ["rhs_mag_m713_Red",25];
_crate addMagazineCargoGlobal ["ACE_HUNTIR_M203",25];
_crate addMagazineCargoGlobal ["rhs_mag_M585_white",25];
_crate addMagazineCargoGlobal ["rhs_mag_m662_red",250];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_red",250];
_crate addMagazineCargoGlobal ["Chemlight_green",25];
_crate addMagazineCargoGlobal ["Chemlight_red",25];
_crate addMagazineCargoGlobal ["Chemlight_yellow",25];
Expand Down Expand Up @@ -250,6 +249,7 @@ if (_companySelector in _bravo or _alwaysAvalible) then {
_crate addItemCargoGlobal ["rhsusf_acc_compm4",50];
_crate addItemCargoGlobal ["rhsusf_acc_acog3",50];
_crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",50];
_crate addItemCargoGlobal ["rhsusf_acc_eotech",50];

//================== AMMO ==================\\

Expand All @@ -268,8 +268,8 @@ if (_companySelector in _bravo or _alwaysAvalible) then {
_crate addMagazineCargoGlobal ["SmokeShellPurple",250];
_crate addMagazineCargoGlobal ["B_IR_Grenade",250];
_crate addMagazineCargoGlobal ["ACE_M84",25];
_crate addMagazineCargoGlobal ["rhs_mag_M585_white",250];
_crate addMagazineCargoGlobal ["rhs_mag_m662_red",250];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_white",250];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_red",250];
_crate addMagazineCargoGlobal ["ACE_Chemlight_HiYellow",250];
_crate addMagazineCargoGlobal ["ACE_Chemlight_HiBlue",250];
_crate addMagazineCargoGlobal ["ACE_Chemlight_HiRed",250];
Expand Down Expand Up @@ -373,8 +373,8 @@ if (_companySelector in _bravo or _alwaysAvalible) then {
_crate addMagazineCargoGlobal ["rhs_mag_m716_yellow",250];
_crate addMagazineCargoGlobal ["rhs_mag_m713_Red",250];
_crate addMagazineCargoGlobal ["ACE_HUNTIR_M203",250];
_crate addMagazineCargoGlobal ["rhs_mag_M585_white",250];
_crate addMagazineCargoGlobal ["rhs_mag_m662_red",250];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_white",250];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_red",250];
_crate addMagazineCargoGlobal ["ACE_Chemlight_HiBlue",250];
_crate addMagazineCargoGlobal ["ACE_Chemlight_HiRed",250];

Expand Down Expand Up @@ -438,6 +438,7 @@ if (_companySelector in _charlie or _alwaysAvalible) then {

//================== OPTICS ==================\\
_crate addItemCargoGlobal ["rhsusf_acc_eotech_xps3",10];
_crate addItemCargoGlobal ["rhsusf_acc_eotech",10];
_crate addItemCargoGlobal ["rhsusf_acc_compm4",10];
_crate addItemCargoGlobal ["rhsusf_acc_acog_rmr",10];

Expand All @@ -452,13 +453,13 @@ if (_companySelector in _charlie or _alwaysAvalible) then {
_crate addMagazineCargoGlobal ["rhsusf_100Rnd_762x51_m62_tracer",50];
_crate addMagazineCargoGlobal ["rhsusf_100Rnd_762x51_m61_ap",50];
_crate addMagazineCargoGlobal ["rhs_mag_M433_HEDP",100];
_crate addMagazineCargoGlobal ["rhs_mag_M397_HET",25];
_crate addMagazineCargoGlobal ["rhs_mag_m714_White",25];
_crate addMagazineCargoGlobal ["rhs_mag_m715_Green",25];
_crate addMagazineCargoGlobal ["rhs_mag_m716_yellow",25];
_crate addMagazineCargoGlobal ["rhs_mag_m713_Red",25];
_crate addMagazineCargoGlobal ["rhs_mag_M585_white",25];
_crate addMagazineCargoGlobal ["rhs_mag_m661_green",25];
_crate addMagazineCargoGlobal ["rhs_mag_m662_red",25];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_green",25];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_red",25];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_ir",25];
_crate addMagazineCargoGlobal ["ACE_HUNTIR_M203",25];
_crate addMagazineCargoGlobal ["rhs_mag_maaws_HE",50];
Expand Down
15 changes: 9 additions & 6 deletions cScripts/CavFnc/functions/logistics/fn_doSupplyCrate.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@

if (!isServer) exitWith {};

params [["_crate", objNull, [objNull]],["_quaScale",1]];
params [["_crate", objNull, [objNull]]];

private _quaScale = 1;

clearweaponcargoGlobal _crate;
clearmagazinecargoGlobal _crate;
Expand Down Expand Up @@ -52,12 +54,13 @@ _crate addMagazineCargoGlobal ["SmokeShellBlue", (_quaScale * 20)];
_crate addMagazineCargoGlobal ["SmokeShellGreen", (_quaScale * 18)];
_crate addMagazineCargoGlobal ["B_IR_Grenade", (_quaScale * 10)];
_crate addMagazineCargoGlobal ["ACE_M84", (_quaScale * 25)];
_crate addMagazineCargoGlobal ["rhs_mag_M433_HEDP", (_quaScale * 40)];
_crate addMagazineCargoGlobal ["rhs_mag_M397_HET", (_quaScale * 40)];
_crate addMagazineCargoGlobal ["rhs_mag_M433_HEDP", (_quaScale * 30)];
_crate addMagazineCargoGlobal ["rhs_mag_M397_HET", (_quaScale * 20)];
_crate addMagazineCargoGlobal ["rhs_mag_m714_White", (_quaScale * 20)];
_crate addMagazineCargoGlobal ["rhs_mag_m662_Red", (_quaScale * 20)];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_Red", (_quaScale * 20)];
_crate addMagazineCargoGlobal ["ACE_HUNTIR_M203", (_quaScale * 10)];
_crate addMagazineCargoGlobal ["rhs_mag_M585_white", (_quaScale * 20)];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_white", (_quaScale * 20)];
_crate addMagazineCargoGlobal ["ACE_40mm_Flare_IR", (_quaScale * 20)];
_crate addMagazineCargoGlobal ["ACE_Chemlight_HiRed", (_quaScale * 25)];
_crate addMagazineCargoGlobal ["ACE_Chemlight_HiBlue", (_quaScale * 25)];
_crate addMagazineCargoGlobal ["ACE_Chemlight_IR", (_quaScale * 25)];
Expand Down Expand Up @@ -92,7 +95,7 @@ _crate addItemCargoGlobal ["ACE_personalAidKit", (_quaScale * 20)];

//================== BACKPACKS ==================\\

_crate addItemCargoGlobal ["B_Kitbag_cbr", (_quaScale * 2)];
_crate addItemCargoGlobal ["B_Kitbag_cbr",2];

// Change ace logistics size of crate
[_crate, 1] remoteExec ["ace_cargo_fnc_setSize",0,true];
Expand Down

0 comments on commit bcc6a9d

Please sign in to comment.