Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Changes A-10/A-164 Cannon Values #7118

Merged
merged 25 commits into from
Jan 3, 2020
Merged

Changes A-10/A-164 Cannon Values #7118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
41c89aa
Fixes A-10 Cannon Dispersion
LorenLuke Aug 1, 2019
b485078
Adds Missing Close Brace
LorenLuke Aug 1, 2019
09b6629
Adjusts 30mm cannon projectiles
LorenLuke Aug 1, 2019
539c4a7
Adds Combat Mix Magazine
LorenLuke Aug 1, 2019
a41640d
Added missing semicolon
LorenLuke Aug 1, 2019
d5146a9
Removes Whitespace from CfgWeapons
LorenLuke Aug 1, 2019
0eee72e
Removes Whitespace from CfgAmmo
LorenLuke Aug 1, 2019
135643d
Adds Combat Mix Magazine to cannon Magazines
LorenLuke Aug 1, 2019
113eb70
Progress commit
LorenLuke Aug 4, 2019
5183d11
Merge branch 'patch-1' of github.com:LorenLuke/ACE3 into patch-1
LorenLuke Aug 4, 2019
06fded2
Removes Tabs
LorenLuke Aug 4, 2019
8e46e0d
Fixes accidental late-night reversion
LorenLuke Aug 4, 2019
cc1dff2
Merge branch 'master' of github.com:acemod/ACE3 into patch-1
LorenLuke Aug 4, 2019
e2c6dee
Fixes deafness issue
LorenLuke Aug 4, 2019
6b67c5e
Adds stringtable entries
LorenLuke Aug 5, 2019
344662e
Adds stringtable magazine values
LorenLuke Aug 5, 2019
92e0d55
Add caliber and deflecting values for AP rounds
LorenLuke Aug 5, 2019
e6b843f
Fixes double deflecting definition
LorenLuke Aug 5, 2019
7d9c7d5
Merge branch 'patch-1' of github.com:LorenLuke/ACE3 into patch-1
LorenLuke Aug 8, 2019
15c65c5
Adds HEI magazine.
LorenLuke Aug 8, 2019
6f96ca1
Added missing magazine and ammunition definitions.
LorenLuke Aug 31, 2019
2487d6c
Removes tabs in CfgAmmo
LorenLuke Sep 5, 2019
153805a
Fixes Typo
LorenLuke Jan 3, 2020
602341b
Added missing magazine and ammunition definitions.
LorenLuke Aug 31, 2019
a3ab0a0
Fix typo
LorenLuke Jan 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 43 additions & 5 deletions addons/aircraft/CfgAmmo.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
class CfgAmmo {
class BulletBase;
class B_20mm : BulletBase {
class B_20mm: BulletBase {
hit = 80;
indirectHit = 12;
indirectHitRange = 2; //2;
Expand All @@ -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;
Expand All @@ -39,15 +39,53 @@ 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 = 70; // 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
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
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
};

// 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;
};

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};
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RPT now throws error

21:43:13 No class Cannon_30mm_HE_Plane_CAS_01_F
21:43:13 No ammo class Cannon_30mm_HE_Plane_CAS_01_F
21:43:13 No class Cannon_30mm_HE_Plane_CAS_01_F
21:43:13 No ammo class Cannon_30mm_HE_Plane_CAS_01_F

I think this should be
Gatling_30mm_HE_Plane_CAS_01_F
instead of
Cannon_30mm_HE_Plane_CAS_01_F

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;
};


// 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 {
Expand Down
27 changes: 27 additions & 0 deletions addons/aircraft/CfgMagazines.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,36 @@ class CfgMagazines {
// shoot helper object to tripple rof
class VehicleMagazine;
class 1000Rnd_Gatling_30mm_Plane_CAS_01_F: VehicleMagazine {
ammo = "ACE_Gatling_30mm_Sub_CM51";
displayName = CSTRING(GatlingDescriptionCM51);
displayNameShort = CSTRING(GatlingDescriptionShortCM51);
count = 1170;
};

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);
};

class ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP: 1000Rnd_Gatling_30mm_Plane_CAS_01_F {
ammo = "ACE_Gatling_30mm_Sub_AP";
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 = 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 = CSTRING(GatlingDescriptionCM51);
displayNameShort = CSTRING(GatlingDescriptionShortCM51);
};

// an extended magazine for the comanche
class 300Rnd_20mm_shells;
class ACE_500Rnd_20mm_shells_Comanche: 300Rnd_20mm_shells {
Expand Down
17 changes: 15 additions & 2 deletions addons/aircraft/CfgWeapons.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand All @@ -16,8 +16,21 @@ class CfgWeapons {
magazineReloadTime = 0.1;
};

// bigger mag for comanche
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_HEI","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;
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"};

};
};
// bigger mag for comanche
class gatling_20mm: CannonCore {
magazines[] += {"ACE_500Rnd_20mm_shells_Comanche"};

Expand Down
24 changes: 24 additions & 0 deletions addons/aircraft/stringtable.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,29 @@
<Chinese>關閉貨艙門</Chinese>
<Chinesesimp>关闭货舱门</Chinesesimp>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionHEI">
<English>30mm High-Explosive Incendiary</English>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionShortHEI">
<English>30mm HEI</English>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionAP">
<English>30mm DU Armor Piercing</English>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionShortAP">
<English>30mm DU AP</English>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionCM41">
<English>30mm Combat Mix 4:1 DU:HEI</English>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionShortCM41">
<English>30mm CM 4:1</English>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionCM51">
<English>30mm Combat Mix 5:1 DU:HEI</English>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionShortCM51">
<English>30mm CM 5:1</English>
</Key>
</Package>
</Project>