Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ballistics/Realistic Names - Integrate P90 Compat #6667

Merged
merged 7 commits into from
Dec 3, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions addons/ballistics/CfgAmmo.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
Expand Down
12 changes: 12 additions & 0 deletions addons/ballistics/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
1 change: 1 addition & 0 deletions addons/main/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ class CfgPatches {
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {
"A3_Data_F_Tank_Loadorder",
"A3_Data_F_Mod_Loadorder",
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Does this one not require A3_Data_F_Tank_Loadorder?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it seems to just be itself, unless I'm reading it wrong

// CBA
"cba_ui",
"cba_xeh",
Expand Down
2 changes: 1 addition & 1 deletion addons/main/script_mod.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions addons/realisticnames/CfgMagazines.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
54 changes: 54 additions & 0 deletions addons/realisticnames/CfgWeapons.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Loading