Day 2 fixes + weapons cleanup

This commit is contained in:
2025-06-01 10:20:26 +03:00
parent f4da44c1a9
commit c6d32943ae
2 changed files with 72 additions and 57 deletions

View File

@@ -1,13 +1,5 @@
// Custom Arsenal Preset
GRLIB_arsenal_weapons = [
"rhs_weap_ak74n",
"rhs_weap_ak74n_gp25",
"rhs_weap_ak74n_2",
"rhs_weap_ak74n_2_gp25",
"gm_ak74n_wud",
"uk3cb_weap_ak74n_2_1p29",
"uk3cb_weap_ak74n_2_gp25_1p29",
"uk3cb_weap_ak74n_2_1p29_sup",
"arifle_AKM_F",
"arifle_AKM_FL_F",
"rhs_weap_akm",
@@ -17,17 +9,20 @@ GRLIB_arsenal_weapons = [
"rhs_weap_akms",
"rhs_weap_akms_folded",
"rhs_weap_akms_gp25",
"rhs_weap_ak103_base",
"rhs_weap_45th_akm",
"rhs_weap_45th_akm_gp25",
"rhs_weap_45th_akms",
"rhs_weap_m70ab2",
"rhs_weap_m70b1",
"rhs_weap_m76",
"rhs_weap_savz58p",
"rhs_weap_savz58v",
"gm_akm_wud",
"gm_akml_wud",
"gm_akmn_wud",
"gm_akms_wud",
"gm_akmsl_wud",
"gm_akmsn_wud",
"gm_akm_pallad_wud",
"uk3cb_weap_akm_sup",
"uk3cb_weap_akm_gp25_sup",
"uk3cb_weap_akmn_sup",
@@ -72,9 +67,6 @@ GRLIB_arsenal_weapons = [
"rhs_weap_ak74_3",
"rhs_weap_45th_ak74_ekp1",
"gm_ak74n_wud",
"gm_mpiak74n_brn",
"gm_mpiak74n_blk",
"gm_mpiak74n_prp",
"uk3cb_weap_ak74n_2_1p29",
"uk3cb_weap_ak74n_2_gp25_1p29",
"uk3cb_weap_ak74n_2_1p29_sup",
@@ -94,12 +86,6 @@ GRLIB_arsenal_weapons = [
"rhs_weap_aks74un_folded",
"rhs_weap_aks74u_sup",
"rhs_weap_aks74un_sup",
"gm_mpiaks74n_brn",
"gm_mpiaks74nk_brn",
"gm_mpiaks74n_blk",
"gm_mpiaks74nk_blk",
"gm_mpiaks74n_prp",
"gm_mpiaks74nk_prp",
"uk3cb_weap_aks74un_ekp8",
"uk3cb_weap_aks74un_ekp8_sup",
"rhs_weap_asval",
@@ -162,13 +148,16 @@ GRLIB_arsenal_weapons = [
"gm_pim_blk",
"gm_pimb_blk",
"rhs_weap_tt33",
"gm_pn3_gry",
"rhs_weap_rsp30_white",
"rhs_weap_rsp30_green",
"rhs_weap_rsp30_red",
"rhs_weap_tr8",
//Turrets
//Turrets
"ace_compat_rhs_afrf3_2b14_carry",
"ace_csw_kordCarryTripod",
"ace_csw_kordCarryTripodLow",
"ace_compat_rhs_afrf3_metis_carry",
"ace_compat_rhs_afrf3_kornet_carry",
"ace_compat_rhs_afrf3_ags30_carry",
"ace_compat_rhs_gref3_dshkm_carry",
"ace_csw_carryMortarBaseplate",
@@ -177,7 +166,7 @@ GRLIB_arsenal_weapons = [
"ace_csw_spg9CarryTripod",
"ace_compat_rhs_afrf3_spg9_carry",
//Launchers
//Launchers
"gm_9k32m_oli",
"rhs_weap_igla",
"rhs_weap_rpg18",
@@ -185,15 +174,18 @@ GRLIB_arsenal_weapons = [
"rhs_weap_rpg26",
"rhs_weap_rpg26_used",
"RPG29_Lorad",
"launch_RPG7_F",
"rhs_weap_rpg75",
"rhs_weap_rpg75_used",
"gm_wz78_blk",
"rhs_weap_m80"
"rhs_weap_m80",
"launch_RPG7_F",
"gm_rpg7_wud",
"gm_rpg7_prp",
"rhs_weap_rpg7"
];
GRLIB_arsenal_magazines = [
//AK74 5.45
//AK74 5.45
"rhs_30Rnd_545x39_AK",
"rhs_30Rnd_545x39_7N6_AK",
"rhs_30Rnd_545x39_7N6M_AK",
@@ -217,12 +209,8 @@ GRLIB_arsenal_magazines = [
"gm_45rnd_545x39mm_ak74_prp",
"gm_45rnd_545x39mm_ak74_org",
"gm_45rnd_545x39mm_ak74_blk",
"rhs_30Rnd_545x39_7N6M_AK",
"rhs_30Rnd_545x39_7N6M_green_AK",
"rhs_30Rnd_545x39_7N6M_plum_AK",
"rhs_45Rnd_545X39_7N6M_AK",
//AKM 7.62
//AKM 7.62
"30Rnd_762x39_Mag_Green_F",
"30Rnd_762x39_Mag_F",
"30Rnd_762x39_Mag_Tracer_Green_F",
@@ -316,7 +304,7 @@ GRLIB_arsenal_magazines = [
"UK3CB_RPK_75rnd_762x39_WT",
"UK3CB_RPK_75rnd_762x39_YT",
//Others
//Others
"uk3cb_10rnd_magazine_sks",
"uk3cb_10rnd_magazine_sks_G",
"uk3cb_10rnd_magazine_sks_R",
@@ -329,6 +317,8 @@ GRLIB_arsenal_magazines = [
"rhssaf_30Rnd_762x39mm_M67",
"rhssaf_30Rnd_762x39mm_M78_tracer",
"rhssaf_30Rnd_762x39_M82_api",
"rhssaf_10Rnd_792x57_m67_tracer",
"rhsgref_10Rnd_792x57_m67",
"rhs_30Rnd_762x39mm_Savz58",
"rhs_30Rnd_762x39mm_Savz58_tracer",
"UK3CB_RPD_100rnd_762x39_G",
@@ -414,23 +404,11 @@ GRLIB_arsenal_magazines = [
"gm_1Rnd_265mm_smoke_single_vlt_DM24",
"rhs_mag_9x18_12_57N181S",
"rhs_mag_9x18_8_57N181S",
"gm_15Rnd_9x18mm_B_pst_pm63_blk",
"gm_25Rnd_9x18mm_B_pst_pm63_blk",
"gm_8Rnd_9x18mm_B_pst_pm_blk",
"rhs_mag_762x25_8",
"rhs_mag_9k38_rocket",
//RPG Ammo
"RPG29_AT",
"RPG29_HE_F",
"rhs_pg7_PG7V_mag",
"rhs_pg7_PG7VM_mag",
"rhs_pg7_PG7VS_mag",
"rhs_pg7_PG7VL_mag",
"rhs_pg7_TBG7V_mag",
"gm_1Rnd_72mm_he_9m32m",
//Underbarrel Grenades
//Underbarrel Grenades
"rhs_GDM40",
"rhs_GRD40_Green",
"rhs_GRD40_Red",
@@ -444,8 +422,8 @@ GRLIB_arsenal_magazines = [
"rhs_VG40OP_white",
"rhs_VG40SZ",
"rhs_VG40TB",
"rhs_VG25",
"rhs_VG25P",
"rhs_VOG25",
"rhs_VOG25P",
"1Rnd_SmokeBlue_Grenade_shell",
"1Rnd_SmokeGreen_Grenade_shell",
"1Rnd_SmokeOrange_Grenade_shell",
@@ -453,15 +431,14 @@ GRLIB_arsenal_magazines = [
"1Rnd_SmokeRed_Grenade_shell",
"1Rnd_Smoke_Grenade_shell",
"1Rnd_SmokeYellow_Grenade_shell",
"1Rnd_HE_Grenade_shell",
"UGL_FlareGreen_F",
"UGL_FlareCIR_F",
"UGL_FlareRed_F",
"UGL_FlareWhite_F",
"UGL_FlareYellow_F",
"gm_1Rnd_40x47_he_ngo74",
"gm_1rnd_40x47_he_ngo74",
// Grenades
// Grenades
"gm_handgrenade_frag_rgd5",
"rhs_mag_f1",
"rhs_mag_rgn",
@@ -490,7 +467,7 @@ GRLIB_arsenal_magazines = [
"ACE_Chemlight_HiYellow",
"ACE_Chemlight_UltraHiOrange",
// Explosives
// Explosives
"gm_explosive_plnp_charge",
"gm_mine_at_tm46",
"gm_explosive_petn_charge",
@@ -506,7 +483,27 @@ GRLIB_arsenal_magazines = [
"rhs_mine_tm62m_mag",
"rhs_mine_ozm72_a_mag",
"rhs_mine_ozm72_b_mag",
"rhs_mine_ozm72_c_mag"
"rhs_mine_ozm72_c_mag",
// RPG Ammo
"RPG29_AT",
"RPG29_HE_F",
"rhs_rpg7_PG7V_mag",
"rhs_rpg7_PG7VM_mag",
"rhs_rpg7_PG7VS_mag",
"rhs_rpg7_PG7VL_mag",
"rhs_rpg7_TBG7V_mag",
"gm_1Rnd_72mm_he_9m32m",
// CSW weapons
"ace_csw_50Rnd_127x108_mag",
"ACE_1Rnd_82mm_Mo_HE",
"ACE_1Rnd_82mm_Mo_Illum",
"ACE_1Rnd_82mm_Mo_Smoke",
"ace_compat_rhs_afrf3_mag_OG9V",
"ace_compat_rhs_afrf3_mag_PG9N",
"ace_compat_rhs_afrf3_mag_PG9VNT",
"ace_compat_rhs_afrf3_mag_VOG17m_30"
];
GRLIB_arsenal_items = [
@@ -703,10 +700,15 @@ GRLIB_arsenal_items = [
"rhsgref_ssh68_vsr",
//NVG
// NVG
"gm_nsg66_oli",
//Binoculars
// Gloves that are in the NVG slot
"UK3CB_Gloves_black_NVG",
"UK3CB_Gloves_green_NVG",
"UK3CB_Gloves_tan_NVG",
// Binoculars
"rhs_tr8_periscope",
"rhs_tr8_periscope_pip",
"gm_df7x40_blk",
@@ -750,6 +752,10 @@ GRLIB_arsenal_items = [
"JAM_ENVA_H_NVA_KDA_Balaclava_01",
"rhs_balaclava",
"rhs_balaclava1_olive",
"rhs_scarf",
"UK3CB_Gloves_black",
"UK3CB_Gloves_green",
"UK3CB_Gloves_tan",
// Attachments
"gm_pgo7v_blk",
@@ -773,7 +779,9 @@ GRLIB_arsenal_items = [
"rhs_acc_dtk",
"rhs_acc_dtk1983",
"rhs_acc_tgpa",
"rhs_acc_",
"rhs_acc_tgpv",
"rhs_acc_pgs64_74u",
"rhs_acc_pgs64_74un",
"gm_zfk4x25_blk",
"gm_npsu_dovetail_blk",
"gm_npsu_dovetail_gry",
@@ -886,7 +894,7 @@ GRLIB_arsenal_items = [
"kat_scalpel",
"kat_stethoscope",
// Food
// Food
"ACE_Canteen",
"ACE_Canteen_Half",
"ACE_Canteen_Empty",
@@ -903,7 +911,7 @@ GRLIB_arsenal_items = [
"ACE_MRE_SteakVegetables",
"ACE_MRE_ChickenHerbDumplings",
// ACE Items
// ACE Items
"ACE_adenosine", // Adenosine autoinjector
"ACE_artilleryTable", // Artillery Rangetable
"ACE_Banana", // Banana

View File

@@ -62,3 +62,10 @@ if (isServer) then {
KPLIB_initServer = true;
publicVariable "KPLIB_initServer";
};
// WIP - this doesn't work yet, i don't know why.
/*
// Spawn and activate the GM Save Pictures module at mission start
private _m = createVehicle ["gm_moduleSavePictures", [0, 0, 0], [], 0, "NONE"];
_m setVariable ["BIS_fnc_initModules_activate", true, true];
*/