Merge pull request #1373 from acemod/rhsJavelinAmmoCompat

#1321 - Add MGuidance to RHS Javelin Ammo
This commit is contained in:
jaynus 2015-05-23 18:14:24 -07:00
commit a69c6fd090
2 changed files with 44 additions and 26 deletions

View File

@ -2,8 +2,7 @@
class CfgAmmo
{
class BulletBase;
class rhsusf_B_300winmag: BulletBase
{
class rhsusf_B_300winmag: BulletBase {
ACE_caliber=7.823;
ACE_bulletLength=37.821;
ACE_bulletMass=14.256;
@ -16,8 +15,7 @@ class CfgAmmo
ACE_barrelLengths[]={508.0, 609.6, 660.4};
};
class B_556x45_Ball;
class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball
{
class rhs_ammo_556x45_Mk318_Ball: B_556x45_Ball {
ACE_caliber=5.69;
ACE_bulletLength=23.012;
ACE_bulletMass=4.0176;
@ -29,8 +27,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={780, 886, 950};
ACE_barrelLengths[]={254.0, 393.7, 508.0};
};
class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball
{
class rhs_ammo_556x45_Mk262_Ball: B_556x45_Ball {
ACE_caliber=5.69;
ACE_bulletLength=23.012;
ACE_bulletMass=4.9896;
@ -42,8 +39,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={624, 816, 832, 838};
ACE_barrelLengths[]={190.5, 368.3, 457.2, 508.0};
};
class rhs_ammo_762x51_M80_Ball: BulletBase
{
class rhs_ammo_762x51_M80_Ball: BulletBase {
ACE_caliber=7.823;
ACE_bulletLength=28.956;
ACE_bulletMass=9.4608;
@ -55,8 +51,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={700, 800, 820, 833, 845};
ACE_barrelLengths[]={254.0, 406.4, 508.0, 609.6, 660.4};
};
class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball
{
class rhs_ammo_762x51_M118_Special_Ball: rhs_ammo_762x51_M80_Ball {
ACE_caliber=7.823;
ACE_bulletLength=31.496;
ACE_bulletMass=11.34;
@ -68,8 +63,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={750, 780, 790, 794};
ACE_barrelLengths[]={406.4, 508.0, 609.6, 660.4};
};
class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball
{
class rhs_ammo_762x51_M993_Ball: rhs_ammo_762x51_M80_Ball {
ACE_caliber=7.823;
ACE_bulletLength=31.496;
ACE_bulletMass=8.2296;
@ -81,8 +75,7 @@ class CfgAmmo
ACE_muzzleVelocities[]={875, 910, 930};
ACE_barrelLengths[]={330.2, 406.4, 508.0};
};
class rhs_ammo_45ACP_MHP: BulletBase
{
class rhs_ammo_45ACP_MHP: BulletBase {
ACE_caliber=11.481;
ACE_bulletLength=17.272;
ACE_bulletMass=14.904;
@ -94,4 +87,39 @@ class CfgAmmo
ACE_muzzleVelocities[]={230, 250, 285};
ACE_barrelLengths[]={101.6, 127.0, 228.6};
};
};
class M_Titan_AT;
class rhs_ammo_M_fgm148_AT: M_Titan_AT {
irLock = 0;
laserLock = 0;
airLock = 0;
// Begin ACE guidance Configs
class ace_missileguidance {
enabled = 1;
minDeflection = 0.00005; // Minium flap deflection for guidance
maxDeflection = 0.025; // Maximum flap deflection for guidance
incDeflection = 0.00005; // The incrmeent in which deflection adjusts.
canVanillaLock = 0;
// Guidance type for munitions
defaultSeekerType = "Optic";
seekerTypes[] = { "Optic" };
defaultSeekerLockMode = "LOBL";
seekerLockModes[] = { "LOBL" };
seekerAngle = 180; // Angle in front of the missile which can be searched
seekerAccuracy = 1; // seeker accuracy multiplier
seekerMinRange = 0;
seekerMaxRange = 2500; // Range from the missile which the seeker can visually search
// Attack profile type selection
defaultAttackProfile = "JAV_TOP";
attackProfiles[] = { "JAV_TOP", "JAV_DIR" };
};
};
};

View File

@ -97,14 +97,4 @@ class CfgWeapons
lockingTargetSound[] = {"",0,1};
lockedTargetSound[] = {"",0,1};
};
class rhs_weap_fgm148 : launch_O_Titan_F {
ace_javelin_enabled = 1;
weaponInfoType = "ACE_RscOptics_javelin";
modelOptics = "\z\ace\addons\javelin\data\reticle_titan.p3d";
canLock = 0;
lockingTargetSound[] = {"",0,1};
lockedTargetSound[] = {"",0,1};
};
};
};