From 7dea95f2ae4c3ef709a22ba1c507ad30d751fd96 Mon Sep 17 00:00:00 2001 From: robalo Date: Wed, 19 Sep 2018 15:05:08 +0300 Subject: [PATCH 01/10] Split/extend the magwell classes by size --- addons/jam/CfgMagazineWells.hpp | 165 +++----------------------------- addons/jam/CfgWeapons.hpp | 16 ++-- addons/jam/magwells_357SIG.hpp | 3 + addons/jam/magwells_40SW.hpp | 3 + addons/jam/magwells_40mm.hpp | 38 ++++++++ addons/jam/magwells_545x39.hpp | 10 ++ addons/jam/magwells_556x45.hpp | 35 +++++++ addons/jam/magwells_580x42.hpp | 10 ++ addons/jam/magwells_65x39.hpp | 14 +++ addons/jam/magwells_762x39.hpp | 8 ++ addons/jam/magwells_762x51.hpp | 24 +++++ addons/jam/magwells_762x54.hpp | 12 +++ addons/jam/magwells_9x19.hpp | 5 + 13 files changed, 181 insertions(+), 162 deletions(-) create mode 100644 addons/jam/magwells_357SIG.hpp create mode 100644 addons/jam/magwells_40SW.hpp create mode 100644 addons/jam/magwells_40mm.hpp create mode 100644 addons/jam/magwells_545x39.hpp create mode 100644 addons/jam/magwells_556x45.hpp create mode 100644 addons/jam/magwells_580x42.hpp create mode 100644 addons/jam/magwells_65x39.hpp create mode 100644 addons/jam/magwells_762x39.hpp create mode 100644 addons/jam/magwells_762x51.hpp create mode 100644 addons/jam/magwells_762x54.hpp create mode 100644 addons/jam/magwells_9x19.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index 9b23f3243..1e9cbbda8 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -1,170 +1,27 @@ 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_9x19.hpp" + #include "magwells_357SIG.hpp" + #include "magwells_40SW.hpp" 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_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_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 - 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 {}; + #include "magwells_40mm.hpp" class CBA_RPG7 { BI_rockets[] = { diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp index 7ff7004bf..a65a72898 100644 --- a/addons/jam/CfgWeapons.hpp +++ b/addons/jam/CfgWeapons.hpp @@ -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"}; }; }; @@ -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 { diff --git a/addons/jam/magwells_357SIG.hpp b/addons/jam/magwells_357SIG.hpp new file mode 100644 index 000000000..ecd31731c --- /dev/null +++ b/addons/jam/magwells_357SIG.hpp @@ -0,0 +1,3 @@ + class CBA_357SIG_P226 {}; // SIG P226 + class CBA_357SIG_P229 {}; // SIG P229 + class CBA_357SIG_P239 {}; // SIG P239 diff --git a/addons/jam/magwells_40SW.hpp b/addons/jam/magwells_40SW.hpp new file mode 100644 index 000000000..cffe63265 --- /dev/null +++ b/addons/jam/magwells_40SW.hpp @@ -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 diff --git a/addons/jam/magwells_40mm.hpp b/addons/jam/magwells_40mm.hpp new file mode 100644 index 000000000..852d1f13f --- /dev/null +++ b/addons/jam/magwells_40mm.hpp @@ -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 diff --git a/addons/jam/magwells_545x39.hpp b/addons/jam/magwells_545x39.hpp new file mode 100644 index 000000000..48dc3a9fa --- /dev/null +++ b/addons/jam/magwells_545x39.hpp @@ -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 diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp new file mode 100644 index 000000000..2b1ebea9c --- /dev/null +++ b/addons/jam/magwells_556x45.hpp @@ -0,0 +1,35 @@ + 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" + }; + }; + + class CBA_556x45_STANAG_L {}; // Magpul PMAG 40, Surefire MAG5-60 + class CBA_556x45_STANAG_XL {}; // Surefire MAG5-100 + class CBA_556x45_STANAG_2D {}; // twin-drum 100rnd Beta C-MAG + + class CBA_556x45_STANAG_2D_XL { // twin-drum 150rnd Armatac SAW-MAG + BI_mags[] = { + "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 {}; diff --git a/addons/jam/magwells_580x42.hpp b/addons/jam/magwells_580x42.hpp new file mode 100644 index 000000000..5a96e66e3 --- /dev/null +++ b/addons/jam/magwells_580x42.hpp @@ -0,0 +1,10 @@ + 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" + }; + }; diff --git a/addons/jam/magwells_65x39.hpp b/addons/jam/magwells_65x39.hpp new file mode 100644 index 000000000..a85fa5604 --- /dev/null +++ b/addons/jam/magwells_65x39.hpp @@ -0,0 +1,14 @@ + 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" + }; + }; + class CBA_65x39_MX_XL { + BI_mags[] = { + "100Rnd_65x39_caseless_mag", + "100Rnd_65x39_caseless_mag_Tracer" + }; + }; diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp new file mode 100644 index 000000000..b321f7fba --- /dev/null +++ b/addons/jam/magwells_762x39.hpp @@ -0,0 +1,8 @@ + 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" + }; + }; diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp new file mode 100644 index 000000000..9e5ac8ab1 --- /dev/null +++ b/addons/jam/magwells_762x51.hpp @@ -0,0 +1,24 @@ + 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" + }; + }; diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp new file mode 100644 index 000000000..f6350a6a7 --- /dev/null +++ b/addons/jam/magwells_762x54.hpp @@ -0,0 +1,12 @@ + class CBA_762x54R_SVD { + BI_mags[] = { + "10Rnd_762x54_Mag" + }; + }; + + class CBA_762x54R_LINKS { + BI_belts[] = { + "150Rnd_762x54_Box", + "150Rnd_762x54_Box_Tracer" + }; + }; diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp new file mode 100644 index 000000000..c2250594b --- /dev/null +++ b/addons/jam/magwells_9x19.hpp @@ -0,0 +1,5 @@ + 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 From 1bc3d066e1211096bf4ac0ac84f393b1d89119b6 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Wed, 19 Sep 2018 11:59:18 -0700 Subject: [PATCH 02/10] add magwells for current IFA3, FOW, LEN weapons - Add magwells for current IFA3, FOW, LEN weapons - Also add magwells for non-magazine fed shotguns. All shotguns should use every magwell that is <= its tube capacity. --- addons/jam/CfgMagazineWells.hpp | 37 +++++++++++++++++++++++++++++---- addons/jam/magwells_10gauge.hpp | 9 ++++++++ addons/jam/magwells_12gauge.hpp | 11 ++++++++++ addons/jam/magwells_145x114.hpp | 2 ++ addons/jam/magwells_16gauge.hpp | 9 ++++++++ addons/jam/magwells_20gauge.hpp | 9 ++++++++ addons/jam/magwells_22LR.hpp | 2 ++ addons/jam/magwells_3006.hpp | 5 +++++ addons/jam/magwells_303B.hpp | 4 ++++ addons/jam/magwells_32ACP.hpp | 3 +++ addons/jam/magwells_380ACP.hpp | 2 ++ addons/jam/magwells_45ACP.hpp | 7 +++++++ addons/jam/magwells_762x25.hpp | 6 ++++++ addons/jam/magwells_762x54.hpp | 6 ++++++ addons/jam/magwells_77x58.hpp | 3 +++ addons/jam/magwells_792x57.hpp | 6 ++++++ addons/jam/magwells_8x22.hpp | 3 +++ addons/jam/magwells_9x19.hpp | 8 +++++++ 18 files changed, 128 insertions(+), 4 deletions(-) create mode 100644 addons/jam/magwells_10gauge.hpp create mode 100644 addons/jam/magwells_12gauge.hpp create mode 100644 addons/jam/magwells_145x114.hpp create mode 100644 addons/jam/magwells_16gauge.hpp create mode 100644 addons/jam/magwells_20gauge.hpp create mode 100644 addons/jam/magwells_22LR.hpp create mode 100644 addons/jam/magwells_3006.hpp create mode 100644 addons/jam/magwells_303B.hpp create mode 100644 addons/jam/magwells_32ACP.hpp create mode 100644 addons/jam/magwells_380ACP.hpp create mode 100644 addons/jam/magwells_45ACP.hpp create mode 100644 addons/jam/magwells_762x25.hpp create mode 100644 addons/jam/magwells_77x58.hpp create mode 100644 addons/jam/magwells_792x57.hpp create mode 100644 addons/jam/magwells_8x22.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index 1e9cbbda8..2f9bf883c 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -6,26 +6,55 @@ class CfgMagazineWells { #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_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_9x39_VSS {}; // Vintorez, Val - class CBA_10x25_MP5 {}; // H&K MP5/10 10mm Auto - class CBA_12g_SAIGA {}; + + class CBA_35mm_Type10 {}; // Japanese Type 10 Flare Pistol #include "magwells_40mm.hpp" + class CBA_Bazooka {}; // M1, M1A1 Bazooka + class CBA_RPG7 { BI_rockets[] = { "RPG7_F" }; }; + + class CBA_PIAT {}; // PIAT + class CBA_Panzerschreck {}; // Panzerschreck RPzB 54 }; diff --git a/addons/jam/magwells_10gauge.hpp b/addons/jam/magwells_10gauge.hpp new file mode 100644 index 000000000..1a5880425 --- /dev/null +++ b/addons/jam/magwells_10gauge.hpp @@ -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 diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp new file mode 100644 index 000000000..71b719e6c --- /dev/null +++ b/addons/jam/magwells_12gauge.hpp @@ -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 {}; diff --git a/addons/jam/magwells_145x114.hpp b/addons/jam/magwells_145x114.hpp new file mode 100644 index 000000000..f9b611f71 --- /dev/null +++ b/addons/jam/magwells_145x114.hpp @@ -0,0 +1,2 @@ + class CBA_145x114_PTRD {}; // PTRD-41 + class CBA_145x114_PTRS {}; // PTRS-41 diff --git a/addons/jam/magwells_16gauge.hpp b/addons/jam/magwells_16gauge.hpp new file mode 100644 index 000000000..a7c996246 --- /dev/null +++ b/addons/jam/magwells_16gauge.hpp @@ -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 diff --git a/addons/jam/magwells_20gauge.hpp b/addons/jam/magwells_20gauge.hpp new file mode 100644 index 000000000..f6b7b116c --- /dev/null +++ b/addons/jam/magwells_20gauge.hpp @@ -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 diff --git a/addons/jam/magwells_22LR.hpp b/addons/jam/magwells_22LR.hpp new file mode 100644 index 000000000..65cd5bd4b --- /dev/null +++ b/addons/jam/magwells_22LR.hpp @@ -0,0 +1,2 @@ + class CBA_22LR_PP {}; // Walther PP in .22LR + class CBA_22LR_PPK {}; // Walther PPK in .22LR diff --git a/addons/jam/magwells_3006.hpp b/addons/jam/magwells_3006.hpp new file mode 100644 index 000000000..e3e66b8af --- /dev/null +++ b/addons/jam/magwells_3006.hpp @@ -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 diff --git a/addons/jam/magwells_303B.hpp b/addons/jam/magwells_303B.hpp new file mode 100644 index 000000000..6b25320e2 --- /dev/null +++ b/addons/jam/magwells_303B.hpp @@ -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) diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp new file mode 100644 index 000000000..6c5dab839 --- /dev/null +++ b/addons/jam/magwells_32ACP.hpp @@ -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) diff --git a/addons/jam/magwells_380ACP.hpp b/addons/jam/magwells_380ACP.hpp new file mode 100644 index 000000000..cceb96bcb --- /dev/null +++ b/addons/jam/magwells_380ACP.hpp @@ -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) diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp new file mode 100644 index 000000000..597053598 --- /dev/null +++ b/addons/jam/magwells_45ACP.hpp @@ -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 diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp new file mode 100644 index 000000000..61848b2c1 --- /dev/null +++ b/addons/jam/magwells_762x25.hpp @@ -0,0 +1,6 @@ + class CBA_762x25_TT {}; // TT-30, TT-33 Tokarev + class CBA_762x25_PPS {}; // PPS-43 + class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines + class CBA_762x25_PPSh_Drum {}; // PPSh-41 drum magazines + class CBA_762x25_PPD_Stick {}; // PPD-40 stick magazines + class CBA_762x25_PPD_Drum {}; // PPD-40 drum magazines diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp index f6350a6a7..d28491b47 100644 --- a/addons/jam/magwells_762x54.hpp +++ b/addons/jam/magwells_762x54.hpp @@ -10,3 +10,9 @@ "150Rnd_762x54_Box_Tracer" }; }; + + class CBA_762x54R_Mosin {}; // M91/30, M38, M44 Mosin + class CBA_762x54R_SVT {}; // SVT + class CBA_762x54R_DPM {}; // DPM + class CBA_762x54R_DT {}; // DT + class CBA_762x54R_Maxim {}; // Maxim gun in 7.62x54R diff --git a/addons/jam/magwells_77x58.hpp b/addons/jam/magwells_77x58.hpp new file mode 100644 index 000000000..b8b5f6b8c --- /dev/null +++ b/addons/jam/magwells_77x58.hpp @@ -0,0 +1,3 @@ + class CBA_77x58_Arisaka {}; // Japanese Type 99 Arisaka + class CBA_77x58_Type92 {}; // Japanese Type 92 HMG + class CBA_77x58_Type99 {}; // Japanese Type 99 LMG diff --git a/addons/jam/magwells_792x57.hpp b/addons/jam/magwells_792x57.hpp new file mode 100644 index 000000000..f29655eb5 --- /dev/null +++ b/addons/jam/magwells_792x57.hpp @@ -0,0 +1,6 @@ + class CBA_792x57_FG42 {}; // FG42 + class CBA_792x57_G43 {}; // G43, G41 + class CBA_792x57_K98 {}; // K98, G98 + class CBA_792x57_LINKS {}; // MG42, MG34 + class CBA_792x57_TROMMEL {}; // MG34 Patronentrommel 34 + class CBA_792x57_MG08 {}; // MG08 diff --git a/addons/jam/magwells_8x22.hpp b/addons/jam/magwells_8x22.hpp new file mode 100644 index 000000000..6270fcce9 --- /dev/null +++ b/addons/jam/magwells_8x22.hpp @@ -0,0 +1,3 @@ + class CBA_8x22_TypeB {}; // Japanese Type B Nambu + class CBA_8x22_Type14 {}; // Japanese Type 14 Nambu + class CBA_8x22_Type100 {}; // Japanese Type 100 SMG diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp index c2250594b..1d59fd7cc 100644 --- a/addons/jam/magwells_9x19.hpp +++ b/addons/jam/magwells_9x19.hpp @@ -3,3 +3,11 @@ class CBA_9x19_P226 {}; // SIG P226 class CBA_9x19_P228 {}; // SIG P228 class CBA_9x19_P239 {}; // SIG P239 + class CBA_9x19_MP40 {}; // MP40, MP38 + class CBA_9x19_STEN {}; // STEN + class CBA_9x19_C96 {}; // Mauser C-96 in 9x19mm + class CBA_9x19_HiPower {}; // Browning HiPower + class CBA_9x19_P08 {}; // Luger P08 + class CBA_9x19_P38 {}; // Walther P38 + class CBA_9x19_Vis {}; // wz. 35 Vis (Radom) + class CBA_9x19_Welrod {}; // Welrod pistol in 9x19mm From 6f878ce1b02f3c2f5bd1fbae955f5f8392f14276 Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Thu, 20 Sep 2018 11:45:40 +0200 Subject: [PATCH 03/10] Translate JAM and JR module nams into Polish (#987) --- addons/jam/stringtable.xml | 3 ++- addons/jr/stringtable.xml | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index 6e3e54486..9f627e042 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -1,9 +1,10 @@ - + Community Base Addons - Joint Ammo Magazines Community Base Addons - Gemeinsame Munition und Magazine + Community Base Addons - Wspólna Amunicja oraz Magazynki diff --git a/addons/jr/stringtable.xml b/addons/jr/stringtable.xml index b073a0fa2..4b7850a0b 100644 --- a/addons/jr/stringtable.xml +++ b/addons/jr/stringtable.xml @@ -1,4 +1,4 @@ - + @@ -8,7 +8,7 @@ 社群基礎模組 - 共用導軌 社群基础模组 - 共用导轨 Community Base Addons - Система Joint Rails - Community Base Addons - System Joint Rails + Community Base Addons - Wspólne Szyny Montażowe Community Base Addons - Rails d'accessoires From 231e8a8368e9f4f4c3bf6534fd9d3904a084354b Mon Sep 17 00:00:00 2001 From: robalo Date: Thu, 27 Sep 2018 15:38:50 +0300 Subject: [PATCH 04/10] add CBA_762x39_RPK --- addons/jam/magwells_762x39.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp index b321f7fba..3241cc7a8 100644 --- a/addons/jam/magwells_762x39.hpp +++ b/addons/jam/magwells_762x39.hpp @@ -6,3 +6,4 @@ "30Rnd_762x39_Mag_Tracer_Green_F" }; }; + class CBA_762x39_RPK {}; // 40/45rnd From 6a818a7c9780ce316cfcfad6fbeff199e6c56666 Mon Sep 17 00:00:00 2001 From: Robalo Date: Thu, 27 Sep 2018 16:25:56 +0000 Subject: [PATCH 05/10] minor last-minute tweaks for AK magwells (#994) --- addons/jam/CfgWeapons.hpp | 6 +++--- addons/jam/magwells_545x39.hpp | 2 +- addons/jam/magwells_762x39.hpp | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/addons/jam/CfgWeapons.hpp b/addons/jam/CfgWeapons.hpp index a65a72898..8beb382cf 100644 --- a/addons/jam/CfgWeapons.hpp +++ b/addons/jam/CfgWeapons.hpp @@ -53,14 +53,14 @@ class CfgWeapons { }; class arifle_AK12_base_F : Rifle_Base_F { - magazineWell[] = {"CBA_762x39_AK"}; + magazineWell[] = {"CBA_762x39_AK", "CBA_762x39_RPK"}; }; class arifle_AKM_base_F : Rifle_Base_F { - magazineWell[] = {"CBA_762x39_AK"}; + magazineWell[] = {"CBA_762x39_AK", "CBA_762x39_RPK"}; }; class arifle_AKS_base_F : Rifle_Base_F { - magazineWell[] = {"CBA_545x39_AK", "CBA_545x39_AK_L"}; + magazineWell[] = {"CBA_545x39_AK", "CBA_545x39_RPK"}; }; class LMG_03_base_F : Rifle_Long_Base_F { diff --git a/addons/jam/magwells_545x39.hpp b/addons/jam/magwells_545x39.hpp index 48dc3a9fa..718bfb131 100644 --- a/addons/jam/magwells_545x39.hpp +++ b/addons/jam/magwells_545x39.hpp @@ -7,4 +7,4 @@ }; }; - class CBA_545x39_AK_L {}; // 45rnd RPK-74 + class CBA_545x39_RPK {}; // 45rnd RPK-74 diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp index 3241cc7a8..c7c219b7c 100644 --- a/addons/jam/magwells_762x39.hpp +++ b/addons/jam/magwells_762x39.hpp @@ -6,4 +6,5 @@ "30Rnd_762x39_Mag_Tracer_Green_F" }; }; - class CBA_762x39_RPK {}; // 40/45rnd + + class CBA_762x39_RPK {}; // 40/45rnd RPK From fc76d690591f247a67d398010157be6628b11727 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Tue, 2 Oct 2018 08:34:46 -0700 Subject: [PATCH 06/10] More JAM stuff (#995) * Magwells - sort, add magwells and comments - Sort #includes and their magwell classes in lexicographical order - Put all calibers in their own included .hpp file (except manpad AT and AA launchers, not sure what to do with those yet. - add a few new magwell calibers (.38 Special, .357 Mag, .408 Chey Tac, .45 Gap, 6.5 Creedmore, 6.5 Grendal) - add magwells for Glock pistols * add more pistol magwells - 7.62x26 - 9x18 - 9x19 - .32 ACP - .380 ACP --- addons/jam/CfgMagazineWells.hpp | 109 +++++++++++++++++-------------- addons/jam/magwells_10mmAuto.hpp | 3 + addons/jam/magwells_11x59R.hpp | 1 + addons/jam/magwells_12gauge.hpp | 3 +- addons/jam/magwells_3006.hpp | 10 +-- addons/jam/magwells_300BLK.hpp | 6 ++ addons/jam/magwells_300WM.hpp | 1 + addons/jam/magwells_303B.hpp | 2 +- addons/jam/magwells_32ACP.hpp | 5 ++ addons/jam/magwells_338LM.hpp | 1 + addons/jam/magwells_357Mag.hpp | 6 ++ addons/jam/magwells_357SIG.hpp | 9 ++- addons/jam/magwells_35mm.hpp | 1 + addons/jam/magwells_380ACP.hpp | 17 ++++- addons/jam/magwells_38Spec.hpp | 5 ++ addons/jam/magwells_38_200.hpp | 1 + addons/jam/magwells_408CT.hpp | 1 + addons/jam/magwells_40SW.hpp | 3 + addons/jam/magwells_40mm.hpp | 36 +++++----- addons/jam/magwells_455W.hpp | 1 + addons/jam/magwells_45ACP.hpp | 13 ++-- addons/jam/magwells_45GAP.hpp | 3 + addons/jam/magwells_50BMG.hpp | 1 + addons/jam/magwells_545x39.hpp | 2 +- addons/jam/magwells_556x45.hpp | 18 +++-- addons/jam/magwells_580x42.hpp | 5 +- addons/jam/magwells_65C.hpp | 1 + addons/jam/magwells_65G.hpp | 5 ++ addons/jam/magwells_68SPC.hpp | 6 ++ addons/jam/magwells_75x55.hpp | 1 + addons/jam/magwells_762x25.hpp | 12 ++-- addons/jam/magwells_762x38R.hpp | 1 + addons/jam/magwells_762x39.hpp | 10 ++- addons/jam/magwells_762x51.hpp | 32 +++++---- addons/jam/magwells_762x54.hpp | 20 +++--- addons/jam/magwells_763x25.hpp | 1 + addons/jam/magwells_765x21.hpp | 1 + addons/jam/magwells_792x33.hpp | 1 + addons/jam/magwells_792x57.hpp | 2 +- addons/jam/magwells_8x22.hpp | 4 +- addons/jam/magwells_9x18.hpp | 17 +++++ addons/jam/magwells_9x19.hpp | 27 ++++++-- addons/jam/magwells_9x39.hpp | 1 + 43 files changed, 276 insertions(+), 129 deletions(-) create mode 100644 addons/jam/magwells_10mmAuto.hpp create mode 100644 addons/jam/magwells_11x59R.hpp create mode 100644 addons/jam/magwells_300BLK.hpp create mode 100644 addons/jam/magwells_300WM.hpp create mode 100644 addons/jam/magwells_338LM.hpp create mode 100644 addons/jam/magwells_357Mag.hpp create mode 100644 addons/jam/magwells_35mm.hpp create mode 100644 addons/jam/magwells_38Spec.hpp create mode 100644 addons/jam/magwells_38_200.hpp create mode 100644 addons/jam/magwells_408CT.hpp create mode 100644 addons/jam/magwells_455W.hpp create mode 100644 addons/jam/magwells_45GAP.hpp create mode 100644 addons/jam/magwells_50BMG.hpp create mode 100644 addons/jam/magwells_65C.hpp create mode 100644 addons/jam/magwells_65G.hpp create mode 100644 addons/jam/magwells_68SPC.hpp create mode 100644 addons/jam/magwells_75x55.hpp create mode 100644 addons/jam/magwells_762x38R.hpp create mode 100644 addons/jam/magwells_763x25.hpp create mode 100644 addons/jam/magwells_765x21.hpp create mode 100644 addons/jam/magwells_792x33.hpp create mode 100644 addons/jam/magwells_9x18.hpp create mode 100644 addons/jam/magwells_9x39.hpp diff --git a/addons/jam/CfgMagazineWells.hpp b/addons/jam/CfgMagazineWells.hpp index 2f9bf883c..7598e5d7c 100644 --- a/addons/jam/CfgMagazineWells.hpp +++ b/addons/jam/CfgMagazineWells.hpp @@ -1,60 +1,73 @@ class CfgMagazineWells { - #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_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_35mm_Type10 {}; // Japanese Type 10 Flare Pistol + // Rifle calibre magwells, ordered lexicographically in metric and imperial groups + #include "magwells_11x59R.hpp" // 11x59mmR Gras | 11mm Vickers + #include "magwells_145x114.hpp" // 14.5x114mm + #include "magwells_545x39.hpp" // 5.45x39mm + #include "magwells_556x45.hpp" // 5.56x45mm | .223 + #include "magwells_580x42.hpp" // 5.8x42mm + #include "magwells_65C.hpp" // 6.5mm Creedmoor | 6.5 Creedmoor | 6,5 Creedmoor | 6.5 CM | 6.5 CRDMR + #include "magwells_65G.hpp" // 6.5mm Grendel | 6.5x39mm Grendel + #include "magwells_65x39.hpp" // 6.5x39mm Caseless + #include "magwells_68SPC.hpp" // 6.8mm Remington SPC | 6.8 SPC | 6.8x43mm + #include "magwells_75x55.hpp" // 7.5x55mm Swiss | 7.5x55mm Schmidt–Rubin + #include "magwells_762x39.hpp" // 7.62x39mm | 7.62 Soviet | .30 Russian Short + #include "magwells_762x51.hpp" // 7.62x51mm | .308 + #include "magwells_762x54.hpp" // 7.62x54mmR + #include "magwells_77x58.hpp" // 7.7x58mm Arisaka | Type 99 rimless 7.7 mm | 7.7mm Japanese + #include "magwells_792x33.hpp" // 7.92x33mm Kurz | 7.92 x 33 kurz | 7.9mm Kurz | 7.9 Kurz | 7.9mmK | 8x33 Polte + #include "magwells_792x57.hpp" // 7.92x57mm Mauser | 8mm Mauser | 8x57mm | 8 x 57 IS + #include "magwells_9x39.hpp" // 9x39mm + + #include "magwells_3006.hpp" // .30-06 Springfield | 7.62x63mm + #include "magwells_300BLK.hpp" // .300 AAC Blackout | 300 BLK | .300 Blackout | 7.62x35mm + #include "magwells_300WM.hpp" // .300 Winchester Magnum | .300 Win Mag | 300WM + #include "magwells_303B.hpp" // .303 British | 7.7x56mmR + #include "magwells_338LM.hpp" // .338 Lapua Magnum + #include "magwells_408CT.hpp" // .408 Cheyenne Tactical | 408 Chey Tac | 10.36x77mm + #include "magwells_50BMG.hpp" // .50 BMG | .50 Browning Machine Gun | 12.7x99mm NATO + + // Pistol calibre magwells, ordered lexicographically in metric and imperial groups + #include "magwells_10mmAuto.hpp" // 10mm Auto | 10mm Automatic | 10x25mm + #include "magwells_762x25.hpp" // 7.62x25mm Tokarev + #include "magwells_762x38R.hpp" // 7.62x38mmR | 7.62 mm Nagant + #include "magwells_763x25.hpp" // 7.63x25mm Mauser | .30 Mauser Automatic + #include "magwells_765x21.hpp" // 7.65x21mm Parabellum | 7,65 Parabellum | 7.65mm Luger | .30 Luger + #include "magwells_8x22.hpp" // 8x22mm Nambu + #include "magwells_9x18.hpp" // 9x18mm Makarov | 9mm Makarov | 9x18mm PM + #include "magwells_9x19.hpp" // 9x19mm Parabellum | 9mm Luger + + #include "magwells_22LR.hpp" // .22 LR | .22 Long Rifle | 5.6x15mmR + #include "magwells_32ACP.hpp" // .32 ACP | .32 Automatic | 7.65x17mmSR Browning | 7.65 mm Browning Short + #include "magwells_357Mag.hpp" // .375 Magnum | .357 S&W Magnum | 9x33mmR + #include "magwells_357SIG.hpp" // .357 SIG + #include "magwells_380ACP.hpp" // .380 ACP | .380 Auto | 9mm Browning | 9mm Corto | 9mm Kurz | 9mm Short | 9x17mm | 9 mm Browning Court + #include "magwells_38Spec.hpp" // .38 Smith & Wesson Special | .38 Special | .38 Spl | .38 Spc | 9x29.5mmR | 9.1x29mmR + #include "magwells_38_200.hpp" // .38/200 | 9x20mmR + #include "magwells_40SW.hpp" // .40 S&W + #include "magwells_455W.hpp" // .455 Webley | .455 Eley | .455 Colt + #include "magwells_45ACP.hpp" // .45 ACP | .45 Automatic Colt Pistol | .45 Auto | 11.43x23mm + #include "magwells_45GAP.hpp" // .45 GAP | .45 "GAP" | .45 Glock Auto Pistol + + // Shotgun calibre magwells, ordered lexicographically + #include "magwells_10gauge.hpp" // 10 Gauge + #include "magwells_12gauge.hpp" // 12 Gauge + #include "magwells_16gauge.hpp" // 16 Gauge + #include "magwells_20gauge.hpp" // 20 Gauge + + + // Grenade/Flare Launchers, ordered lexicographically + #include "magwells_35mm.hpp" #include "magwells_40mm.hpp" + // AT and AA Launchers, ordered lexicographically class CBA_Bazooka {}; // M1, M1A1 Bazooka + class CBA_Panzerschreck {}; // Panzerschreck RPzB 54 + class CBA_PIAT {}; // PIAT class CBA_RPG7 { BI_rockets[] = { "RPG7_F" }; }; - - class CBA_PIAT {}; // PIAT - class CBA_Panzerschreck {}; // Panzerschreck RPzB 54 }; diff --git a/addons/jam/magwells_10mmAuto.hpp b/addons/jam/magwells_10mmAuto.hpp new file mode 100644 index 000000000..9d2ba1a11 --- /dev/null +++ b/addons/jam/magwells_10mmAuto.hpp @@ -0,0 +1,3 @@ + class CBA_10mmAuto_Glock_Cpct {}; // Compact Glock in 10mm Auto (Glock 29) + class CBA_10mmAuto_Glock_Full {}; // Fullsize Glock in 10mm Auto (Glock 20, 40) + class CBA_10mmAuto_MP5 {}; // H&K MP5/10 10mm Auto diff --git a/addons/jam/magwells_11x59R.hpp b/addons/jam/magwells_11x59R.hpp new file mode 100644 index 000000000..4bfaa5aaf --- /dev/null +++ b/addons/jam/magwells_11x59R.hpp @@ -0,0 +1 @@ + class CBA_11mm_Vickers {}; // Vickers machine gun in 11mm Vickers diff --git a/addons/jam/magwells_12gauge.hpp b/addons/jam/magwells_12gauge.hpp index 71b719e6c..18436001a 100644 --- a/addons/jam/magwells_12gauge.hpp +++ b/addons/jam/magwells_12gauge.hpp @@ -8,4 +8,5 @@ class CBA_12g_2rnds {}; // 2 loose rounds class CBA_12g_1rnd {}; // 1 loose round - class CBA_12g_SAIGA {}; + class CBA_12g_SAIGA {}; // Saiga Stick Magazines + class CBA_12g_SAIGA_XL {}; // Saiga Drum Magazines diff --git a/addons/jam/magwells_3006.hpp b/addons/jam/magwells_3006.hpp index e3e66b8af..de5fe2ea3 100644 --- a/addons/jam/magwells_3006.hpp +++ b/addons/jam/magwells_3006.hpp @@ -1,5 +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 + class CBA_3006_BAR {}; // M1918 BAR + class CBA_3006_Belt {}; // M1917/M1919 Browning Machine Gun + class CBA_3006_Garand {}; // M1 Garand + class CBA_3006_Spring {}; // M1903 Springfield + class CBA_3006_Vickers {}; // Vickers machine gun in .30-06 \ No newline at end of file diff --git a/addons/jam/magwells_300BLK.hpp b/addons/jam/magwells_300BLK.hpp new file mode 100644 index 000000000..12fa13ae3 --- /dev/null +++ b/addons/jam/magwells_300BLK.hpp @@ -0,0 +1,6 @@ + class CBA_300BLK_STANAG {}; // .300 Blackout in a normal STANAG mag + class CBA_300BLK_STANAG_L {}; // .300 Blackout in a long STANAG mag + class CBA_300BLK_STANAG_XL {}; // .300 Blackout in a drum or XL stick mag + class CBA_300BLK_STANAG_2D {}; // .300 Blackout in a twin-drum mag + class CBA_300BLK_STANAG_2D_XL {}; // .300 Blackout in a XL twin-drum mag + class CBA_762x35_STANAG {}; // .300 Blackout diff --git a/addons/jam/magwells_300WM.hpp b/addons/jam/magwells_300WM.hpp new file mode 100644 index 000000000..3bda524af --- /dev/null +++ b/addons/jam/magwells_300WM.hpp @@ -0,0 +1 @@ + class CBA_300WM_AI {}; // AI .300 Winchester Magnum diff --git a/addons/jam/magwells_303B.hpp b/addons/jam/magwells_303B.hpp index 6b25320e2..63f05954d 100644 --- a/addons/jam/magwells_303B.hpp +++ b/addons/jam/magwells_303B.hpp @@ -1,4 +1,4 @@ - class CBA_303B_LeeEn {}; // Lee Enfield class CBA_303B_BREN {}; // BREN gun + class CBA_303B_LeeEn {}; // Lee Enfield 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) diff --git a/addons/jam/magwells_32ACP.hpp b/addons/jam/magwells_32ACP.hpp index 6c5dab839..a2f153358 100644 --- a/addons/jam/magwells_32ACP.hpp +++ b/addons/jam/magwells_32ACP.hpp @@ -1,3 +1,8 @@ + class CBA_32ACP_CZ82 {}; // CZ 83 + class CBA_32ACP_P83 {}; // FB P-83 Wanad + class CBA_32ACP_PA63 {}; // FEG PA-63 + class CBA_32ACP_PM63 {}; // FB PM-63 RAK 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_Vz61 {}; // Škorpion (vz. 61), M84 class CBA_32ACP_Welrod {}; // Welrod pistol in .32 ACP (7.65x17mm Browning) diff --git a/addons/jam/magwells_338LM.hpp b/addons/jam/magwells_338LM.hpp new file mode 100644 index 000000000..dabc4dbcd --- /dev/null +++ b/addons/jam/magwells_338LM.hpp @@ -0,0 +1 @@ + class CBA_338LM_AI {}; // AI .338 Lapua Magnum diff --git a/addons/jam/magwells_357Mag.hpp b/addons/jam/magwells_357Mag.hpp new file mode 100644 index 000000000..977788e5a --- /dev/null +++ b/addons/jam/magwells_357Mag.hpp @@ -0,0 +1,6 @@ + class CBA_357_Clip_6rnds {}; // 6 round .357 Magnum moon clip + class CBA_357_Clip_5rnds {}; // 5 round .357 Magnum moon clip + + class CBA_357_6rnds {}; // 6 loose rounds of .357 Magnum + class CBA_357_5rnds {}; // 5 loose rounds of .357 Magnum + diff --git a/addons/jam/magwells_357SIG.hpp b/addons/jam/magwells_357SIG.hpp index ecd31731c..9913c8e86 100644 --- a/addons/jam/magwells_357SIG.hpp +++ b/addons/jam/magwells_357SIG.hpp @@ -1,3 +1,6 @@ - class CBA_357SIG_P226 {}; // SIG P226 - class CBA_357SIG_P229 {}; // SIG P229 - class CBA_357SIG_P239 {}; // SIG P239 + class CBA_375SIG_Glock_SubC {}; // Subcompact Glock in 375SIGmm (Glock 33) + class CBA_375SIG_Glock_Cpct {}; // Compact Glock in 375SIGmm (Glock 32) + class CBA_375SIG_Glock_Full {}; // Fullsize Glock in 375SIGmm (Glock 31) + class CBA_357SIG_P226 {}; // SIG P226 + class CBA_357SIG_P229 {}; // SIG P229 + class CBA_357SIG_P239 {}; // SIG P239 diff --git a/addons/jam/magwells_35mm.hpp b/addons/jam/magwells_35mm.hpp new file mode 100644 index 000000000..2538f14df --- /dev/null +++ b/addons/jam/magwells_35mm.hpp @@ -0,0 +1 @@ + class CBA_35mm_Type10 {}; // Japanese Type 10 Flare Pistol diff --git a/addons/jam/magwells_380ACP.hpp b/addons/jam/magwells_380ACP.hpp index cceb96bcb..2f9974e91 100644 --- a/addons/jam/magwells_380ACP.hpp +++ b/addons/jam/magwells_380ACP.hpp @@ -1,2 +1,15 @@ - 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) + class CBA_380ACP_CZ82 {}; // CZ 83 + class CBA_380ACP_Fort12 {}; // Fort-12 + class CBA_380ACP_Glock_Slim {}; // Slimline Glock in .380 ACP (Glock 42) + class CBA_380ACP_Glock_SubC {}; // Subcompact Glock in .380 ACP (Glock 28) + class CBA_380ACP_Glock_Cpct {}; // Compact Glock in .380 ACP (Glock 25) + class CBA_380ACP_Ots01 {}; // OTs-01 Kobalt + class CBA_380ACP_P83 {}; // FB P-83 Wanad + class CBA_380ACP_PA63 {}; // FEG PA-63 + class CBA_380ACP_PM {}; // Makarov PM in .380 ACP + class CBA_380ACP_PM63 {}; // FB PM-63 RAK + class CBA_380ACP_PMM {}; // Makarov PMM in .380 ACP + class CBA_380ACP_PP {}; // Walther PP in .380 ACP + class CBA_380ACP_PP19 {}; // PP-19 Bizon-2-02 + class CBA_380ACP_PPK {}; // Walther PPK in .380 ACP + class CBA_380ACP_Vz64 {}; // Škorpion (vz. 64, vz. 83) diff --git a/addons/jam/magwells_38Spec.hpp b/addons/jam/magwells_38Spec.hpp new file mode 100644 index 000000000..abe20d323 --- /dev/null +++ b/addons/jam/magwells_38Spec.hpp @@ -0,0 +1,5 @@ + class CBA_38_Special_Clip_6rnds {}; // 6 round .38 Special moon clip + class CBA_38_Special_Clip_5rnds {}; // 5 round .38 Special moon clip + + class CBA_38_Special_6rnds {}; // 6 loose rounds of .38 Special + class CBA_38_Special_5rnds {}; // 5 loose rounds of .38 Special diff --git a/addons/jam/magwells_38_200.hpp b/addons/jam/magwells_38_200.hpp new file mode 100644 index 000000000..25d27cf4e --- /dev/null +++ b/addons/jam/magwells_38_200.hpp @@ -0,0 +1 @@ + class CBA_38_200_Webley {}; // Webley Revolver in .38/200 diff --git a/addons/jam/magwells_408CT.hpp b/addons/jam/magwells_408CT.hpp new file mode 100644 index 000000000..b36debe13 --- /dev/null +++ b/addons/jam/magwells_408CT.hpp @@ -0,0 +1 @@ + class CBA_408CT_Inter {}; // CheyTac Intervention in .408 Chey Tac diff --git a/addons/jam/magwells_40SW.hpp b/addons/jam/magwells_40SW.hpp index cffe63265..ff94c8726 100644 --- a/addons/jam/magwells_40SW.hpp +++ b/addons/jam/magwells_40SW.hpp @@ -1,3 +1,6 @@ + class CBA_40SW_Glock_SubC {}; // Subcompact Glock in .40 S&W (Glock 27) + class CBA_40SW_Glock_Cpct {}; // Compact Glock in .40 S&W (Glock 23) + class CBA_40SW_Glock_Full {}; // Fullsize Glock in .40 S&W (Glock 22, 24, 35) 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 diff --git a/addons/jam/magwells_40mm.hpp b/addons/jam/magwells_40mm.hpp index 852d1f13f..030aa9ac9 100644 --- a/addons/jam/magwells_40mm.hpp +++ b/addons/jam/magwells_40mm.hpp @@ -1,21 +1,3 @@ - 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", @@ -36,3 +18,21 @@ class CBA_40mm_EGLM {}; // for longer grenades that can only fit side breech-loading class CBA_40mm_GP {}; // GP-25, GP-30 + + 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" + }; + }; diff --git a/addons/jam/magwells_455W.hpp b/addons/jam/magwells_455W.hpp new file mode 100644 index 000000000..75fd9efee --- /dev/null +++ b/addons/jam/magwells_455W.hpp @@ -0,0 +1 @@ + class CBA_455_Webley {}; // Webley Revolver in .455 Webley diff --git a/addons/jam/magwells_45ACP.hpp b/addons/jam/magwells_45ACP.hpp index 597053598..c9f8d5caa 100644 --- a/addons/jam/magwells_45ACP.hpp +++ b/addons/jam/magwells_45ACP.hpp @@ -1,7 +1,10 @@ - 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_1911 {}; // Colt M1911 + class CBA_45ACP_C96 {}; // Mauser C-96 in .45 ACP + class CBA_45ACP_Delisle {}; // De Lisle Carbine + class CBA_45ACP_Glock_Slim {}; // Slimline Glock in .45 ACP (Glock 36) + class CBA_45ACP_Glock_Cpct {}; // Compact Glock in .45 ACP (Glock 29) + class CBA_45ACP_Glock_Full {}; // Fullsize Glock in .45 ACP (Glock 21, 41) + class CBA_45ACP_Grease {}; // Grease Gun + class CBA_45ACP_Reising {}; // M50/M55 Reising class CBA_45ACP_Thompson_Stick {}; // Thompson stick magazines class CBA_45ACP_Thompson_Drum {}; // Thompson drum magazines - class CBA_45ACP_Reising {}; // M50/M55 Reising diff --git a/addons/jam/magwells_45GAP.hpp b/addons/jam/magwells_45GAP.hpp new file mode 100644 index 000000000..8c5b811b7 --- /dev/null +++ b/addons/jam/magwells_45GAP.hpp @@ -0,0 +1,3 @@ + class CBA_45GAP_Glock_SubC {}; // Subcompact Glock in .45 GAP (Glock 39) + class CBA_45GAP_Glock_Cpct {}; // Compact Glock in .45 GAP (Glock 38) + class CBA_45GAP_Glock_Full {}; // Fullsize Glock in .45 GAP (Glock 37) diff --git a/addons/jam/magwells_50BMG.hpp b/addons/jam/magwells_50BMG.hpp new file mode 100644 index 000000000..3e36f884b --- /dev/null +++ b/addons/jam/magwells_50BMG.hpp @@ -0,0 +1 @@ + class CBA_50BMG_M107 {}; // M82, M107, G82 diff --git a/addons/jam/magwells_545x39.hpp b/addons/jam/magwells_545x39.hpp index 718bfb131..4c242af6c 100644 --- a/addons/jam/magwells_545x39.hpp +++ b/addons/jam/magwells_545x39.hpp @@ -1,4 +1,4 @@ - class CBA_545x39_AK { + class CBA_545x39_AK { // Standard AK-74 magazines BI_mags[] = { "30Rnd_545x39_Mag_F", "30Rnd_545x39_Mag_Green_F", diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp index 2b1ebea9c..f9a44c3e8 100644 --- a/addons/jam/magwells_556x45.hpp +++ b/addons/jam/magwells_556x45.hpp @@ -1,3 +1,6 @@ + class CBA_556x45_G36 {}; // H&K G36 + class CBA_556x45_HK33 {}; // H&K 33/53/93 + class CBA_556x45_MINIMI { BI_boxes[] = { "200Rnd_556x45_Box_F", @@ -7,6 +10,10 @@ }; }; + class CBA_556x45_TYPE97 {}; // QBZ-97 Stick Mags + class CBA_556x45_TYPE97_XL {}; // QBB-97 LSW Drums + class CBA_556x45_SG550 {}; + class CBA_556x45_STANAG { BI_mags[] = { "30Rnd_556x45_Stanag", @@ -18,18 +25,15 @@ }; }; - class CBA_556x45_STANAG_L {}; // Magpul PMAG 40, Surefire MAG5-60 - class CBA_556x45_STANAG_XL {}; // Surefire MAG5-100 + class CBA_556x45_STANAG_L {}; // Magpul PMAG 40, Surefire MAG5-60 + class CBA_556x45_STANAG_XL {}; // Surefire MAG5-100 class CBA_556x45_STANAG_2D {}; // twin-drum 100rnd Beta C-MAG - class CBA_556x45_STANAG_2D_XL { // twin-drum 150rnd Armatac SAW-MAG + class CBA_556x45_STANAG_2D_XL { // twin-drum 150rnd Armatac SAW-MAG BI_mags[] = { "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_556x45_STEYR {}; // Steyr AUG diff --git a/addons/jam/magwells_580x42.hpp b/addons/jam/magwells_580x42.hpp index 5a96e66e3..d5b7de3b2 100644 --- a/addons/jam/magwells_580x42.hpp +++ b/addons/jam/magwells_580x42.hpp @@ -1,8 +1,11 @@ - class CBA_580x42_TYPE95 { + class CBA_580x42_TYPE95 { // QBZ-95 Stick Mags BI_mags[] = { "30Rnd_580x42_Mag_F", "30Rnd_580x42_Mag_Tracer_F" }; + }; + + class CBA_580x42_TYPE95_XL { // QBB-95 LSW Drums BI_drums[] = { "100Rnd_580x42_Mag_F", "100Rnd_580x42_Mag_Tracer_F" diff --git a/addons/jam/magwells_65C.hpp b/addons/jam/magwells_65C.hpp new file mode 100644 index 000000000..9024af1b5 --- /dev/null +++ b/addons/jam/magwells_65C.hpp @@ -0,0 +1 @@ + class CBA_65C_AR10 {}; // AR-10 in 6.5 Creedmoor standard mag (20 rounds) diff --git a/addons/jam/magwells_65G.hpp b/addons/jam/magwells_65G.hpp new file mode 100644 index 000000000..1dbbc8366 --- /dev/null +++ b/addons/jam/magwells_65G.hpp @@ -0,0 +1,5 @@ + class CBA_65G_STANAG {}; // 6.5mm Grendel in a normal STANAG mag + class CBA_65G_STANAG_L {}; // 6.5mm Grendel in a long STANAG mag + class CBA_65G_STANAG_XL {}; // 6.5mm Grendel in a drum or XL stick mag + class CBA_65G_STANAG_2D {}; // 6.5mm Grendel in a twin-drum mag + class CBA_65G_STANAG_2D_XL {}; // 6.5mm Grendel in a XL twin-drum mag diff --git a/addons/jam/magwells_68SPC.hpp b/addons/jam/magwells_68SPC.hpp new file mode 100644 index 000000000..9f1bddac4 --- /dev/null +++ b/addons/jam/magwells_68SPC.hpp @@ -0,0 +1,6 @@ + class CBA_68SPC_STANAG {}; // 6.8 SPC in a normal STANAG mag + class CBA_68SPC_STANAG_2D {}; // 6.8 SPC in a twin-drum mag + class CBA_68SPC_STANAG_2D_XL {}; // 6.8 SPC in a XL twin-drum mag + class CBA_68SPC_STANAG_L {}; // 6.8 SPC in a long STANAG mag + class CBA_68SPC_STANAG_XL {}; // 6.8 SPC in a drum or XL stick mag + class CBA_68x43_ACR {}; // 6.8mm Remington SPC diff --git a/addons/jam/magwells_75x55.hpp b/addons/jam/magwells_75x55.hpp new file mode 100644 index 000000000..b3af913e9 --- /dev/null +++ b/addons/jam/magwells_75x55.hpp @@ -0,0 +1 @@ + class CBA_75x55_STGW57 {}; // SIG SG 510-1, Stgw. 57 diff --git a/addons/jam/magwells_762x25.hpp b/addons/jam/magwells_762x25.hpp index 61848b2c1..0e2e2dfaa 100644 --- a/addons/jam/magwells_762x25.hpp +++ b/addons/jam/magwells_762x25.hpp @@ -1,6 +1,10 @@ - class CBA_762x25_TT {}; // TT-30, TT-33 Tokarev + class CBA_762x25_CZ52 {}; // CZ 52, vz. 52, CZ 482 + class CBA_762x25_Ots27 {}; // OTs-27 Berdysh + class CBA_762x25_PM63 {}; // FB PM-63 RAK + class CBA_762x25_PP19 {}; // PP-19 Bizon-2-07 + class CBA_762x25_PPD_Drum {}; // PPD-40 drum magazines + class CBA_762x25_PPD_Stick {}; // PPD-40 stick magazines class CBA_762x25_PPS {}; // PPS-43 - class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines class CBA_762x25_PPSh_Drum {}; // PPSh-41 drum magazines - class CBA_762x25_PPD_Stick {}; // PPD-40 stick magazines - class CBA_762x25_PPD_Drum {}; // PPD-40 drum magazines + class CBA_762x25_PPSh_Stick {}; // PPSh-41 stick magazines + class CBA_762x25_TT {}; // TT-30, TT-33 Tokarev diff --git a/addons/jam/magwells_762x38R.hpp b/addons/jam/magwells_762x38R.hpp new file mode 100644 index 000000000..bb9c93346 --- /dev/null +++ b/addons/jam/magwells_762x38R.hpp @@ -0,0 +1 @@ + class CBA_762x38R_Nagant {}; // Nagant M1895 Revolver diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp index c7c219b7c..33aeb6e8c 100644 --- a/addons/jam/magwells_762x39.hpp +++ b/addons/jam/magwells_762x39.hpp @@ -1,4 +1,4 @@ - class CBA_762x39_AK { + class CBA_762x39_AK { // Standard AK-47/AKM magazines BI_mags[] = { "30Rnd_762x39_Mag_F", "30Rnd_762x39_Mag_Green_F", @@ -7,4 +7,10 @@ }; }; - class CBA_762x39_RPK {}; // 40/45rnd RPK + class CBA_762x39_RPK {}; // 40/45/75rnd RPK magazines + + class CBA_762x39_STANAG {}; // 762x39mm in a normal STANAG mag + class CBA_762x39_STANAG_L {}; // 762x39mm in a long STANAG mag + class CBA_762x39_STANAG_XL {}; // 762x39mm in a drum or XL stick mag + class CBA_762x39_STANAG_2D {}; // 762x39mm in a twin-drum mag + class CBA_762x39_STANAG_2D_XL {}; // 762x39mm in a XL twin-drum mag diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index 9e5ac8ab1..edba95a66 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -1,24 +1,30 @@ - class CBA_762x51_M14 { - BI_mags[] = { - "20Rnd_762x51_Mag" - }; - }; - class CBA_762x51_HK417 { + class CBA_762x51_AR10 {}; // AR-10 standard mag (20 rounds) + class CBA_762x51_AR10_L {}; // AR-10 long mag (25 rounds) + class CBA_762x51_AR10_XL {}; // AR-10 drum mag (X-Products 50 round) + class CBA_762x51_FAL {}; // FN FAL + class CBA_762x51_G3 {}; // H&K G3 + + class CBA_762x51_HK417 { // H&K 417 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 { + class CBA_762x51_LINKS { // M13 Links for M60, M240, MG3 (DM60) BI_belts[] = { "150Rnd_762x51_Box", "150Rnd_762x51_Box_Tracer" }; }; + + class CBA_762x51_M14 { // M14 + BI_mags[] = { + "20Rnd_762x51_Mag" + }; + }; + + class CBA_762x51_MG3 {}; // MG3 DM1 belts + class CBA_762x51_SCAR {}; // SCAR-H + class CBA_762x51_SIGAMT {}; // SIG 510-4, AMT + class CBA_762x51_SR25 {}; // M110, SIG716 diff --git a/addons/jam/magwells_762x54.hpp b/addons/jam/magwells_762x54.hpp index d28491b47..8a04d3ab5 100644 --- a/addons/jam/magwells_762x54.hpp +++ b/addons/jam/magwells_762x54.hpp @@ -1,18 +1,20 @@ - class CBA_762x54R_SVD { - BI_mags[] = { - "10Rnd_762x54_Mag" - }; - }; + class CBA_762x54R_DPM {}; // DPM LMG + class CBA_762x54R_DT {}; // DT LMG - class CBA_762x54R_LINKS { + class CBA_762x54R_LINKS { // Links for PK, PKM, and similar BI_belts[] = { "150Rnd_762x54_Box", "150Rnd_762x54_Box_Tracer" }; }; + class CBA_762x54R_Maxim {}; // Maxim gun in 7.62x54R class CBA_762x54R_Mosin {}; // M91/30, M38, M44 Mosin + + class CBA_762x54R_SVD { // SVD + BI_mags[] = { + "10Rnd_762x54_Mag" + }; + }; + class CBA_762x54R_SVT {}; // SVT - class CBA_762x54R_DPM {}; // DPM - class CBA_762x54R_DT {}; // DT - class CBA_762x54R_Maxim {}; // Maxim gun in 7.62x54R diff --git a/addons/jam/magwells_763x25.hpp b/addons/jam/magwells_763x25.hpp new file mode 100644 index 000000000..1f81a2de7 --- /dev/null +++ b/addons/jam/magwells_763x25.hpp @@ -0,0 +1 @@ + class CBA_763x25_C96 {}; // Mauser C-96 in 7.63x25mm diff --git a/addons/jam/magwells_765x21.hpp b/addons/jam/magwells_765x21.hpp new file mode 100644 index 000000000..63a31376f --- /dev/null +++ b/addons/jam/magwells_765x21.hpp @@ -0,0 +1 @@ + class CBA_765x21_C96 {}; // Mauser C-96 in 7.65x21mm diff --git a/addons/jam/magwells_792x33.hpp b/addons/jam/magwells_792x33.hpp new file mode 100644 index 000000000..ab3460694 --- /dev/null +++ b/addons/jam/magwells_792x33.hpp @@ -0,0 +1 @@ + class CBA_792x33_StG {}; // StG44 diff --git a/addons/jam/magwells_792x57.hpp b/addons/jam/magwells_792x57.hpp index f29655eb5..1e8b06c05 100644 --- a/addons/jam/magwells_792x57.hpp +++ b/addons/jam/magwells_792x57.hpp @@ -2,5 +2,5 @@ class CBA_792x57_G43 {}; // G43, G41 class CBA_792x57_K98 {}; // K98, G98 class CBA_792x57_LINKS {}; // MG42, MG34 - class CBA_792x57_TROMMEL {}; // MG34 Patronentrommel 34 class CBA_792x57_MG08 {}; // MG08 + class CBA_792x57_TROMMEL {}; // MG34 Patronentrommel 34 diff --git a/addons/jam/magwells_8x22.hpp b/addons/jam/magwells_8x22.hpp index 6270fcce9..2c78d3da9 100644 --- a/addons/jam/magwells_8x22.hpp +++ b/addons/jam/magwells_8x22.hpp @@ -1,3 +1,3 @@ - class CBA_8x22_TypeB {}; // Japanese Type B Nambu - class CBA_8x22_Type14 {}; // Japanese Type 14 Nambu class CBA_8x22_Type100 {}; // Japanese Type 100 SMG + class CBA_8x22_Type14 {}; // Japanese Type 14 Nambu + class CBA_8x22_TypeB {}; // Japanese Type B Nambu diff --git a/addons/jam/magwells_9x18.hpp b/addons/jam/magwells_9x18.hpp new file mode 100644 index 000000000..1240fd119 --- /dev/null +++ b/addons/jam/magwells_9x18.hpp @@ -0,0 +1,17 @@ + class CBA_9x18_APS {}; // Stechkin automatic pistol (APS) + class CBA_9x18_Fort12 {}; // Fort-12 + class CBA_9x18_GPP9M {}; // Grand Power K100 P9M + class CBA_9x18_Ots01 {}; // OTs-01 Kobalt + class CBA_9x18_Ots02 {}; // OTs-01 Kiparis + class CBA_9x18_Ots27 {}; // OTs-27 Berdysh + class CBA_9x18_Ots33 {}; // OTs-33 Pernach + class CBA_9x18_P64 {}; // FB P-64 CZAK + class CBA_9x18_P83 {}; // FB P-83 Wanad + class CBA_9x18_PA63 {}; // FEG PA-63 + class CBA_9x18_PM {}; // Makarov PM + class CBA_9x18_PM63 {}; // FB PM-63 RAK + class CBA_9x18_PM84 {}; // FB PM-84 Glauberyt + class CBA_9x18_PMM {}; // Makarov PMM + class CBA_9x18_PP19 {}; // PP-19 Bizon-1 + class CBA_9x18_PP91 {}; // PP-91 KEDR + class CBA_9x18_Vz65 {}; // Škorpion (vz. 65) diff --git a/addons/jam/magwells_9x19.hpp b/addons/jam/magwells_9x19.hpp index 1d59fd7cc..ffbe0fde5 100644 --- a/addons/jam/magwells_9x19.hpp +++ b/addons/jam/magwells_9x19.hpp @@ -1,13 +1,28 @@ + class CBA_9x19_C96 {}; // Mauser C-96 in 9x19mm + class CBA_9x19_CZ82 {}; // CZ 82, Vz. 82, CZ 83 + class CBA_9x19_GPK199 {}; // Grand Power K100 + class CBA_9x19_GSh18 {}; // GSh-18 + class CBA_9x19_Glock_Slim {}; // Slimline Glock in 9x19mm (Glock 43) + class CBA_9x19_Glock_SubC {}; // Subcompact Glock in 9x19mm (Glock 26) + class CBA_9x19_Glock_Cpct {}; // Compact Glock in 9x19mm (Glock 19, 46) + class CBA_9x19_Glock_Full {}; // Fullsize Glock in 9x19mm (Glock 17, 18, 34, 45) + class CBA_9x19_HiPower {}; // Browning HiPower + class CBA_9x19_MP40 {}; // MP40, MP38 + class CBA_9x19_MP443 {}; // MP-443 Grach class CBA_9x19_MP5 {}; // H&K MP5 - class CBA_9x19_STEYR {}; // AUG SMG, MPi, TMP + class CBA_9x19_Ots27 {}; // OTs-27 Berdysh + class CBA_9x19_P08 {}; // Luger P08 class CBA_9x19_P226 {}; // SIG P226 class CBA_9x19_P228 {}; // SIG P228 class CBA_9x19_P239 {}; // SIG P239 - class CBA_9x19_MP40 {}; // MP40, MP38 - class CBA_9x19_STEN {}; // STEN - class CBA_9x19_C96 {}; // Mauser C-96 in 9x19mm - class CBA_9x19_HiPower {}; // Browning HiPower - class CBA_9x19_P08 {}; // Luger P08 class CBA_9x19_P38 {}; // Walther P38 + class CBA_9x19_PM63 {}; // FB PM-63 RAK + class CBA_9x19_PM84 {}; // FB PM-84 Glauberyt + class CBA_9x19_PP19 {}; // PP-19 Bizon-2-01 + class CBA_9x19_STEN {}; // STEN + class CBA_9x19_STEYR {}; // AUG SMG, MPi, TMP + class CBA_9x19_TT {}; // TT-33 Tokarev in 9x19mm (M48, Tokagypt 58, Type 54) class CBA_9x19_Vis {}; // wz. 35 Vis (Radom) + class CBA_9x19_Vityaz {}; // Vityaz-SN + class CBA_9x19_Vz68 {}; // Škorpion (vz. 68) class CBA_9x19_Welrod {}; // Welrod pistol in 9x19mm diff --git a/addons/jam/magwells_9x39.hpp b/addons/jam/magwells_9x39.hpp new file mode 100644 index 000000000..730228879 --- /dev/null +++ b/addons/jam/magwells_9x39.hpp @@ -0,0 +1 @@ + class CBA_9x39_VSS {}; // Vintorez, Val From d846dec761b50d44fe6effad2dfa67a923d5080c Mon Sep 17 00:00:00 2001 From: Filip Maciejewski Date: Thu, 4 Oct 2018 18:44:58 +0200 Subject: [PATCH 07/10] Remove BOM character from stringtables (#1000) --- addons/accessory/stringtable.xml | 2 +- addons/ai/stringtable.xml | 2 +- addons/arrays/stringtable.xml | 2 +- addons/common/stringtable.xml | 2 +- addons/diagnostic/stringtable.xml | 2 +- addons/events/stringtable.xml | 2 +- addons/hashes/stringtable.xml | 2 +- addons/help/stringtable.xml | 2 +- addons/keybinding/stringtable.xml | 2 +- addons/main/stringtable.xml | 2 +- addons/modules/stringtable.xml | 2 +- addons/music/stringtable.xml | 2 +- addons/network/stringtable.xml | 2 +- addons/settings/stringtable.xml | 2 +- addons/statemachine/stringtable.xml | 2 +- addons/ui/stringtable.xml | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/addons/accessory/stringtable.xml b/addons/accessory/stringtable.xml index a8e7c718f..9c6540b80 100644 --- a/addons/accessory/stringtable.xml +++ b/addons/accessory/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index a8554b704..041c2ba80 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/arrays/stringtable.xml b/addons/arrays/stringtable.xml index 79487fbe1..bb83bd1ed 100644 --- a/addons/arrays/stringtable.xml +++ b/addons/arrays/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index b82cb7f17..86eb8be63 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index aa5fd196d..03b62126f 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/events/stringtable.xml b/addons/events/stringtable.xml index 9de5ed512..44e411108 100644 --- a/addons/events/stringtable.xml +++ b/addons/events/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/hashes/stringtable.xml b/addons/hashes/stringtable.xml index 9fcb9c2e3..d740e4944 100644 --- a/addons/hashes/stringtable.xml +++ b/addons/hashes/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/help/stringtable.xml b/addons/help/stringtable.xml index cb230546a..68c92bd4c 100644 --- a/addons/help/stringtable.xml +++ b/addons/help/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/keybinding/stringtable.xml b/addons/keybinding/stringtable.xml index 7bedcdb99..45f0525be 100644 --- a/addons/keybinding/stringtable.xml +++ b/addons/keybinding/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index 54c7fb6df..6676da172 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/modules/stringtable.xml b/addons/modules/stringtable.xml index b205c9edf..5d8cea997 100644 --- a/addons/modules/stringtable.xml +++ b/addons/modules/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/music/stringtable.xml b/addons/music/stringtable.xml index 73f487de8..15c885bfb 100644 --- a/addons/music/stringtable.xml +++ b/addons/music/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index 311b73bb3..9341c0287 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/settings/stringtable.xml b/addons/settings/stringtable.xml index e8b329348..00a2c0b59 100644 --- a/addons/settings/stringtable.xml +++ b/addons/settings/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/statemachine/stringtable.xml b/addons/statemachine/stringtable.xml index 40c283e29..336c601c6 100644 --- a/addons/statemachine/stringtable.xml +++ b/addons/statemachine/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 5cb1a0624..2a3cc740b 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -1,4 +1,4 @@ - + From 0a6c08f6c8e5dd218cc54b77e5055fe6594490b2 Mon Sep 17 00:00:00 2001 From: Drofseh Date: Thu, 4 Oct 2018 12:30:29 -0700 Subject: [PATCH 08/10] JAM STANAG and 7.62.x51 (#997) * adjust STANAG mags, add large 7.62x51 mags * un-deprecate the STANAG 2D XL classes * minor fix - re-add STANAG 2D XL to magazineWell[] for 5.56 rifles - put correct comment for 5.56 FAMAS mag * fix missing ; * fix comment indentation * Remove XL twin drums from bullpups --- addons/jam/magwells_300BLK.hpp | 14 ++++++++------ addons/jam/magwells_556x45.hpp | 12 ++++++------ addons/jam/magwells_65G.hpp | 10 +++++----- addons/jam/magwells_68SPC.hpp | 14 ++++++++------ addons/jam/magwells_762x39.hpp | 10 +++++----- addons/jam/magwells_762x51.hpp | 20 ++++++++++++++++---- 6 files changed, 48 insertions(+), 32 deletions(-) diff --git a/addons/jam/magwells_300BLK.hpp b/addons/jam/magwells_300BLK.hpp index 12fa13ae3..479d64494 100644 --- a/addons/jam/magwells_300BLK.hpp +++ b/addons/jam/magwells_300BLK.hpp @@ -1,6 +1,8 @@ - class CBA_300BLK_STANAG {}; // .300 Blackout in a normal STANAG mag - class CBA_300BLK_STANAG_L {}; // .300 Blackout in a long STANAG mag - class CBA_300BLK_STANAG_XL {}; // .300 Blackout in a drum or XL stick mag - class CBA_300BLK_STANAG_2D {}; // .300 Blackout in a twin-drum mag - class CBA_300BLK_STANAG_2D_XL {}; // .300 Blackout in a XL twin-drum mag - class CBA_762x35_STANAG {}; // .300 Blackout + class CBA_300BLK_STANAG {}; // .300 Blackout in a normal length STANAG mag, including small drums + class CBA_300BLK_STANAG_L {}; // .300 Blackout in a long STANAG stick or coffin + class CBA_300BLK_STANAG_XL {}; // .300 Blackout in an extra long STANAG stick or coffin mag + class CBA_300BLK_STANAG_2D {}; // .300 Blackout in a twin-drum STANAG mag + class CBA_300BLK_STANAG_2D_XL {}; // .300 Blackout in an extra large twin-drum STANAG mag + + //Deprecated classes do not use + class CBA_762x35_STANAG {}; // DEPRECATED, use CBA_300BLK_STANAG diff --git a/addons/jam/magwells_556x45.hpp b/addons/jam/magwells_556x45.hpp index f9a44c3e8..eec292713 100644 --- a/addons/jam/magwells_556x45.hpp +++ b/addons/jam/magwells_556x45.hpp @@ -1,3 +1,4 @@ + class CBA_556x45_FAMAS {}; // FAMAS F1 class CBA_556x45_G36 {}; // H&K G36 class CBA_556x45_HK33 {}; // H&K 33/53/93 @@ -14,7 +15,7 @@ class CBA_556x45_TYPE97_XL {}; // QBB-97 LSW Drums class CBA_556x45_SG550 {}; - class CBA_556x45_STANAG { + class CBA_556x45_STANAG { // STANAG mags, standard length, including small drums BI_mags[] = { "30Rnd_556x45_Stanag", "30Rnd_556x45_Stanag_green", @@ -25,11 +26,10 @@ }; }; - class CBA_556x45_STANAG_L {}; // Magpul PMAG 40, Surefire MAG5-60 - class CBA_556x45_STANAG_XL {}; // Surefire MAG5-100 - class CBA_556x45_STANAG_2D {}; // twin-drum 100rnd Beta C-MAG - - class CBA_556x45_STANAG_2D_XL { // twin-drum 150rnd Armatac SAW-MAG + 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_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[] = { "150Rnd_556x45_Drum_Mag_F", "150Rnd_556x45_Drum_Mag_Tracer_F" diff --git a/addons/jam/magwells_65G.hpp b/addons/jam/magwells_65G.hpp index 1dbbc8366..b90765af5 100644 --- a/addons/jam/magwells_65G.hpp +++ b/addons/jam/magwells_65G.hpp @@ -1,5 +1,5 @@ - class CBA_65G_STANAG {}; // 6.5mm Grendel in a normal STANAG mag - class CBA_65G_STANAG_L {}; // 6.5mm Grendel in a long STANAG mag - class CBA_65G_STANAG_XL {}; // 6.5mm Grendel in a drum or XL stick mag - class CBA_65G_STANAG_2D {}; // 6.5mm Grendel in a twin-drum mag - class CBA_65G_STANAG_2D_XL {}; // 6.5mm Grendel in a XL twin-drum mag + class CBA_65G_STANAG {}; // 6.5mm Grendel in a normal length STANAG mag, including small drums + class CBA_65G_STANAG_L {}; // 6.5mm Grendel in a long STANAG stick or coffin + class CBA_65G_STANAG_XL {}; // 6.5mm Grendel in an extra long STANAG stick or coffin mag + class CBA_65G_STANAG_2D {}; // 6.5mm Grendel in a twin-drum STANAG mag + class CBA_65G_STANAG_2D_XL {}; // 6.5mm Grendel in an extra large twin-drum STANAG mag diff --git a/addons/jam/magwells_68SPC.hpp b/addons/jam/magwells_68SPC.hpp index 9f1bddac4..3b68842fa 100644 --- a/addons/jam/magwells_68SPC.hpp +++ b/addons/jam/magwells_68SPC.hpp @@ -1,6 +1,8 @@ - class CBA_68SPC_STANAG {}; // 6.8 SPC in a normal STANAG mag - class CBA_68SPC_STANAG_2D {}; // 6.8 SPC in a twin-drum mag - class CBA_68SPC_STANAG_2D_XL {}; // 6.8 SPC in a XL twin-drum mag - class CBA_68SPC_STANAG_L {}; // 6.8 SPC in a long STANAG mag - class CBA_68SPC_STANAG_XL {}; // 6.8 SPC in a drum or XL stick mag - class CBA_68x43_ACR {}; // 6.8mm Remington SPC + class CBA_68SPC_STANAG {}; // 6.8 SPC in a normal length STANAG mag, including small drums + class CBA_68SPC_STANAG_L {}; // 6.8 SPC in a long STANAG stick or coffin + class CBA_68SPC_STANAG_XL {}; // 6.8 SPC in an extra long STANAG stick or coffin mag + class CBA_68SPC_STANAG_2D {}; // 6.8 SPC in a twin-drum STANAG mag + class CBA_68SPC_STANAG_2D_XL {}; // 6.8 SPC in an extra large twin-drum STANAG mag + + //Deprecated classes do not use + class CBA_68x43_ACR {}; // DEPRECATED, use CBA_68SPC_STANAG diff --git a/addons/jam/magwells_762x39.hpp b/addons/jam/magwells_762x39.hpp index 33aeb6e8c..53f7f1749 100644 --- a/addons/jam/magwells_762x39.hpp +++ b/addons/jam/magwells_762x39.hpp @@ -9,8 +9,8 @@ class CBA_762x39_RPK {}; // 40/45/75rnd RPK magazines - class CBA_762x39_STANAG {}; // 762x39mm in a normal STANAG mag - class CBA_762x39_STANAG_L {}; // 762x39mm in a long STANAG mag - class CBA_762x39_STANAG_XL {}; // 762x39mm in a drum or XL stick mag - class CBA_762x39_STANAG_2D {}; // 762x39mm in a twin-drum mag - class CBA_762x39_STANAG_2D_XL {}; // 762x39mm in a XL twin-drum mag + class CBA_762x39_STANAG {}; // 762x39mm in a normal length STANAG mag, including small drums + class CBA_762x39_STANAG_L {}; // 762x39mm in a long STANAG stick or coffin + class CBA_762x39_STANAG_XL {}; // 762x39mm in an extra long STANAG stick or coffin mag + class CBA_762x39_STANAG_2D {}; // 762x39mm in a twin-drum STANAG mag + class CBA_762x39_STANAG_2D_XL {}; // 762x39mm in an extra large twin-drum STANAG mag diff --git a/addons/jam/magwells_762x51.hpp b/addons/jam/magwells_762x51.hpp index edba95a66..67429fcdb 100644 --- a/addons/jam/magwells_762x51.hpp +++ b/addons/jam/magwells_762x51.hpp @@ -1,17 +1,25 @@ class CBA_762x51_AR10 {}; // AR-10 standard mag (20 rounds) - class CBA_762x51_AR10_L {}; // AR-10 long mag (25 rounds) + class CBA_762x51_AR10_L {}; // AR-10 long mag (25/30 rounds) class CBA_762x51_AR10_XL {}; // AR-10 drum mag (X-Products 50 round) + 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 + class CBA_762x51_G3_L {}; // H&K G3 long mag (25/30 rounds) + class CBA_762x51_G3_XL {}; // H&K G3 drum mag (X-Products 50 round) class CBA_762x51_HK417 { // H&K 417 BI_mags[] = { "20Rnd_762x51_Mag" }; }; + class CBA_762x51_417_L {}; // H&K417 long mag (25/30 rounds) + class CBA_762x51_417_XL {}; // H&K417 drum mag (50 rounds) - class CBA_762x51_LINKS { // M13 Links for M60, M240, MG3 (DM60) + class CBA_762x51_LINKS { // M13 Links for M60, M240, MG3 (DM6/DM60) BI_belts[] = { "150Rnd_762x51_Box", "150Rnd_762x51_Box_Tracer" @@ -23,8 +31,12 @@ "20Rnd_762x51_Mag" }; }; + class CBA_762x51_M14_L {}; // M14 long mag (25/30 rounds) + class CBA_762x51_M14_XL {}; // M14 drum mag (X-Products 50 round) - class CBA_762x51_MG3 {}; // MG3 DM1 belts + class CBA_762x51_MG3 {}; // MG3 DM1 link belts class CBA_762x51_SCAR {}; // SCAR-H class CBA_762x51_SIGAMT {}; // SIG 510-4, AMT - class CBA_762x51_SR25 {}; // M110, SIG716 + + //Deprecated classes do not use + class CBA_762x51_SR25 {}; // DEPRECATED, use CBA_762x51_AR10 instead. From aaa28ab7a754b0553a91a3b5558845506c3537f2 Mon Sep 17 00:00:00 2001 From: Josuan Albin Date: Thu, 4 Oct 2018 21:31:57 +0200 Subject: [PATCH 09/10] Add french translations for CBA UI (#1001) * Add french translations for CBA UI * Add back missing entries for "STR_CBA_FORMAT_NUMBER_THOUSANDS_SEPARATOR" Note: the thousand separator in french is indeed a space. --- addons/jam/stringtable.xml | 1 + addons/strings/stringtable.xml | 2 +- addons/ui/stringtable.xml | 9 +++++++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index 9f627e042..29eafc179 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -5,6 +5,7 @@ Community Base Addons - Joint Ammo Magazines Community Base Addons - Gemeinsame Munition und Magazine Community Base Addons - Wspólna Amunicja oraz Magazynki + Community Base Addons - Munitions et Chargeurs joints diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 97e5f6c47..23c2fa4be 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -1,4 +1,4 @@ - + diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 2a3cc740b..169ae1406 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -34,46 +34,55 @@ CBA UI CBA UI CBA UI + CBA IU Store server passwords Serverpasswörter speichern Zapamiętuj hasła serwerów + Enregistrer les mots de passe serveur Setting to store the passwords entered when connecting to a multiplayer server. Einstellung zum Speichern der beim Betreten eines Mehrspielerservers eingegebenen Passwörter. Opcja zapamiętywania wprowadzonych haseł do serwerów. + Paramètre pour enregistrer les mots de passe entrés quand vous vous connectez à un serveur multijoueur Save passwords Passwörter speichern Zapisuj hasła + Sauvegarder mots de passe Passwords are stored when connecting to a multiplayer server. Passwörter werden beim Verbinden mit einem Mehrspielerserver gespeichert. Hasła są zapisywane podczas łaczenia do serwerów. + Les mots de passe sont enregistrés quand vous vous connectez à un serveur multijoueur Do not save passwords Passwörter nicht speichern Nie zapisuj haseł + Ne pas enregistrer les mots de passe Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden nicht automatisch eingegeben. Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła nie bedą wykorzystywane. + Les mots de passe ne sont pas enregistrés quand vous vous connectez à un serveur multijoueur.Les mots de passe déjà enregistrés ne seront pas entrés automatiquement. Delete passwords Passwörter löschen Usuń hasła + Supprimer les mots de passe Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden aus dem Profil gelöscht. Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła zostaną usunięte z profilu. + Les mots de passe ne sont pas enregistrés quand vous vous connectez à un serveur multijoueur.Les mots de passe déjà enregistrés vont être supprimés du profile. From ace6f2aa9017c043bec5d28f8f5cd74c586fd5b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ozan=20E=C4=9Fitmen?= Date: Fri, 5 Oct 2018 11:54:11 +0300 Subject: [PATCH 10/10] Add Turkish translations (#1002) --- addons/accessory/stringtable.xml | 9 +++++++++ addons/ai/stringtable.xml | 1 + addons/arrays/stringtable.xml | 1 + addons/common/stringtable.xml | 2 ++ addons/diagnostic/stringtable.xml | 7 +++++++ addons/events/stringtable.xml | 1 + addons/hashes/stringtable.xml | 1 + addons/help/stringtable.xml | 6 ++++++ addons/jam/stringtable.xml | 1 + addons/jr/stringtable.xml | 2 ++ addons/keybinding/stringtable.xml | 4 ++++ addons/main/stringtable.xml | 4 ++++ addons/music/stringtable.xml | 1 + addons/network/stringtable.xml | 1 + addons/statemachine/stringtable.xml | 1 + addons/strings/stringtable.xml | 3 +++ addons/ui/stringtable.xml | 12 ++++++++++++ addons/vectors/stringtable.xml | 1 + addons/versioning/stringtable.xml | 1 + addons/xeh/stringtable.xml | 1 + 20 files changed, 60 insertions(+) diff --git a/addons/accessory/stringtable.xml b/addons/accessory/stringtable.xml index 9c6540b80..120bb7f9e 100644 --- a/addons/accessory/stringtable.xml +++ b/addons/accessory/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - Функционал Аксессуаров Community Base Addons - Funkcje Akcesoriów Community Base Addons - Fonctions des accessoires + Community Base Addons - Aksesuar Fonksiyonları Next rail item state @@ -20,6 +21,7 @@ Следующее состояние приспособления на оружии Następny tryb akcesoria na szynie Mode de l'accessoire sur rail suivant + Sonraki ray aksesuarı Cycles to the next mode available for your rail slot attachment @@ -30,6 +32,7 @@ Переключает на следующий режим, доступный для приспособления на планке Przełącza na następny tryb akcesoria na szynie Passe au prochain mode disponible de votre accessoire sur rail + Ray aksesuarınızı sonraki moda geçirir Prev rail item state @@ -40,6 +43,7 @@ Предыдущее состояние приспособления на планке Poprzedni tryb akcesoria na szynie Mode de l'accessoire sur rail précèdent + Önceki ray aksesuarı Cycles to the previous mode available for your rail slot attachment @@ -50,6 +54,7 @@ Переключает на предыдущий режим, доступный для приспособления на планке Przełącza na poprzedni tryb akcesoria na szynie Passe au précèdent mode disponible de votre accessoire sur rail + Ray aksesuarınızı önceki moda geçirir Next optics state @@ -60,6 +65,7 @@ Следующий режим оптики Następny tryb optyki Mode de l'optique suivant + Sonraki dürbün modu Cycles to the next mode available for your optics slot attachment @@ -70,6 +76,7 @@ Переключает на следующий режим доступный для оптики на оружии Przełącza na następny dostępny tryb optyki Passe au prochain mode disponible de votre optique + Varolan dürbününüzü sonraki moduna geçirir Prev optics state @@ -80,6 +87,7 @@ Предыдущее состояние оптики Poprzedni tryb optyki Mode de l'optique sur rail précèdent + Önceki dürbün modu Cycles to the previous mode available for your optics slot attachment @@ -90,6 +98,7 @@ Переключает на предыдущий режим доступный для оптики на оружии Przełącza na poprzedni dostępny tryb optyki Passe au précèdent mode disponible de votre optique + Varolan dürbününüzü önceki moduna geçirir diff --git a/addons/ai/stringtable.xml b/addons/ai/stringtable.xml index 041c2ba80..eae9e6e35 100644 --- a/addons/ai/stringtable.xml +++ b/addons/ai/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - Искуственный Интеллект Community Base Addons - Intelligence artificielle Community Base Addons - Sztuczna Inteligencja + Community Base Addons - Yapay Zeka diff --git a/addons/arrays/stringtable.xml b/addons/arrays/stringtable.xml index bb83bd1ed..aad4789c9 100644 --- a/addons/arrays/stringtable.xml +++ b/addons/arrays/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - Массивы Community Base Addons - Tableaux Community Base Addons - Tablice + Community Base Addons - Diziler diff --git a/addons/common/stringtable.xml b/addons/common/stringtable.xml index 86eb8be63..f250da46b 100644 --- a/addons/common/stringtable.xml +++ b/addons/common/stringtable.xml @@ -10,12 +10,14 @@ Community Base Addons - Общие Компоненты Community Base Addons - Composants communs Community Base Addons - Ogólne Komponenty + Community Base Addons - Ortak Bileşenler You must first start a mission. Sie müssen zuerst eine Mission starten. Vous devez d'abord commencer une mission. Należy najpierw uruchomić misję. + Önce bir görev başlatmalısınız. diff --git a/addons/diagnostic/stringtable.xml b/addons/diagnostic/stringtable.xml index 03b62126f..cd4b55d94 100644 --- a/addons/diagnostic/stringtable.xml +++ b/addons/diagnostic/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - Диагностика Community Base Addons - Diagnostyka Community Base Addons - Diagnostics + Community Base Addons - Teşhis Extended Debug Console @@ -20,6 +21,7 @@ Расширенная Консоль Отладки Console de débogage étendue Rozszerzona Konsola Debugowania + Geliştirilmiş Debug Konsolu Previous Statement @@ -30,6 +32,7 @@ Пред. команда Déclaration précédente Poprzednie polecenie + Önceki İfade Next Statement @@ -40,6 +43,7 @@ След. команда Déclaration suivante Następne polecenie + Sonraki İfade Target Exec @@ -50,6 +54,7 @@ На цели Wykonaj na celu Cible Exec + Hedefte Çalıştır Enable Target Debugging @@ -60,6 +65,7 @@ Включить Отладку Цели Włącz debugowanie na celu Activer le débogage de la cible + Hedefte Çalıştırmayı Aktifleştir [CBA] Allows remote target debugging. Requires Debug Console. @@ -70,6 +76,7 @@ [CBA] Разрешает отладку дистанционной цели. Требуется Консоль Отладки. [CBA] Włącza debugowanie zdalnego celu. Konsola Debugowania musi być dostęna. [CBA] Permet le débogage de la cible distante. Nécessite la console de débogage. + [CBA] Başka hedefte çalıştırmayı aktifleştirir. Debug konsolu gerektirir. diff --git a/addons/events/stringtable.xml b/addons/events/stringtable.xml index 44e411108..a119c12c0 100644 --- a/addons/events/stringtable.xml +++ b/addons/events/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - События Community Base Addons - Événements Community Base Addons - Zdarzenia + Community Base Addons - Durumlar diff --git a/addons/hashes/stringtable.xml b/addons/hashes/stringtable.xml index d740e4944..c984ea213 100644 --- a/addons/hashes/stringtable.xml +++ b/addons/hashes/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - Хэши Community Base Addons - Hashe Community Base Addons - Hashes + Community Base Addons - Hashler diff --git a/addons/help/stringtable.xml b/addons/help/stringtable.xml index 68c92bd4c..7bc7e8e73 100644 --- a/addons/help/stringtable.xml +++ b/addons/help/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Помощь Community Base Addons - Pomoc Community Base Addons - Aide + Community Base Addons - Yardım Keybindings @@ -25,6 +26,7 @@ キー割り当て 按鍵綁定 按键绑定 + Klavye Tuşları Bugtracker @@ -39,6 +41,7 @@ バグトラッカー 臭蟲追蹤器 臭虫追踪器 + Sorun Takibi Wiki (Documentation) @@ -53,6 +56,7 @@ ウィキ (ドキュメント) 維基 (文件) 维基 (文件) + Wiki (Dökümantasyon) Credits @@ -67,6 +71,7 @@ クレジット 製作組 制作组 + Yapımcılar Credits - Addons @@ -81,6 +86,7 @@ クレジット - アドオン 製作組 - 模組 制作组 - 模组 + Yapımcılar - Modüller diff --git a/addons/jam/stringtable.xml b/addons/jam/stringtable.xml index 29eafc179..324ebd43f 100644 --- a/addons/jam/stringtable.xml +++ b/addons/jam/stringtable.xml @@ -6,6 +6,7 @@ Community Base Addons - Gemeinsame Munition und Magazine Community Base Addons - Wspólna Amunicja oraz Magazynki Community Base Addons - Munitions et Chargeurs joints + Community Base Addons - Birleştirilmiş Cephane Şarjörleri diff --git a/addons/jr/stringtable.xml b/addons/jr/stringtable.xml index 4b7850a0b..2c764eefd 100644 --- a/addons/jr/stringtable.xml +++ b/addons/jr/stringtable.xml @@ -10,6 +10,7 @@ Community Base Addons - Система Joint Rails Community Base Addons - Wspólne Szyny Montażowe Community Base Addons - Rails d'accessoires + Community Base Addons - Birleştirilmiş Raylar Sound Suppressor MG @@ -24,6 +25,7 @@ MG用消音器 機槍用消音器 机枪用消音器 + Community Base Addons - MG Susturucusu diff --git a/addons/keybinding/stringtable.xml b/addons/keybinding/stringtable.xml index 45f0525be..4380b683e 100644 --- a/addons/keybinding/stringtable.xml +++ b/addons/keybinding/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Назначения Клавиш Community Base Addons - Klawisze Community Base Addons - Configurations des touches + Community Base Addons - Klavye Tuşları Configure Addons @@ -22,6 +23,7 @@ Configure as Extensões Настроить Дополнения Configurer les addons + Eklentileri Düzenle Configure Base @@ -33,6 +35,7 @@ Configure as Bases Основные Настройки Configurer la base + Temeli Düzenle Unknown Key %1 @@ -44,6 +47,7 @@ Chave desconhecida %1 Неизвестная Клавиша %1 Touche inconnue %1 + Bilinmeyen Tuş %1 diff --git a/addons/main/stringtable.xml b/addons/main/stringtable.xml index 6676da172..6f159a58e 100644 --- a/addons/main/stringtable.xml +++ b/addons/main/stringtable.xml @@ -11,6 +11,7 @@ Команда CBA Equipe CBA Zespół CBA + CBA Takımı https://www.github.com/CBATeam/CBA_A3 @@ -38,6 +39,7 @@ Community Base Addons - Основной Компонент Community Base Addons - Composante principale Community Base Addons - Główny Komponent + Community Base Addons - Ana Komponent Community Base Addons - Optional Component @@ -49,6 +51,7 @@ Community Base Addons - Опциональный Компонент Community Base Addons - Composant facultatif Community Base Addons - Komponent Opcjonalny + Community Base Addons - Opsiyonel Komponent ADDON: @@ -59,6 +62,7 @@ アドオン: ADDON : ADDON: + EKLENTİ: diff --git a/addons/music/stringtable.xml b/addons/music/stringtable.xml index 15c885bfb..cea768b5b 100644 --- a/addons/music/stringtable.xml +++ b/addons/music/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Музыка Community Base Addons - Musique Community Base Addons - Muzyka + Community Base Addons - Müzik diff --git a/addons/network/stringtable.xml b/addons/network/stringtable.xml index 9341c0287..b0bf24d41 100644 --- a/addons/network/stringtable.xml +++ b/addons/network/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Сеть Community Base Addons - Réseau Community Base Addons - Sieć + Community Base Addons - Ağ diff --git a/addons/statemachine/stringtable.xml b/addons/statemachine/stringtable.xml index 336c601c6..d00965f0c 100644 --- a/addons/statemachine/stringtable.xml +++ b/addons/statemachine/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Компонент Машины Состояний Community Base Addons - Komponent Maszyny Stanów Community Base Addons - Composant machine d'état + Community Base Addons - Durum Makinası diff --git a/addons/strings/stringtable.xml b/addons/strings/stringtable.xml index 23c2fa4be..83c179388 100644 --- a/addons/strings/stringtable.xml +++ b/addons/strings/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Строки Community Base Addons - Ciągi znaków Community Base Addons - Textes + Community Base Addons - Yazılar . @@ -25,6 +26,7 @@ . . , + , , @@ -39,6 +41,7 @@ , , . + . diff --git a/addons/ui/stringtable.xml b/addons/ui/stringtable.xml index 169ae1406..0cc5ce57e 100644 --- a/addons/ui/stringtable.xml +++ b/addons/ui/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Пользовательский Интерфейс Community Base Addons - Interface utilisateur Community Base Addons - Interfejs Użytkownika + Community Base Addons - Kullanıcı Arayüzü Progress Bar @@ -20,6 +21,7 @@ 進度條 进度条 Pasek postępu + Yükleme Çubuğu Position of the progress bar. @@ -29,60 +31,70 @@ 進度條的位置。 进度条的位置。 Pozycja paska postępu. + Yükleme çubuğunun konumu. CBA UI CBA UI CBA UI CBA IU + CBA UI Store server passwords Serverpasswörter speichern Zapamiętuj hasła serwerów Enregistrer les mots de passe serveur + Sunucu şifrelerini kaydet Setting to store the passwords entered when connecting to a multiplayer server. Einstellung zum Speichern der beim Betreten eines Mehrspielerservers eingegebenen Passwörter. Opcja zapamiętywania wprowadzonych haseł do serwerów. Paramètre pour enregistrer les mots de passe entrés quand vous vous connectez à un serveur multijoueur + Çok oyunculu bir sunucuya bağlanırken girilen şifreleri kaydetme ayarı. Save passwords Passwörter speichern Zapisuj hasła Sauvegarder mots de passe + Şifreleri kaydet Passwords are stored when connecting to a multiplayer server. Passwörter werden beim Verbinden mit einem Mehrspielerserver gespeichert. Hasła są zapisywane podczas łaczenia do serwerów. Les mots de passe sont enregistrés quand vous vous connectez à un serveur multijoueur + Çok oyunculu bir sunucuya girerken şifreler kaydedilir. Do not save passwords Passwörter nicht speichern Nie zapisuj haseł Ne pas enregistrer les mots de passe + Şifreleri kaydetme Passwords are not stored when connecting to a multiplayer server. Already stored passwords will not be automatically entered. Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden nicht automatisch eingegeben. Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła nie bedą wykorzystywane. Les mots de passe ne sont pas enregistrés quand vous vous connectez à un serveur multijoueur.Les mots de passe déjà enregistrés ne seront pas entrés automatiquement. + Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler otomatik olarak doldurulmaz. Delete passwords Passwörter löschen Usuń hasła Supprimer les mots de passe + Şifreleri sil Passwords are not stored when connecting to a multiplayer server. Already stored passwords are deleted from the profile. Passwörter werden beim Verbinden mit einem Mehrspielerserver nicht gespeichert. Bereits gespeicherte Passwörter werden aus dem Profil gelöscht. Hasła nie są zapisywane podczas łączenia do serwerów. Już zapisane hasła zostaną usunięte z profilu. Les mots de passe ne sont pas enregistrés quand vous vous connectez à un serveur multijoueur.Les mots de passe déjà enregistrés vont être supprimés du profile. + Çok oyunculu bir sunucuya girerken şifreler kaydedilmez. Zaten kayıtlı olan şifreler bilgisayardan silinir. diff --git a/addons/vectors/stringtable.xml b/addons/vectors/stringtable.xml index f1737a7a1..ce92fda35 100644 --- a/addons/vectors/stringtable.xml +++ b/addons/vectors/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Векторы Community Base Addons - Vecteurs Community Base Addons - Wektory + Community Base Addons - Vektörler diff --git a/addons/versioning/stringtable.xml b/addons/versioning/stringtable.xml index bac5bf9cb..469991681 100644 --- a/addons/versioning/stringtable.xml +++ b/addons/versioning/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Версионность Community Base Addons - Wersjonowanie Community Base Addons - Version + Community Base Addons - Versiyonlama diff --git a/addons/xeh/stringtable.xml b/addons/xeh/stringtable.xml index 0563601df..0a6345fb7 100644 --- a/addons/xeh/stringtable.xml +++ b/addons/xeh/stringtable.xml @@ -11,6 +11,7 @@ Community Base Addons - Расширенные Обработчики Событий Community Base Addons - Rozszerzona Obsługa Zdarzeń Community Base Addons - Gestionnaires d'évènement étendus + Community Base Addons - Geliştirmiş Durum İşlenimi