Ballistics/Realistic Names - Integrate P90 Compat (#6667)

* Ballistics/Realistic Names - Integrate P90 Compat * Update CfgWeapons.hpp * Remove old compat addon * Update addons/realisticnames/stringtable.xml Co-Authored-By: PabstMirror <[email protected]> * Update addons/realisticnames/CfgWeapons.hpp Co-Authored-By: PabstMirror <[email protected]> * Update addons/ballistics/CfgWeapons.hpp Co-Authored-By: PabstMirror <[email protected]> * Update addons/ballistics/CfgWeapons.hpp Co-Authored-By: PabstMirror <[email protected]>
acemod · Dec 3, 2018 · c129239 · c129239
1 parent 5b62128
commit c129239
Show file tree

Hide file tree

Showing 16 changed files with 371 additions and 414 deletions.
diff --git a/addons/ballistics/CfgAmmo.hpp b/addons/ballistics/CfgAmmo.hpp
@@ -603,6 +603,17 @@ class CfgAmmo {
         ACE_muzzleVelocities[]={510, 550, 596};
         ACE_barrelLengths[]={304.8, 406.4, 609.6};
     };
+    class B_570x28_Ball: BulletBase {
+        ACE_caliber = 5.7;
+        ACE_bulletLength = 21.6; // http://blog.thejustnation.org/2011/04/5-7x28mm-ammo-review/
+        ACE_bulletMass = 2; // based on the SS190
+        ACE_ballisticCoefficients[] = {0.177}; //http://m.delphiforums.com/autogun/messages/5267/7
+        ACE_velocityBoundaries[] = {};
+        ACE_standardAtmosphere = "ASM"; // 50/50 chance to get it right
+        ACE_dragModel = 7;
+        ACE_muzzleVelocities[] = {716,776};
+        ACE_barrelLengths[] = {264,407};
+    };
     class B_19mm_HE: BulletBase {
         tracerScale = 1;
     };

diff --git a/addons/ballistics/CfgWeapons.hpp b/addons/ballistics/CfgWeapons.hpp
@@ -70,6 +70,18 @@ class CfgWeapons {
         };
     };
 
+    // P90 (1.86)
+    class SMG_03_TR_BASE: Rifle_Base_F {
+        ACE_barrelTwist = 228.6; // 1:9 inch twist
+        ACE_barrelLength = 407;
+        ACE_twistDirection = 1;
+        modes[] = {"Single"};
+    };
+    class SMG_03C_BASE: SMG_03_TR_BASE {
+        ACE_barrelLength = 264;
+        modes[] = {"Single", "FullAuto"};
+    };
+
     // Noreen "Bad News" ULR
     class DMR_02_base_F: Rifle_Long_Base_F {
         class Single: Mode_SemiAuto {

diff --git a/addons/main/config.cpp b/addons/main/config.cpp
@@ -8,6 +8,7 @@ class CfgPatches {
         requiredVersion = REQUIRED_VERSION;
         requiredAddons[] = {
             "A3_Data_F_Tank_Loadorder",
+            "A3_Data_F_Mod_Loadorder",
             // CBA
             "cba_ui",
             "cba_xeh",

diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
@@ -9,7 +9,7 @@
 #define VERSION_AR MAJOR,MINOR,PATCHLVL,BUILD
 
 // MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 1.84
+#define REQUIRED_VERSION 1.86
 #define REQUIRED_CBA_VERSION {3,9,0}
 
 #ifdef COMPONENT_BEAUTIFIED

diff --git a/addons/realisticnames/CfgMagazines.hpp b/addons/realisticnames/CfgMagazines.hpp
@@ -422,6 +422,10 @@ class CfgMagazines {
         displayName = CSTRING(SmokeShellYellow_Name);
     };
 
+    class 50Rnd_570x28_SMG_03: CA_Magazine {
+        displayName = CSTRING(P90_Mag_Name);
+        descriptionShort = CSTRING(P90_Mag_DescriptionShort);
+    };
 
     // 1.70 Pylon Magazines (Should Match Weapon Name)
     class 2Rnd_Missile_AA_04_F;

diff --git a/addons/realisticnames/CfgWeapons.hpp b/addons/realisticnames/CfgWeapons.hpp
@@ -93,6 +93,60 @@ class CfgWeapons {
     class arifle_Mk20_GL_plain_F: arifle_Mk20_GL_F {
         displayName = CSTRING(arifle_Mk20_GL_plain_Name);
     };
+
+    // P90 (1.86)
+    class SMG_03_TR_BASE;
+    class SMG_03_TR_black: SMG_03_TR_BASE {
+        displayName = CSTRING(PS90_TR_Black_Name);
+    };
+    class SMG_03_TR_khaki: SMG_03_TR_black {
+        displayName = CSTRING(PS90_TR_Khaki_Name);
+    };
+    class SMG_03_TR_camo: SMG_03_TR_black {
+        displayName = CSTRING(PS90_TR_Camo_Name);
+    };
+    class SMG_03_TR_hex: SMG_03_TR_BASE {
+        displayName = CSTRING(PS90_TR_Hex_Name);
+    };
+    class SMG_03_black: SMG_03_TR_BASE {
+        displayName = CSTRING(PS90_Black_Name);
+    };
+    class SMG_03_khaki: SMG_03_black {
+        displayName = CSTRING(PS90_Khaki_Name);
+    };
+    class SMG_03_camo: SMG_03_black {
+        displayName = CSTRING(PS90_Camo_Name);
+    };
+    class SMG_03_hex: SMG_03_black {
+        displayName = CSTRING(PS90_Hex_Name);
+    };
+    class SMG_03C_BASE: SMG_03_TR_BASE {};
+    class SMG_03C_TR_black: SMG_03C_BASE {
+        displayName = CSTRING(P90_TR_Black_Name);
+    };
+    class SMG_03C_TR_khaki: SMG_03C_TR_black {
+        displayName = CSTRING(P90_TR_Khaki_Name);
+    };
+    class SMG_03C_TR_camo: SMG_03C_TR_black {
+        displayName = CSTRING(P90_TR_Camo_Name);
+    };
+    class SMG_03C_TR_hex: SMG_03C_TR_black {
+        displayName = CSTRING(P90_TR_Hex_Name);
+    };
+    class SMG_03C_black: SMG_03C_Base {
+        displayName = CSTRING(P90_Black_Name);
+    };
+    class SMG_03C_khaki: SMG_03C_black {
+        displayName = CSTRING(P90_Khaki_Name);
+    };
+    class SMG_03C_camo: SMG_03C_black {
+        displayName = CSTRING(P90_Camo_Name);
+    };
+    class SMG_03C_hex: SMG_03C_black {
+        displayName = CSTRING(P90_Hex_Name);
+    };
+
+
 
     // Vector
     class SMG_01_Base;