more stuff

- added more ammotypes
- stringtable now follows guideline

addons/magazines/CfgAmmo.hpp

@@ -107,18 +107,65 @@ class CfgAmmo {
         //typicalspeed = 792;
         //airfriction = -0.0008577;
     };
-	
-	/* .338 Lapua Magnum */
-    
+
+
+    /* .338 Lapua Magnum */
+
     // IR Dim
     class B_338_Ball;
     class ACE_B_338_Ball_Tracer_Dim: B_338_Ball {
         nvgOnly = 1;
     };
-    
+
+    //AP
+    class ACE_B_338_Ball_AP: B_338_Ball {
+        caliber = 3.6;
+        hit = 18.9;
+    };
+
+    //SD
+    class ACE_B_338_Ball_SD: B_338_Ball {
+        airFriction = -0.00036;
+        hit = 15.75;
+        supersonicCrackFar[] = {};
+        supersonicCrackNear[] = {};
+        typicalSpeed = 320;
+        audibleFire = 1.2;
+        visibleFire = 4.0;
+    };
+
+
     /* .338 Norma Magnum */
+
+    //IR Dim
     class B_338_NM_Ball;
     class ACE_B_338_NM_Ball_Tracer_Dim: B_338_NM_Ball {
         nvgOnly = 1;
     };
+
+
+    /* 9.3x64mm */
+
+    //IR Dim
+    class B_93x64_Ball;
+    class ACE_B_93x64_Ball_Tracer_Dim: B_93x64_Ball {
+        nvgOnly = 1;
+    };
+
+    //AP
+    class ACE_B_93x64_Ball_AP: B_93x64_Ball {
+        caliber = 4.0;
+        hit = 21;
+    };
+
+    //SD
+    class ACE_B_93x64_Ball_SD: B_93x64_Ball {
+        airFriction = -0.00042;
+        hit = 17.5;
+        supersonicCrackFar[] = {};
+        supersonicCrackNear[] = {};
+        typicalSpeed = 320;
+        audibleFire = 1.2;
+        visibleFire = 4.0;
+    };
 };

addons/magazines/CfgMagazines.hpp

@@ -136,36 +136,97 @@ class CfgMagazines {
         displayNameShort = "$STR_ACE_20Rnd_762x51_mag_APNameShort";
         descriptionShort = "$STR_ACE_20Rnd_762x51_mag_APDescription";
     };
+
+
+    /* 338 Lapua Magnum */
     class 10Rnd_338_Mag;
-    /* .338 Lapua Magnum */
     class ACE_10Rnd_338_Mag_Tracer: 10Rnd_338_Mag {
-        author="$STR_ACE_Common_ACETeam"
-        displayName = "$STR_ACE_10Rnd_388_Mag_TracerName";
-        displayNameShort = "$STR_ACE_10Rnd_388_Mag_TracerNameShort";
-        descriptionShort = "$STR_ACE_10Rnd_388_Mag_TracerDescription";
+        author = "$STR_ACE_Common_ACETeam";
+        displayName = "$STR_ACE_10Rnd_338_Mag_TracerName";
+        displayNameShort = "$STR_ACE_10Rnd_338_Mag_TracerNameShort";
+        descriptionShort = "$STR_ACE_10Rnd_338_Mag_TracerDescription";
         tracersEvery = 1;
     };
+
     class ACE_10Rnd_338_Mag_Tracer_Dim: ACE_10Rnd_338_Mag_Tracer {
-        author="$STR_ACE_Common_ACETeam"
-        ammo = "ACE_B_338_Ball_Tracer_Dim"
+        author = "$STR_ACE_Common_ACETeam";
+        ammo = "ACE_B_338_Ball_Tracer_Dim";
         displayName = "$STR_ACE_10Rnd_388_Mag_Tracer_DimName";
-        displayNameShort = "$STR_ACE_10Rnd_388_Mag_Tracer_DimNameShort";
-        descriptionShort = "$STR_ACE_10Rnd_388_Mag_Tracer_DimDescription";
+        displayNameShort = "$STR_ACE_10Rnd_338_Mag_Tracer_DimNameShort";
+        descriptionShort = "$STR_ACE_10Rnd_338_Mag_Tracer_DimDescription";
     };
+
+    class ACE_10Rnd_338_Mag_AP: 10Rnd_338_Mag {
+        author = "$STR_ACE_Common_ACETeam";
+        ammo ="ACE_B_338_Ball_AP";
+        displayName = "$STR_ACE_10Rnd_338_Mag_APName";
+        displayNameShort = "$STR_ACE_10Rnd_338_Mag_APNameShort";
+        descriptionShort = "$STR_ACE_10Rnd_338_Mag_APDescription";
+    };
+
+    class ACE_10Rnd_338_Mag_SD: 10Rnd_338_Mag {
+        author = "$STR_ACE_Common_ACETeam";
+        ammo = "ACE_B_338_Ball_SD";
+        displayName = "$STR_ACE_10Rnd_338_Mag_SDName";
+        displayNameShort = "$STR_ACE_10Rnd_338_Mag_SDNameShort";
+        descriptionShort = "$STR_ACE_10Rnd_338_Mag_SDDescription";
+        initSpeed = 320;
+    };
+
+
     /* .333 Norma Magnum */
