Skip to content

Commit

Permalink
Merge pull request #851 from 7Cav/JAN-Hotfix
Browse files Browse the repository at this point in the history 
January Fixes
  • Loading branch information
@AndreasBrostrom
AndreasBrostrom authored Feb 7, 2023
2 parents 1e25865 + 4801af8 commit c61832a
Show file tree
Hide file tree
Showing 4 changed files with 60 additions and 20 deletions.
2 changes: 1 addition & 1 deletion cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ class Cav_B_B_Scout_CombatLifeSaver_F : Cav_B_Bravo_Base_F {
//Stryker Crew
class Cav_B_B_Crew_F : Cav_B_Bravo_base_F {
displayName = "Crew";
scope = 0;
scope = 2;
category[] += {"cScripts_Loadout_Cat_Bravo_Viking_Squad"};
abilityEngineer = 1;
};
Expand Down
4 changes: 2 additions & 2 deletions cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,12 @@ class Cav_B_C_Officer_F : Cav_B_Charlie_base_F {
class Cav_B_C_PlatoonSergeant_F : Cav_B_C_Officer_F {
displayName = "$STR_Cav_Charlie_Characters_C_PlatoonSergeant";
scope = 2;
loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],""],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14]]],["USP_CRYE_JPC_ASLTB",[["ACE_IR_Strobe_Item",1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_45L_RUCKSACK_MC",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["ACE_EarPlugs",1],["SmokeShellGreen",2,1],["SmokeShellRed",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","USP_MFRAME_TAN",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","ItemRadioAcreFlagged","ItemCompass","ACE_Altimeter",""]];
loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],""],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14]]],["USP_CRYE_JPC_ASLTB",[["ACE_IR_Strobe_Item",1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["SmokeShellBlue",2,1],["HandGrenade",2,1]]],["USP_45L_RUCKSACK_MC",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["ACE_EarPlugs",1],["SmokeShellGreen",2,1],["SmokeShellRed",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","USP_MFRAME_TAN",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","ItemRadioAcreFlagged","ItemCompass","ACE_Altimeter",""]];
};
class Cav_B_C_PlatoonLeader_F : Cav_B_C_Officer_F {
displayName = "$STR_Cav_Charlie_Characters_C_PlatoonLeader";
scope = 2;
loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],""],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14]]],["USP_CRYE_JPC_ASLTB",[["ACE_IR_Strobe_Item",1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["SmokeShellBlue",2,1]]],["USP_45L_RUCKSACK_MC",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["ACE_EarPlugs",1],["SmokeShellGreen",2,1],["SmokeShellRed",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","USP_MFRAME_TAN",["ACE_Vector","","","",[],[],""],["ItemMap","ItemcTab","ItemRadioAcreFlagged","ItemCompass","ACE_Altimeter",""]],[["ace_earplugs",true]];
loadout = [["rhs_weap_m4a1_blockII_KAC","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",30],[],""],[],["rhsusf_weap_glock17g4","","acc_flashlight_pistol","",["rhsusf_mag_17Rnd_9x19_FMJ",17],[],""],["USP_G3C_RS2_KP_OR_MC",[["ACE_tourniquet",4],["ACE_Flashlight_XL50",1],["ACE_MapTools",1],["ACE_microDAGR",1],["ACE_packingBandage",14]]],["USP_CRYE_JPC_ASLTB",[["ACE_IR_Strobe_Item",1],["rhsusf_mag_17Rnd_9x19_FMJ",2,17],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tan_Tracer_Red",9,30],["HandGrenade",2,1],["SmokeShell",4,1],["ACE_Chemlight_IR",2,1],["SmokeShellBlue",2,1]]],["USP_45L_RUCKSACK_MC",[["USP_PVS15",1],["ACE_splint",2],["ACE_SpraypaintRed",1],["ACE_EntrenchingTool",1],["ACE_CableTie",2],["ACE_EarPlugs",1],["SmokeShellGreen",2,1],["SmokeShellRed",2,1]]],"USP_OPSCORE_FASTMTC_CGTW","USP_MFRAME_TAN",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","ItemRadioAcreFlagged","ItemCompass","ACE_Altimeter",""]];
};
class Cav_B_C_Drone_Operator_F_Local : Cav_B_C_Officer_F {
displayName = "Platoon Drone Operator";
Expand Down
56 changes: 48 additions & 8 deletions cScripts/functions/systems/fn_getArsenalWhitelist.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,16 @@ private _commonGear = [
"ACE_M84",
"rhs_mag_mk3a2",
"B_IR_Grenade",


// Explosives
"ACE_M26_Clacker",
"ACE_DefusalKit",
"ACE_Clacker",
"SatchelCharge_Remote_Mag",
"DemoCharge_Remote_Mag",
"ClaymoreDirectionalMine_Remote_Mag",


// Radios
"ACRE_PRC343",
"ACRE_PRC152",
Expand Down Expand Up @@ -270,11 +279,13 @@ private _companyItems = switch (_company) do {


// Explosives
"ACE_M26_Clacker",
"ACE_DefusalKit",
"ACE_Clacker",
"ClaymoreDirectionalMine_Remote_Mag",
"rhsusf_m112_mag",
"rhsusf_m112x4_mag",
"SatchelCharge_Remote_Mag"
"SatchelCharge_Remote_Mag",
"DemoCharge_Remote_Mag",
"AMP_Breaching_Charge_Mag",
"ClaymoreDirectionalMine_Remote_Mag"
]};
case "bravo": {[
// Helmets
Expand Down Expand Up @@ -429,10 +440,12 @@ private _companyItems = switch (_company) do {
"rhsusf_acc_acog_wd",

// Explosives
"ACE_M26_Clacker",
"ACE_DefusalKit",
"ACE_Clacker",
"ClaymoreDirectionalMine_Remote_Mag",
"DemoCharge_Remote_Mag",
"SatchelCharge_Remote_Mag",
"DemoCharge_Remote_Mag",
"ClaymoreDirectionalMine_Remote_Mag",
"AMP_Breaching_Charge_Mag",

// Radios
Expand Down Expand Up @@ -729,11 +742,38 @@ private _weaponSystemSpecific = switch (true) do {
"rhs_weap_hk416d10_m320"
]};

case (_primaryWeapon isKindof ['rhs_weap_m4a1_m320', configFile >> 'CfgWeapons']
case (_primaryWeapon isKindof ['rhs_weap_mk18_m320', configFile >> 'CfgWeapons']
|| _primaryWeapon isKindof ['rhs_weap_m16a4_carryhandle_M203', configFile >> 'CfgWeapons']): {[

"rhs_weap_m4a1_m320",
"rhs_weap_mk18_m320",
"rhs_weap_M320",
"rhs_weap_m4a1_carryhandle",
"rhs_weap_m4a1_carryhandle_mstock",
"rhs_weap_m4a1",
"rhs_weap_m4a1_mstock",
"rhs_weap_m4a1_d",
"rhs_weap_m4a1_d_mstock",
"rhs_weap_m4a1_wd",
"rhs_weap_m4a1_wd_mstock",

"rhs_weap_m4a1_blockII",
"rhs_weap_m4a1_blockII_KAC",
"rhs_weap_m4a1_blockII_bk",
"rhs_weap_m4a1_blockII_KAC_bk",
"rhs_weap_m4a1_blockII_d",
"rhs_weap_m4a1_blockII_KAC_d",
"rhs_weap_m4a1_blockII_wd",
"rhs_weap_m4a1_blockII_KAC_wd",

"rhs_weap_mk18",
"rhs_weap_mk18_bk",
"rhs_weap_mk18_KAC_bk",
"rhs_weap_mk18_d",
"rhs_weap_mk18_KAC_d",
"rhs_weap_mk18_KAC",
"rhs_weap_mk18_wd",
"rhs_weap_mk18_KAC_wd",

"rhs_mag_M397_HET",
"rhs_mag_M433_HEDP",
Expand Down
18 changes: 9 additions & 9 deletions cba_settings.sqf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
force force ace_advanced_ballistics_ammoTemperatureEnabled = true;
force force ace_advanced_ballistics_barrelLengthInfluenceEnabled = true;
force force ace_advanced_ballistics_bulletTraceEnabled = true;
force force ace_advanced_ballistics_enabled = false;
force force ace_advanced_ballistics_enabled = true;
force force ace_advanced_ballistics_muzzleVelocityVariationEnabled = true;
force force ace_advanced_ballistics_simulationInterval = 0.05;

Expand Down Expand Up @@ -76,12 +76,12 @@ force force ace_common_checkPBOsWhitelist = "[]";
force force ace_noradio_enabled = true;

// ACE Cook off
force force ace_cookoff_ammoCookoffDuration = 1;
force force ace_cookoff_ammoCookoffDuration = 0;
force force ace_cookoff_enable = 0;
force force ace_cookoff_enableAmmobox = false;
force force ace_cookoff_enableAmmoCookoff = false;
force force ace_cookoff_enableFire = true;
force force ace_cookoff_probabilityCoef = 1;
force force ace_cookoff_probabilityCoef = 0;

// ACE Crew Served Weapons
force force ace_csw_ammoHandling = 2;
Expand Down Expand Up @@ -362,16 +362,16 @@ force force ace_nametags_playerNamesViewDistance = 6;
force force ace_nightvision_aimDownSightsBlur = 0;
force force ace_nightvision_disableNVGsWithSights = false;
force force ace_nightvision_effectScaling = 0.101011;
force force ace_nightvision_fogScaling = 0;
force force ace_nightvision_fogScaling = 0.105;
force force ace_nightvision_noiseScaling = 0.0713011;
force force ace_nightvision_shutterEffects = true;

// ACE Overheating
force force ace_overheating_cookoffCoef = 1;
force force ace_overheating_cookoffCoef = 0.1;
force force ace_overheating_displayTextOnJam = true;
force force ace_overheating_enabled = true;
force force ace_overheating_heatCoef = 1;
force force ace_overheating_jamChanceCoef = 1;
force force ace_overheating_jamChanceCoef = 0.5;
force force ace_overheating_overheatingDispersion = true;
force force ace_overheating_overheatingRateOfFire = true;
force force ace_overheating_particleEffectsAndDispersionDistance = 3000;
Expand Down Expand Up @@ -645,9 +645,9 @@ force force acre_sys_gestures_stopADS = false;
//acre_sys_list_ToggleHeadsetColor = [0.66,0.05,1,1];

// ACRE2 Zeus
force force acre_sys_zeus_zeusCanSpectate = true;
force force acre_sys_zeus_zeusCommunicateViaCamera = true;
force force acre_sys_zeus_zeusDefaultVoiceSource = false;
//force force acre_sys_zeus_zeusCanSpectate = true;
//force force acre_sys_zeus_zeusCommunicateViaCamera = true;
//force force acre_sys_zeus_zeusDefaultVoiceSource = false;

// BettIR
force force BettIR_ViewDistance = 300;
Expand Down

0 comments on commit c61832a

Please sign in to comment.