Skip to content

Commit

Permalink
add Joint Ammo Magazines A3 (#928)
Browse files Browse the repository at this point in the history
* Add Joint Ammo and Magazines

* Define magazine wells

* Jam (#929)

* tabs to spaces, component name

* delete a file

* + magwells

* reorder + moar magwells

* fix

* + sig 556 and barrett .50 magwells

* German translation
  • Loading branch information
commy2 committed Sep 17, 2018
1 parent f525479 commit 5651590
Show file tree
Hide file tree
Showing 5 changed files with 279 additions and 0 deletions.
174 changes: 174 additions & 0 deletions addons/jam/CfgMagazineWells.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,174 @@
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"
};
};

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

class CBA_RPG7 {
BI_rockets[] = {
"RPG7_F"
};
};
};
73 changes: 73 additions & 0 deletions addons/jam/CfgWeapons.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
class CfgWeapons {
class GrenadeLauncher;
class Rifle_Base_F;
class Rifle_Long_Base_F;
class Launcher_Base_F;

class mk20_base_F: Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
};
class SDAR_base_F: Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
};
class Tavor_base_F: Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
};
class arifle_SPAR_01_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
};
class arifle_SPAR_02_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_556x45_STANAG"};
};

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

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

class EBR_base_F: Rifle_Long_Base_F {
magazineWell[] = {"CBA_762x51_M14"};
};
class DMR_06_base_F: Rifle_Long_Base_F {
magazineWell[] = {"CBA_762x51_M14"};
};
class arifle_SPAR_03_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_762x51_HK417"};
};

class DMR_01_base_F : Rifle_Long_Base_F {
magazineWell[] = {"CBA_762x54R_SVD"};
};

class arifle_CTAR_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_580x42_TYPE95"};
};
class arifle_CTARS_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_580x42_TYPE95"};
};

class arifle_AK12_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_762x39_AK"};
};
class arifle_AKM_base_F : Rifle_Base_F {
magazineWell[] = {"CBA_762x39_AK"};
};

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

class LMG_03_base_F : Rifle_Long_Base_F {
magazineWell[] = {"CBA_556x45_MINIMI"};
};

class launch_RPG7_F : Launcher_Base_F {
magazineWell[] = {"CBA_RPG7"};
};
};
20 changes: 20 additions & 0 deletions addons/jam/config.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
author = "$STR_CBA_Author";
name = CSTRING(component);
url = "$STR_CBA_URL";
units[] = {};
weapons[] = {};
magazines[] = {};
ammo[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"CBA_main"};
version = VERSION;
authors[] = {"Robalo"};
};
};

#include "CfgMagazineWells.hpp"
#include "CfgWeapons.hpp"
3 changes: 3 additions & 0 deletions addons/jam/script_component.hpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
#define COMPONENT jam
#include "\x\cba\addons\main\script_mod.hpp"
#include "\x\cba\addons\main\script_macros.hpp"
9 changes: 9 additions & 0 deletions addons/jam/stringtable.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<Project name="CBA_A3">
<Package name="JAM">
<Key ID="STR_CBA_JR_Component">
<English>Community Base Addons - Joint Ammo Magazines</English>
<German>Community Base Addons - Joint Ammo Magazines</German>
</Key>
</Package>
</Project>

0 comments on commit 5651590

Please sign in to comment.