From 5aafdbb9e28c0a5f032c1997ed9297d3da6dfef2 Mon Sep 17 00:00:00 2001 From: "Blake.H" Date: Fri, 11 Oct 2024 22:13:36 +0100 Subject: [PATCH 1/6] Grammar fix for fn_gear_saveLoadout --- cScripts/functions/gear/fn_gear_saveLoadout.sqf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/functions/gear/fn_gear_saveLoadout.sqf b/cScripts/functions/gear/fn_gear_saveLoadout.sqf index 0c55a0ae7..a2ace790c 100644 --- a/cScripts/functions/gear/fn_gear_saveLoadout.sqf +++ b/cScripts/functions/gear/fn_gear_saveLoadout.sqf @@ -29,7 +29,7 @@ if (_insignia != "") then { [ [], - ["Loadout have been saved"], + ["Loadout has been saved"], [""], [""] ] call CBA_fnc_notify; From cd6366a4f03b339d555f224bb49bdb2dc8edf447 Mon Sep 17 00:00:00 2001 From: "Blake.H" Date: Fri, 11 Oct 2024 22:52:48 +0100 Subject: [PATCH 2/6] Correction to Atlas Team leader loadout --- cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp index e2b5e62a8..aca1130ba 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp @@ -12,8 +12,8 @@ class Cav_B_Bravo_Atlas_base_F: Cav_B_Bravo_base_F { class Cav_B_B_Atlas_Medic_TeamLeader_F: Cav_B_Bravo_Atlas_base_F { displayName = "Team Leader"; scope = 2; - loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["ACE_IR_Strobe_Item",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",3],["kat_norepinephrine",4],["kat_phenylephrine",8],["ACE_packingBandage",5],["ACE_elasticBandage",25],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",6],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",4],["kat_nalbuphine",8],["ACE_adenosine",1],["kat_amiodarone",5],["kat_atropine",5],["kat_EACA",2],["kat_TXA",2],["kat_BVM",1],["ACE_epinephrine",2],["ACE_splint",4],["kat_phenylephrineAuto",2],["kat_ultrasound",1],["ACE_EntrenchingTool",1],["kat_epinephrineIV",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1]]],["USP_DELTA_BAG_MC",[["kat_vacuum",1],["kat_etomidate",14],["kat_flumazenil",6],["kat_larynx",10],["kat_lorazepam",6],["ACE_plasmaIV",2],["ACE_plasmaIV_500",6],["ACE_salineIV_250",6],["kat_scalpel",30],["kat_accuvac",1],["kat_reboa",10],["kat_aatKit",5],["kat_plate",10],["kat_clamp",1],["kat_retractor",1],["ACE_bloodIV",2],["ACE_bloodIV_500",6],["kat_lidocaine",10]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; -}; + loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",4],["kat_norepinephrine",8],["kat_phenylephrine",10],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",10],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",5],["kat_nalbuphine",10],["kat_TXA",2],["kat_lidocaine",5],["kat_EACA",2],["kat_atropine",5],["kat_amiodarone",5],["ACE_splint",4],["ACE_adenosine",1],["kat_phenylephrineAuto",2],["kat_epinephrineIV",4],["ACE_epinephrine",2],["kat_ultrasound",1],["kat_BVM",1],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_TACTICAL_PACK",[["kat_AED",1],["ACE_plasmaIV",2],["ACE_plasmaIV_500",6],["kat_larynx",10],["kat_accuvac",1],["kat_aatKit",5],["ACE_bloodIV",2],["ACE_bloodIV_500",6],["ACE_salineIV_500",2]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; + }; class Cav_B_B_Atlas_Medic_CombatMedic_F: Cav_B_B_Atlas_Medic_TeamLeader_F { displayName = "Team Member"; From c14a68d4bee73ccfe484770511295722c400f508 Mon Sep 17 00:00:00 2001 From: "Blake.H" Date: Fri, 11 Oct 2024 22:56:21 +0100 Subject: [PATCH 3/6] Correction to Atlas Team leader loadout --- cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp index aca1130ba..49dc92af2 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp @@ -13,7 +13,7 @@ class Cav_B_B_Atlas_Medic_TeamLeader_F: Cav_B_Bravo_Atlas_base_F { displayName = "Team Leader"; scope = 2; loadout = [["rhs_weap_mk18_KAC_bk","rhsusf_acc_SF3P556","rhsusf_acc_anpeq15side_bk","rhsusf_acc_ACOG_RMR",["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",30],[],""],[],[],["USP_G3C_RS2_KP_OR_VQ_MC",[["ACE_surgicalKit",1],["ACE_tourniquet",8],["kat_Pulseoximeter",2],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["USP_PVS15",1],["kat_Carbonate",1,10],["kat_Painkiller",2,4],["ACE_Chemlight_White",1,1]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",4],["kat_norepinephrine",8],["kat_phenylephrine",10],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",10],["kat_chestSeal",5],["kat_fentanyl",2],["kat_ketamine",5],["kat_nalbuphine",10],["kat_TXA",2],["kat_lidocaine",5],["kat_EACA",2],["kat_atropine",5],["kat_amiodarone",5],["ACE_splint",4],["ACE_adenosine",1],["kat_phenylephrineAuto",2],["kat_epinephrineIV",4],["ACE_epinephrine",2],["kat_ultrasound",1],["kat_BVM",1],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",5,1],["kat_Penthrox",1,10]]],["USP_TACTICAL_PACK",[["kat_AED",1],["ACE_plasmaIV",2],["ACE_plasmaIV_500",6],["kat_larynx",10],["kat_accuvac",1],["kat_aatKit",5],["ACE_bloodIV",2],["ACE_bloodIV_500",6],["ACE_salineIV_500",2]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter",""]]; - }; +}; class Cav_B_B_Atlas_Medic_CombatMedic_F: Cav_B_B_Atlas_Medic_TeamLeader_F { displayName = "Team Member"; From 9d0d6dba3a48cf7012fa4cfc22d5472086d1f8ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Brostr=C3=B6m=2EA=20=7C=20Evul?= Date: Sat, 12 Oct 2024 00:00:15 +0200 Subject: [PATCH 4/6] Update CfgLoadouts_Bravo_Atlas.hpp --- cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp index 49dc92af2..73d0ed73d 100644 --- a/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp +++ b/cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp @@ -36,3 +36,4 @@ class Cav_B_B_Atlas_Medic_Surgeon_F_Local: Cav_B_B_Atlas_Medic_TeamLeader_F { // Named class Cav_B_B_Atlas_Medic_TeamLeader_3_1_F: Cav_B_B_Atlas_Medic_TeamLeader_F { scope = 1; }; class Cav_B_B_Atlas_Medic_TeamLeader_3_2_F: Cav_B_B_Atlas_Medic_TeamLeader_F { scope = 1; }; + From 9d754cfbe15d375b1b352fe9dccf90db88623612 Mon Sep 17 00:00:00 2001 From: "Blake.H" Date: Sat, 12 Oct 2024 20:29:44 +0100 Subject: [PATCH 5/6] updated medical equipment in cScripts_Logisitics --- cScripts/cScripts_logistics.sqf | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/cScripts/cScripts_logistics.sqf b/cScripts/cScripts_logistics.sqf index 180534006..e83685f78 100644 --- a/cScripts/cScripts_logistics.sqf +++ b/cScripts/cScripts_logistics.sqf @@ -451,7 +451,7 @@ // Bandages ["ACE_elasticBandage",60], ["ACE_packingBandage",90], - ["ACE_quikclot",150], + ["ACE_quikclot",60], ["kat_chestSeal",20], ["kat_guedel",10], @@ -461,6 +461,8 @@ // Fluids ["ACE_plasmaIV",20], ["ACE_plasmaIV_500",20], + ["ACE_bloodIV",20], + ["ACE_bloodIV_500",20], // IV & IO Catheters ["kat_IO_FAST",10], @@ -521,6 +523,8 @@ ["ACE_plasmaIV",30], ["ACE_plasmaIV_500",30], ["ACE_salineIV_250",20], + ["ACE_bloodIV",20], + ["ACE_bloodIV_500",20], // IV & IO Catheters ["kat_IO_FAST",20], @@ -534,6 +538,7 @@ // Cardiac resuscitation ["kat_amiodarone",10], ["kat_atropine",10], + ["kat_epinephrineIV",15], // Blood Pressure Medication ["kat_nitroglycerin",40], @@ -555,17 +560,18 @@ // Surgical Equipment ["kat_scalpel",40], - ["kat_plate",10], - ["kat_clamp",4], - ["kat_retractor",4], + ["kat_plate",12], + ["kat_clamp",2], + ["kat_retractor",2], ["kat_vacuum",1], ["kat_reboa",12], + ["kat_ultrasound",1], // Surgical Medication ["kat_lidocaine",20], - ["kat_lorazepam",10], - ["kat_etomidate",20], - ["kat_flumazenil",10], + ["kat_lorazepam",12], + ["kat_etomidate",26], + ["kat_flumazenil",12], // Surgical Kits ["ACE_surgicalKit",4], @@ -747,6 +753,8 @@ ["kat_larynx",15], ["kat_pocketBVM",3], + // Coagulation Equipment + ["kat_coag_sense",1], // Bandages ["ACE_elasticBandage",150], @@ -827,8 +835,7 @@ ["ACE_SpraypaintRed",1], // Rifle Ammo - ["rhs_mag_30Rnd_556x45_M855A1_PMAG",24], // M855A1 PMAGs - ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",8] // M856A1 PMAGs + ["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",24] // M856A1 PMAGs Tracer ]], ["vehicle_strykerDragoon", [ // AT From fb6e684f0f7a0044decaacfb70d1e6cbfc45c632 Mon Sep 17 00:00:00 2001 From: "Blake.H" Date: Sat, 12 Oct 2024 20:52:21 +0100 Subject: [PATCH 6/6] Corrected fluid levels in cScripts_logistics --- cScripts/cScripts_logistics.sqf | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/cScripts/cScripts_logistics.sqf b/cScripts/cScripts_logistics.sqf index e83685f78..141d6594d 100644 --- a/cScripts/cScripts_logistics.sqf +++ b/cScripts/cScripts_logistics.sqf @@ -459,10 +459,11 @@ ["ACE_tourniquet",50], // Fluids - ["ACE_plasmaIV",20], - ["ACE_plasmaIV_500",20], - ["ACE_bloodIV",20], - ["ACE_bloodIV_500",20], + ["ACE_plasmaIV",4], + ["ACE_plasmaIV_500",8], + ["ACE_salineIV_500",4], + ["ACE_bloodIV",4], + ["ACE_bloodIV_500",8], // IV & IO Catheters ["kat_IO_FAST",10], @@ -520,11 +521,12 @@ ["ACE_tourniquet",20], // Fluids - ["ACE_plasmaIV",30], - ["ACE_plasmaIV_500",30], - ["ACE_salineIV_250",20], - ["ACE_bloodIV",20], - ["ACE_bloodIV_500",20], + ["ACE_plasmaIV",10], + ["ACE_plasmaIV_500",15], + ["ACE_salineIV_500",4], + ["ACE_salineIV_250",10], + ["ACE_bloodIV",10], + ["ACE_bloodIV_500",15], // IV & IO Catheters ["kat_IO_FAST",20], @@ -766,9 +768,12 @@ ["kat_reboa",10], // Fluids - ["ACE_plasmaIV",30], - ["ACE_plasmaIV_500",30], - ["ACE_salineIV_250",20], + ["ACE_plasmaIV",10], + ["ACE_plasmaIV_500",15], + ["ACE_salineIV_500",4], + ["ACE_salineIV_250",12], + ["ACE_bloodIV",10], + ["ACE_bloodIV_500",15], // IV & IO Catheters ["kat_IO_FAST",20],