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.

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

Add magazine wells for WS CDLC #1539

Merged
merged 16 commits into from
Sep 22, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
157 changes: 157 additions & 0 deletions addons/jam/jam_ws/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,157 @@
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"
};
};

/* AA12 proxy is different compared to CUP proxy
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"
};
};
*/

/* Galil proxy is different compared to CUP proxy
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"
};
};

/* FAL proxy is different compared to CUP proxy
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_desert_lxWS",
"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"
};
};
};
45 changes: 45 additions & 0 deletions addons/jam/jam_ws/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
class CfgWeapons {
class Rifle_Base_F;

class arifle_Galat_base_lxWS: Rifle_Base_F {
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;

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 {
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;

/* 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"};
};
*/
};
22 changes: 22 additions & 0 deletions addons/jam/jam_ws/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
#include "script_component.hpp"

class CfgPatches {
class SUBADDON {
name = CSTRING(component);
units[] = {};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"cba_jam",
"data_f_lxWS_Loadorder"
};
author = "$STR_CBA_Author";
authors[] = {};
url = "$STR_CBA_URL";
skipWhenMissingDependencies = 1;
VERSION_CONFIG;
};
};

#include "CfgMagazineWells.hpp"
#include "CfgWeapons.hpp"
2 changes: 2 additions & 0 deletions addons/jam/jam_ws/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define SUBCOMPONENT ws
#include "..\script_component.hpp"