From 41c89aa1a614ee9870ad8fbf33a756a6e311d9db Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 1 Aug 2019 01:25:39 -0700 Subject: [PATCH 01/21] Fixes A-10 Cannon Dispersion Changes A-10 Cannon Dispersion to realistic levels. --- addons/aircraft/CfgWeapons.hpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index 5543925b5b0..bf89ff2d25b 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -16,8 +16,15 @@ class CfgWeapons { magazineReloadTime = 0.1; }; - // bigger mag for comanche class CannonCore; + // Fix attrocious A-10 Cannon Dispersion + class Gatling_30mm_Plane_CAS_01_F : CannonCore { + class LowROF : Mode_FullAuto { + burst = 1; + reloadtime = 0.015; + dispersion = 0.0028; //0.279508497 = 0.25 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke + }; + // bigger mag for comanche class gatling_20mm: CannonCore { magazines[] += {"ACE_500Rnd_20mm_shells_Comanche"}; From b485078e53d06932413085f895c66c2a5c30de06 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 1 Aug 2019 01:28:33 -0700 Subject: [PATCH 02/21] Adds Missing Close Brace Adds Missing Close Brace --- addons/aircraft/CfgWeapons.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index bf89ff2d25b..905fa35847f 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -23,6 +23,7 @@ class CfgWeapons { burst = 1; reloadtime = 0.015; dispersion = 0.0028; //0.279508497 = 0.25 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke + }; }; // bigger mag for comanche class gatling_20mm: CannonCore { From 09b66294c29174bad7f9b292713bb9892033df6a Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 1 Aug 2019 02:19:11 -0700 Subject: [PATCH 03/21] Adjusts 30mm cannon projectiles Adjust 30mm cannon projectile damage. Adds AP projectile. Adds Combat Mix Projectile Capability. --- addons/aircraft/CfgAmmo.hpp | 29 +++++++++++++++++++++++++---- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 0da9c7760fa..7d091244eb9 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -39,9 +39,9 @@ class CfgAmmo { // also adjust tracer, "muh lightshow"; also adjust splash damage radius class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase { - hit = 80; // default: 180 + hit = 40; // default: 180 indirectHit = 12; // default: 4 - indirectHitRange = 3; // default: 3 + indirectHitRange = 4; // default: 3 caliber = 1.4; // default: 5 deflecting = 3; // default: 5 fuseDistance = 3; // default: 10 @@ -51,8 +51,29 @@ class CfgAmmo { // 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 + hit = 65; // default: 150 + indirectHit = 10; // default: 4 indirectHitRange = 3; // default: 3 }; + + // adjust damage and splash damage, AP Rounds + class Cannon_30mm_HE_Plane_CAS_03_F: Gatling_30mm_HE_Plane_CAS_01_F { + hit = 75; // default: 150 + indirectHit = 1; // default: 4 + indirectHitRange = 0.25; // default: 3 + deflecting = 5 + }; + + + class SubmunitionBase; + class ACE_30mm_mix : SubmunitionBase { + simulation = "shotSubmunitions"; + submunitionAmmo[] = {"Gatling_30mm_HE_Plane_CAS_03_F",0.8,"Cannon_30mm_HE_Plane_CAS_01_F",0.2}; + weaponType = "cannon"; + model = "\A3\Weapons_f\empty"; + triggerTime = 0.005; + }; + + + }; From 539c4a7a1053fbd8999decc924c45b8ed146944b Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 1 Aug 2019 02:21:28 -0700 Subject: [PATCH 04/21] Adds Combat Mix Magazine --- addons/aircraft/CfgMagazines.hpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index 19797b53d87..e3393eadc3a 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -4,6 +4,11 @@ class CfgMagazines { class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { count = 1170; }; + + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM: VehicleMagazine { + count = 1170; + ammo = "ACE_30mm_mix"; + }; // an extended magazine for the comanche class 300Rnd_20mm_shells; From a41640d41157fd488798d2d293de17b858144152 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 1 Aug 2019 02:27:12 -0700 Subject: [PATCH 05/21] Added missing semicolon --- addons/aircraft/CfgAmmo.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 7d091244eb9..b3223a31a87 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -61,7 +61,7 @@ class CfgAmmo { hit = 75; // default: 150 indirectHit = 1; // default: 4 indirectHitRange = 0.25; // default: 3 - deflecting = 5 + deflecting = 5; }; From d5146a9b3b81fcd2811a1d15976b644851f8b2e8 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 1 Aug 2019 14:46:35 -0700 Subject: [PATCH 06/21] Removes Whitespace from CfgWeapons --- addons/aircraft/CfgWeapons.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index 905fa35847f..c60fd340bdf 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -2,7 +2,7 @@ class Mode_FullAuto; class CfgWeapons { class RocketPods; - class ACE_AIR_SAFETY : RocketPods { + class ACE_AIR_SAFETY: RocketPods { CanLock = 0; displayName = "SAFE"; displayNameMagazine = "SAFE"; @@ -18,8 +18,8 @@ class CfgWeapons { class CannonCore; // Fix attrocious A-10 Cannon Dispersion - class Gatling_30mm_Plane_CAS_01_F : CannonCore { - class LowROF : Mode_FullAuto { + class Gatling_30mm_Plane_CAS_01_F: CannonCore { + class LowROF: Mode_FullAuto { burst = 1; reloadtime = 0.015; dispersion = 0.0028; //0.279508497 = 0.25 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke From 0eee72e393b66c2d695885551174449a3bf51465 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 1 Aug 2019 14:47:45 -0700 Subject: [PATCH 07/21] Removes Whitespace from CfgAmmo --- addons/aircraft/CfgAmmo.hpp | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index b3223a31a87..ebbea6cf039 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -1,6 +1,6 @@ class CfgAmmo { class BulletBase; - class B_20mm : BulletBase { + class B_20mm: BulletBase { hit = 80; indirectHit = 12; indirectHitRange = 2; //2; @@ -15,8 +15,8 @@ class CfgAmmo { model = "\A3\Weapons_f\Data\bullettracer\tracer_red"; }; - class ACE_20mm_HE : B_20mm {}; - class ACE_20mm_AP : B_20mm { + class ACE_20mm_HE: B_20mm {}; + class ACE_20mm_AP: B_20mm { hit = 50; indirectHit = 12; indirectHitRange = 0.3; //2; @@ -64,16 +64,12 @@ class CfgAmmo { deflecting = 5; }; - class SubmunitionBase; - class ACE_30mm_mix : SubmunitionBase { + class ACE_30mm_mix: SubmunitionBase { simulation = "shotSubmunitions"; submunitionAmmo[] = {"Gatling_30mm_HE_Plane_CAS_03_F",0.8,"Cannon_30mm_HE_Plane_CAS_01_F",0.2}; weaponType = "cannon"; model = "\A3\Weapons_f\empty"; triggerTime = 0.005; }; - - - }; From 135643d604584ba24e07dd8c3b9ec39d310f776b Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 1 Aug 2019 16:24:47 -0700 Subject: [PATCH 08/21] Adds Combat Mix Magazine to cannon Magazines --- addons/aircraft/CfgWeapons.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index c60fd340bdf..cd72629d65c 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -23,6 +23,7 @@ class CfgWeapons { burst = 1; reloadtime = 0.015; dispersion = 0.0028; //0.279508497 = 0.25 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke + magazines[] = {"1000Rnd_Gatling_30mm_Plane_CAS_01_F", "ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM"}; }; }; // bigger mag for comanche From 113eb70c5595a67f93cb58029a9860ac6ca3593a Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sun, 4 Aug 2019 03:36:40 -0700 Subject: [PATCH 09/21] Progress commit --- addons/aircraft/CfgAmmo.hpp | 52 +++++++++++++++++++++----------- addons/aircraft/CfgMagazines.hpp | 20 ++++++++++-- addons/aircraft/CfgWeapons.hpp | 9 ++++-- 3 files changed, 57 insertions(+), 24 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index ebbea6cf039..73c376320d3 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -39,7 +39,7 @@ class CfgAmmo { // also adjust tracer, "muh lightshow"; also adjust splash damage radius class Gatling_30mm_HE_Plane_CAS_01_F: BulletBase { - hit = 40; // default: 180 + hit = 70; // default: 180 indirectHit = 12; // default: 4 indirectHitRange = 4; // default: 3 caliber = 1.4; // default: 5 @@ -48,28 +48,44 @@ class CfgAmmo { 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 = 65; // default: 150 - indirectHit = 10; // default: 4 - indirectHitRange = 3; // default: 3 - }; - + // adjust damage and splash damage, AP Rounds - class Cannon_30mm_HE_Plane_CAS_03_F: Gatling_30mm_HE_Plane_CAS_01_F { - hit = 75; // default: 150 - indirectHit = 1; // default: 4 - indirectHitRange = 0.25; // default: 3 + class ACE_Gatling_30mm_AP_Plane_CAS_01_F: Gatling_30mm_HE_Plane_CAS_01_F { + explosive = 0.05; // default: 0.4 + hit = 110; // default: 180 + indirectHit = 2.5; // default: 4 + indirectHitRange = 1; // default: 3 + fuseDistance = 0.2; // default: 10 deflecting = 5; }; - class SubmunitionBase; - class ACE_30mm_mix: SubmunitionBase { - simulation = "shotSubmunitions"; - submunitionAmmo[] = {"Gatling_30mm_HE_Plane_CAS_03_F",0.8,"Cannon_30mm_HE_Plane_CAS_01_F",0.2}; + // adds submunition logic, enabling multiple rounds per frame + class ACE_Gatling_30mm_Sub_HEI: SubmunitionBullet { + submunitionAmmo = "Gatling_30mm_HE_Plane_CAS_01_F"; weaponType = "cannon"; - model = "\A3\Weapons_f\empty"; + submunitionConeType[] = {"poissondisccenter", 3}; + submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present + model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d"; triggerTime = 0.005; + }; + + class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { + submunitionAmmo = "ACE_Gatling_30mm_AP_Plane_CAS_01_F"; + }; + + class ACE_Gatling_30mm_Sub_CM41: ACE_Gatling_30mm_Sub_HEI { + submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.8,"Cannon_30mm_HE_Plane_CAS_01_F",0.2}; + }; + + class ACE_Gatling_30mm_Sub_CM51: ACE_Gatling_30mm_Sub_HEI { + submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.83,"Cannon_30mm_HE_Plane_CAS_01_F",0.17}; + }; + + + // 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 }; }; diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index e3393eadc3a..5b387e529be 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -2,12 +2,26 @@ class CfgMagazines { // shoot helper object to tripple rof class VehicleMagazine; class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { + ammo = "ACE_Gatling_30mm_Sub_HEI"; count = 1170; }; + + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { + ammo = "ACE_Gatling_30mm_Sub_AP"; + displayName = "30mm DU Armor Piercing"; + displayNameShort = "30mm DUAP"; + }; - class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM: VehicleMagazine { - count = 1170; - ammo = "ACE_30mm_mix"; + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { + ammo = "ACE_Gatling_30mm_Sub_CM41"; + displayName = "30mm Combat Mix 4:1 DU:HEI"; + displayNameShort = "30mm 4:1 DU:HEI"; + }; + + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { + ammo = "ACE_Gatling_30mm_Sub_CM51"; + displayName = "30mm Combat Mix 5:1 DU:HEI"; + displayNameShort = "30mm 5:1 DU:HEI"; }; // an extended magazine for the comanche diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index c60fd340bdf..86cfdda5982 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -17,12 +17,15 @@ class CfgWeapons { }; class CannonCore; - // Fix attrocious A-10 Cannon Dispersion + // Fix attrocious A-10 Cannon Dispersion; Add high ROF capability class Gatling_30mm_Plane_CAS_01_F: CannonCore { + magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51"}; class LowROF: Mode_FullAuto { + multiplier = 3; burst = 1; - reloadtime = 0.015; - dispersion = 0.0028; //0.279508497 = 0.25 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke + burstRangeMax = 1; + reloadtime = 0.046; + dispersion = 0.0046; //Ammo has 0.001 dispersion; 0.559016994 = 0.5 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke }; }; // bigger mag for comanche From 06fded2ed8485acc68fcf8f94987e4598721fe1d Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sun, 4 Aug 2019 03:49:23 -0700 Subject: [PATCH 10/21] Removes Tabs --- addons/aircraft/CfgAmmo.hpp | 24 ++++++++++++------------ addons/aircraft/CfgMagazines.hpp | 18 +++++++++--------- addons/aircraft/CfgWeapons.hpp | 6 +++--- 3 files changed, 24 insertions(+), 24 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 73c376320d3..4886e08618f 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -48,31 +48,31 @@ class CfgAmmo { tracerStartTime = 0.02; // default: 0.1 timeToLive = 40; // default: 6 }; - + // adjust damage and splash damage, AP Rounds class ACE_Gatling_30mm_AP_Plane_CAS_01_F: Gatling_30mm_HE_Plane_CAS_01_F { explosive = 0.05; // default: 0.4 - hit = 110; // default: 180 + hit = 110; // default: 180 indirectHit = 2.5; // default: 4 indirectHitRange = 1; // default: 3 - fuseDistance = 0.2; // default: 10 + fuseDistance = 0.2; // default: 10 deflecting = 5; }; - // adds submunition logic, enabling multiple rounds per frame - class ACE_Gatling_30mm_Sub_HEI: SubmunitionBullet { + // adds submunition logic, enabling multiple rounds per frame + class ACE_Gatling_30mm_Sub_HEI: SubmunitionBullet { submunitionAmmo = "Gatling_30mm_HE_Plane_CAS_01_F"; weaponType = "cannon"; - submunitionConeType[] = {"poissondisccenter", 3}; - submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present + submunitionConeType[] = {"poissondisccenter", 3}; + submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d"; triggerTime = 0.005; - }; + }; - class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { - submunitionAmmo = "ACE_Gatling_30mm_AP_Plane_CAS_01_F"; - }; - + class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { + submunitionAmmo = "ACE_Gatling_30mm_AP_Plane_CAS_01_F"; + }; + class ACE_Gatling_30mm_Sub_CM41: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.8,"Cannon_30mm_HE_Plane_CAS_01_F",0.2}; }; diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index 5b387e529be..a19e203f1e8 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -2,26 +2,26 @@ class CfgMagazines { // shoot helper object to tripple rof class VehicleMagazine; class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { - ammo = "ACE_Gatling_30mm_Sub_HEI"; + ammo = "ACE_Gatling_30mm_Sub_HEI"; count = 1170; }; class ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_AP"; - displayName = "30mm DU Armor Piercing"; - displayNameShort = "30mm DUAP"; + displayName = "30mm DU Armor Piercing"; + displayNameShort = "30mm DUAP"; }; class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_CM41"; - displayName = "30mm Combat Mix 4:1 DU:HEI"; - displayNameShort = "30mm 4:1 DU:HEI"; + displayName = "30mm Combat Mix 4:1 DU:HEI"; + displayNameShort = "30mm 4:1 DU:HEI"; }; - - class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { + + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_CM51"; - displayName = "30mm Combat Mix 5:1 DU:HEI"; - displayNameShort = "30mm 5:1 DU:HEI"; + displayName = "30mm Combat Mix 5:1 DU:HEI"; + displayNameShort = "30mm 5:1 DU:HEI"; }; // an extended magazine for the comanche diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index 5711435c315..c1cbe4d1638 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -19,11 +19,11 @@ class CfgWeapons { class CannonCore; // Fix attrocious A-10 Cannon Dispersion; Add high ROF capability class Gatling_30mm_Plane_CAS_01_F: CannonCore { - magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51"}; + magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51"}; class LowROF: Mode_FullAuto { - multiplier = 3; + multiplier = 3; burst = 1; - burstRangeMax = 1; + burstRangeMax = 1; reloadtime = 0.015; dispersion = 0.0028; //0.279508497 = 0.25 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke magazines[] = {"1000Rnd_Gatling_30mm_Plane_CAS_01_F", "ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM"}; From 8e46e0d131aea530048a8a2aae058a512bf78fec Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sun, 4 Aug 2019 03:52:04 -0700 Subject: [PATCH 11/21] Fixes accidental late-night reversion --- addons/aircraft/CfgAmmo.hpp | 10 +++++----- addons/aircraft/CfgMagazines.hpp | 14 +++++++------- addons/aircraft/CfgWeapons.hpp | 10 +++++----- 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 4886e08618f..ffb3fab3e4c 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -52,10 +52,10 @@ class CfgAmmo { // adjust damage and splash damage, AP Rounds class ACE_Gatling_30mm_AP_Plane_CAS_01_F: Gatling_30mm_HE_Plane_CAS_01_F { explosive = 0.05; // default: 0.4 - hit = 110; // default: 180 + hit = 110; // default: 180 indirectHit = 2.5; // default: 4 indirectHitRange = 1; // default: 3 - fuseDistance = 0.2; // default: 10 + fuseDistance = 0.2; // default: 10 deflecting = 5; }; @@ -63,14 +63,14 @@ class CfgAmmo { class ACE_Gatling_30mm_Sub_HEI: SubmunitionBullet { submunitionAmmo = "Gatling_30mm_HE_Plane_CAS_01_F"; weaponType = "cannon"; - submunitionConeType[] = {"poissondisccenter", 3}; - submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present + submunitionConeType[] = {"poissondisccenter", 3}; + submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d"; triggerTime = 0.005; }; class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { - submunitionAmmo = "ACE_Gatling_30mm_AP_Plane_CAS_01_F"; + submunitionAmmo = "ACE_Gatling_30mm_AP_Plane_CAS_01_F"; }; class ACE_Gatling_30mm_Sub_CM41: ACE_Gatling_30mm_Sub_HEI { diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index a19e203f1e8..2325cd402f6 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -2,26 +2,26 @@ class CfgMagazines { // shoot helper object to tripple rof class VehicleMagazine; class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { - ammo = "ACE_Gatling_30mm_Sub_HEI"; + ammo = "ACE_Gatling_30mm_Sub_HEI"; count = 1170; }; class ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_AP"; - displayName = "30mm DU Armor Piercing"; - displayNameShort = "30mm DUAP"; + displayName = "30mm DU Armor Piercing"; + displayNameShort = "30mm DUAP"; }; class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_CM41"; - displayName = "30mm Combat Mix 4:1 DU:HEI"; - displayNameShort = "30mm 4:1 DU:HEI"; + displayName = "30mm Combat Mix 4:1 DU:HEI"; + displayNameShort = "30mm 4:1 DU:HEI"; }; class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_CM51"; - displayName = "30mm Combat Mix 5:1 DU:HEI"; - displayNameShort = "30mm 5:1 DU:HEI"; + displayName = "30mm Combat Mix 5:1 DU:HEI"; + displayNameShort = "30mm 5:1 DU:HEI"; }; // an extended magazine for the comanche diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index c1cbe4d1638..78669c54093 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -19,13 +19,13 @@ class CfgWeapons { class CannonCore; // Fix attrocious A-10 Cannon Dispersion; Add high ROF capability class Gatling_30mm_Plane_CAS_01_F: CannonCore { - magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51"}; + magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51"}; class LowROF: Mode_FullAuto { - multiplier = 3; + multiplier = 3; burst = 1; - burstRangeMax = 1; - reloadtime = 0.015; - dispersion = 0.0028; //0.279508497 = 0.25 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke + burstRangeMax = 1; + reloadtime = 0.046; + dispersion = 0.0046; //0.279508497 = 0.25 * sqrt(0.8^-1); (80%, 5mil. https://en.wikipedia.org/wiki/GAU-8_Avenger#Accuracy) - Luke magazines[] = {"1000Rnd_Gatling_30mm_Plane_CAS_01_F", "ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM"}; }; From e2c6dee3d94f7d291ad39312c7257f25b83d563f Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sun, 4 Aug 2019 12:35:37 -0700 Subject: [PATCH 12/21] Fixes deafness issue --- addons/aircraft/CfgAmmo.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index ffb3fab3e4c..f2eb9cf3b37 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -67,6 +67,7 @@ class CfgAmmo { submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d"; triggerTime = 0.005; + ACE_caliber = 1.4; }; class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { From 6b67c5e36537305868baad60617f7a0977cc947a Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sun, 4 Aug 2019 20:38:13 -0700 Subject: [PATCH 13/21] Adds stringtable entries --- addons/aircraft/stringtable.xml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml index 0c523972428..1ea8ac977da 100644 --- a/addons/aircraft/stringtable.xml +++ b/addons/aircraft/stringtable.xml @@ -49,5 +49,23 @@ 關閉貨艙門 关闭货舱门 + + 30mm DU Armor Piercing + + + 30mm AP + + + 30mm Combat Mix 4:1 DU:HEI + + + 30mm CM 4:1 + + + 30mm Combat Mix 5:1 DU:HEI + + + 30mm CM 5:1 + From 344662e76c67de9750fc5ddb33e4f853e4d63b3c Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sun, 4 Aug 2019 20:45:05 -0700 Subject: [PATCH 14/21] Adds stringtable magazine values --- addons/aircraft/CfgMagazines.hpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index 2325cd402f6..b42580b5ed1 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -8,20 +8,20 @@ class CfgMagazines { class ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_AP"; - displayName = "30mm DU Armor Piercing"; - displayNameShort = "30mm DUAP"; + displayName = CSTRING(GatlingDescriptionAP); + displayNameShort = CSTRING(GatlingDescriptionShortAP); }; class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_CM41"; - displayName = "30mm Combat Mix 4:1 DU:HEI"; - displayNameShort = "30mm 4:1 DU:HEI"; + displayName = CSTRING(GatlingDescriptionCM41); + displayNameShort = CSTRING(GatlingDescriptionShortCM41); }; class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_CM51"; - displayName = "30mm Combat Mix 5:1 DU:HEI"; - displayNameShort = "30mm 5:1 DU:HEI"; + displayName = CSTRING(GatlingDescriptionCM51); + displayNameShort = CSTRING(GatlingDescriptionShortCM51); }; // an extended magazine for the comanche From 92e0d55ef0c3e24cd5a81daaa31f8f5a4f954a36 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Mon, 5 Aug 2019 11:10:15 -0700 Subject: [PATCH 15/21] Add caliber and deflecting values for AP rounds --- addons/aircraft/CfgAmmo.hpp | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index f2eb9cf3b37..01bb46e4a86 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -51,23 +51,25 @@ class CfgAmmo { // adjust damage and splash damage, AP Rounds class ACE_Gatling_30mm_AP_Plane_CAS_01_F: Gatling_30mm_HE_Plane_CAS_01_F { - explosive = 0.05; // default: 0.4 - hit = 110; // default: 180 - indirectHit = 2.5; // default: 4 - indirectHitRange = 1; // default: 3 - fuseDistance = 0.2; // default: 10 - deflecting = 5; + explosive = 0.05; // default: 0.4 + caliber = 5; // default: 5 + deflecting = 8; // default: 5 + hit = 110; // default: 180 + indirectHit = 2.5; // default: 4 + indirectHitRange = 1; // default: 3 + fuseDistance = 0.2; // default: 10 + deflecting = 5; }; // adds submunition logic, enabling multiple rounds per frame class ACE_Gatling_30mm_Sub_HEI: SubmunitionBullet { - submunitionAmmo = "Gatling_30mm_HE_Plane_CAS_01_F"; - weaponType = "cannon"; - submunitionConeType[] = {"poissondisccenter", 3}; - submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present - model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d"; - triggerTime = 0.005; - ACE_caliber = 1.4; + submunitionAmmo = "Gatling_30mm_HE_Plane_CAS_01_F"; + weaponType = "cannon"; + submunitionConeType[] = {"poissondisccenter", 3}; + submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present + model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d"; + triggerTime = 0.005; + ACE_caliber = 1.4; }; class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { From e6b843f2d2ad277bec28cfa986c4d7e4a77c2d45 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Mon, 5 Aug 2019 12:56:19 -0700 Subject: [PATCH 16/21] Fixes double deflecting definition --- addons/aircraft/CfgAmmo.hpp | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 01bb46e4a86..06d42456415 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -58,7 +58,6 @@ class CfgAmmo { indirectHit = 2.5; // default: 4 indirectHitRange = 1; // default: 3 fuseDistance = 0.2; // default: 10 - deflecting = 5; }; // adds submunition logic, enabling multiple rounds per frame From 15c65c577972e3189e8593fb13536d77475ef1e9 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 8 Aug 2019 12:17:00 -0700 Subject: [PATCH 17/21] Adds HEI magazine. Configs default "1000Rnd_Gatling_30mm_Plane_CAS_01_F" magazine as CM5:1. Keeps "ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51" for legacy reasons. --- addons/aircraft/CfgMagazines.hpp | 10 +++++++++- addons/aircraft/stringtable.xml | 8 +++++++- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index b42580b5ed1..f269a320ba4 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -2,10 +2,18 @@ class CfgMagazines { // shoot helper object to tripple rof class VehicleMagazine; class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine { - ammo = "ACE_Gatling_30mm_Sub_HEI"; + ammo = "ACE_Gatling_30mm_Sub_CM51"; + displayName = CSTRING(GatlingDescriptionCM51); + displayNameShort = CSTRING(GatlingDescriptionShortCM51); count = 1170; }; + class 1000Rnd_Gatling_30mm_Plane_CAS_HEI: VehicleMagazine { + ammo = "ACE_Gatling_30mm_Sub_HEI"; + displayName = CSTRING(GatlingDescriptionHEI); + displayNameShort = CSTRING(GatlingDescriptionShortHEI); + }; + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_AP"; displayName = CSTRING(GatlingDescriptionAP); diff --git a/addons/aircraft/stringtable.xml b/addons/aircraft/stringtable.xml index 1ea8ac977da..cc8cd469439 100644 --- a/addons/aircraft/stringtable.xml +++ b/addons/aircraft/stringtable.xml @@ -49,11 +49,17 @@ 關閉貨艙門 关闭货舱门 + + 30mm High-Explosive Incendiary + + + 30mm HEI + 30mm DU Armor Piercing - 30mm AP + 30mm DU AP 30mm Combat Mix 4:1 DU:HEI From 6f96ca1a6437fc2c0a9fae1f2ff938172ae748d6 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sat, 31 Aug 2019 15:13:38 -0700 Subject: [PATCH 18/21] Added missing magazine and ammunition definitions. --- addons/aircraft/CfgAmmo.hpp | 3 +++ addons/aircraft/CfgWeapons.hpp | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 06d42456415..25a36d8ef8c 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -73,14 +73,17 @@ class CfgAmmo { class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo = "ACE_Gatling_30mm_AP_Plane_CAS_01_F"; + ACE_caliber = 1.4; }; class ACE_Gatling_30mm_Sub_CM41: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.8,"Cannon_30mm_HE_Plane_CAS_01_F",0.2}; + ACE_caliber = 1.4; }; class ACE_Gatling_30mm_Sub_CM51: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.83,"Cannon_30mm_HE_Plane_CAS_01_F",0.17}; + ACE_caliber = 1.4; }; diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index 78669c54093..3a91b11dbe9 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -19,7 +19,7 @@ class CfgWeapons { class CannonCore; // Fix attrocious A-10 Cannon Dispersion; Add high ROF capability class Gatling_30mm_Plane_CAS_01_F: CannonCore { - magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51"}; + magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_HEI"}; class LowROF: Mode_FullAuto { multiplier = 3; burst = 1; From 2487d6c8ff4897f2cba2a059997b266643b080b9 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Wed, 4 Sep 2019 18:22:43 -0700 Subject: [PATCH 19/21] Removes tabs in CfgAmmo --- addons/aircraft/CfgAmmo.hpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 25a36d8ef8c..dd93606d8a5 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -73,17 +73,17 @@ class CfgAmmo { class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo = "ACE_Gatling_30mm_AP_Plane_CAS_01_F"; - ACE_caliber = 1.4; + ACE_caliber = 1.4; }; class ACE_Gatling_30mm_Sub_CM41: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.8,"Cannon_30mm_HE_Plane_CAS_01_F",0.2}; - ACE_caliber = 1.4; + ACE_caliber = 1.4; }; class ACE_Gatling_30mm_Sub_CM51: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.83,"Cannon_30mm_HE_Plane_CAS_01_F",0.17}; - ACE_caliber = 1.4; + ACE_caliber = 1.4; }; From 153805a138f11f9d6145575fd5d50de87d1ee816 Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Thu, 2 Jan 2020 16:15:47 -0800 Subject: [PATCH 20/21] Fixes Typo Review Ready. --- addons/aircraft/CfgMagazines.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index f269a320ba4..7b6844ebe47 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -8,7 +8,7 @@ class CfgMagazines { count = 1170; }; - class 1000Rnd_Gatling_30mm_Plane_CAS_HEI: VehicleMagazine { + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_HEI: VehicleMagazine { ammo = "ACE_Gatling_30mm_Sub_HEI"; displayName = CSTRING(GatlingDescriptionHEI); displayNameShort = CSTRING(GatlingDescriptionShortHEI); From 602341b535008c3dca60e5958fecb014874b899b Mon Sep 17 00:00:00 2001 From: LorenLuke Date: Sat, 31 Aug 2019 15:13:38 -0700 Subject: [PATCH 21/21] Added missing magazine and ammunition definitions. --- addons/aircraft/CfgAmmo.hpp | 3 +++ addons/aircraft/CfgMagazines.hpp | 2 +- addons/aircraft/CfgWeapons.hpp | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index 06d42456415..25a36d8ef8c 100644 --- a/addons/aircraft/CfgAmmo.hpp +++ b/addons/aircraft/CfgAmmo.hpp @@ -73,14 +73,17 @@ class CfgAmmo { class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo = "ACE_Gatling_30mm_AP_Plane_CAS_01_F"; + ACE_caliber = 1.4; }; class ACE_Gatling_30mm_Sub_CM41: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.8,"Cannon_30mm_HE_Plane_CAS_01_F",0.2}; + ACE_caliber = 1.4; }; class ACE_Gatling_30mm_Sub_CM51: ACE_Gatling_30mm_Sub_HEI { submunitionAmmo[] = {"ACE_Gatling_30mm_AP_Plane_CAS_01_F",0.83,"Cannon_30mm_HE_Plane_CAS_01_F",0.17}; + ACE_caliber = 1.4; }; diff --git a/addons/aircraft/CfgMagazines.hpp b/addons/aircraft/CfgMagazines.hpp index f269a320ba4..d08a460bb83 100644 --- a/addons/aircraft/CfgMagazines.hpp +++ b/addons/aircraft/CfgMagazines.hpp @@ -8,7 +8,7 @@ class CfgMagazines { count = 1170; }; - class 1000Rnd_Gatling_30mm_Plane_CAS_HEI: VehicleMagazine { + class ACE_1000Rnd_Gatling_30mm_Plane_CAS_HEI: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { ammo = "ACE_Gatling_30mm_Sub_HEI"; displayName = CSTRING(GatlingDescriptionHEI); displayNameShort = CSTRING(GatlingDescriptionShortHEI); diff --git a/addons/aircraft/CfgWeapons.hpp b/addons/aircraft/CfgWeapons.hpp index 78669c54093..3a91b11dbe9 100644 --- a/addons/aircraft/CfgWeapons.hpp +++ b/addons/aircraft/CfgWeapons.hpp @@ -19,7 +19,7 @@ class CfgWeapons { class CannonCore; // Fix attrocious A-10 Cannon Dispersion; Add high ROF capability class Gatling_30mm_Plane_CAS_01_F: CannonCore { - magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM51"}; + magazines[] += {"ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP","ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41","ACE_1000Rnd_Gatling_30mm_Plane_CAS_HEI"}; class LowROF: Mode_FullAuto { multiplier = 3; burst = 1;