diff --git a/addons/aircraft/CfgAmmo.hpp b/addons/aircraft/CfgAmmo.hpp index ebbea6cf03..73c376320d 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 e3393eadc3..5b387e529b 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 c60fd340bd..86cfdda598 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