From 87fd464d9669ef7a473a6448a30931d46c23b3b9 Mon Sep 17 00:00:00 2001 From: "Geki.T" <46270872+Robot-Panda15@users.noreply.github.com> Date: Sun, 15 Jan 2023 13:29:37 -0600 Subject: [PATCH 1/4] Fix Scope on Stryker Crew --- cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp index 848b7dee4..79207a4b0 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Viking.hpp @@ -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; }; From 56fcbf82119dbfc67e1cefe203e98100ca9a59a9 Mon Sep 17 00:00:00 2001 From: "Geki.T" <46270872+Robot-Panda15@users.noreply.github.com> Date: Sun, 15 Jan 2023 13:44:06 -0600 Subject: [PATCH 2/4] More updates to staging zone arsenal remove RHS demo blocks and charges, fix grenadier selections --- .../systems/fn_getArsenalWhitelist.sqf | 56 ++++++++++++++++--- 1 file changed, 48 insertions(+), 8 deletions(-) diff --git a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf index f7894c908..401015929 100644 --- a/cScripts/functions/systems/fn_getArsenalWhitelist.sqf +++ b/cScripts/functions/systems/fn_getArsenalWhitelist.sqf @@ -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", @@ -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 @@ -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 @@ -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", From 7cc5c451061a8960566634644de0514801d2853c Mon Sep 17 00:00:00 2001 From: "Geki.T" <46270872+Robot-Panda15@users.noreply.github.com> Date: Sun, 5 Feb 2023 16:46:18 -0600 Subject: [PATCH 3/4] Update Charlie Loadouts v1 replaces cTAB with Android --- cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp index 0e9d38cd6..05bda9d6c 100644 --- a/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Charlie_Squad.hpp @@ -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"; From 4801af824ca5b63ac03c47d63197f2607af6a5f4 Mon Sep 17 00:00:00 2001 From: "Geki.T" <46270872+Robot-Panda15@users.noreply.github.com> Date: Sun, 5 Feb 2023 16:55:20 -0600 Subject: [PATCH 4/4] Fix Overheat and Cook Off Coeff --- cba_settings.sqf | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/cba_settings.sqf b/cba_settings.sqf index 095f6709a..1d777558f 100644 --- a/cba_settings.sqf +++ b/cba_settings.sqf @@ -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; @@ -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; @@ -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; @@ -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;