diff --git a/addons/ballistics/CfgMagazines.hpp b/addons/ballistics/CfgMagazines.hpp
index f9e936dc04..de3f80fd83 100644
--- a/addons/ballistics/CfgMagazines.hpp
+++ b/addons/ballistics/CfgMagazines.hpp
@@ -30,15 +30,21 @@ class CfgMagazines {
descriptionShort = "$STR_ACE_200Rnd_65x39_cased_Box_Tracer_DimDescription";
picture = "\A3\weapons_f\data\ui\m_200rnd_65x39_yellow_ca.paa";
};
- class 30Rnd_65x39_caseless_mag_Tracer: 30Rnd_65x39_caseless_mag {
- };
+ class 30Rnd_65x39_caseless_mag_Tracer;
class ACE_30Rnd_65x39_caseless_mag_Tracer_Dim: 30Rnd_65x39_caseless_mag_Tracer {
author = "$STR_ACE_Common_ACETeam";
ammo = "ACE_65x39_Caseless_Tracer_Dim";
displayName = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimName";
displayNameShort = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimNameShort";
descriptionShort = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimDescription";
- picture = "\A3\weapons_f\data\ui\m_30stanag_caseless_yellow_ca.paa";
+ };
+ class 30Rnd_65x39_caseless_green_mag_Tracer;
+ class ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim: 30Rnd_65x39_caseless_green_mag_Tracer {
+ author = "$STR_ACE_Common_ACETeam";
+ ammo = "ACE_65x39_Caseless_green_Tracer_Dim";
+ displayName = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimName";
+ displayNameShort = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimNameShort";
+ descriptionShort = "$STR_ACE_30Rnd_65x39_caseless_mag_Tracer_DimDescription";
};
class 30Rnd_556x45_Stanag: CA_Magazine {
@@ -108,8 +114,7 @@ class CfgMagazines {
initSpeed = 325;
};
- class ACE_10Rnd_762x51_M118LR_Mag: 10Rnd_762x51_Mag
- {
+ class ACE_10Rnd_762x51_M118LR_Mag: 10Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
ammo = "ACE_762x51_Ball_M118LR";
count=10;
@@ -118,8 +123,7 @@ class CfgMagazines {
descriptionShort = "$STR_ACE_10Rnd_762x51_M118LR_Mag_Description";
initSpeed = 780;
};
- class ACE_20Rnd_762x51_M118LR_Mag: 20Rnd_762x51_Mag
- {
+ class ACE_20Rnd_762x51_M118LR_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
ammo = "ACE_762x51_Ball_M118LR";
displayName = "$STR_ACE_20Rnd_762x51_M118LR_Mag_Name";
@@ -127,40 +131,45 @@ class CfgMagazines {
descriptionShort = "$STR_ACE_20Rnd_762x51_M118LR_Mag_Description";
initSpeed = 780;
};
- class ACE_20Rnd_762x67_Mk248_Mod_0_Mag: 20Rnd_762x51_Mag
- {
+ class ACE_20Rnd_762x67_Mk248_Mod_0_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
ammo = "ACE_762x67_Ball_Mk248_Mod_0";
displayName = "$STR_ACE_20Rnd_762x67_Mk248_Mod_0_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x67_Mk248_Mod_0_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x67_Mk248_Mod_0_Mag_Description";
- initSpeed = 865;
+ initSpeed = 900;
};
- class ACE_20Rnd_762x67_Mk248_Mod_1_Mag: 20Rnd_762x51_Mag
- {
+ class ACE_20Rnd_762x67_Mk248_Mod_1_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
ammo = "ACE_762x67_Ball_Mk248_Mod_1";
displayName = "$STR_ACE_20Rnd_762x67_Mk248_Mod_1_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x67_Mk248_Mod_1_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x67_Mk248_Mod_1_Mag_Description";
- initSpeed = 847;
+ initSpeed = 880;
};
- class ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag: 20Rnd_762x51_Mag
- {
+ class ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag: 20Rnd_762x51_Mag {
author = "$STR_ACE_Common_ACETeam";
ammo = "ACE_762x67_Ball_Berger_Hybrid_OTM";
displayName = "$STR_ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag_Name";
displayNameShort = "$STR_ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag_NameShort";
descriptionShort = "$STR_ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag_Description";
- initSpeed = 800;
+ initSpeed = 832;
};
- class ACE_30Rnd_65x47_Scenar_mag: 30Rnd_65x39_caseless_mag
- {
+ class ACE_30Rnd_65x47_Scenar_mag: 30Rnd_65x39_caseless_mag {
author = "$STR_ACE_Common_ACETeam";
ammo = "ACE_65x47_Ball_Scenar";
- count=30;
- displayName = "30rnd 6.5mm Mag (HPBT Scenar)";
- descriptionshort = "Caliber: 65x47 mm (HPBT Scenar)
Rounds: 30
Used in: MXM";
+ displayName = "$STR_ACE_30Rnd_65x47_Scenar_mag_Name";
+ displayNameShort = "$STR_ACE_30Rnd_65x47_Scenar_mag_NameShort";
+ descriptionShort = "$STR_ACE_30Rnd_65x47_Scenar_mag_Description";
+ };
+ class 10Rnd_338_Mag;
+ class ACE_10Rnd_338_300gr_HPBT_Mag: 10Rnd_338_Mag {
+ author = "$STR_ACE_Common_ACETeam";
+ ammo = "ACE_338_Ball";
+ displayName = "$STR_ACE_10Rnd_338_300gr_HPBT_Mag_Name";
+ displayNameShort = "$STR_ACE_10Rnd_338_300gr_HPBT_Mag_NameShort";
+ descriptionShort = "$STR_ACE_10Rnd_338_300gr_HPBT_Mag_Description";
+ initSpeed = 800;
};
class 30Rnd_9x21_Mag: CA_Magazine {
diff --git a/addons/ballistics/CfgVehicles.hpp b/addons/ballistics/CfgVehicles.hpp
index e114bef671..7c32774f9f 100644
--- a/addons/ballistics/CfgVehicles.hpp
+++ b/addons/ballistics/CfgVehicles.hpp
@@ -65,6 +65,7 @@ class CfgVehicles {
class Box_East_WpsSpecial_F: EAST_Box_Base {
class TransportMagazines {
MACRO_ADDMAGAZINE(ACE_30Rnd_556x45_Stanag_Tracer_Dim,1);
+ MACRO_ADDMAGAZINE(ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
MACRO_ADDMAGAZINE(ACE_10Rnd_762x54_Tracer_mag,4);
};
@@ -154,6 +155,7 @@ class CfgVehicles {
MACRO_ADDMAGAZINE(ACE_30Rnd_556x45_Stanag_Mk318_mag,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_556x45_Stanag_Tracer_Dim,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x39_caseless_mag_Tracer_Dim,4);
+ MACRO_ADDMAGAZINE(ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim,4);
MACRO_ADDMAGAZINE(ACE_100Rnd_65x39_caseless_mag_Tracer_Dim,4);
MACRO_ADDMAGAZINE(ACE_200Rnd_65x39_cased_Box_Tracer_Dim,4);
MACRO_ADDMAGAZINE(ACE_30Rnd_65x47_Scenar_mag,4);
diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
index 7944215c29..d5b6ad448f 100644
--- a/addons/ballistics/CfgWeapons.hpp
+++ b/addons/ballistics/CfgWeapons.hpp
@@ -304,9 +304,9 @@ class CfgWeapons {
};
class arifle_Katiba_F: arifle_katiba_Base_F {
magazines[] = {
- "30Rnd_65x39_caseless_mag",
- "30Rnd_65x39_caseless_mag_Tracer",
- "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim"
+ "30Rnd_65x39_caseless_green",
+ "30Rnd_65x39_caseless_green_mag_Tracer",
+ "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim"
};
initSpeed = -1.08;
ACE_barrelTwist=8;
@@ -314,9 +314,9 @@ class CfgWeapons {
};
class arifle_Katiba_C_F: arifle_katiba_Base_F {
magazines[] = {
- "30Rnd_65x39_caseless_mag",
- "30Rnd_65x39_caseless_mag_Tracer",
- "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim"
+ "30Rnd_65x39_caseless_green",
+ "30Rnd_65x39_caseless_green_mag_Tracer",
+ "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim"
};
initSpeed = -1.07;
ACE_barrelTwist=8;
@@ -324,9 +324,9 @@ class CfgWeapons {
};
class arifle_Katiba_GL_F: arifle_katiba_Base_F {
magazines[] = {
- "30Rnd_65x39_caseless_mag",
- "30Rnd_65x39_caseless_mag_Tracer",
- "ACE_30Rnd_65x39_caseless_mag_Tracer_Dim"
+ "30Rnd_65x39_caseless_green",
+ "30Rnd_65x39_caseless_green_mag_Tracer",
+ "ACE_30Rnd_65x39_caseless_green_mag_Tracer_Dim"
};
initSpeed = -1.08;
ACE_barrelTwist=8;
@@ -527,9 +527,16 @@ class CfgWeapons {
ACE_barrelLength=43.3;
};
class srifle_DMR_02_F: DMR_02_base_F {
- initSpeed = -1.0;
+ magazines[] = {
+ "10Rnd_338_Mag",
+ "ACE_10Rnd_338_300gr_HPBT_Mag",
+ "ACE_20Rnd_762x67_Mk248_Mod_0_Mag",
+ "ACE_20Rnd_762x67_Mk248_Mod_1_Mag",
+ "ACE_20Rnd_762x67_Berger_Hybrid_OTM_Mag"
+ };
+ initSpeed = -0.962;
ACE_barrelTwist=10;
- ACE_barrelLength=26;
+ ACE_barrelLength=20;
};
class srifle_DMR_03_F: DMR_03_base_F {
magazines[] = {
diff --git a/addons/ballistics/stringtable.xml b/addons/ballistics/stringtable.xml
index 51447237b4..760a07b7aa 100644
--- a/addons/ballistics/stringtable.xml
+++ b/addons/ballistics/stringtable.xml
@@ -746,5 +746,23 @@
Caliber: 7.62x67 mm NATO (Berger Hybrid OTM)<br />Rounds: 20
Kaliber: 7,62x67 mm NATO (Berger Hybrid OTM)<br />Pociski: 20
+
+ 6.5x47mm 30Rnd Mag (HPBT Scenar)
+
+
+ 6.5mm Scenar
+
+
+ Caliber: 6.5x47mm (HPBT Scenar)<br />Rounds: 30
+
+
+ 8.6x70mm 10Rnd Mag (300gr Sierra MatchKing HPBT)
+
+
+ .338 (HPBT)
+
+
+ Caliber: 8.6x70mm (300gr Sierra MatchKing HPBT)<br />Rounds: 10
+