diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal.p3d b/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal.p3d index 498c07f..5dd12a5 100644 --- a/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal.p3d +++ b/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1a1c8b8b81d9a0e0e1c085623a1030d1edef9bb9b2a255be375321e29f567730 -size 247322485 +oid sha256:3696899d8d3f43fa799c389adb213174a12c04e2db036c403f9d23d2da7a3ec3 +size 249977266 diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/Caracal_Base.hpp b/braf_air/Braf_Helicopters/Braf_Caracal/Caracal_Base.hpp index 9e68d7d..f734e8e 100644 --- a/braf_air/Braf_Helicopters/Braf_Caracal/Caracal_Base.hpp +++ b/braf_air/Braf_Helicopters/Braf_Caracal/Caracal_Base.hpp @@ -2188,16 +2188,63 @@ class BRAF_Caracal_10: BRAF_Caracal_2 statement="this animate ['NVG_Hide',1]"; }; }; + class Components: Components + { + class TransportPylonsComponent + { + class Pylons + { + class PylonLeft1 + { + attachment="braf_mag_am39_pylon_1rnd"; + priority=5; + turret[]={1}; + hardpoints[]={"BRAF_AM39_PYLON"}; + UIposition[]={0.06,0.4}; + }; + class PylonRight1: PylonLeft1 + { + mirroredMissilePos=1; + UIposition[]={0.59,0.4}; + }; + }; + class Presets + { + class Empty + { + displayName="$STR_empty"; + attachment[]={}; + }; + class AM39 + { + displayName="AM39 Exocet 2x"; + attachment[]={ + "braf_mag_am39_pylon_1rnd", + "braf_mag_am39_pylon_1rnd" + }; + }; + }; + }; + }; class CargoTurret; class Turrets: Turrets { class BRAF_CopilotTurret: BRAF_CopilotTurret{}; - class BRAF_Crew_Chief_Turret: BRAF_Crew_Chief_Turret{}; - class BRAF_Mansup_Gunner_Turret: BRAF_Crew_Chief_Turret + class BRAF_AM39_Gunner_Turret: BRAF_Crew_Chief_Turret { - gunnerName="MANSUP Operator"; + gunnerName="Weapons Officer"; gunnerCompartments="Compartment2"; proxyIndex=3; + isCopilot=0; + startEngine=0; + weapons[]= + { + "Laserdesignator_mounted" + }; + magazines[]= + { + "Laserbatteries" + }; }; }; textureList[]= diff --git a/braf_air/config.cpp b/braf_air/config.cpp index 3de0db5..97ad4e7 100644 --- a/braf_air/config.cpp +++ b/braf_air/config.cpp @@ -7,6 +7,7 @@ class CfgPatches { "A3_Data_F", "A3_Armor_F_Beta_APC_Tracked_01", "A3_Weapons_F", + "braf_naval_weapons", "braf_characters_army", "BRAF_Insignia", "BRAF_Soft", @@ -54,7 +55,8 @@ class CfgPatches { //"BRAF_Caracal_6a", "BRAF_Caracal_7", "BRAF_Caracal_8", - "BRAF_Caracal_9" + "BRAF_Caracal_9", + "BRAF_Caracal_10" }; weapons[] = {}; }; diff --git a/braf_weapons_naval/braf_asm/Exocet/AM39/braf_am39.p3d b/braf_weapons_naval/braf_asm/Exocet/AM39/braf_am39.p3d new file mode 100644 index 0000000..5c98278 --- /dev/null +++ b/braf_weapons_naval/braf_asm/Exocet/AM39/braf_am39.p3d @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:306073bae67776522cee1ac5f2268d0c83413532bcb78606d223c7f9a6f184b6 +size 1954295 diff --git a/braf_weapons_naval/braf_asm/Exocet/AM39/braf_am39_fly.p3d b/braf_weapons_naval/braf_asm/Exocet/AM39/braf_am39_fly.p3d index ff5c432..c6b7ce7 100644 --- a/braf_weapons_naval/braf_asm/Exocet/AM39/braf_am39_fly.p3d +++ b/braf_weapons_naval/braf_asm/Exocet/AM39/braf_am39_fly.p3d @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:230406a19624bb1f1a00daadc829555d1090f34892fd30d6f2f7ac2cc0b74c4f -size 2077103 +oid sha256:8a27b3bb8e518d74f3203cf6a73266020a29aea807f9c9d123f8e027cd71e506 +size 2098061 diff --git a/braf_weapons_naval/braf_asm/Exocet/AM39/model.cfg b/braf_weapons_naval/braf_asm/Exocet/AM39/model.cfg index f510f83..65b6631 100644 --- a/braf_weapons_naval/braf_asm/Exocet/AM39/model.cfg +++ b/braf_weapons_naval/braf_asm/Exocet/AM39/model.cfg @@ -310,4 +310,5 @@ class CfgModels }; }; }; + class braf_am39: braf_am39_fly{}; }; diff --git a/braf_weapons_naval/config.cpp b/braf_weapons_naval/config.cpp index 688d3ce..c437cad 100644 --- a/braf_weapons_naval/config.cpp +++ b/braf_weapons_naval/config.cpp @@ -23,7 +23,7 @@ class CfgAmmo { scope = 0; cameraViewAvailable = 1; - initTime = 0.3; + initTime = 0.5; }; class braf_ammo_am39_asm: braf_ammo_asm_cruise_base { @@ -31,7 +31,9 @@ class CfgAmmo displayName = "AM39 Exocet"; author = "BRAF TEAM"; model = "braf\braf_weapons_naval\braf_asm\Exocet\AM39\braf_am39_fly.p3d"; - proxyShape = "braf\braf_weapons_naval\braf_asm\Exocet\AM39\braf_am39_fly.p3d"; + proxyShape = "braf\braf_weapons_naval\braf_asm\Exocet\AM39\braf_am39.p3d"; + effectsMissileInit = "PylonBackEffects_InitDelay"; + muzzleEffect = ""; }; }; class CfgMagazines @@ -54,8 +56,10 @@ class CfgMagazines author = "BRAF TEAM"; count = 1; initSpeed = 12; + model = "braf\braf_weapons_naval\braf_asm\Exocet\AM39\braf_am39.p3d"; ammo = "braf_ammo_am39_asm"; pylonWeapon = "braf_weapon_am39_asm"; + hardpoints[] = {"BRAF_AM39_PYLON"}; ejectSpeed[] = {1,0,0}; }; };