Maverick - Update to missile guidance framework

addons/maverick/ACE_GuidanceConfig.hpp

@@ -2,6 +2,6 @@ class EGVAR(missileguidance,AttackProfiles) {
     class maverick {
         name = "LOAL-DIR";
         nameLocked = "LOBL-DIR";
-        functionName = QEFUNC(missileguidance,attackProfile_DIR);
+        functionName = QEFUNC(missileguidance,attackProfile_LIN);
     };
 };

addons/maverick/CfgAmmo.hpp

@@ -5,6 +5,45 @@ class CfgAmmo {
     };
     class Missile_AGM_02_F: MissileBase {};
 
+    class GVAR(D): Missile_AGM_02_F {
+        author = "Dani (TCVM)";
+        missileLockMaxDistance = 14000;
+        maneuvrability = 0;
+        class ace_missileguidance {
+            enabled = 1;
+
+            pitchRate = 15;
+            yawRate = 15;
+
+            canVanillaLock = 1;
+
+            defaultSeekerType = "Optic";
+            seekerTypes[] = {"Optic"};
+
+            defaultSeekerLockMode = "LOBL";
+            seekerLockModes[] = {"LOBL"};
+
+            defaultNavigationType = "AugmentedProportionalNavigation";
+            navigationTypes[] = { "AugmentedProportionalNavigation" };
+
+            seekLastTargetPos = 1;
+            seekerAngle = 60;
+            seekerAccuracy = 1;
+
+            seekerMinRange = 1;
+            seekerMaxRange = 14000;
+
+            defaultAttackProfile = "maverick";
+            attackProfiles[] = {"maverick"};
+        };
+    };
+
+    class GVAR(G): GVAR(D) {
+        class ace_missileguidance: ace_missileguidance {
+            enabled = 1;
+        };
+    };
+
     class GVAR(L): Missile_AGM_02_F {
         author = "xrufix";
         autoSeekTarget = 0;
@@ -16,9 +55,8 @@ class CfgAmmo {
         class ace_missileguidance {
             enabled = 1;
 
-            minDeflection = 0;
-            maxDeflection = 0.002;
-            incDeflection = 0.001;
+            pitchRate = 15;
+            yawRate = 15;
 
             canVanillaLock = 0;
 
@@ -28,6 +66,9 @@ class CfgAmmo {
             defaultSeekerLockMode = "LOAL";
             seekerLockModes[] = {"LOAL","LOBL"};
 
+            defaultNavigationType = "AugmentedProportionalNavigation";
+            navigationTypes[] = { "AugmentedProportionalNavigation" };
+
             seekLastTargetPos = 1;
             seekerAngle = 60;
             seekerAccuracy = 1;
@@ -49,9 +90,8 @@ class CfgAmmo {
         class ace_missileguidance {
             enabled = 1;
 
-            minDeflection = 0;
-            maxDeflection = 0.002;
-            incDeflection = 0.001;
+            pitchRate = 20;
+            yawRate = 20;
 
             canVanillaLock = 0;
 
@@ -61,6 +101,9 @@ class CfgAmmo {
             defaultSeekerLockMode = "LOAL";
             seekerLockModes[] = {"LOAL"};
 
+            defaultNavigationType = "AugmentedProportionalNavigation";
+            navigationTypes[] = { "AugmentedProportionalNavigation" };
+
             seekLastTargetPos = 1;
             seekerAngle = 40;
             seekerAccuracy = 1;

addons/maverick/CfgMagazines.hpp

@@ -12,7 +12,71 @@ class CfgMagazines {
 
     class PylonRack_Missile_AGM_02_x1: magazine_Missile_AGM_02_x1 {};
     class PylonRack_Missile_AGM_02_x2: magazine_Missile_AGM_02_x1 {};
+
+    // Optical Mavericks
+    class GVAR(D_magazine): 6Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(D);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(d_mag_x1);
+    };
+    class GVAR(D_pylonRack_1Rnd): PylonRack_1Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(D);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(d_mag_x1);
+        pylonWeapon = QGVAR(D_Launcher);
+    };
+    class GVAR(D_pylonRack_3Rnd): PylonRack_3Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(D);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(d_mag_x3);
+        pylonWeapon = QGVAR(D_Launcher);
+    };
+
+    class GVAR(G_magazine_x1): magazine_Missile_AGM_02_x1 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x1);
+    };
+    class GVAR(G_pylonmissile_x1): PylonMissile_Missile_AGM_02_x1 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x1);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+    class GVAR(G_pylonmissile_x2): PylonMissile_Missile_AGM_02_x2 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x2);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+
+    class GVAR(G_pylonRack_1Rnd): PylonRack_1Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x1);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+    class GVAR(G_PylonRack_3Rnd): PylonRack_3Rnd_Missile_AGM_02_F {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x3);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+
+    class GVAR(G_PylonRack_x1): PylonRack_Missile_AGM_02_x1 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x1);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
+    class GVAR(G_PylonRack_x2): PylonRack_Missile_AGM_02_x2 {
+        ammo = QGVAR(G);
+        author = "Dani (TCVM)";
+        displayName = CSTRING(g_mag_x2);
+        pylonWeapon = QGVAR(G_Launcher);
+    };
 
