Merge branch 'patch-1' of github.com:LorenLuke/ACE3 into patch-1

This commit is contained in:
LorenLuke 2019-08-08 12:08:22 -07:00
commit 7d9c7d5483
3 changed files with 38 additions and 18 deletions

View File

@ -52,11 +52,12 @@ class CfgAmmo {
// adjust damage and splash damage, AP Rounds // adjust damage and splash damage, AP Rounds
class ACE_Gatling_30mm_AP_Plane_CAS_01_F: Gatling_30mm_HE_Plane_CAS_01_F { class ACE_Gatling_30mm_AP_Plane_CAS_01_F: Gatling_30mm_HE_Plane_CAS_01_F {
explosive = 0.05; // default: 0.4 explosive = 0.05; // default: 0.4
caliber = 5; // default: 5
deflecting = 8; // default: 5
hit = 110; // default: 180 hit = 110; // default: 180
indirectHit = 2.5; // default: 4 indirectHit = 2.5; // default: 4
indirectHitRange = 1; // default: 3 indirectHitRange = 1; // default: 3
fuseDistance = 0.2; // default: 10 fuseDistance = 0.2; // default: 10
deflecting = 5;
}; };
// adds submunition logic, enabling multiple rounds per frame // adds submunition logic, enabling multiple rounds per frame
@ -67,6 +68,7 @@ class CfgAmmo {
submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present submunitionConeAngle = 0.056; // in degrees, 0.055 ~= 0.001 mils minute, but present
model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d"; model = "\A3\Weapons_f\Data\bullettracer\tracer_red.p3d";
triggerTime = 0.005; triggerTime = 0.005;
ACE_caliber = 1.4;
}; };
class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI { class ACE_Gatling_30mm_Sub_AP: ACE_Gatling_30mm_Sub_HEI {

View File

@ -8,20 +8,20 @@ class CfgMagazines {
class ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { class ACE_1000Rnd_Gatling_30mm_Plane_CAS_AP: 1000Rnd_Gatling_30mm_Plane_CAS_01_F {
ammo = "ACE_Gatling_30mm_Sub_AP"; ammo = "ACE_Gatling_30mm_Sub_AP";
displayName = "30mm DU Armor Piercing"; displayName = CSTRING(GatlingDescriptionAP);
displayNameShort = "30mm DUAP"; displayNameShort = CSTRING(GatlingDescriptionShortAP);
}; };
class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41: 1000Rnd_Gatling_30mm_Plane_CAS_01_F { class ACE_1000Rnd_Gatling_30mm_Plane_CAS_CM41: 1000Rnd_Gatling_30mm_Plane_CAS_01_F {
ammo = "ACE_Gatling_30mm_Sub_CM41"; ammo = "ACE_Gatling_30mm_Sub_CM41";
displayName = "30mm Combat Mix 4:1 DU:HEI"; displayName = CSTRING(GatlingDescriptionCM41);
displayNameShort = "30mm 4:1 DU:HEI"; displayNameShort = CSTRING(GatlingDescriptionShortCM41);
}; };
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"; ammo = "ACE_Gatling_30mm_Sub_CM51";
displayName = "30mm Combat Mix 5:1 DU:HEI"; displayName = CSTRING(GatlingDescriptionCM51);
displayNameShort = "30mm 5:1 DU:HEI"; displayNameShort = CSTRING(GatlingDescriptionShortCM51);
}; };
// an extended magazine for the comanche // an extended magazine for the comanche

View File

@ -49,5 +49,23 @@
<Chinese>關閉貨艙門</Chinese> <Chinese>關閉貨艙門</Chinese>
<Chinesesimp>关闭货舱门</Chinesesimp> <Chinesesimp>关闭货舱门</Chinesesimp>
</Key> </Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionAP">
<English>30mm DU Armor Piercing</English>
</Key>
<Key ID="STR_ACE_Aircraft_GatlingDescriptionShortAP">
<English>30mm 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> </Package>
</Project> </Project>