Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed PVS-31 classnames after USP update #1194

Merged
merged 5 commits into from
May 14, 2024
Merged

Fixed PVS-31 classnames after USP update #1194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6a0c758
Updated
pool011 May 14, 2024
b37cc99
Fix PVS31 in loadouts
pool011 May 14, 2024
b82afcc
Fix whitelist PVS-31s
pool011 May 14, 2024
1f8e7e1
Merge branch 'main' into Add-updated-NVGs
pool011 May 14, 2024
c86fd2c
Merge branch 'main' into Add-updated-NVGs
AndreasBrostrom May 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions cScripts/Loadouts/CfgLoadouts_Bravo_Atlas.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,25 +12,25 @@ 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",4],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_EarPlugs",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",5],["kat_norepinephrine",15],["kat_phenylephrine",15],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",15],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["kat_TXA",5],["kat_lidocaine",5],["kat_EACA",15],["kat_atropine",5],["kat_amiodarone",5],["ACE_epinephrine",3],["ACE_splint",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_TACTICAL_PACK",[["kat_AED",1],["ACE_plasmaIV",6],["ACE_plasmaIV_500",6],["ACE_salineIV_250",2],["kat_BVM",1],["kat_larynx",10],["ACE_salineIV",1],["ACE_Chemlight_Shield",1],["kat_accuvac",1],["kat_ultrasound",1],["kat_aatKit",5],["ACE_Chemlight_White",1,1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31_COMPACT"]];
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",4],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_IR_Strobe_Item",2],["ACE_EarPlugs",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",5],["kat_norepinephrine",15],["kat_phenylephrine",15],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",15],["kat_stethoscope",1],["ACE_microDAGR",1],["kat_nitroglycerin",15],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["kat_TXA",5],["kat_lidocaine",5],["kat_EACA",15],["kat_atropine",5],["kat_amiodarone",5],["ACE_epinephrine",3],["ACE_splint",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_TACTICAL_PACK",[["kat_AED",1],["ACE_plasmaIV",6],["ACE_plasmaIV_500",6],["ACE_salineIV_250",2],["kat_BVM",1],["kat_larynx",10],["ACE_salineIV",1],["ACE_Chemlight_Shield",1],["kat_accuvac",1],["kat_ultrasound",1],["kat_aatKit",5],["ACE_Chemlight_White",1,1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31"]];
};

class Cav_B_B_Atlas_Medic_CombatMedic_F: Cav_B_B_Atlas_Medic_TeamLeader_F {
displayName = "Team Member";
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",5],["ACE_CableTie",4],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",5],["kat_norepinephrine",15],["kat_phenylephrine",15],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",20],["kat_stethoscope",1],["ACE_Chemlight_Shield",1],["ACE_IR_Strobe_Item",2],["kat_nitroglycerin",12],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["ACE_epinephrine",3],["kat_amiodarone",5],["kat_atropine",10],["kat_EACA",10],["kat_TXA",5],["ACE_splint",4],["ACE_EntrenchingTool",1],["kat_reboa",1],["kat_ultrasound",1],["ACE_Chemlight_White",1,1],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",7],["kat_lidocaine",5],["ACE_salineIV_250",2],["kat_aatKit",5],["ACE_plasmaIV_500",7],["kat_BVM",1],["ACE_salineIV",2],["kat_accuvac",1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31_COMPACT"]];
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",5],["ACE_CableTie",4],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",10],["kat_naloxone",5],["kat_norepinephrine",15],["kat_phenylephrine",15],["ACE_packingBandage",10],["ACE_elasticBandage",30],["kat_IV_16",20],["kat_stethoscope",1],["ACE_Chemlight_Shield",1],["ACE_IR_Strobe_Item",2],["kat_nitroglycerin",12],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["ACE_epinephrine",3],["kat_amiodarone",5],["kat_atropine",10],["kat_EACA",10],["kat_TXA",5],["ACE_splint",4],["ACE_EntrenchingTool",1],["kat_reboa",1],["kat_ultrasound",1],["ACE_Chemlight_White",1,1],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",7],["kat_lidocaine",5],["ACE_salineIV_250",2],["kat_aatKit",5],["ACE_plasmaIV_500",7],["kat_BVM",1],["ACE_salineIV",2],["kat_accuvac",1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31"]];
};

