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 VN CDLC #1537

Merged
merged 32 commits into from
Oct 11, 2023
Merged
Show file tree
Hide file tree
Changes from 13 commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
2c390ab
Add magazine wells for VN CDLC
Dahlgren Mar 22, 2022
24d672e
Move VN CfgWeapons classes to separate file
Dahlgren Mar 22, 2022
06b1b88
Fix syntax issue
Dahlgren Mar 22, 2022
bc0d5f5
Add missing array name
Dahlgren Mar 22, 2022
f806239
Format Welrod comment
Dahlgren Mar 23, 2022
44761b7
Merge branch 'master' into feature/vn-magazine-wells
Dahlgren Sep 7, 2023
d541f5a
Setup nested jam_vn addon
Dahlgren Sep 7, 2023
b52096e
Move VN CfgWeapons to jam_vn
Dahlgren Sep 7, 2023
bde02f7
Move VN CfgMagazineWells to jam_vn
Dahlgren Sep 7, 2023
758febb
Update base parent classes for CfgWeapons
Dahlgren Sep 7, 2023
3e8a776
Change to require loadorder_f_vietnam
Dahlgren Sep 7, 2023
6752301
Merge branch 'master' into pr/1537
PabstMirror Sep 13, 2023
b21266d
SUBADDON
PabstMirror Sep 13, 2023
a047d01
Fix vn_tt33 inheritance
Dahlgren Sep 13, 2023
3f7f8e7
Add Garand magazines
Dahlgren Sep 13, 2023
fa94c4c
Add Kar 98 magazines
Dahlgren Sep 13, 2023
de01c5f
Add KBKG magazines
Dahlgren Sep 13, 2023
d386c13
Add L1A1 magazines
Dahlgren Sep 13, 2023
0676d23
Add M1903 Springfield magazines
Dahlgren Sep 13, 2023
c9fca42
Add BAR magazines
Dahlgren Sep 13, 2023
ddd0e62
Add PPK magazines
Dahlgren Sep 13, 2023
8950bb6
Add SVD magazines
Dahlgren Sep 13, 2023
0e469e5
Add MG42 magazines
Dahlgren Sep 13, 2023
9be8a9a
Add P38 magazines
Dahlgren Sep 13, 2023
0045c56
Merge branch 'master' into feature/vn-magazine-wells
Dahlgren Sep 17, 2023
8c75be3
Add M1 Garand weapon support
Dahlgren Sep 17, 2023
08ece12
Add K98 weapon support
Dahlgren Sep 17, 2023
87ad4c7
Merge branch 'master' into feature/vn-magazine-wells
Dahlgren Oct 7, 2023
06bf021
Fix inherited PM magazines by TT33
Dahlgren Oct 7, 2023
a4ced99
Fix Browning HiPower weapon and magazine
Dahlgren Oct 7, 2023
fa15f81
Fix inherited PPS52 magazines by MC-10
Dahlgren Oct 7, 2023
3aa1ffc
Fix inherited UGL_F magazines by vn_ugl
Dahlgren Oct 7, 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
203 changes: 203 additions & 0 deletions addons/jam/jam_vn/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,203 @@
class CfgMagazineWells {

class CBA_12g_6rnds {
VN_rounds[] = {
"vn_m1897_buck_mag",
"vn_m1897_fl_mag"
};
};

class CBA_12g_2rnds {
VN_rounds[] = {
"vn_izh54_mag",
"vn_izh54_so_mag"
};
};

class CBA_30Carbine_M1Carbine {
VN_mags[] = {
"vn_carbine_15_mag",
"vn_carbine_15_t_mag",
"vn_carbine_30_mag",
"vn_carbine_30_t_mag"
};
};

class CBA_32ACP_Vz61 {
VN_mags[] = {
"vn_vz61_mag"
};
};
class CBA_32ACP_Welrod {
VN_mags[] = {
"vn_welrod_mag"
};
};

class CBA_38_Special_6rnds {
VN_rounds[] = {
"vn_m10_mag"
};
};

class CBA_45ACP_1911 {
VN_mags[] = {
"vn_m1911_mag"
};
};

class CBA_45ACP_Grease {
VN_mags[] = {
"vn_m3a1_mag",
"vn_m3a1_t_mag"
};
};

class CBA_45ACP_Thompson_Stick {
VN_mags[] = {
"vn_m1a1_20_mag",
"vn_m1a1_20_t_mag",
"vn_m1a1_30_mag",
"vn_m1a1_30_t_mag"
};
};

class CBA_45ACP_Thompson_Drum {
VN_mags[] = {
"vn_m1928_mag",
"vn_m1928_t_mag"
};
};

class CBA_556x45_STANAG {
VN_mags[] = {
"vn_m16_20_mag",
"vn_m16_20_t_mag",
"vn_m16_30_mag",
"vn_m16_30_t_mag",
"vn_m16_40_mag",
"vn_m16_40_t_mag"
};
};

class CBA_762x25_PPS {
VN_mags[] = {
"vn_pps_mag",
"vn_pps_t_mag"
};
};

class CBA_762x25_PPSh_Drum {
VN_mags[] = {
"vn_ppsh41_71_mag",
"vn_ppsh41_71_t_mag"
};
};

class CBA_762x25_PPSh_Stick {
VN_mags[] = {
"vn_ppsh41_35_mag",
"vn_ppsh41_35_t_mag"
};
};

class CBA_762x25_TT {
VN_mags[] = {
"vn_tt33_mag"
};
};

class CBA_762x38R_Nagant {
VN_rounds[] = {
"vn_m1895_mag"
};
};

class CBA_762x39_AK {
VN_mags[] = {
"vn_type56_mag",
"vn_type56_t_mag"
};
};

class CBA_762x39_SKS_Clip {
VN_clips[] = {
"vn_sks_mag",
"vn_sks_t_mag"
};
};

class CBA_762x51_5rnds {
VN_rounds[] = {
"vn_m40a1_mag",
"vn_m40a1_t_mag"
};
};

class CBA_762x51_LINKS {
VN_belts[] = {
"vn_m60_100_mag"
};
};

class CBA_762x51_M14 {
VN_mags[] = {
"vn_m14_10_mag",
"vn_m14_10_t_mag",
"vn_m14_mag",
"vn_m14_t_mag"
};
};

class CBA_762x54R_DPM {
VN_mags[] = {
"vn_dp28_mag"
};
};

class CBA_762x54R_LINKS {
VN_belts[] = {
"vn_pk_100_mag"
};
};

class CBA_762x54R_Mosin {
VN_clips[] = {
"vn_m38_mag",
"vn_m38_t_mag"
};
};

class CBA_763x25_M712 {
VN_mags[] = {
"vn_m712_mag"
};
};

class CBA_9x18_PM {
VN_mags[] = {
"vn_pm_mag"
};
};

class CBA_9x19_MP40 {
VN_mags[] = {
"vn_mp40_mag",
"vn_mp40_t_mag"
};
};

class CBA_9x19_STEN {
VN_mags[] = {
"vn_sten_mag",
"vn_sten_t_mag"
};
};

class CBA_RPG7 {
VN_rockets[] = {
"vn_rpg7_mag"
};
};

};
139 changes: 139 additions & 0 deletions addons/jam/jam_vn/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,139 @@
class CfgWeapons {
class vn_rifle;

class vn_m16: vn_rifle {
magazineWell[] += {"CBA_556x45_STANAG","CBA_556x45_STANAG_L","CBA_556x45_STANAG_XL","CBA_556x45_STANAG_2D","CBA_556x45_STANAG_2D_XL"};
};

class vn_rifle762: vn_rifle {};

class vn_m1carbine: vn_rifle762 {
magazineWell[] += {"CBA_30Carbine_M1Carbine"};
};

class vn_m14: vn_rifle762 {
magazineWell[] += {"CBA_762x51_M14", "CBA_762x51_M14_L", "CBA_762x51_M14_XL"};
};

class vn_sks: vn_rifle762 {
magazineWell[] += {"CBA_762x39_SKS"};
};

class vn_type56: vn_rifle762 {
magazineWell[] += {"CBA_762x39_AK","CBA_762x39_RPK"};
};

class vn_rifle_boltaction_base: vn_rifle762 {};

class m40a1: vn_rifle_boltaction_base {
magazineWell[] += {"CBA_762x51_5rnds"};
};

class vn_rifle_boltaction_clip_base: vn_rifle_boltaction_base {};

class vn_m38: vn_rifle_boltaction_clip_base {
magazineWell[] += {"CBA_762x54R_Mosin"};
};

class vn_lmg: vn_rifle {};

class vn_dp28: vn_lmg {
magazineWell[] += {"CBA_762x54R_DPM"};
};

class vn_m60: vn_lmg {
magazineWell[] += {"CBA_762x51_LINKS"};
};

class vn_pk: vn_lmg {
magazineWell[] += {"CBA_762x54R_LINKS"};
};

class vn_smg: vn_rifle {};

class vn_m1a1_tommy: vn_smg {
magazineWell[] += {"CBA_45ACP_Thompson_Stick"};
};

class vn_m1928_tommy: vn_m1a1_tommy {
magazineWell[] += {"CBA_45ACP_Thompson_Drum", "CBA_45ACP_Thompson_Stick"};
};

class vn_m3a1: vn_smg {
magazineWell[] += {"CBA_45ACP_Grease"};
};

class vn_mp40: vn_smg {
magazineWell[] += {"CBA_9x19_MP40"};
};

class vn_pps52: vn_smg {
magazineWell[] += {"CBA_762x25_PPS"};
};

class vn_ppsh41: vn_smg {
magazineWell[] += {"CBA_762x25_PPSh_Drum", "CBA_762x25_PPSh_Stick"};
};

class vn_sten: vn_smg {
magazineWell[] += {"CBA_9x19_STEN"};
};

class vn_vz61: vn_smg {
magazineWell[] += {"CBA_32ACP_Vz61"};
};

class vn_shotgun: vn_rifle {};

class vn_izh54: vn_shotgun {
magazineWell[] += {"CBA_12g_2rnds", "CBA_12g_1rnd"};
};

class vn_m1897: vn_shotgun {
magazineWell[] += {"CBA_12g_6rnds", "CBA_12g_5rnds", "CBA_12g_4rnds", "CBA_12g_3rnds", "CBA_12g_2rnds", "CBA_12g_1rnd"};
};

class vn_pistol;

class vn_hd: vn_pistol {};

class vn_m1911: vn_pistol {
magazineWell[] += {"CBA_45ACP_1911"};
};

class vn_mk22: vn_pistol {};

class vn_m10: vn_mk22 {
magazineWell[] += {"CBA_38_Special_6rnds"};
};

class vn_m712: vn_pistol {
magazineWell[] += {"CBA_763x25_M712"};
};

class vn_m1895: vn_mk22 {
magazineWell[] += {"CBA_762x38R_Nagant"};
};

class vn_pm: vn_pistol {
Dahlgren marked this conversation as resolved.
Show resolved Hide resolved
magazineWell[] += {"CBA_9x18_PM"};
};

class vn_tt33: vn_pistol {
magazineWell[] += {"CBA_762x25_TT"};
PabstMirror marked this conversation as resolved.
Show resolved Hide resolved
};

class vn_vz61_p: vn_pistol {
magazineWell[] += {"CBA_32ACP_Vz61"};
};

class vn_welrod: vn_hd {
magazineWell[] += {"CBA_32ACP_Welrod"};
};

class vn_Launcher_Base_F;

class vn_rpg7: vn_Launcher_Base_F {
magazineWell[] += {"CBA_RPG7"};
};
};
22 changes: 22 additions & 0 deletions addons/jam/jam_vn/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",
"loadorder_f_vietnam"
};
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_vn/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
#define SUBCOMPONENT vn
#include "..\script_component.hpp"