From d78606b2bcf8a0ee234a2a747134677f035b6eb9 Mon Sep 17 00:00:00 2001
From: "Brandon-PC\\Brandon" <brandondanyluk366@gmail.com>
Date: Sun, 13 Jan 2019 00:08:48 -0700
Subject: [PATCH] Fix inheritance issues. Missile damage values tweaked. Fix
 String Table. Add backblast area.

---
 addons/dragon/CfgAmmo.hpp      |  4 ++--
 addons/dragon/CfgMagazines.hpp |  2 ++
 addons/dragon/CfgWeapons.hpp   | 24 ++++++++++++++++++++----
 addons/dragon/stringtable.xml  | 27 +++++++++++++++------------
 4 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/addons/dragon/CfgAmmo.hpp b/addons/dragon/CfgAmmo.hpp
index 6512ac4da6..3cc5e71610 100644
--- a/addons/dragon/CfgAmmo.hpp
+++ b/addons/dragon/CfgAmmo.hpp
@@ -24,7 +24,7 @@ class CfgAmmo {
         
         indirectHit = 9;
         indirectHitRange = 1;
-        explosive = 0.1;
+        explosive = 0.02;
         timeToLive = 60;
         cost = 4000;
         simulationStep = 0.005;
@@ -71,7 +71,7 @@ class CfgAmmo {
         hit = 460;
         indirectHit = 9;
         indirectHitRange = 1;
-        explosive = 0.1;
+        explosive = 0.02;
         cost = 4000;
         
         submunitionAmmo = QGVAR(penetrator_super);
diff --git a/addons/dragon/CfgMagazines.hpp b/addons/dragon/CfgMagazines.hpp
index ef2ff0fdd2..f162995371 100644
--- a/addons/dragon/CfgMagazines.hpp
+++ b/addons/dragon/CfgMagazines.hpp
@@ -9,6 +9,8 @@ class CfgMagazines {
         initSpeed = 200;
         scope = 1;
         displayName = CSTRING(dragonName);
+        displayNameShort = CSTRING(dragonName);
+        descriptionShort = CSTRING(dragonDescription);
     };
 };
 
diff --git a/addons/dragon/CfgWeapons.hpp b/addons/dragon/CfgWeapons.hpp
index 4133c968fd..f728c19fe8 100644
--- a/addons/dragon/CfgWeapons.hpp
+++ b/addons/dragon/CfgWeapons.hpp
@@ -1,12 +1,23 @@
 class CfgWeapons {
-    class launch_Titan_F;
-    class launch_NLAW_F;
-    class missiles_titan_static;
+    class launch_Titan_base;
+    class Launcher_Base_F;
+    class missiles_titan;
+    class launch_NLAW_F: Launcher_Base_F {
+        class WeaponSlotsInfo;
+    };
+    class missiles_titan_static: missiles_titan {
+        class WeaponSlotsInfo;
+    };
+    class launch_Titan_F: launch_Titan_base {
+        class WeaponSlotsInfo;
+    };
+    
     class GVAR(super): launch_Titan_F {
         model = QPATHTOF(models\ace_m47_magazine.p3d);
         picture = QPATHTOF(data\m47_dragon_item_ca.paa);
         magazines[] = {};
         displayName = CSTRING(dragonName);
+        descriptionShort = CSTRING(dragonDescription);
         scope = 2;
         
         class ACE_CSW {
@@ -22,7 +33,12 @@ class CfgWeapons {
     };
     
     class GVAR(superStatic): missiles_titan_static {
+        EGVAR(overpressure,angle) = 90;
+        EGVAR(overpressure,range) = 30;
+        EGVAR(overpressure,damage) = 0.85;
+        
         displayName = CSTRING(dragonName);
+        descriptionShort = CSTRING(dragonDescription);
         magazines[] = { QGVAR(super) };
     };
     
@@ -37,7 +53,7 @@ class CfgWeapons {
         showSwitchAction = 1;
         useAsBinocular = 1;
         uipicture = "";
-        descriptionshort = CSTRING(sightDescription);
+        descriptionShort = CSTRING(sightDescription);
         ace_disposable = 0;
         magazines[] = {};
         type = 4096;
diff --git a/addons/dragon/stringtable.xml b/addons/dragon/stringtable.xml
index 056d4496a2..bba0b07f63 100644
--- a/addons/dragon/stringtable.xml
+++ b/addons/dragon/stringtable.xml
@@ -1,23 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project name="ACE">
     <Package name="dragon">
-        <Key ID="dragonName">
-            <english>M47 Super-Dragon</english>
+        <Key ID="STR_ACE_dragon_dragonName">
+            <English>M47 Super-Dragon</English>
         </Key>
-        <Key ID="dragonNoSight">
-            <english>M47 Super-Dragon (NoSight)</english>
+        <Key ID="STR_ACE_dragon_dragonNoSight">
+            <English>M47 Super-Dragon (No Sight)</English>
         </Key>
-        <Key ID="dragonSight">
-            <english>M47 Super-Dragon (With Sight)</english>
+        <Key ID="STR_ACE_dragon_dragonSight">
+            <English>M47 Super-Dragon (With Sight)</English>
         </Key>
-        <Key ID="attachSight">
-            <english>Attach Sight</english>
+        <Key ID="STR_ACE_dragon_attachSight">
+            <English>Attach Sight</English>
         </Key>
-        <Key ID="sightName">
-            <english>SU-36/P Daysight</english>
+        <Key ID="STR_ACE_dragon_sightName">
+            <English>SU-36/P Daysight</English>
         </Key>
-        <Key ID="sightDescription">
-            <english>A light, cheap sight used for daytime operations. Contains the guidance computer for the whole system</english>
+        <Key ID="STR_ACE_dragon_sightDescription">
+            <English>A light, cheap sight used for daytime operations. Contains the guidance computer for the whole system</English>
+        </Key>
+        <Key ID="STR_ACE_dragon_dragonDescription">
+            <English>A Wire-Guided SACLOS missile with a unique flight characteristic</English>
         </Key>
     </Package>
 </Project>