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

Split/extend the magwell classes and files #990

Merged
merged 3 commits into from
Sep 27, 2018
Merged

Split/extend the magwell classes and files #990

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7dea95f
Split/extend the magwell classes by size
robalo Sep 19, 2018
1bc3d06
add magwells for current IFA3, FOW, LEN weapons
Drofseh Sep 19, 2018
acdee5e
Merge pull request #991 from Drofseh/jam_ww2
robalo Sep 19, 2018
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
198 changes: 42 additions & 156 deletions addons/jam/CfgMagazineWells.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,174 +1,60 @@
class CfgMagazineWells {
class CBA_545x39_AK {
BI_mags[] = {
"30Rnd_545x39_Mag_F",
"30Rnd_545x39_Mag_Green_F",
"30Rnd_545x39_Mag_Tracer_F",
"30Rnd_545x39_Mag_Tracer_Green_F"
};
};

class CBA_556x45_MINIMI {
BI_boxes[] = {
"200Rnd_556x45_Box_F",
"200Rnd_556x45_Box_Red_F",
"200Rnd_556x45_Box_Tracer_F",
"200Rnd_556x45_Box_Tracer_Red_F"
};
};
class CBA_556x45_STANAG {
BI_mags[] = {
"30Rnd_556x45_Stanag",
"30Rnd_556x45_Stanag_green",
"30Rnd_556x45_Stanag_red",
"30Rnd_556x45_Stanag_Tracer_Red",
"30Rnd_556x45_Stanag_Tracer_Green",
"30Rnd_556x45_Stanag_Tracer_Yellow"
};
BI_drums[] = {
"150Rnd_556x45_Drum_Mag_F",
"150Rnd_556x45_Drum_Mag_Tracer_F"
};
};

class CBA_556x45_STEYR {}; // AUG
class CBA_556x45_HK33 {}; // H&K 33/53/93
class CBA_556x45_G36 {};
class CBA_556x45_SG550 {};

class CBA_580x42_TYPE95 {
BI_mags[] = {
"30Rnd_580x42_Mag_F",
"30Rnd_580x42_Mag_Tracer_F"
};
BI_drums[] = {
"100Rnd_580x42_Mag_F",
"100Rnd_580x42_Mag_Tracer_F"
};
};

class CBA_65x39_MX {
BI_mags[] = {
"30Rnd_65x39_caseless_mag",
"30Rnd_65x39_caseless_green",
"30Rnd_65x39_caseless_mag_Tracer",
"30Rnd_65x39_caseless_green_mag_Tracer",
"100Rnd_65x39_caseless_mag",
"100Rnd_65x39_caseless_mag_Tracer"
};
};
#include "magwells_556x45.hpp"
#include "magwells_545x39.hpp"
#include "magwells_580x42.hpp"
#include "magwells_65x39.hpp"
#include "magwells_762x39.hpp"
#include "magwells_762x51.hpp"
#include "magwells_762x54.hpp"
#include "magwells_77x58.hpp"
#include "magwells_792x57.hpp"
#include "magwells_145x114.hpp"
#include "magwells_303B.hpp"
#include "magwells_3006.hpp"

#include "magwells_762x25.hpp"
#include "magwells_8x22.hpp"
#include "magwells_9x19.hpp"
#include "magwells_22LR.hpp"
#include "magwells_32ACP.hpp"
#include "magwells_357SIG.hpp"
#include "magwells_40SW.hpp"
#include "magwells_45ACP.hpp"

#include "magwells_10gauge.hpp"
#include "magwells_12gauge.hpp"
#include "magwells_16gauge.hpp"
#include "magwells_20gauge.hpp"

class CBA_762x38R_Nagant {}; // Nagant M1895 Revolver
class CBA_763x25_C96 {}; // Mauser C-96 in 7.63x25mm
class CBA_765x21_C96 {}; // Mauser C-96 in 7.65x21mm
class CBA_10x25_MP5 {}; // H&K MP5/10 10mm Auto
class CBA_38_200_Webley {}; // Webley Revolver in .38/200
class CBA_455_Webley {}; // Webley Revolver in .455 Webley

class CBA_68x43_ACR {}; // 6.8mm Remington SPC
class CBA_75x55_STGW57 {}; // SIG SG 510-1, Stgw. 57
class CBA_762x35_STANAG {}; // .300 Blackout

class CBA_762x39_AK {
BI_mags[] = {
"30Rnd_762x39_Mag_F",
"30Rnd_762x39_Mag_Green_F",
"30Rnd_762x39_Mag_Tracer_F",
"30Rnd_762x39_Mag_Tracer_Green_F"
};
};

class CBA_762x51_M14 {
BI_mags[] = {
"20Rnd_762x51_Mag"
};
};
class CBA_762x51_HK417 {
BI_mags[] = {
"20Rnd_762x51_Mag"
};
};
class CBA_762x51_SR25 {}; // M110, SIG716
class CBA_762x51_SCAR {};
class CBA_762x51_FAL {};
class CBA_762x51_G3 {};
class CBA_762x51_SIGAMT {}; // SIG 510-4, AMT

class CBA_762x51_LINKS {
BI_belts[] = {
"150Rnd_762x51_Box",
"150Rnd_762x51_Box_Tracer"
};
};

class CBA_762x54R_SVD {
BI_mags[] = {
"10Rnd_762x54_Mag"
};
};
class CBA_762x54R_LINKS {
BI_belts[] = {
"150Rnd_762x54_Box",
"150Rnd_762x54_Box_Tracer"
};
};

class CBA_792x57_LINKS {}; // MG42
class CBA_792x33_StG {}; // StG44
class CBA_9x39_VSS {}; // Vintorez, Val
class CBA_11mm_Vickers {}; // Vickers machine gun in 11mm Vickers
class CBA_300WM_AI {}; // AI .300 Winchester Magnum
class CBA_338LM_AI {}; // AI .338 Lapua Magnum
class CBA_50BMG_M107 {}; // M82, M107, G82

class CBA_9x19_MP5 {}; // H&K MP5
class CBA_9x19_STEYR {}; // AUG SMG, MPi, TMP
class CBA_9x19_P226 {}; // SIG P226
class CBA_9x19_P228 {}; // SIG P228
class CBA_9x19_P239 {}; // SIG P239

class CBA_9x39_VSS {}; // Vintorez, Val

class CBA_357SIG_P226 {}; // SIG P226
class CBA_357SIG_P229 {}; // SIG P229
class CBA_357SIG_P239 {}; // SIG P239
class CBA_35mm_Type10 {}; // Japanese Type 10 Flare Pistol

class CBA_40SW_P226 {}; // SIG P226 .40 S&W
class CBA_40SW_P229 {}; // SIG P229 .40 S&W
class CBA_40SW_P239 {}; // SIG P239 .40 S&W
#include "magwells_40mm.hpp"

class CBA_10x25_MP5 {}; // H&K MP5/10 10mm Auto
class CBA_12g_SAIGA {};

class CBA_40mm_M203 {
BI_grenades[] = {
"1Rnd_HE_Grenade_shell",
"1Rnd_Smoke_Grenade_shell",
"1Rnd_SmokeRed_Grenade_shell",
"1Rnd_SmokeGreen_Grenade_shell",
"1Rnd_SmokeYellow_Grenade_shell",
"1Rnd_SmokePurple_Grenade_shell",
"1Rnd_SmokeBlue_Grenade_shell",
"1Rnd_SmokeOrange_Grenade_shell",
"UGL_FlareWhite_F",
"UGL_FlareGreen_F",
"UGL_FlareRed_F",
"UGL_FlareYellow_F",
"UGL_FlareCIR_F"
};
};
class CBA_40mm_3GL {
BI_grenades[] = {
"3Rnd_HE_Grenade_shell",
"3Rnd_Smoke_Grenade_shell",
"3Rnd_SmokeRed_Grenade_shell",
"3Rnd_SmokeGreen_Grenade_shell",
"3Rnd_SmokeYellow_Grenade_shell",
"3Rnd_SmokePurple_Grenade_shell",
"3Rnd_SmokeBlue_Grenade_shell",
"3Rnd_SmokeOrange_Grenade_shell",
"3Rnd_UGL_FlareWhite_F",
"3Rnd_UGL_FlareGreen_F",
"3Rnd_UGL_FlareRed_F",
"3Rnd_UGL_FlareYellow_F",
"3Rnd_UGL_FlareCIR_F"
};
};
class CBA_40mm_GP {};
class CBA_Bazooka {}; // M1, M1A1 Bazooka

class CBA_RPG7 {
BI_rockets[] = {
"RPG7_F"
};
};

class CBA_PIAT {}; // PIAT
class CBA_Panzerschreck {}; // Panzerschreck RPzB 54
};
16 changes: 8 additions & 8 deletions addons/jam/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,29 +5,29 @@ class CfgWeapons {
class Launcher_Base_F;

class mk20_base_F: Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
};
class SDAR_base_F: Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
};
class Tavor_base_F: Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D"};
};
class arifle_SPAR_01_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
};
class arifle_SPAR_02_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
magazineWell[] = {"CBA_556x45_STANAG", "CBA_556x45_STANAG_L", "CBA_556x45_STANAG_XL", "CBA_556x45_STANAG_2D", "CBA_556x45_STANAG_2D_XL"};
};

