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

Jump to bottom

Update magazine wells for CSLA CDLC #1603

Merged
merged 5 commits into from
Sep 22, 2023
Merged

Update magazine wells for CSLA CDLC #1603

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
78721d9
Fix wrong inheritance
Dahlgren Sep 17, 2023
fcd793c
Override magazine well for pistols inheriting from parent
Dahlgren Sep 17, 2023
f884652
Simplify inheritance for MGs
Dahlgren Sep 17, 2023
784cd14
Add Cz75 variants
Dahlgren Sep 17, 2023
785d8b4
Disable magazines with bad proxies
Dahlgren Sep 17, 2023
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
22 changes: 20 additions & 2 deletions addons/jam/jam_csla/CfgMagazineWells.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ class CfgMagazineWells {
};
};

/* CSLA magazines do not define a modelSpecial
class CBA_556x45_MINIMI {
CSLA_boxes[] = {
"US85_200Rnd_556x45"
};
};
*/

class CBA_556x45_STANAG {
CSLA_mags[] = {
Expand All @@ -50,27 +52,34 @@ class CfgMagazineWells {
};
};

/* CSLA magazines do not define a modelSpecial
class CBA_762x39_AK {
CSLA_mags[] = {
"CSLA_Sa58_30rnd_7_62Cv43",
"CSLA_Sa58_30rnd_7_62Sv43",
"CSLA_Sa58_30rnd_7_62vz43"
};
};
*/

class CBA_762x51_AICS {
/* CSLA proxy is different compared to CUP proxy
class CBA_762x51_FAL {
CSLA_mags[] = {
"US85_10Rnd_762x51"
"US85_20Rnd_762M61",
"US85_20Rnd_762x51"
};
};
*/

/* CSLA magazines do not define a modelSpecial
class CBA_762x51_LINKS {
CSLA_belts[] = {
"US85_50Rnd_762x51",
"US85_100Rnd_762x51",
"US85_200Rnd_762x51"
};
};
*/

class CBA_762x54R_SVD {
CSLA_mags[] = {
Expand All @@ -97,17 +106,26 @@ class CfgMagazineWells {
};
};

class CBA_9x19_CZ75_Full {
CSLA_mags[] = {
"CSLA_Pi75_15Rnd_9Cv48",
"CSLA_Pi75_15Rnd_9Luger"
};
};

class CBA_9x19_M9 {
CSLA_mags[] = {
"US85_M9_15Rnd_9Luger"
};
};

/* CSLA magazines do not define a modelSpecial
class CBA_9x19_MP5 {
CSLA_mags[] = {
"US85_MPV_30Rnd_9Luger"
};
};
*/

class CBA_SMAW {
CSLA_rounds[] = {
Expand Down
22 changes: 12 additions & 10 deletions addons/jam/jam_csla/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@ class CfgWeapons {
magazineWell[] += {"CBA_762x39_AK"};
};

class CSLA_MachinegunBase_5_56: CSLA_baseWeapon {};

class CSLA_MachinegunBase_7_62: CSLA_MachinegunBase_5_56 {};
class CSLA_MachinegunBase_7_62;

class CSLA_UK59L: CSLA_MachinegunBase_7_62 {
magazineWell[] += {"CBA_762x54R_Vz59_LINKS"};
Expand All @@ -28,17 +26,21 @@ class CfgWeapons {
magazineWell[] += {"CBA_762x25_TT"};
};

class CSLA_Pi75sr: CSLA_PistolBase {
magazineWell[] += {"CBA_9x19_CZ75_Full"};
};

class CSLA_Pi82: CSLA_Pi52 {
magazineWell[] += {"CBA_9x18_CZ82"};
magazineWell[] = {"CBA_9x18_CZ82"};
};

class CSLA_Sa61: CSLA_Pi52 {
magazineWell[] += {"CBA_32ACP_Vz61"};
magazineWell[] = {"CBA_32ACP_Vz61"};
};

class CSLA_LauncherBase;
class CSLA_Launcher_AT;

class CSLA_RPG7: CSLA_LauncherBase {
class CSLA_RPG7: CSLA_Launcher_AT {
magazineWell[] += {"CBA_RPG7"};
};

Expand All @@ -52,7 +54,7 @@ class CfgWeapons {
magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"};
};

class US85_M21_Base: US85_weaponBase {
class US85_M14_M21_Base: US85_weaponBase {
magazineWell[] += {"CBA_762x51_M14", "CBA_762x51_M14_L"};
};

Expand Down Expand Up @@ -82,9 +84,9 @@ class CfgWeapons {
magazineWell[] += {"CBA_9x19_M9"};
};

class US85_launcherBase;
class US85_Launcher_AT;

class US85_MAAWS: US85_launcherBase {
class US85_MAAWS: US85_Launcher_AT {
magazineWell[] += {"CBA_Carl_Gustaf"};
};

Expand Down