diff --git a/addons/ballistics/CfgMagazineWells.hpp b/addons/ballistics/CfgMagazineWells.hpp
index d75381f8a4..316bea32de 100644
--- a/addons/ballistics/CfgMagazineWells.hpp
+++ b/addons/ballistics/CfgMagazineWells.hpp
@@ -155,15 +155,16 @@ class CfgMagazineWells {
"ACE_10Rnd_338_API526_Mag",
"ACE_20Rnd_762x67_Mk248_Mod_0_Mag",
"ACE_20Rnd_762x67_Mk248_Mod_1_Mag",
- "ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag"
+ "ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag",
+ "ACE_10Rnd_762x67_Mk248_Mod_0_Mag",
+ "ACE_10Rnd_762x67_Mk248_Mod_1_Mag",
+ "ACE_10Rnd_762x67_Berger_Hybrid_OTM_Mag"
};
};
class CBA_65C_AR10 {
ADDON[] = {
- "ACE_30Rnd_65_Creedmor_mag",
"ACE_20Rnd_65_Creedmor_mag",
- "ACE_30Rnd_65x47_Scenar_mag",
"ACE_20Rnd_65x47_Scenar_mag"
};
};
@@ -174,7 +175,7 @@ class CfgMagazineWells {
};
};
- class CBA_50BMG_M107 {
+ class CBA_50BMG_AS50 {
ADDON[] = {
"ACE_5Rnd_127x99_Mag",
"ACE_5Rnd_127x99_API_Mag",
@@ -182,6 +183,14 @@ class CfgMagazineWells {
};
};
+ class CBA_50BMG_M107 {
+ ADDON[] = {
+ "ACE_10Rnd_127x99_Mag",
+ "ACE_10Rnd_127x99_API_Mag",
+ "ACE_10Rnd_127x99_AMAX_Mag"
+ };
+ };
+
class CBA_9x19_P226 { // SIG P226
ADDON[] = {
"ACE_16Rnd_9x19_mag"
diff --git a/addons/ballistics/CfgMagazines.hpp b/addons/ballistics/CfgMagazines.hpp
index 175d2687d0..0a19fb3090 100644
--- a/addons/ballistics/CfgMagazines.hpp
+++ b/addons/ballistics/CfgMagazines.hpp
@@ -260,6 +260,8 @@ class CfgMagazines {
initSpeed = 827;
};
+ class 10Rnd_Mk14_762x51_Mag;
+
class 10Rnd_762x51_Mag: 20Rnd_762x51_Mag {
initSpeed = 833;
};
@@ -298,7 +300,7 @@ class CfgMagazines {
initSpeed = 330;
};
- class ACE_10Rnd_762x51_M118LR_Mag: 10Rnd_762x51_Mag {
+ class ACE_10Rnd_762x51_M118LR_Mag: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_M118LR";
count = 10;
@@ -308,7 +310,7 @@ class CfgMagazines {
initSpeed = 780;
};
- class ACE_10Rnd_762x51_Mk316_Mod_0_Mag: 10Rnd_762x51_Mag {
+ class ACE_10Rnd_762x51_Mk316_Mod_0_Mag: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Mk316_Mod_0";
count = 10;
@@ -318,7 +320,7 @@ class CfgMagazines {
initSpeed = 790;
};
- class ACE_10Rnd_762x51_Mk319_Mod_0_Mag: 10Rnd_762x51_Mag {
+ class ACE_10Rnd_762x51_Mk319_Mod_0_Mag: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_Mk319_Mod_0";
count = 10;
@@ -328,7 +330,7 @@ class CfgMagazines {
initSpeed = 900;
};
- class ACE_10Rnd_762x51_M993_AP_Mag: 10Rnd_762x51_Mag {
+ class ACE_10Rnd_762x51_M993_AP_Mag: 10Rnd_Mk14_762x51_Mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_762x51_Ball_M993_AP";
count = 10;
@@ -376,33 +378,6 @@ class CfgMagazines {
initSpeed = 930;
};
- class ACE_20Rnd_762x67_Mk248_Mod_0_Mag: 20Rnd_762x51_Mag {
- author = ECSTRING(common,ACETeam);
- ammo = "ACE_762x67_Ball_Mk248_Mod_0";
- displayName = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Name);
- displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_NameShort);
- descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Description);
- initSpeed = 865;
- };
-
- class ACE_20Rnd_762x67_Mk248_Mod_1_Mag: 20Rnd_762x51_Mag {
- author = ECSTRING(common,ACETeam);
- ammo = "ACE_762x67_Ball_Mk248_Mod_1";
- displayName = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Name);
- displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_NameShort);
- descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Description);
- initSpeed = 847;
- };
-
- class ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag: 20Rnd_762x51_Mag {
- author = ECSTRING(common,ACETeam);
- ammo = "ACE_762x67_Ball_Berger_Hybrid_OTM";
- displayName = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name);
- displayNameShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort);
- descriptionShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Description);
- initSpeed = 800;
- };
-
class ACE_30Rnd_65x47_Scenar_mag: 30Rnd_65x39_caseless_mag {
author = ECSTRING(common,ACETeam);
ammo = "ACE_65x47_Ball_Scenar";
@@ -461,6 +436,69 @@ class CfgMagazines {
initSpeed = 880;
};
+ class ACE_20Rnd_762x67_Mk248_Mod_0_Mag: 10Rnd_338_Mag {
+ author = ECSTRING(common,ACETeam);
+ ammo = "ACE_762x67_Ball_Mk248_Mod_0";
+ count = 20;
+ scope = 1; // backwards compatibility only
+ mass = 28; // 10Rnd_338_Mag mass * 2
+ displayName = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Name);
+ displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_NameShort);
+ descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_0_Mag_Description);
+ initSpeed = 865;
+ };
+
+ class ACE_20Rnd_762x67_Mk248_Mod_1_Mag: 10Rnd_338_Mag {
+ author = ECSTRING(common,ACETeam);
+ ammo = "ACE_762x67_Ball_Mk248_Mod_1";
+ count = 20;
+ scope = 1;
+ mass = 28;
+ displayName = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Name);
+ displayNameShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_NameShort);
+ descriptionShort = CSTRING(20Rnd_762x67_Mk248_Mod_1_Mag_Description);
+ initSpeed = 847;
+ };
+
+ class ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag: 10Rnd_338_Mag {
+ author = ECSTRING(common,ACETeam);
+ ammo = "ACE_762x67_Ball_Berger_Hybrid_OTM";
+ count = 20;
+ scope = 1;
+ mass = 28;
+ displayName = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name);
+ displayNameShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort);
+ descriptionShort = CSTRING(20Rnd_762x67_Berger_Hybrid_OTM_Mag_Description);
+ initSpeed = 800;
+ };
+
+ class ACE_10Rnd_762x67_Mk248_Mod_0_Mag: ACE_20Rnd_762x67_Mk248_Mod_0_Mag {
+ scope = 2;
+ count = 10;
+ mass = 14; // same as 10Rnd_338_Mag
+ displayName = CSTRING(10Rnd_762x67_Mk248_Mod_0_Mag_Name);
+ displayNameShort = CSTRING(10Rnd_762x67_Mk248_Mod_0_Mag_NameShort);
+ descriptionShort = CSTRING(10Rnd_762x67_Mk248_Mod_0_Mag_Description);
+ };
+
+ class ACE_10Rnd_762x67_Mk248_Mod_1_Mag: ACE_20Rnd_762x67_Mk248_Mod_1_Mag {
+ scope = 2;
+ count = 10;
+ mass = 14;
+ displayName = CSTRING(10Rnd_762x67_Mk248_Mod_1_Mag_Name);
+ displayNameShort = CSTRING(10Rnd_762x67_Mk248_Mod_1_Mag_NameShort);
+ descriptionShort = CSTRING(10Rnd_762x67_Mk248_Mod_1_Mag_Description);
+ };
+
+ class ACE_10Rnd_762x67_Berger_Hybrid_OTM_Mag: ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag {
+ scope = 2;
+ count = 10;
+ mass = 14;
+ displayName = CSTRING(10Rnd_762x67_Berger_Hybrid_OTM_Mag_Name);
+ displayNameShort = CSTRING(10Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort);
+ descriptionShort = CSTRING(10Rnd_762x67_Berger_Hybrid_OTM_Mag_Description);
+ };
+
class 7Rnd_408_Mag: CA_Magazine {
initSpeed = 867;
};
@@ -506,6 +544,30 @@ class CfgMagazines {
initSpeed = 860;
};
+ class ACE_10Rnd_127x99_Mag: ACE_5Rnd_127x99_Mag {
+ count = 10;
+ mass = 32; // 5Rnd_127x108_Mag mass * 2
+ displayName = CSTRING(5Rnd_127x99_Mag_Name);
+ displayNameShort = CSTRING(5Rnd_127x99_Mag_NameShort);
+ descriptionShort = CSTRING(5Rnd_127x99_Mag_Description);
+ };
+
+ class ACE_10Rnd_127x99_API_Mag: ACE_5Rnd_127x99_API_Mag {
+ count = 10;
+ mass = 32;
+ displayName = CSTRING(5Rnd_127x99_API_Mag_Name);
+ displayNameShort = CSTRING(5Rnd_127x99_API_Mag_NameShort);
+ descriptionShort = CSTRING(5Rnd_127x99_API_Mag_Description);
+ };
+
+ class ACE_10Rnd_127x99_AMAX_Mag: ACE_5Rnd_127x99_AMAX_Mag {
+ count = 10;
+ mass = 32;
+ displayName = CSTRING(5Rnd_127x99_AMAX_Mag_Name);
+ displayNameShort = CSTRING(5Rnd_127x99_AMAX_Mag_NameShort);
+ descriptionShort = CSTRING(5Rnd_127x99_AMAX_Mag_Description);
+ };
+
class 30Rnd_9x21_Mag: CA_Magazine {
initSpeed = 430;
};
diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
index 8bb00972e7..3484810458 100644
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@@ -13,7 +13,7 @@ class CfgWeapons {
ACE_barrelTwist = 381.0;
initSpeed = -1.0;
magazineWell[] += {
- "CBA_50BMG_M107"
+ "CBA_50BMG_AS50"
}; // empty in vanilla
};
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 354598ffe0..79833fc3d8 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -2453,6 +2453,159 @@
口径: .300 WM NATO标准 (Berger Hybrid 空尖比赛专用弹)<br />发数: 20
Kalibre: .300 WM NATO (Berger Hybrid OTM)<br />Mermi: 20
+
+ .300 WM 10Rnd Mag (Mk248 Mod 0)
+ Magazynek .300 WM 10rd (Mk248 Mod 0)
+ Ch. .300 WM 10Cps (Mk248 Mod 0)
+ Cargador de 10 balas de .300 WM (Mk248 Mod 0)
+ Магазин из 10-ти .300 WM (Mk248 Mod 0)
+ .300 WM 10-Patronen-Magazin (Mk248 Mod 0)
+ .300 WM 10Rnd Mag (Mk248 Mod 0)
+ .300 WM 10náb. Zásobník (Mk248 Mod 0)
+ Carregador .300 WM com 10 cartuchos (Mk248 Mod 0)
+ .300 WM 10-lövedékes tár (Mk248 Mod 0)
+ .300 WM 10発入り 弾倉 (Mk248 Mod 0)
+ 10발들이 .300 WM 탄창 (Mk248 Mod 0)
+ .300 萬能(WM) 10發 彈匣 (Mk248 Mod 0 狙擊專用彈)
+ .300 WM 10发 弹匣 (Mk248 Mod 0 狙击专用弹)
+ .300 WM 10Rnd Mag (Mk248 Mod 0)
+
+
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 西米 Mk248 狙擊專用彈
+ .300 WM Mk248 狙击专用弹
+ .300 WM Mk248
+
+
+ Caliber: .300 WM NATO (Mk248 Mod 0)<br />Rounds: 10
+ Kaliber: .300 WM NATO (Mk248 Mod 0)<br />Pociski: 10
+ Calibre: .300 WM NATO (Mk248 Mod 0)<br />Cartouches: 10
+ Calibre: .300 WM NATO (Mk248 Mod 0)<br />Balas: 10
+ Калибр: .300 WM NATO (Mk248 Mod 0)<br />Патронов: 10
+ Kaliber: .300 WM NATO (Mk248 Mod 0)<br />Patronen: 10
+ Calibro: .300 WM NATO (Mk248 Mod 0)<br />Munizioni: 10
+ Ráže: .300 WM (Mk248 Mod 0)<br />Nábojů: 10
+ Calibre: .300 WM NATO (Mk248 Mod 0)<br/>Cartuchos: 10
+ Kaliber: .300 WM NATO (Mk248 Mod 0)<br />Lövedékek: 10
+ 口径: .300 WM NATO (Mk248 Mod 0)<br />装填数: 10
+ 구경: .300 WM NATO (Mk248 Mod 0)<br />장탄수: 10
+ 口徑: .300 西米 NATO標準 (Mk248 Mod 0 狙擊專用彈)<br />發數: 10
+ 口径: .300 WM NATO标准 (Mk248 Mod 0 狙击专用弹)<br />发数: 10
+ Kalibre: .300 WM NATO (Mk248 Mod 0)<br />Mermi: 10
+
+
+ .300 WM 10Rnd Mag (Mk248 Mod 1)
+ Magazynek .300 WM 10rd (Mk248 Mod 1)
+ Ch. .300 WM 10Cps (Mk248 Mod 1)
+ Cargador de 10 balas de .300 WM (Mk248 Mod 1)
+ Магазин из 10-ти .300 WM (Mk248 Mod 1)
+ .300 WM 10-Patronen-Magazin (Mk248 Mod 1)
+ .300 WM 10Rnd Mag (Mk248 Mod 1)
+ .300 WM 10náb. Zásobník (Mk248 Mod 1)
+ Carregador .300 WM com 10 cartuchos (Mk248 Mod 1)
+ .300 WM 10-lövedékes tár (Mk248 Mod 1)
+ .300 WM 10発入り 弾倉 (Mk248 Mod 1)
+ 10발들이 .300 WM 탄창 (Mk248 Mod 1)
+ .300 西米 10發 彈匣 (Mk248 Mod 1 狙擊專用彈)
+ .300 WM 10发 弹匣 (Mk248 Mod 1 狙击专用弹)
+ .300 WM 10Rnd Mag (Mk248 Mod 1)
+
+
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 WM Mk248
+ .300 西米 Mk248 狙擊專用彈
+ .300 WM Mk248 狙击专用弹
+ .300 WM Mk248
+
+
+ Caliber: .300 WM NATO (Mk248 Mod 1)<br />Rounds: 10
+ Kaliber: .300 WM NATO (Mk248 Mod 1)<br />Pociski: 10
+ Calibre: .300 WM NATO (Mk248 Mod 1)<br />Cartouches: 10
+ Calibre: .300 WM NATO (Mk248 Mod 1)<br />Balas: 10
+ Калибр: .300 WM NATO (Mk248 Mod 1)<br />Патронов: 10
+ Kaliber: .300 WM NATO (Mk248 Mod 1)<br />Patronen: 10
+ Calibro: .300 WM NATO (Mk248 Mod 1)<br />Munizioni: 10
+ Ráže: .300 WM NATO (Mk248 Mod 1)<br />Nábojů: 10
+ Calibre: .300 WM NATO (Mk248 Mod 1)<br/>Cartuchos: 10
+ Kaliber: .300 WM NATO (Mk248 Mod 1)<br />Lövedékek: 10
+ 口径: .300 WM NATO (Mk248 Mod 1)<br />装填数: 10
+ 구경: .300 WM NATO (Mk248 Mod 1)<br />장탄수: 10
+ 口徑: .300 西米 NATO標準 (Mk248 Mod 1 狙擊專用彈)<br />發數: 10
+ 口径: .300 WM NATO标准 (Mk248 Mod 1 狙击专用弹)<br />发数: 10
+ Kalibre: .300 WM NATO (Mk248 Mod 1)<br />Mermi: 10
+
+
+ .300 WM 10Rnd Mag (Berger Hybrid OTM)
+ Magazynek .300 WM 10rd (Berger Hybrid OTM)
+ Ch. .300 WM 10Cps (Berger Hybrid OTM)
+ Cargador de 10 balas de .300 WM (Berger Hybrid OTM)
+ Магазин из 10-ти .300 WM (Berger Hybrid OTM)
+ .300 WM 10-Patronen-Magazin (Berger Hybrid OTM)
+ .300 WM 10Rnd Mag (Berger Hybrid OTM)
+ .300 WM 10náb. Zásobník (Berger Hybrid OTM)
+ Carregador .300 WM com 10 cartuchos (Berger Hybrid OTM)
+ .300 WM 10-lövedékes tár (Berger Hybrid OTM)
+ .300 WM 10発入り 弾倉 (Berger Hybrid OTM)
+ 10발들이 .300 WM 탄창 (Berger Hybrid OTM)
+ .300 西米 10發 彈匣 (Berger Hybrid 空尖比賽專用彈)
+ .300 WM 10发 弹匣 (Berger Hybrid 空尖比赛专用弹)
+ .300 WM 10Rnd Mag (Berger Hybrid OTM)
+
+
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 WM OTM
+ .300 西米 空尖比賽專用彈
+ .300 WM 空尖比赛专用弹
+ .300 WM OTM
+
+
+ Caliber: .300 WM NATO (Berger Hybrid OTM)<br />Rounds: 10
+ Kaliber: .300 WM NATO (Berger Hybrid OTM)<br />Pociski: 10
+ Calibre: .300 WM NATO (Berger Hybrid OTM)<br />Cartouches: 10
+ Calibre: .300 WM NATO (Berger Hybrid OTM)<br />Balas: 10
+ Калибр: .300 WM NATO (Berger Hybrid OTM)<br />Патронов: 10
+ Kaliber: .300 WM NATO (Berger Hybrid OTM)<br />Patronen: 10
+ Calibro: .300 WM NATO (Berger Hybrid OTM)<br />Munizioni: 10
+ Ráže: .300 WM NATO (Berger Hybrid OTM)<br />Nábojů: 10
+ Calibre: .300 WM OTM NATO (Berger Hybrid OTM)<br/>Cartuchos: 10
+ Kaliber: .300 WM NATO (Berger Hybrid OTM)<br />Lövedékek: 10
+ 口径: .300 WM NATO (Berger Hybrid OTM)<br />装填数: 10
+ 구경: .300 WM NATO (Berger Hybrid OTM)<br />장탄수: 10
+ 口徑: .300 西米 NATO標準 (Berger Hybrid 空尖比賽專用彈)<br />發數: 10
+ 口径: .300 WM NATO标准 (Berger Hybrid 空尖比赛专用弹)<br />发数: 10
+ Kalibre: .300 WM NATO (Berger Hybrid OTM)<br />Mermi: 10
+
6.5x47mm 30Rnd Mag (HPBT Scenar)
Ch. 6,5x47mm 30Cps (HPBT Scenar)