From 4d088fd828644ef67d527bc4746b9f0138fef9f5 Mon Sep 17 00:00:00 2001
From: Bailey Danyluk <TheCandianVendingMachine@users.noreply.github.com>
Date: Fri, 23 Aug 2024 08:46:44 -0600
Subject: [PATCH] Missileguidance - Update DAGR (#10024)

---
 addons/missileguidance/CfgAmmo.hpp      | 11 ++++----
 addons/missileguidance/CfgMagazines.hpp | 34 ++++++++++++++++++-------
 addons/missileguidance/CfgWeapons.hpp   |  7 ++++-
 addons/missileguidance/stringtable.xml  |  9 +++++++
 4 files changed, 46 insertions(+), 15 deletions(-)

diff --git a/addons/missileguidance/CfgAmmo.hpp b/addons/missileguidance/CfgAmmo.hpp
index a2b07b7fff1..814e6575d5e 100644
--- a/addons/missileguidance/CfgAmmo.hpp
+++ b/addons/missileguidance/CfgAmmo.hpp
@@ -20,19 +20,21 @@ class CfgAmmo {
         class ADDON {
             enabled = 1;
 
-            minDeflection = 0.0005;      // Minium flap deflection for guidance
-            maxDeflection = 0.0025;       // Maximum flap deflection for guidance
-            incDeflection = 0.0005;      // The incrmeent in which deflection adjusts.
+            pitchRate = 40; // degrees per second
+            yawRate = 40;
 
             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" };
 
             defaultSeekerLockMode = "LOAL";
             seekerLockModes[] = { "LOAL", "LOBL" };
 
+            defaultNavigationType = "AugmentedProportionalNavigation";
+            navigationTypes[] = { "AugmentedProportionalNavigation" };
+
             seekerAngle = 90;           // Angle in front of the missile which can be searched
             seekerAccuracy = 1;         // seeker accuracy multiplier
 
@@ -68,7 +70,6 @@ class CfgAmmo {
         // Begin ACE guidance Configs
         class ADDON {
             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.
diff --git a/addons/missileguidance/CfgMagazines.hpp b/addons/missileguidance/CfgMagazines.hpp
index 74d75e8d4ae..c7ef48004ca 100644
--- a/addons/missileguidance/CfgMagazines.hpp
+++ b/addons/missileguidance/CfgMagazines.hpp
@@ -4,24 +4,40 @@ class CfgMagazines {
     class 6Rnd_ACE_Hydra70_DAGR: 12Rnd_PG_missiles {
         ammo = "ACE_Hydra70_DAGR";
         count = 12;
-        displayName = "6 Round DAGR";
-        displayNameShort = "6 Round DAGR";
-        descriptionShort = "6 Round DAGR";
+        displayName = CSTRING(Hydra70_DAGR_6x);
         weight = 36;
 
     };
     class 12Rnd_ACE_Hydra70_DAGR: 6Rnd_ACE_Hydra70_DAGR {
         count = 12;
-        displayName = "16 Round DAGR";
-        displayNameShort = "16 Round DAGR";
-        descriptionShort = "16 Round DAGR";
+        displayName = CSTRING(Hydra70_DAGR_12x);
         weight = 72;
     };
     class 24Rnd_ACE_Hydra70_DAGR: 6Rnd_ACE_Hydra70_DAGR {
         count = 24;
-        displayName = "24 Round DAGR";
-        displayNameShort = "24 Round DAGR";
-        descriptionShort = "24 Round DAGR";
+        displayName = CSTRING(Hydra70_DAGR_24x);
         weight = 72;
     };
+
+    class PylonRack_12Rnd_PG_missiles;
+    class PylonRack_6Rnd_ACE_DAGR: PylonRack_12Rnd_PG_missiles {
+        ammo = "ACE_Hydra70_DAGR";
+        displayName = CSTRING(Hydra70_DAGR_6x);
+        count = 6;
+        pylonWeapon = QGVAR(dagr);
+    };
+
+    class PylonRack_12Rnd_ACE_DAGR: PylonRack_12Rnd_PG_missiles {
+        ammo = "ACE_Hydra70_DAGR";
+        displayName = CSTRING(Hydra70_DAGR_12x);
+        count = 12;
+        pylonWeapon = QGVAR(dagr);
+    };
+
+    class PylonRack_24Rnd_ACE_DAGR: PylonRack_12Rnd_PG_missiles {
+        ammo = "ACE_Hydra70_DAGR";
+        displayName = CSTRING(Hydra70_DAGR_24x);
+        count = 24;
+        pylonWeapon = QGVAR(dagr);
+    };
 };
diff --git a/addons/missileguidance/CfgWeapons.hpp b/addons/missileguidance/CfgWeapons.hpp
index b03628e7776..d88cf27b539 100644
--- a/addons/missileguidance/CfgWeapons.hpp
+++ b/addons/missileguidance/CfgWeapons.hpp
@@ -2,8 +2,13 @@ class CfgWeapons {
     class missiles_DAGR;
 
     class GVAR(dagr): missiles_DAGR {
+        EGVAR(laser,canSelect) = 1; // can ace_laser lock (allows switching laser code)
+        EGVAR(laser,showHud) = 1; // show attack profile / lock on hud
+        magazines[] = {"6Rnd_ACE_Hydra70_DAGR","12Rnd_ACE_Hydra70_DAGR","24Rnd_ACE_Hydra70_DAGR","PylonRack_6Rnd_ACE_DAGR","PylonRack_12Rnd_ACE_DAGR","PylonRack_24Rnd_ACE_DAGR"};
+
+        autoFire = 0;
         canLock = 0;
-        magazines[] = {"6Rnd_ACE_Hydra70_DAGR","12Rnd_ACE_Hydra70_DAGR","24Rnd_ACE_Hydra70_DAGR"};
+        weaponLockSystem = 0;
         lockingTargetSound[] = {"",0,1};
         lockedTargetSound[] = {"",0,1};
     };
diff --git a/addons/missileguidance/stringtable.xml b/addons/missileguidance/stringtable.xml
index aacdd472d69..8020415eaa7 100644
--- a/addons/missileguidance/stringtable.xml
+++ b/addons/missileguidance/stringtable.xml
@@ -205,5 +205,14 @@
             <Chinese>循環切換開火模式</Chinese>
             <Turkish>Ateşleme Modunu Değiştir</Turkish>
         </Key>
+        <Key ID="STR_ACE_MissileGuidance_Hydra70_DAGR_6x">
+            <English>6x DAGR [ACE]</English>
+        </Key>
+        <Key ID="STR_ACE_MissileGuidance_Hydra70_DAGR_12x">
+            <English>12x DAGR [ACE]</English>
+        </Key>
+        <Key ID="STR_ACE_MissileGuidance_Hydra70_DAGR_24x">
+            <English>24x DAGR [ACE]</English>
+        </Key>
     </Package>
 </Project>