From 31d75ee6978681d8efa9c851bd40ae57818ce723 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 31 May 2017 22:23:41 -0500
Subject: [PATCH 1/2] Remove changes to Aircraft cannons

---
 addons/aircraft/CfgAmmo.hpp      | 28 ----------------------------
 addons/aircraft/CfgMagazines.hpp |  1 -
 addons/aircraft/CfgWeapons.hpp   | 18 ------------------
 3 files changed, 47 deletions(-)

diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp
index ec7cfd6a541..5390a9eacea 100644
--- a/addons/aircraft/CfgAmmo.hpp
+++ b/addons/aircraft/CfgAmmo.hpp
@@ -36,32 +36,4 @@ class CfgAmmo {
         caliber = 1.6;
         deflecting = 15;
     };
-
-    // also adjust tracer, "muh lightshow"; also adjust splash damage radius
-    class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase {
-        hit = 80;
-        indirectHit = 12;
-        indirectHitRange = 3; //2;
-        caliber = 1.4;
-        deflecting = 3;
-        fuseDistance = 3;
-        tracerStartTime = 0.02;
-        timeToLive = 40;
-    };
-
-    // helper projectiles to simulate a rof > fps
-    class ACE_Gatling_30mm_HE_Plane_CAS_01_Deploy: Gatling_30mm_HE_Plane_CAS_01_F {
-        simulation = "shotSubmunitions";
-        triggerTime = 0;
-        submunitionAmmo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Sub";
-        submunitionConeType[] = {"custom", {{0,0}, {0,0}, {0,0}} };
-    };
-    class ACE_Gatling_30mm_HE_Plane_CAS_01_Sub: Gatling_30mm_HE_Plane_CAS_01_F {};
-
-    // adjust damage and splash damage, closer to bluefor gatling with same caliber
-    class Cannon_30mm_HE_Plane_CAS_02_F: Gatling_30mm_HE_Plane_CAS_01_F {
-        hit = 70; //40;
-        indirectHit = 11; //14;
-        indirectHitRange = 3;
-    };
 };
diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp
index 6d35e902558..19797b53d87 100644
--- a/addons/aircraft/CfgMagazines.hpp
+++ b/addons/aircraft/CfgMagazines.hpp
@@ -2,7 +2,6 @@ class CfgMagazines {
     // shoot helper object to tripple rof
     class VehicleMagazine;
     class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine {
-        ammo = "ACE_Gatling_30mm_HE_Plane_CAS_01_Deploy";
         count = 1170;
     };
 
diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp
index 7e5c2a34bb2..2d16223e1d9 100644
--- a/addons/aircraft/CfgWeapons.hpp
+++ b/addons/aircraft/CfgWeapons.hpp
@@ -111,22 +111,4 @@ class CfgWeapons {
         class medium: LowROF {};
         class far: medium {};
     };
-
-    class Gatling_30mm_Plane_CAS_01_F: CannonCore {
-        autoFire = 1;
-        burst = 1;
-
-        class LowROF: Mode_FullAuto {
-            autoFire = 0;
-            burst = 22; //65;
-            reloadTime = 0.0462; //0.0154; //0.034;
-            multiplier = 3;
-        };
-
-        class close: LowROF {};
-        class near: close {};
-        class short: close {};
-        class medium: close {};
-        class far: close {};
-    };
 };

From 23fdeaa596a2451db24b1b5778c8bca511c7e3c4 Mon Sep 17 00:00:00 2001
From: PabstMirror <pabstmirror@gmail.com>
Date: Wed, 31 May 2017 22:57:03 -0500
Subject: [PATCH 2/2] keep ammo changes, i guess

---
 addons/aircraft/CfgAmmo.hpp | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp
index 5390a9eacea..0da9c7760fa 100644
--- a/addons/aircraft/CfgAmmo.hpp
+++ b/addons/aircraft/CfgAmmo.hpp
@@ -36,4 +36,23 @@ class CfgAmmo {
         caliber = 1.6;
         deflecting = 15;
     };
+
+    // also adjust tracer, "muh lightshow"; also adjust splash damage radius
+    class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase {
+        hit = 80; // default: 180
+        indirectHit = 12; // default: 4
+        indirectHitRange = 3; // default: 3
+        caliber = 1.4; // default: 5
+        deflecting = 3; // default: 5
+        fuseDistance = 3; // default: 10
+        tracerStartTime = 0.02; // default: 0.1
+        timeToLive = 40; // default: 6
+    };
+
+    // adjust damage and splash damage, closer to bluefor gatling with same caliber
+    class Cannon_30mm_HE_Plane_CAS_02_F: Gatling_30mm_HE_Plane_CAS_01_F {
+        hit = 70; // default: 150
+        indirectHit = 11; // default: 4
+        indirectHitRange = 3; // default: 3
+    };
 };