From d34385b187bdd3f1d8a72a058c302a55b9b994cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 23 Mar 2022 21:57:35 +0100 Subject: [PATCH 01/13] Add Western Sahara magazines to CBA magazine wells --- addons/jam/magwells_12gauge.hpp | 7 ++++++- addons/jam/magwells_556x45.hpp | 15 +++++++++++++-- addons/jam/magwells_762x51.hpp | 14 ++++++++++++-- 3 files changed, 31 insertions(+), 5 deletions(-) diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp index eb4cb837c0..341404c27b 100644 --- a/addons/jam/magwells_12gauge.hpp +++ b/addons/jam/magwells_12gauge.hpp @@ -5,7 +5,12 @@ class CBA_12g_5rnds {}; // 5 loose rounds class CBA_12g_4rnds {}; // 4 loose rounds class CBA_12g_3rnds {}; // 3 loose rounds - class CBA_12g_2rnds {}; // 2 loose rounds + class CBA_12g_2rnds { // 2 loose rounds + WS_rounds[] = { + "2rnd_HE_Mag_lxWS", + "2rnd_Smoke_Mag_lxWS" + }; + }; class CBA_12g_1rnd {}; // 1 loose round class CBA_12g_AA12 {}; // AA-12 Stick Magazines diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp index 06301bd027..42d086b78f 100644 --- a/addons/jam/magwells_556x45.hpp +++ b/addons/jam/magwells_556x45.hpp @@ -1,7 +1,12 @@ class CBA_556x45_AK {}; // AK mags for 5.56 AK type rifles, AK-101, AK-102, etc. class CBA_556x45_RPK {}; // 45rnd RPK mags for 5.56 RPK-201 class CBA_556x45_FAMAS {}; // FAMAS F1 - class CBA_556x45_GALIL {}; // IMI Galil + class CBA_556x45_GALIL { // IMI Galil + WS_mags[] = { + "35Rnd_556x45_Velko_lxWS", + "50Rnd_556x45_Velko_lxWS" + }; + }; class CBA_556x45_G36 {}; // H&K G36 class CBA_556x45_HK33 {}; // H&K 33/53/93 class CBA_556x45_M21 {}; // Zastava M21 @@ -53,7 +58,13 @@ }; class CBA_556x45_STANAG_L {}; // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60) - class CBA_556x45_STANAG_XL {}; // STANAG mags, extra long stick or coffin (80/100 rounds, Surefire MAG5-100) + class CBA_556x45_STANAG_XL { // STANAG mags, extra long stick or coffin (80/100 rounds, Surefire MAG5-100) + WS_mags[] = { + "75Rnd_556x45_Stanag_lxWS", + "75Rnd_556x45_Stanag_green_lxWS", + "75Rnd_556x45_Stanag_red_lxWS" + }; + }; class CBA_556x45_STANAG_2D {}; // STANAG mags, twin drums (100rnd Beta C-MAG) class CBA_556x45_STANAG_2D_XL { // STANAG mags, extra large twin-drums (150rnd Armatac SAW-MAG) BI_mags[] = { diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index 9e079e2bc8..5039b260d8 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -12,8 +12,18 @@ class CBA_762x51_CZ750 {}; // CZ-750 - class CBA_762x51_FAL {}; // FN FAL - class CBA_762x51_FAL_L {}; // FN FAL long mag (25/30 rounds) + class CBA_762x51_FAL { // FN FAL + WS_mags[] = { + "20Rnd_762x51_slr_lxWS", + "20Rnd_762x51_slr_lxWS_desert" + }; + }; + class CBA_762x51_FAL_L { // FN FAL long mag (25/30 rounds) + WS_mags[] = { + "30Rnd_762x51_slr_lxWS", + "30Rnd_762x51_slr_lxWS_desert" + }; + }; class CBA_762x51_FAL_XL {}; // FN FAL drum mag (X-Products 50 round) class CBA_762x51_G3 {}; // H&K G3 From 659a8348eeebcdc380683cb4abd2d8a257e66db0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 23 Mar 2022 21:57:40 +0100 Subject: [PATCH 02/13] Add CBA magazine wells to Western Sahara weapons --- addons/jam/jam_ws/CfgWeapons.hpp | 29 ++++++++++++++++++++++++++ addons/jam/jam_ws/config.cpp | 24 +++++++++++++++++++++ addons/jam/jam_ws/script_component.hpp | 3 +++ 3 files changed, 56 insertions(+) create mode 100644 addons/jam/jam_ws/CfgWeapons.hpp create mode 100644 addons/jam/jam_ws/config.cpp create mode 100644 addons/jam/jam_ws/script_component.hpp diff --git a/addons/jam/jam_ws/CfgWeapons.hpp b/addons/jam/jam_ws/CfgWeapons.hpp new file mode 100644 index 0000000000..efd22de47a --- /dev/null +++ b/addons/jam/jam_ws/CfgWeapons.hpp @@ -0,0 +1,29 @@ +class CfgWeapons { + class Rifle_Base_F; + + class arifle_Galat_base_lxWS: Rifle_Base_F { + magazineWell[] += {"CBA_762x39_AK"}; + }; + + class arifle_Velko_base_lxWS: arifle_Galat_base_lxWS { + magazineWell[] += {"CBA_556x45_GALIL"}; + }; + + class arifle_SPAR_01_base_F; + + class arifle_XMS_Base_lxWS: arifle_SPAR_01_base_F { + magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"}; + }; + + class arifle_XMS_Shot_lxWS: arifle_XMS_Base_lxWS { + class UBS_lxWS: Rifle_Base_F { + magazineWell[] += {"CBA_12g_6rnds", "CBA_12g_5rnds", "CBA_12g_4rnds", "CBA_12g_3rnds", "CBA_12g_2rnds", "CBA_12g_1rnd"}; + }; + }; + + class DMR_06_base_F; + + class arifle_SLR_lxWS: DMR_06_base_F { + magazineWell[] += {"CBA_762x51_FAL", "CBA_762x51_FAL_L"}; + }; +}; diff --git a/addons/jam/jam_ws/config.cpp b/addons/jam/jam_ws/config.cpp new file mode 100644 index 0000000000..161c0d2d75 --- /dev/null +++ b/addons/jam/jam_ws/config.cpp @@ -0,0 +1,24 @@ +#if __has_include("\lxWS\data_f_lxWS\config.bin") + +#include "script_component.hpp" + +class CfgPatches { + class ADDON { + name = ECSTRING(jam,component); + units[] = {}; + weapons[] = {}; + requiredVersion = REQUIRED_VERSION; + requiredAddons[] = { + "cba_jam", + "Weapons_F_lxWS_Rifles" + }; + author = "$STR_CBA_Author"; + authors[] = {}; + url = "$STR_CBA_URL"; + VERSION_CONFIG; + }; +}; + +#include "CfgWeapons.hpp" + +#endif diff --git a/addons/jam/jam_ws/script_component.hpp b/addons/jam/jam_ws/script_component.hpp new file mode 100644 index 0000000000..a45d01a9fa --- /dev/null +++ b/addons/jam/jam_ws/script_component.hpp @@ -0,0 +1,3 @@ +#define COMPONENT jam_ws +#include "\x\cba\addons\main\script_mod.hpp" +#include "\x\cba\addons\main\script_macros.hpp" From e09ba09bc8495ca2834db17c8da58f5fa4132980 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 23 Mar 2022 22:01:51 +0100 Subject: [PATCH 03/13] Tabs to spaces --- addons/jam/jam_ws/CfgWeapons.hpp | 40 ++++++++++++++++---------------- addons/jam/jam_ws/config.cpp | 4 ++-- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/addons/jam/jam_ws/CfgWeapons.hpp b/addons/jam/jam_ws/CfgWeapons.hpp index efd22de47a..823e6a72c5 100644 --- a/addons/jam/jam_ws/CfgWeapons.hpp +++ b/addons/jam/jam_ws/CfgWeapons.hpp @@ -1,29 +1,29 @@ class CfgWeapons { - class Rifle_Base_F; + class Rifle_Base_F; - class arifle_Galat_base_lxWS: Rifle_Base_F { - magazineWell[] += {"CBA_762x39_AK"}; - }; + class arifle_Galat_base_lxWS: Rifle_Base_F { + magazineWell[] += {"CBA_762x39_AK"}; + }; - class arifle_Velko_base_lxWS: arifle_Galat_base_lxWS { - magazineWell[] += {"CBA_556x45_GALIL"}; - }; + class arifle_Velko_base_lxWS: arifle_Galat_base_lxWS { + magazineWell[] += {"CBA_556x45_GALIL"}; + }; - class arifle_SPAR_01_base_F; + class arifle_SPAR_01_base_F; - class arifle_XMS_Base_lxWS: arifle_SPAR_01_base_F { - magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"}; - }; + class arifle_XMS_Base_lxWS: arifle_SPAR_01_base_F { + magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"}; + }; - class arifle_XMS_Shot_lxWS: arifle_XMS_Base_lxWS { - class UBS_lxWS: Rifle_Base_F { - magazineWell[] += {"CBA_12g_6rnds", "CBA_12g_5rnds", "CBA_12g_4rnds", "CBA_12g_3rnds", "CBA_12g_2rnds", "CBA_12g_1rnd"}; - }; - }; + class arifle_XMS_Shot_lxWS: arifle_XMS_Base_lxWS { + class UBS_lxWS: Rifle_Base_F { + magazineWell[] += {"CBA_12g_6rnds", "CBA_12g_5rnds", "CBA_12g_4rnds", "CBA_12g_3rnds", "CBA_12g_2rnds", "CBA_12g_1rnd"}; + }; + }; - class DMR_06_base_F; + class DMR_06_base_F; - class arifle_SLR_lxWS: DMR_06_base_F { - magazineWell[] += {"CBA_762x51_FAL", "CBA_762x51_FAL_L"}; - }; + class arifle_SLR_lxWS: DMR_06_base_F { + magazineWell[] += {"CBA_762x51_FAL", "CBA_762x51_FAL_L"}; + }; }; diff --git a/addons/jam/jam_ws/config.cpp b/addons/jam/jam_ws/config.cpp index 161c0d2d75..3e96172163 100644 --- a/addons/jam/jam_ws/config.cpp +++ b/addons/jam/jam_ws/config.cpp @@ -9,8 +9,8 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = { - "cba_jam", - "Weapons_F_lxWS_Rifles" + "cba_jam", + "Weapons_F_lxWS_Rifles" }; author = "$STR_CBA_Author"; authors[] = {}; From 7989814ded0a9bc41d01e6c18cdec8461e58a6c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 6 Sep 2023 22:14:09 +0200 Subject: [PATCH 04/13] Move CfgMagazineWells entries into jam_ws and update list --- addons/jam/jam_ws/CfgMagazineWells.hpp | 151 +++++++++++++++++++++++++ addons/jam/jam_ws/config.cpp | 1 + addons/jam/magwells_12gauge.hpp | 7 +- addons/jam/magwells_556x45.hpp | 15 +-- addons/jam/magwells_762x51.hpp | 14 +-- 5 files changed, 157 insertions(+), 31 deletions(-) create mode 100644 addons/jam/jam_ws/CfgMagazineWells.hpp diff --git a/addons/jam/jam_ws/CfgMagazineWells.hpp b/addons/jam/jam_ws/CfgMagazineWells.hpp new file mode 100644 index 0000000000..6aa64cdaa8 --- /dev/null +++ b/addons/jam/jam_ws/CfgMagazineWells.hpp @@ -0,0 +1,151 @@ +class CfgMagazineWells { + class CBA_40mm_3GL { + WS_grenades[] = { + "1Rnd_40mm_HE_lxWS", + "1Rnd_Pellet_Grenade_shell_lxWS" + }; + }; + + class CBA_12g_2rnds { + WS_rounds[] = { + "2rnd_HE_Mag_lxWS", + "2rnd_Smoke_Mag_lxWS" + }; + }; + + class CBA_12g_6rnds { + WS_rounds[] = { + "6rnd_HE_Mag_lxWS", + "6rnd_Smoke_Mag_lxWS" + }; + }; + + class CBA_12g_AA12 { + WS_mags[] = { + "8Rnd_12Gauge_AA40_HE_lxWS", + "8Rnd_12Gauge_AA40_HE_Snake_lxWS", + "8Rnd_12Gauge_AA40_HE_Tan_lxWS", + "8Rnd_12Gauge_AA40_Pellets_lxWS", + "8Rnd_12Gauge_AA40_Pellets_Snake_lxWS", + "8Rnd_12Gauge_AA40_Pellets_Tan_lxWS", + "8Rnd_12Gauge_AA40_Slug_lxWS", + "8Rnd_12Gauge_AA40_Slug_Snake_lxWS", + "8Rnd_12Gauge_AA40_Slug_Tan_lxWS", + "8Rnd_12Gauge_AA40_Smoke_lxWS", + "8Rnd_12Gauge_AA40_Smoke_Snake_lxWS", + "8Rnd_12Gauge_AA40_Smoke_Tan_lxWS" + }; + }; + + class CBA_12g_AA12_XL { + WS_drums[] = { + "20Rnd_12Gauge_AA40_HE_lxWS", + "20Rnd_12Gauge_AA40_HE_Snake_lxWS", + "20Rnd_12Gauge_AA40_HE_Tan_lxWS", + "20Rnd_12Gauge_AA40_Pellets_lxWS", + "20Rnd_12Gauge_AA40_Pellets_Snake_lxWS", + "20Rnd_12Gauge_AA40_Pellets_Tan_lxWS", + "20Rnd_12Gauge_AA40_Slug_lxWS", + "20Rnd_12Gauge_AA40_Slug_Snake_lxWS", + "20Rnd_12Gauge_AA40_Slug_Tan_lxWS", + "20Rnd_12Gauge_AA40_Slug_Tan_lxWS", + "20Rnd_12Gauge_AA40_Smoke_lxWS", + "20Rnd_12Gauge_AA40_Smoke_Snake_lxWS", + "20Rnd_12Gauge_AA40_Smoke_Tan_lxWS" + }; + }; + + class CBA_556x45_GALIL { + WS_mags[] = { + "35Rnd_556x45_Velko_lxWS", + "35Rnd_556x45_Velko_reload_tracer_green_lxWS", + "35Rnd_556x45_Velko_reload_tracer_red_lxWS", + "35Rnd_556x45_Velko_reload_tracer_yellow_lxWS", + "35Rnd_556x45_Velko_snake_lxWS", + "35Rnd_556x45_Velko_snake_reload_tracer_green_lxWS", + "35Rnd_556x45_Velko_snake_reload_tracer_red_lxWS", + "35Rnd_556x45_Velko_snake_reload_tracer_yellow_lxWS", + "35Rnd_556x45_Velko_snake_tracer_green_lxWS", + "35Rnd_556x45_Velko_snake_tracer_red_lxWS", + "35Rnd_556x45_Velko_snake_tracer_yellow_lxWS", + "35Rnd_556x45_Velko_tracer_green_lxWS", + "35Rnd_556x45_Velko_tracer_red_lxWS", + "35Rnd_556x45_Velko_tracer_yellow_lxWS", + "50Rnd_556x45_Velko_lxWS", + "50Rnd_556x45_Velko_reload_tracer_green_lxWS", + "50Rnd_556x45_Velko_reload_tracer_red_lxWS", + "50Rnd_556x45_Velko_reload_tracer_yellow_lxWS", + "50Rnd_556x45_Velko_snake_lxWS", + "50Rnd_556x45_Velko_snake_reload_tracer_green_lxWS", + "50Rnd_556x45_Velko_snake_reload_tracer_red_lxWS", + "50Rnd_556x45_Velko_snake_reload_tracer_yellow_lxWS", + "50Rnd_556x45_Velko_snake_tracer_green_lxWS", + "50Rnd_556x45_Velko_snake_tracer_red_lxWS", + "50Rnd_556x45_Velko_snake_tracer_yellow_lxWS", + "50Rnd_556x45_Velko_tracer_green_lxWS", + "50Rnd_556x45_Velko_tracer_red_lxWS", + "50Rnd_556x45_Velko_tracer_yellow_lxWS" + }; + }; + + class CBA_556x45_STANAG_XL { + WS_mags[] = { + "75Rnd_556x45_Stanag_lxWS", + "75Rnd_556x45_Stanag_green_lxWS", + "75Rnd_556x45_Stanag_red_lxWS" + }; + }; + + class CBA_762x39_AK { + WS_mags[] = { + "30Rnd_762x39_Mag_worn_lxWS" + }; + }; + + class CBA_762x51_FAL { + WS_mags[] = { + "20Rnd_762x51_slr_lxWS", + "20Rnd_762x51_slr_desert_lxWS" + "20Rnd_762x51_slr_desert_reload_tracer_green_lxWS", + "20Rnd_762x51_slr_desert_tracer_green_lxWS", + "20Rnd_762x51_slr_reload_tracer_green_lxWS", + "20Rnd_762x51_slr_tracer_green_lxWS" + }; + }; + + class CBA_762x51_FAL_L { + WS_mags[] = { + "30Rnd_762x51_slr_lxWS", + "30Rnd_762x51_slr_lxWS_desert", + "30Rnd_762x51_slr_desert_reload_tracer_green_lxWS", + "30Rnd_762x51_slr_desert_tracer_green_lxWS", + "30Rnd_762x51_slr_reload_tracer_green_lxWS", + "30Rnd_762x51_slr_tracer_green_lxWS" + }; + }; + + class CBA_762x51_LINKS { + WS_belts[] = { + "100Rnd_762x51_S77_Green_lxWS", + "100Rnd_762x51_S77_Green_Tracer_lxWS", + "100Rnd_762x51_S77_Red_lxWS", + "100Rnd_762x51_S77_Red_Tracer_lxWS", + "100Rnd_762x51_S77_Yellow_lxWS", + "100Rnd_762x51_S77_Yellow_Tracer_lxWS" + }; + }; + + class CBA_762x51_M14 { + WS_mags[] = { + "10Rnd_Mk14_762x51_Mag_blk_lxWS", + "10Rnd_Mk14_762x51_Mag_snake_lxWS" + } + }; + + class CBA_762x51_MkI_EMR { + WS_mags[] = { + "20Rnd_762x51_Mag_blk_lxWS", + "20Rnd_762x51_Mag_snake_lxWS" + } + }; +}; \ No newline at end of file diff --git a/addons/jam/jam_ws/config.cpp b/addons/jam/jam_ws/config.cpp index 3e96172163..8f348a20c8 100644 --- a/addons/jam/jam_ws/config.cpp +++ b/addons/jam/jam_ws/config.cpp @@ -19,6 +19,7 @@ class CfgPatches { }; }; +#include "CfgMagazineWells.hpp" #include "CfgWeapons.hpp" #endif diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp index 341404c27b..eb4cb837c0 100644 --- a/addons/jam/magwells_12gauge.hpp +++ b/addons/jam/magwells_12gauge.hpp @@ -5,12 +5,7 @@ class CBA_12g_5rnds {}; // 5 loose rounds class CBA_12g_4rnds {}; // 4 loose rounds class CBA_12g_3rnds {}; // 3 loose rounds - class CBA_12g_2rnds { // 2 loose rounds - WS_rounds[] = { - "2rnd_HE_Mag_lxWS", - "2rnd_Smoke_Mag_lxWS" - }; - }; + class CBA_12g_2rnds {}; // 2 loose rounds class CBA_12g_1rnd {}; // 1 loose round class CBA_12g_AA12 {}; // AA-12 Stick Magazines diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp index 42d086b78f..06301bd027 100644 --- a/addons/jam/magwells_556x45.hpp +++ b/addons/jam/magwells_556x45.hpp @@ -1,12 +1,7 @@ class CBA_556x45_AK {}; // AK mags for 5.56 AK type rifles, AK-101, AK-102, etc. class CBA_556x45_RPK {}; // 45rnd RPK mags for 5.56 RPK-201 class CBA_556x45_FAMAS {}; // FAMAS F1 - class CBA_556x45_GALIL { // IMI Galil - WS_mags[] = { - "35Rnd_556x45_Velko_lxWS", - "50Rnd_556x45_Velko_lxWS" - }; - }; + class CBA_556x45_GALIL {}; // IMI Galil class CBA_556x45_G36 {}; // H&K G36 class CBA_556x45_HK33 {}; // H&K 33/53/93 class CBA_556x45_M21 {}; // Zastava M21 @@ -58,13 +53,7 @@ }; class CBA_556x45_STANAG_L {}; // STANAG mags, long stick or coffin (40/60 rounds, Magpul PMAG 40, Surefire MAG5-60) - class CBA_556x45_STANAG_XL { // STANAG mags, extra long stick or coffin (80/100 rounds, Surefire MAG5-100) - WS_mags[] = { - "75Rnd_556x45_Stanag_lxWS", - "75Rnd_556x45_Stanag_green_lxWS", - "75Rnd_556x45_Stanag_red_lxWS" - }; - }; + class CBA_556x45_STANAG_XL {}; // STANAG mags, extra long stick or coffin (80/100 rounds, Surefire MAG5-100) class CBA_556x45_STANAG_2D {}; // STANAG mags, twin drums (100rnd Beta C-MAG) class CBA_556x45_STANAG_2D_XL { // STANAG mags, extra large twin-drums (150rnd Armatac SAW-MAG) BI_mags[] = { diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index 5039b260d8..9e079e2bc8 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -12,18 +12,8 @@ class CBA_762x51_CZ750 {}; // CZ-750 - class CBA_762x51_FAL { // FN FAL - WS_mags[] = { - "20Rnd_762x51_slr_lxWS", - "20Rnd_762x51_slr_lxWS_desert" - }; - }; - class CBA_762x51_FAL_L { // FN FAL long mag (25/30 rounds) - WS_mags[] = { - "30Rnd_762x51_slr_lxWS", - "30Rnd_762x51_slr_lxWS_desert" - }; - }; + class CBA_762x51_FAL {}; // FN FAL + class CBA_762x51_FAL_L {}; // FN FAL long mag (25/30 rounds) class CBA_762x51_FAL_XL {}; // FN FAL drum mag (X-Products 50 round) class CBA_762x51_G3 {}; // H&K G3 From ca6ccb812eb1d7a431a1dbec98ae69b74c244824 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 6 Sep 2023 22:16:52 +0200 Subject: [PATCH 05/13] Migrate jam_ws to use skipWhenMissingDependencies --- addons/jam/jam_ws/config.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/addons/jam/jam_ws/config.cpp b/addons/jam/jam_ws/config.cpp index 8f348a20c8..1b71d4edbe 100644 --- a/addons/jam/jam_ws/config.cpp +++ b/addons/jam/jam_ws/config.cpp @@ -1,5 +1,3 @@ -#if __has_include("\lxWS\data_f_lxWS\config.bin") - #include "script_component.hpp" class CfgPatches { @@ -15,11 +13,10 @@ class CfgPatches { author = "$STR_CBA_Author"; authors[] = {}; url = "$STR_CBA_URL"; + skipWhenMissingDependencies = 1; VERSION_CONFIG; }; }; #include "CfgMagazineWells.hpp" #include "CfgWeapons.hpp" - -#endif From f33723dd27998dd98e4db07fe208b600c9d21060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 6 Sep 2023 22:18:27 +0200 Subject: [PATCH 06/13] Add missing newline to CfgMagazineWells.hpp --- addons/jam/jam_ws/CfgMagazineWells.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/jam/jam_ws/CfgMagazineWells.hpp b/addons/jam/jam_ws/CfgMagazineWells.hpp index 6aa64cdaa8..2746988461 100644 --- a/addons/jam/jam_ws/CfgMagazineWells.hpp +++ b/addons/jam/jam_ws/CfgMagazineWells.hpp @@ -148,4 +148,4 @@ class CfgMagazineWells { "20Rnd_762x51_Mag_snake_lxWS" } }; -}; \ No newline at end of file +}; From e4ca8dc5fe8ca952778a2b73326d4e5d53be3621 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 6 Sep 2023 22:23:01 +0200 Subject: [PATCH 07/13] S77 magazine well --- addons/jam/jam_ws/CfgWeapons.hpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/addons/jam/jam_ws/CfgWeapons.hpp b/addons/jam/jam_ws/CfgWeapons.hpp index 823e6a72c5..3b47cbfcaa 100644 --- a/addons/jam/jam_ws/CfgWeapons.hpp +++ b/addons/jam/jam_ws/CfgWeapons.hpp @@ -9,6 +9,12 @@ class CfgWeapons { magazineWell[] += {"CBA_556x45_GALIL"}; }; + class Rifle_Long_Base_F; + + class LMG_S77_base_lxWS: Rifle_Long_Base_F { + magazineWell[] += {"CBA_762x51_LINKS"}; + }; + class arifle_SPAR_01_base_F; class arifle_XMS_Base_lxWS: arifle_SPAR_01_base_F { From 4e3f2b145cac967bef885f0ea788b87eda33f435 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 6 Sep 2023 22:25:18 +0200 Subject: [PATCH 08/13] Add AA40 --- addons/jam/jam_ws/CfgWeapons.hpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/addons/jam/jam_ws/CfgWeapons.hpp b/addons/jam/jam_ws/CfgWeapons.hpp index 3b47cbfcaa..fb5cdaf657 100644 --- a/addons/jam/jam_ws/CfgWeapons.hpp +++ b/addons/jam/jam_ws/CfgWeapons.hpp @@ -9,6 +9,10 @@ class CfgWeapons { magazineWell[] += {"CBA_556x45_GALIL"}; }; + class sgun_aa40_base_lxWS: Rifle_Base_F { + magazineWell[] += {"CBA_12g_AA12", "CBA_12g_AA12_XL"}; + }; + class Rifle_Long_Base_F; class LMG_S77_base_lxWS: Rifle_Long_Base_F { From 62a52cf5a88b0f8a592975317160af6fd63299f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Wed, 6 Sep 2023 22:28:41 +0200 Subject: [PATCH 09/13] Fix HEMTT errors --- addons/jam/jam_ws/CfgMagazineWells.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/jam/jam_ws/CfgMagazineWells.hpp b/addons/jam/jam_ws/CfgMagazineWells.hpp index 2746988461..6e13c749e9 100644 --- a/addons/jam/jam_ws/CfgMagazineWells.hpp +++ b/addons/jam/jam_ws/CfgMagazineWells.hpp @@ -105,7 +105,7 @@ class CfgMagazineWells { class CBA_762x51_FAL { WS_mags[] = { "20Rnd_762x51_slr_lxWS", - "20Rnd_762x51_slr_desert_lxWS" + "20Rnd_762x51_slr_desert_lxWS", "20Rnd_762x51_slr_desert_reload_tracer_green_lxWS", "20Rnd_762x51_slr_desert_tracer_green_lxWS", "20Rnd_762x51_slr_reload_tracer_green_lxWS", @@ -139,13 +139,13 @@ class CfgMagazineWells { WS_mags[] = { "10Rnd_Mk14_762x51_Mag_blk_lxWS", "10Rnd_Mk14_762x51_Mag_snake_lxWS" - } + }; }; class CBA_762x51_MkI_EMR { WS_mags[] = { "20Rnd_762x51_Mag_blk_lxWS", "20Rnd_762x51_Mag_snake_lxWS" - } + }; }; }; From ada194df93e686759ba1ab44fc4e5cf75a4cf7b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 7 Sep 2023 20:32:36 +0200 Subject: [PATCH 10/13] Fix magazine class name --- addons/jam/jam_ws/CfgMagazineWells.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/jam/jam_ws/CfgMagazineWells.hpp b/addons/jam/jam_ws/CfgMagazineWells.hpp index 6e13c749e9..b9a985e990 100644 --- a/addons/jam/jam_ws/CfgMagazineWells.hpp +++ b/addons/jam/jam_ws/CfgMagazineWells.hpp @@ -116,7 +116,7 @@ class CfgMagazineWells { class CBA_762x51_FAL_L { WS_mags[] = { "30Rnd_762x51_slr_lxWS", - "30Rnd_762x51_slr_lxWS_desert", + "30Rnd_762x51_slr_desert_lxWS", "30Rnd_762x51_slr_desert_reload_tracer_green_lxWS", "30Rnd_762x51_slr_desert_tracer_green_lxWS", "30Rnd_762x51_slr_reload_tracer_green_lxWS", From c56c6a06d00be8933416cbff133bdd3a6c777963 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Thu, 7 Sep 2023 20:33:23 +0200 Subject: [PATCH 11/13] Use load order CfgPatches --- addons/jam/jam_ws/config.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/jam/jam_ws/config.cpp b/addons/jam/jam_ws/config.cpp index 1b71d4edbe..ae86588a60 100644 --- a/addons/jam/jam_ws/config.cpp +++ b/addons/jam/jam_ws/config.cpp @@ -8,7 +8,7 @@ class CfgPatches { requiredVersion = REQUIRED_VERSION; requiredAddons[] = { "cba_jam", - "Weapons_F_lxWS_Rifles" + "data_f_lxWS_Loadorder" }; author = "$STR_CBA_Author"; authors[] = {}; From a74543939600cc5a306e201b3f5154549aa5ecca Mon Sep 17 00:00:00 2001 From: PabstMirror Date: Tue, 12 Sep 2023 20:58:05 -0500 Subject: [PATCH 12/13] SUBADDON --- addons/jam/jam_ws/config.cpp | 4 ++-- addons/jam/jam_ws/script_component.hpp | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/jam/jam_ws/config.cpp b/addons/jam/jam_ws/config.cpp index ae86588a60..4b8a1b20ac 100644 --- a/addons/jam/jam_ws/config.cpp +++ b/addons/jam/jam_ws/config.cpp @@ -1,8 +1,8 @@ #include "script_component.hpp" class CfgPatches { - class ADDON { - name = ECSTRING(jam,component); + class SUBADDON { + name = CSTRING(component); units[] = {}; weapons[] = {}; requiredVersion = REQUIRED_VERSION; diff --git a/addons/jam/jam_ws/script_component.hpp b/addons/jam/jam_ws/script_component.hpp index a45d01a9fa..09ab172d1b 100644 --- a/addons/jam/jam_ws/script_component.hpp +++ b/addons/jam/jam_ws/script_component.hpp @@ -1,3 +1,2 @@ -#define COMPONENT jam_ws -#include "\x\cba\addons\main\script_mod.hpp" -#include "\x\cba\addons\main\script_macros.hpp" +#define SUBCOMPONENT ws +#include "..\script_component.hpp" From 17335a703bb7f03f4a30341a1ece30af2e123179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Dahlgren?= Date: Sun, 17 Sep 2023 21:34:39 +0200 Subject: [PATCH 13/13] Disable magazines and weapons not compatible with CUP --- addons/jam/jam_ws/CfgMagazineWells.hpp | 6 ++++++ addons/jam/jam_ws/CfgWeapons.hpp | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/addons/jam/jam_ws/CfgMagazineWells.hpp b/addons/jam/jam_ws/CfgMagazineWells.hpp index b9a985e990..a56975554b 100644 --- a/addons/jam/jam_ws/CfgMagazineWells.hpp +++ b/addons/jam/jam_ws/CfgMagazineWells.hpp @@ -20,6 +20,7 @@ class CfgMagazineWells { }; }; + /* AA12 proxy is different compared to CUP proxy class CBA_12g_AA12 { WS_mags[] = { "8Rnd_12Gauge_AA40_HE_lxWS", @@ -54,7 +55,9 @@ class CfgMagazineWells { "20Rnd_12Gauge_AA40_Smoke_Tan_lxWS" }; }; + */ + /* Galil proxy is different compared to CUP proxy class CBA_556x45_GALIL { WS_mags[] = { "35Rnd_556x45_Velko_lxWS", @@ -87,6 +90,7 @@ class CfgMagazineWells { "50Rnd_556x45_Velko_tracer_yellow_lxWS" }; }; + */ class CBA_556x45_STANAG_XL { WS_mags[] = { @@ -102,6 +106,7 @@ class CfgMagazineWells { }; }; + /* FAL proxy is different compared to CUP proxy class CBA_762x51_FAL { WS_mags[] = { "20Rnd_762x51_slr_lxWS", @@ -123,6 +128,7 @@ class CfgMagazineWells { "30Rnd_762x51_slr_tracer_green_lxWS" }; }; + */ class CBA_762x51_LINKS { WS_belts[] = { diff --git a/addons/jam/jam_ws/CfgWeapons.hpp b/addons/jam/jam_ws/CfgWeapons.hpp index fb5cdaf657..e53d1e58fa 100644 --- a/addons/jam/jam_ws/CfgWeapons.hpp +++ b/addons/jam/jam_ws/CfgWeapons.hpp @@ -5,13 +5,17 @@ class CfgWeapons { magazineWell[] += {"CBA_762x39_AK"}; }; + /* WS Galil proxy is different compared to CUP Galil proxy class arifle_Velko_base_lxWS: arifle_Galat_base_lxWS { magazineWell[] += {"CBA_556x45_GALIL"}; }; + */ + /* WS AA12 proxy is different compared to CUP AA12 proxy class sgun_aa40_base_lxWS: Rifle_Base_F { magazineWell[] += {"CBA_12g_AA12", "CBA_12g_AA12_XL"}; }; + */ class Rifle_Long_Base_F; @@ -33,7 +37,9 @@ class CfgWeapons { class DMR_06_base_F; + /* WS FAL proxy is different compared to CUP FAL proxy class arifle_SLR_lxWS: DMR_06_base_F { magazineWell[] += {"CBA_762x51_FAL", "CBA_762x51_FAL_L"}; }; + */ };