class Cav_B_B_Atlas_Medic_CRNA_F: Cav_B_B_Atlas_Medic_TeamLeader_F {
displayName = "CRNA";
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",5],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_Chemlight_Shield",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",5],["kat_norepinephrine",12],["kat_phenylephrine",12],["ACE_packingBandage",10],["ACE_elasticBandage",20],["kat_IV_16",15],["ACE_IR_Strobe_Item",2],["kat_nitroglycerin",15],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",10],["kat_nalbuphine",10],["ACE_adenosine",3],["ACE_epinephrine",5],["kat_amiodarone",5],["kat_atropine",3],["kat_EACA",10],["kat_TXA",5],["ACE_splint",4],["kat_ultrasound",1],["SmokeShellBlue",2,1],["SmokeShellPurple",1,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",5],["kat_lidocaine",10],["ACE_salineIV_250",2],["kat_aatKit",3],["ACE_plasmaIV_500",5],["kat_BVM",1],["kat_accuvac",1],["kat_X_AED",1],["kat_etomidate",12],["kat_flumazenil",6],["kat_lorazepam",6],["kat_oxygenTank_300",1,200]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31_COMPACT"]];
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",5],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_microDAGR",1],["ACE_Chemlight_Shield",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",5],["kat_norepinephrine",12],["kat_phenylephrine",12],["ACE_packingBandage",10],["ACE_elasticBandage",20],["kat_IV_16",15],["ACE_IR_Strobe_Item",2],["kat_nitroglycerin",15],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",10],["kat_nalbuphine",10],["ACE_adenosine",3],["ACE_epinephrine",5],["kat_amiodarone",5],["kat_atropine",3],["kat_EACA",10],["kat_TXA",5],["ACE_splint",4],["kat_ultrasound",1],["SmokeShellBlue",2,1],["SmokeShellPurple",1,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_larynx",10],["ACE_plasmaIV",5],["kat_lidocaine",10],["ACE_salineIV_250",2],["kat_aatKit",3],["ACE_plasmaIV_500",5],["kat_BVM",1],["kat_accuvac",1],["kat_X_AED",1],["kat_etomidate",12],["kat_flumazenil",6],["kat_lorazepam",6],["kat_oxygenTank_300",1,200]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31"]];
};

class Cav_B_B_Atlas_Medic_Surgeon_F_Local: Cav_B_B_Atlas_Medic_TeamLeader_F {
displayName = "Surgeon";
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",5],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",3],["kat_norepinephrine",10],["kat_phenylephrine",10],["ACE_packingBandage",5],["ACE_elasticBandage",25],["kat_IV_16",15],["kat_stethoscope",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["kat_nitroglycerin",6],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["kat_amiodarone",5],["kat_atropine",5],["kat_EACA",10],["kat_TXA",5],["kat_lidocaine",10],["kat_BVM",1],["ACE_epinephrine",3],["ACE_splint",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_vacuum",1],["kat_etomidate",14],["kat_flumazenil",6],["kat_larynx",10],["kat_lorazepam",6],["ACE_plasmaIV",6],["ACE_plasmaIV_500",5],["ACE_salineIV_250",6],["kat_scalpel",30],["kat_accuvac",1],["kat_ultrasound",1],["kat_reboa",10],["kat_aatKit",5],["kat_plate",6],["kat_clamp",1],["kat_retractor",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31_COMPACT"]];
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",5],["ACE_CableTie",2],["ACE_MapTools",1],["ACE_EarPlugs",1],["ACE_Chemlight_Shield",1],["kat_Carbonate",2,10],["kat_Painkiller",4,10]]],["USP_CRYE_CPC_MEDIC_BELT_MC",[["kat_IO_FAST",5],["kat_naloxone",3],["kat_norepinephrine",10],["kat_phenylephrine",10],["ACE_packingBandage",5],["ACE_elasticBandage",25],["kat_IV_16",15],["kat_stethoscope",1],["ACE_IR_Strobe_Item",2],["ACE_microDAGR",1],["kat_nitroglycerin",6],["kat_chestSeal",5],["kat_fentanyl",5],["kat_ketamine",5],["kat_nalbuphine",5],["ACE_adenosine",3],["kat_amiodarone",5],["kat_atropine",5],["kat_EACA",10],["kat_TXA",5],["kat_lidocaine",10],["kat_BVM",1],["ACE_epinephrine",3],["ACE_splint",4],["SmokeShellBlue",2,1],["SmokeShellPurple",2,1],["rhs_mag_30Rnd_556x45_M855A1_PMAG_Tracer_Red",5,30],["SmokeShell",4,1]]],["USP_DELTA_BAG_MC",[["kat_vacuum",1],["kat_etomidate",14],["kat_flumazenil",6],["kat_larynx",10],["kat_lorazepam",6],["ACE_plasmaIV",6],["ACE_plasmaIV_500",5],["ACE_salineIV_250",6],["kat_scalpel",30],["kat_accuvac",1],["kat_ultrasound",1],["kat_reboa",10],["kat_aatKit",5],["kat_plate",6],["kat_clamp",1],["kat_retractor",1],["ACE_EntrenchingTool",1]]],"USP_OPSCORE_FASTMTC_CMTW","USP_MFRAME_BLK2",["ACE_Vector","","","",[],[],""],["ItemMap","ItemAndroid","","ItemCompass","ACE_Altimeter","USP_PVS31"]];
};

// Named
Expand Down
5 changes: 2 additions & 3 deletions cScripts/cScripts_logistics.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,9 +187,8 @@
["USP_L4G19", 0],
["USP_L4G24",0],
["USP_PVS31",0],
["USP_PVS31_HIGH",0],
["USP_PVS31_LOW",0],
["USP_PVS31_COMPACT",0],
["USP_PVS31_BLK2",0],
["USP_PVS31_TAN2",0],
["USP_RHINO", 0],

// cTab
Expand Down