diff --git a/addons/missileguidance/CfgAmmo.hpp b/addons/missileguidance/CfgAmmo.hpp index 779d2a82eb..2f8b4c93f4 100644 --- a/addons/missileguidance/CfgAmmo.hpp +++ b/addons/missileguidance/CfgAmmo.hpp @@ -5,7 +5,7 @@ enum { class CfgAmmo { class MissileBase; - + class M_PG_AT : MissileBase { model = "\A3\Weapons_F\Ammo\Rocket_01_fly_F"; proxyShape = "\A3\Weapons_F\Ammo\Rocket_01_F"; @@ -26,7 +26,7 @@ class CfgAmmo { thrustTime = 1.07; thrust = 530; fuseDistance = 2; - + effectsMissileInit = "MissileDAR1"; effectsMissile = "missile2"; whistleDist = 4; @@ -34,65 +34,67 @@ class CfgAmmo { // Turn off arma crosshair-guidance manualControl = 0; - + // ACE uses these values trackOversteer = 1; trackLead = 0; - + // Begin ACE guidance Configs class ADDON { enabled = 1; - + minDeflection = 0.00025; // Minium flap deflection for guidance maxDeflection = 0.001; // Maximum flap deflection for guidance incDeflection = 0.0005; // The incrmeent in which deflection adjusts. - + canVanillaLock = 0; // Can this default vanilla lock? Only applicable to non-cadet mode - + // Guidance type for munitions defaultSeekerType = "SALH"; - seekerTypes[] = { "SALH", "LIDAR", "SARH", "Optic", "Thermal", "GPS", "SACLOS", "MCLOS" }; - + seekerTypes[] = { "SALH", "LIDAR", "SARH", "Optic", "Thermal", "GPS", "SACLOS", "MCLOS" }; + defaultSeekerLockMode = "LOAL"; - seekerLockModes[] = { "LOAL", "LOBL" }; - + seekerLockModes[] = { "LOAL", "LOBL" }; + seekerAngle = 90; // Angle in front of the missile which can be searched seekerAccuracy = 1; // seeker accuracy multiplier - + seekerMinRange = 1; seekerMaxRange = 2500; // Range from the missile which the seeker can visually search - + // Attack profile type selection defaultAttackProfile = "LIN"; attackProfiles[] = { "LIN", "DIR", "MID", "HI" }; }; }; - + class ACE_Hydra70_DAGR : M_PG_AT { displayName = CSTRING(Hydra70_DAGR); displayNameShort = CSTRING(Hydra70_DAGR_Short); - + description = CSTRING(Hydra70_DAGR_Desc); descriptionShort = CSTRING(Hydra70_DAGR_Desc); + + EGVAR(rearm,caliber) = 70; }; - + class ACE_Hellfire_AGM114K : ACE_Hydra70_DAGR { displayName = CSTRING(Hellfire_AGM114K); displayNameShort = CSTRING(Hellfire_AGM114K_Short); - + description = CSTRING(Hellfire_AGM114K_desc); descriptionShort = CSTRING(Hellfire_AGM114K_desc); - + // @TODO: placeholder model to at least make it look different model = "\A3\Weapons_F\Ammo\Missile_AT_03_fly_F"; proxyShape = "\A3\Weapons_F\Ammo\Missile_AT_03_F"; - + hit = 1400; indirectHit = 71; indirectHitRange = 4.5; effectsMissile = "missile2"; }; - + // Titan class M_Titan_AT : MissileBase {}; diff --git a/addons/rearm/CfgAmmo.hpp b/addons/rearm/CfgAmmo.hpp index 3a346f4bd3..e611293164 100644 --- a/addons/rearm/CfgAmmo.hpp +++ b/addons/rearm/CfgAmmo.hpp @@ -35,9 +35,6 @@ class CfgAmmo { GVAR(caliber) = 100; GVAR(dummy) = QGVAR(M_PG_AT); }; - class ACE_Hydra70_DAGR : M_PG_AT { - GVAR(caliber) = 70; - }; class Missile_AGM_02_F : MissileBase { GVAR(dummy) = QGVAR(Missile_AGM_02_F); }; @@ -102,10 +99,6 @@ class CfgAmmo { GVAR(caliber) = 40; }; - class RDS_B_127x107_Ball : BulletBase { - GVAR(caliber) = 12.7; - }; - class ShellBase; class R_230mm_fly : ShellBase { GVAR(dummy) = QGVAR(R_230mm_fly); @@ -140,23 +133,11 @@ class CfgAmmo { class Sh_82mm_AMOS : Sh_155mm_AMOS { GVAR(caliber) = 82; }; - class RDS_Sh_122_HE : Sh_155mm_AMOS { - GVAR(caliber) = 122; - }; - class RDS_Sh_105_HE : Sh_155mm_AMOS { - GVAR(caliber) = 105; - }; class Sh_82mm_AMOS_LG; class Sh_155mm_AMOS_LG : Sh_82mm_AMOS_LG { GVAR(caliber) = 155; }; - class RDS_Sh_122_LASER : Sh_155mm_AMOS_LG { - GVAR(caliber) = 122; - }; - class RDS_Sh_105_LASER : Sh_155mm_AMOS_LG { - GVAR(caliber) = 105; - }; class ShotDeployBase; class Smoke_82mm_AMOS_White : ShotDeployBase { @@ -186,9 +167,6 @@ class CfgAmmo { class R_230mm_HE : SubmunitionBase { GVAR(caliber) = 230; }; - class rhs_ammo_127x108mm_x5 : SubmunitionBase { - GVAR(caliber) = 12.7; - }; class Mine_155mm_AMOS_range : SubmunitionBase { GVAR(caliber) = 155; }; @@ -202,10 +180,6 @@ class CfgAmmo { GVAR(caliber) = 155; }; - class rhs_ammo_rpgShell_base : ShellBase { - GVAR(caliber) = 70; - }; - class Bo_Mk82 : BombCore { GVAR(dummy) = QGVAR(Bo_Mk82); }; @@ -223,18 +197,4 @@ class CfgAmmo { class Bomb_03_F : Bomb_04_F { GVAR(dummy) = QGVAR(Bomb_03_F); }; - - // F18 Mod - class js_a_fa18_wing_tank : LaserBombCore { - GVAR(caliber) = 250; // Default caliber for bombs - }; - class js_a_fa18x_MK82 : BombCore {}; - class js_a_fa18x_GBU39_SDB : js_a_fa18x_MK82 { - GVAR(caliber) = 250; // Default caliber for bombs - }; - - class js_a_fa18_GBU12_LGB : LaserBombCore {}; - class js_a_fa18_GBU38_JDAM : js_a_fa18_GBU12_LGB { - GVAR(caliber) = 250; // Default caliber for bombs - }; };