class UGL_F : GrenadeLauncher {
magazineWell[] = {"CBA_40mm_M203"};
magazineWell[] = {"CBA_40mm_M203", "CBA_40mm_EGLM"};
};

class arifle_MX_Base_F : Rifle_Base_F {
magazineWell[] = {"CBA_65x39_MX"};
magazineWell[] = {"CBA_65x39_MX", "CBA_65x39_MX_XL"};
class GL_3GL_F : UGL_F {
magazineWell[] = {"CBA_40mm_3GL", "CBA_40mm_M203"};
magazineWell[] = {"CBA_40mm_3GL", "CBA_40mm_M203", "CBA_40mm_EGLM"};
};
};

Expand Down Expand Up @@ -60,7 +60,7 @@ class CfgWeapons {
};

class arifle_AKS_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_545x39_AK"};
magazineWell[] = {"CBA_545x39_AK", "CBA_545x39_AK_L"};
};

class LMG_03_base_F : Rifle_Long_Base_F {
Expand Down
9 changes: 9 additions & 0 deletions addons/jam/magwells_10gauge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class CBA_10g_9rnds {}; // 9 loose rounds
class CBA_10g_8rnds {}; // 8 loose rounds
class CBA_10g_7rnds {}; // 7 loose rounds
class CBA_10g_6rnds {}; // 6 loose rounds
class CBA_10g_5rnds {}; // 5 loose rounds
class CBA_10g_4rnds {}; // 4 loose rounds
class CBA_10g_3rnds {}; // 3 loose rounds
class CBA_10g_2rnds {}; // 2 loose rounds
class CBA_10g_1rnd {}; // 1 loose round
11 changes: 11 additions & 0 deletions addons/jam/magwells_12gauge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class CBA_12g_9rnds {}; // 9 loose rounds
class CBA_12g_8rnds {}; // 8 loose rounds
class CBA_12g_7rnds {}; // 7 loose rounds
class CBA_12g_6rnds {}; // 6 loose rounds
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_1rnd {}; // 1 loose round

class CBA_12g_SAIGA {};
2 changes: 2 additions & 0 deletions addons/jam/magwells_145x114.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class CBA_145x114_PTRD {}; // PTRD-41
class CBA_145x114_PTRS {}; // PTRS-41
9 changes: 9 additions & 0 deletions addons/jam/magwells_16gauge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class CBA_16g_9rnds {}; // 9 loose rounds
class CBA_16g_8rnds {}; // 8 loose rounds
class CBA_16g_7rnds {}; // 7 loose rounds
class CBA_16g_6rnds {}; // 6 loose rounds
class CBA_16g_5rnds {}; // 5 loose rounds
class CBA_16g_4rnds {}; // 4 loose rounds
class CBA_16g_3rnds {}; // 3 loose rounds
class CBA_16g_2rnds {}; // 2 loose rounds
class CBA_16g_1rnd {}; // 1 loose round
9 changes: 9 additions & 0 deletions addons/jam/magwells_20gauge.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
class CBA_20g_9rnds {}; // 9 loose rounds
class CBA_20g_8rnds {}; // 8 loose rounds
class CBA_20g_7rnds {}; // 7 loose rounds
class CBA_20g_6rnds {}; // 6 loose rounds
class CBA_20g_5rnds {}; // 5 loose rounds
class CBA_20g_4rnds {}; // 4 loose rounds
class CBA_20g_3rnds {}; // 3 loose rounds
class CBA_20g_2rnds {}; // 2 loose rounds
class CBA_20g_1rnd {}; // 1 loose round
2 changes: 2 additions & 0 deletions addons/jam/magwells_22LR.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class CBA_22LR_PP {}; // Walther PP in .22LR
class CBA_22LR_PPK {}; // Walther PPK in .22LR
5 changes: 5 additions & 0 deletions addons/jam/magwells_3006.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
class CBA_3006_BAR {}; // M1918 BAR
class CBA_3006_Garand {}; // M1 Garand
class CBA_3006_Spring {}; // M1903 Springfield
class CBA_3006_Belt {}; // M1917/M1919 Browning Machine Gun
class CBA_3006_Vickers {}; // Vickers machine gun in .30-06
4 changes: 4 additions & 0 deletions addons/jam/magwells_303B.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class CBA_303B_LeeEn {}; // Lee Enfield
class CBA_303B_BREN {}; // BREN gun
class CBA_303B_Maxim {}; // Maxim gun in .303 British
class CBA_303B_Vickers {}; // Vickers machine gun in .303 British (might be the same as the Maxim belt in .303)
3 changes: 3 additions & 0 deletions addons/jam/magwells_32ACP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class CBA_32ACP_PP {}; // Walther PP in .32 ACP (7.65x17mm Browning)
class CBA_32ACP_PPK {}; // Walther PPK in .32 ACP (7.65x17mm Browning)
class CBA_32ACP_Welrod {}; // Welrod pistol in .32 ACP (7.65x17mm Browning)
3 changes: 3 additions & 0 deletions addons/jam/magwells_357SIG.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class CBA_357SIG_P226 {}; // SIG P226
class CBA_357SIG_P229 {}; // SIG P229
class CBA_357SIG_P239 {}; // SIG P239
2 changes: 2 additions & 0 deletions addons/jam/magwells_380ACP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
class CBA_380ACP_PP {}; // Walther PP in .380 ACP (9x17mm/9mm Short/9mm Browning)
class CBA_380ACP_PPK {}; // Walther PPK in .380 ACP (9x17mm/9mm Short/9mm Browning)
3 changes: 3 additions & 0 deletions addons/jam/magwells_40SW.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class CBA_40SW_P226 {}; // SIG P226 .40 S&W
class CBA_40SW_P229 {}; // SIG P229 .40 S&W
class CBA_40SW_P239 {}; // SIG P239 .40 S&W
38 changes: 38 additions & 0 deletions addons/jam/magwells_40mm.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
class CBA_40mm_M203 {
BI_grenades[] = {
"1Rnd_HE_Grenade_shell",
"1Rnd_Smoke_Grenade_shell",
"1Rnd_SmokeRed_Grenade_shell",
"1Rnd_SmokeGreen_Grenade_shell",
"1Rnd_SmokeYellow_Grenade_shell",
"1Rnd_SmokePurple_Grenade_shell",
"1Rnd_SmokeBlue_Grenade_shell",
"1Rnd_SmokeOrange_Grenade_shell",
"UGL_FlareWhite_F",
"UGL_FlareGreen_F",
"UGL_FlareRed_F",
"UGL_FlareYellow_F",
"UGL_FlareCIR_F"
};
};

class CBA_40mm_3GL {
BI_grenades[] = {
"3Rnd_HE_Grenade_shell",
"3Rnd_Smoke_Grenade_shell",
"3Rnd_SmokeRed_Grenade_shell",
"3Rnd_SmokeGreen_Grenade_shell",
"3Rnd_SmokeYellow_Grenade_shell",
"3Rnd_SmokePurple_Grenade_shell",
"3Rnd_SmokeBlue_Grenade_shell",
"3Rnd_SmokeOrange_Grenade_shell",
"3Rnd_UGL_FlareWhite_F",
"3Rnd_UGL_FlareGreen_F",
"3Rnd_UGL_FlareRed_F",
"3Rnd_UGL_FlareYellow_F",
"3Rnd_UGL_FlareCIR_F"
};
};

class CBA_40mm_EGLM {}; // for longer grenades that can only fit side breech-loading
class CBA_40mm_GP {}; // GP-25, GP-30
7 changes: 7 additions & 0 deletions addons/jam/magwells_45ACP.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class CBA_45ACP_1911 {}; // Colt M1911
class CBA_45ACP_C96 {}; // Mauser C-96 in .45 ACP
class CBA_45ACP_Delisle {}; // De Lisle Carbine
class CBA_45ACP_Grease {}; // Grease Gun
class CBA_45ACP_Thompson_Stick {}; // Thompson stick magazines
class CBA_45ACP_Thompson_Drum {}; // Thompson drum magazines
class CBA_45ACP_Reising {}; // M50/M55 Reising
10 changes: 10 additions & 0 deletions addons/jam/magwells_545x39.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
class CBA_545x39_AK {
BI_mags[] = {
"30Rnd_545x39_Mag_F",
"30Rnd_545x39_Mag_Green_F",
"30Rnd_545x39_Mag_Tracer_F",
"30Rnd_545x39_Mag_Tracer_Green_F"
};
};

class CBA_545x39_AK_L {}; // 45rnd RPK-74
Loading