+
     class 130Rnd_338_Mag;
     class ACE_130Rnd_338_Mag_Tracer: 130Rnd_338_Mag {
-        author="$STR_ACE_Common_ACETeam"
-        displayName = "$STR_ACE_130Rnd_388_Mag_TracerName";
-        displayNameShort = "$STR_ACE_130Rnd_388_Mag_TracerNameShort";
-        descriptionShort = "$STR_ACE_130Rnd_388_Mag_TracerDescription";
+        author = "$STR_ACE_Common_ACETeam";
+        displayName = "$STR_ACE_130Rnd_338_Mag_TracerName";
+        displayNameShort = "$STR_ACE_130Rnd_338_Mag_TracerNameShort";
+        descriptionShort = "$STR_ACE_130Rnd_338_Mag_TracerDescription";
         tracersEvery = 1;
     };
+
     class ACE_130Rnd_338_Mag_Tracer_Dim: ACE_130Rnd_338_Mag_Tracer {
-        author="$STR_ACE_Common_ACETeam"
-        ammo = "ACE_B_338_NM_Ball_Tracer_Dim"
-        displayName = "$STR_ACE_130Rnd_388_Mag_Tracer_DimName";
-        displayNameShort = "$STR_ACE_130Rnd_388_Mag_Tracer_DimNameShort";
-        descriptionShort = "$STR_ACE_130Rnd_388_Mag_Tracer_DimDescription";
-    }
+        author = "$STR_ACE_Common_ACETeam";
+        ammo = "ACE_B_338_NM_Ball_Tracer_Dim";
+        displayName = "$STR_ACE_130Rnd_338_Mag_Tracer_DimName";
+        displayNameShort = "$STR_ACE_130Rnd_338_Mag_Tracer_DimNameShort";
+        descriptionShort = "$STR_ACE_130Rnd_338_Mag_Tracer_DimDescription";
+    };
+
+
+    /* 9.3x64mm */
+
+    class 10Rnd_93x64_DMR_05_Mag;
+    class ACE_10Rnd_93x64_DMR_05_Mag_Tracer:  10Rnd_93x64_DMR_05_Mag {
+        author = "$STR_ACE_Common_ACEETeam";
+        displayName = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_TracerName";
+        displayNameShort = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_TracerNameShort";
+        descriptionShort = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_TracerDescription";
+        tracersEvery = 1;
+    };
+
+    class ACE_10Rnd_93x64_DMR_05_Mag_Tracer_Dim:  ACE_10Rnd_93x64_DMR_05_Mag_Tracer {
+        author = "$STR_ACE_Common_ACEETeam";
+        ammo ="ACE_B_93x64_Ball_Tracer_Dim";
+        displayName = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_Tracer_DimName";
+        displayNameShort = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_Tracer_DimNameShort";
+        descriptionShort = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_Tracer_DimDescription";
+    };
+
+    class ACE_10Rnd_93x64_DMR_05_Mag_AP:  10Rnd_93x64_DMR_05_Mag {
+        author = "$STR_ACE_Common_ACEETeam";
+        ammo = "ACE_B_93x64_Ball_AP";
+        displayName = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_APName";
+        displayNameShort = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_APNameShort";
+        descriptionShort = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_APDescription";
+    };
+
+    class ACE_10Rnd_93x64_DMR_05_Mag_SD:  10Rnd_93x64_DMR_05_Mag {
+        author = "$STR_ACE_Common_ACEETeam";
+        ammo = "ACE_B_93x64_Ball_SD";
+        displayName = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_SDName";
+        displayNameShort = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_SDNameShort";
+        descriptionShort = "$STR_ACE_10Rnd_93x64_DMR_05_Mag_SDDescription";
+        initSpeed = 320;
+    };
 };

addons/magazines/CfgWeapons.hpp

@@ -103,14 +103,16 @@ class CfgWeapons {
             };
         };
     };
-    
+
     class DMR_02_base_F: Rifle_Long_Base_F {
         magazines[] += {
             "ACE_10Rnd_338_Mag_Tracer",
-            "ACE_10Rnd_338_Mag_Tracer_Dim"
+            "ACE_10Rnd_338_Mag_Tracer_Dim",
+            "ACE_10Rnd_338_Mag_AP",
+            "ACE_10Rnd_338_Mag_SD"
         };
     };
-    
+
     class  MMG_02_base_F: Rifle_Long_Base_F {
         magazines[] += {
             "ACE_130Rnd_338_Mag_Tracer",
@@ -118,6 +120,15 @@ class CfgWeapons {
         };
     };
 
+    class DMR_05_base_F: Rifle_Long_Base_F {
+        magazines[] += {
+            "ACE_10Rnd_93x64_DMR_05_Mag_Tracer",
+            "ACE_10Rnd_93x64_DMR_05_Mag_Tracer_Dim",
+            "ACE_10Rnd_93x64_DMR_05_Mag_AP",
+            "ACE_10Rnd_93x64_DMR_05_Mag_SD"
+        };
+    };
+
 
     /* Assault Rifles */