+    // Laser Mavericks
     class GVAR(L_magazine_x1): magazine_Missile_AGM_02_x1 {
         ammo = QGVAR(L);
         author = "xrufix";

addons/maverick/CfgWeapons.hpp

@@ -6,6 +6,22 @@ class CfgWeapons {
     class MissileLauncher: LauncherCore {};
     class Missile_AGM_02_Plane_CAS_01_F: MissileLauncher {};
 
+    class GVAR(D_Launcher): Missile_AGM_02_Plane_CAS_01_F {
+        author = "Dani (TCVM)";
+        displayname = CSTRING(D);
+        magazines[] = {QGVAR(D_magazine), QGVAR(D_pylonRack_1Rnd), QGVAR(D_pylonRack_3Rnd)};
+        weaponLockDelay = 0.1;
+        weaponLockSystem = 2;
+    };
+
+    class GVAR(G_Launcher): weapon_AGM_65Launcher {
+        author = "Dani (TCVM)";
+        displayname = CSTRING(G);
+        magazines[] = {QGVAR(G_magazine_x1), QGVAR(G_pylonmissile_x1), QGVAR(G_pylonmissile_x2), QGVAR(G_pylonRack_1Rnd), QGVAR(G_PylonRack_3Rnd), QGVAR(G_PylonRack_x1), QGVAR(G_PylonRack_x2)};
+        weaponLockDelay = 0.1;
+        weaponLockSystem = 2;
+    };
+
     class GVAR(L_Launcher): weapon_AGM_65Launcher {
         author = "xrufix";
         displayname = CSTRING(L);

addons/maverick/stringtable.xml

@@ -111,6 +111,27 @@
                 <Turkish>1x Kh-25ML [ACE]</Turkish>
                 <Spanish>1x Kh-25ML [ACE]</Spanish>
             </Key>
+            <Key ID="STR_ACE_Maverick_d">
+                <English>AGM-65 Maverick D</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_g">
+                <English>AGM-65 Maverick G</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_d_mag_x1">
+                <English>AGM-65 Maverick D [ACE]</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_d_mag_x3">
+                <English>3x AGM-65 Maverick D [ACE]</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_g_mag_x1">
+                <English>AGM-65 Maverick G [ACE]</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_g_mag_x2">
+                <English>2x AGM-65 Maverick G [ACE]</English>
+            </Key>
+            <Key ID="STR_ACE_Maverick_g_mag_x3">
+                <English>3x AGM-65 Maverick G [ACE]</English>
+            </Key>
         </Container>
         <Container name="weapons">
             <Key ID="STR_ACE_Maverick_l">

addons/missileguidance/ACE_GuidanceConfig.hpp

@@ -6,28 +6,26 @@ class GVAR(AttackProfiles) {
 
         functionName = QFUNC(attackProfile_LIN);
     };
+    // empty classes for backwards compat
+    class MID: LIN {
+    };
+    class HI: LIN {
+    };
     class DIR {
         name = "";
         visualName = "";
         description = "";
 
         functionName = QFUNC(attackProfile_DIR);
     };
-    class MID {
-        name = "";
-        visualName = "";
-        description = "";
-
-        functionName = QFUNC(attackProfile_MID);
-    };
-    class HI {
+    class LOFT {
         name = "";
         visualName = "";
         description = "";
 
-        functionName = QFUNC(attackProfile_HI);
+        functionName = QFUNC(attackProfile_LOFT);
     };
-     class JAV_DIR {
+    class JAV_DIR {
         name = "";
         visualName = "";
         description = "";
@@ -82,12 +80,39 @@ class GVAR(SeekerTypes) {
         functionName = QFUNC(seekerType_SACLOS);
         onFired = QFUNC(SACLOS_onFired);
     };
-    class ARH {
+    class MillimeterWaveRadar {
         name = "";
         visualName = "";
         description = "";
 
-        functionName = QFUNC(seekerType_ARH);
-        onFired = QFUNC(ahr_onFired);
+        functionName = QFUNC(seekerType_MWR);
+        onFired = QFUNC(mwr_onFired);
+    };
+};
+
+class GVAR(NavigationTypes) {
+    class Direct {
+        functionName = QFUNC(navigationType_direct);
+        onFired = "";
+    };
+    class Line {
+        functionName = QFUNC(navigationType_line);
+        onFired = QFUNC(line_onFired);
+    };
+    class LineOfSight {
+        functionName = QFUNC(navigationType_lineOfSight);
+        onFired = QFUNC(proNav_onFired);
+    };
+    class ProportionalNavigation {
+        functionName = QFUNC(navigationType_proNav);
+        onFired = QFUNC(proNav_onFired);
+    };
+    class AugmentedProportionalNavigation {
+        functionName = QFUNC(navigationType_augmentedProNav);
+        onFired = QFUNC(proNav_onFired);
+    };
+    class ZeroEffortMiss {
+        functionName = QFUNC(navigationType_zeroEffortMiss);
+        onFired = QFUNC(proNav_onFired);
     };
 };

addons/missileguidance/XEH_PREP.hpp

@@ -16,28 +16,44 @@ PREP(doSeekerSearch);
 PREP(doHandoff);
 PREP(handleHandoff);
 
+PREP(shouldFilterRadarHit);
+
 // Attack Profiles
 PREP(attackProfile_AIR);
 PREP(attackProfile_DIR);
-PREP(attackProfile_HI);
 PREP(attackProfile_LIN);
-PREP(attackProfile_MID);
+PREP(attackProfile_LOFT);
 PREP(attackProfile_WIRE);
 PREP(attackProfile_BEAM);
+PREP(attackProfile_JDAM);
 
 // Javelin profiles
 PREP(attackProfile_JAV_DIR);
 PREP(attackProfile_JAV_TOP);
 
+// Navigation Profiles
+PREP(navigationType_zeroEffortMiss);
+PREP(navigationType_augmentedProNav);
+PREP(navigationType_proNav);
+PREP(navigationType_lineOfSight);
+PREP(navigationType_line);
+PREP(navigationType_direct);
+
 // Seeker search functions
 PREP(seekerType_SALH);
 PREP(seekerType_Optic);
 PREP(seekerType_SACLOS);
-PREP(seekerType_ARH);
+PREP(seekerType_Doppler);
+PREP(seekerType_MWR);
 
 // Attack Profiles OnFired
 PREP(wire_onFired);
 
 // Seeker OnFired
 PREP(SACLOS_onFired);
-PREP(ahr_onFired);
+PREP(mwr_onFired);
+
+// Navigation OnFired
+PREP(proNav_onFired);
+PREP(line_onFired);
+

addons/missileguidance/XEH_postInit.sqf

@@ -2,12 +2,13 @@
 
 [QGVAR(handoff), LINKFUNC(handleHandoff)] call CBA_fnc_addEventHandler;
 
-["ACE3 Weapons", QGVAR(cycleFireMode), localize LSTRING(CycleFireMode),
-{
+["ACE3 Weapons", QGVAR(cycleFireMode), localize LSTRING(CycleFireMode), {
     [] call FUNC(cycleAttackProfileKeyDown);
     false
-},
-{
+}, {
     false
 },
 [15, [false, true, false]], false] call CBA_fnc_addKeybind;  //Ctrl+Tab Key
+
+GVAR(dev_fnc_projectileCamera) = compile preprocessFileLineNumbers QPATHTOF(dev\projectileCamera.sqf);
+

addons/missileguidance/XEH_preInit.sqf

@@ -11,4 +11,15 @@ PREP_RECOMPILE_END;
 // As weapons take config changes, there is little point in being able to disable guidance
 if (isNil QGVAR(enabled)) then { GVAR(enabled) = 2; };
 
+GVAR(debug_enableMissileCamera) = false;
+GVAR(debug_drawGuidanceInfo) = false;
+
+#ifdef DRAW_GUIDANCE_INFO
+GVAR(debug_drawGuidanceInfo) = true;
+#endif
+
+#ifdef ENABLE_PROJECTILE_CAMERA
+GVAR(debug_enableMissileCamera) = true;
+#endif
+
 ADDON = true;