diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal.p3d b/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal.p3d
index a42317e..2dfb42e 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:bb3282e24954981d57cb742d5b2f2254a5d11dd41a5074f86fff832271529a70
-size 224074929
+oid sha256:7b850281c8241f6feb39d5987436aed88bbde8c5616ad7dc0ff9fa741db2e09c
+size 247656700
diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal_ah15b.p3d b/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal_ah15b.p3d
new file mode 100644
index 0000000..96b7759
--- /dev/null
+++ b/braf_air/Braf_Helicopters/Braf_Caracal/Braf_Caracal_ah15b.p3d
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:60bb6157e57a759d96cdc1292955f777c21a8ea3332d57b66f9372682d968cb1
+size 8461397
diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/Caracal_Base.hpp b/braf_air/Braf_Helicopters/Braf_Caracal/Caracal_Base.hpp
index ed52e50..56a4211 100644
--- a/braf_air/Braf_Helicopters/Braf_Caracal/Caracal_Base.hpp
+++ b/braf_air/Braf_Helicopters/Braf_Caracal/Caracal_Base.hpp
@@ -325,6 +325,18 @@ class BRAF_Caracal_Base: Helicopter_Base_H
animPeriod=0;
initPhase=0;
};
+ class AH15_Hide
+ {
+ source="user";
+ animPeriod=0;
+ initPhase=0;
+ };
+ class UH15_Hide
+ {
+ source="user";
+ animPeriod=0;
+ initPhase=0;
+ };
class Hoist_Hide
{
source="user";
@@ -1038,7 +1050,9 @@ class BRAF_Caracal_FFV: BRAF_Caracal_Base
"Hoist_Hide",0,
"SEAT_Hide",1,
"Flir_Hide",1,
- "REVO_Hide",1
+ "REVO_Hide",1,
+ "UH15_Hide",0,
+ "AH15_Hide",1
};
class UserActions
{
@@ -1222,7 +1236,9 @@ class BRAF_Caracal_2: BRAF_Caracal_Base
"Hoist_Hide",1,
"SEAT_Hide",1,
"Flir_Hide",0,
- "REVO_Hide",1
+ "REVO_Hide",1,
+ "UH15_Hide",0,
+ "AH15_Hide",1
};
class UserActions
{
@@ -1620,7 +1636,9 @@ class BRAF_Caracal_3: BRAF_Caracal_Base
"Hoist_Hide",0,
"SEAT_Hide",0,
"Flir_Hide",1,
- "REVO_Hide",1
+ "REVO_Hide",1,
+ "UH15_Hide",0,
+ "AH15_Hide",1
};
};
class BRAF_Caracal_4: BRAF_Caracal_1
@@ -1696,7 +1714,9 @@ class BRAF_Caracal_4: BRAF_Caracal_1
"Hoist_Hide",0,
"SEAT_Hide",1,
"Flir_Hide",1,
- "REVO_Hide",1
+ "REVO_Hide",1,
+ "UH15_Hide",0,
+ "AH15_Hide",1
};
};
class BRAF_Caracal_5: BRAF_Caracal_2
@@ -1753,7 +1773,9 @@ class BRAF_Caracal_5: BRAF_Caracal_2
"Hoist_Hide",1,
"SEAT_Hide",1,
"Flir_Hide",0,
- "REVO_Hide",1
+ "REVO_Hide",1,
+ "UH15_Hide",0,
+ "AH15_Hide",1
};
hiddenSelectionsTextures[]=
{
@@ -1825,7 +1847,9 @@ class BRAF_Caracal_6: BRAF_Caracal_3
"Hoist_Hide",0,
"SEAT_Hide",0,
"Flir_Hide",1,
- "REVO_Hide",1
+ "REVO_Hide",1,
+ "UH15_Hide",0,
+ "AH15_Hide",1
};
hiddenSelectionsTextures[]=
{
@@ -1843,32 +1867,10 @@ class BRAF_Caracal_6: BRAF_Caracal_3
"HU41",0.5
};
};
-//class BRAF_Caracal_6a: BRAF_Caracal_2
-//{
-// author="BRAF TEAM";
-// _generalMacro="BRAF_Caracal_6";
-// displayName="AH-15B Super Cougar (ASW)";
-// editorPreview="\braf\braf_insignia\editorpreview\air\BRAF_Caracal_6a.jpg";
-// faction="BRAF_NAVY";
-// textureList[]=
-// {
-// "HU2",1
-// };
-// animationList[]=
-// {
-// "EFS_Hide",0,
-// "SAR_Hide",1,
-// "Pole_Hide",1,
-// "Hoist_Hide",0,
-// "SEAT_Hide",1,
-// "Flir_Hide",0,
-// "REVO_Hide",1
-// };
-//};
class BRAF_Caracal_7: BRAF_Caracal_1
{
author="BRAF TEAM";
- _generalMacro="BRAF_Caracal_4";
+ _generalMacro="BRAF_Caracal_7";
displayName="H-36 Caracal (Fast Rope)";
editorPreview="\braf\braf_insignia\editorpreview\air\BRAF_Caracal_7.jpg";
faction="BRAF_FAB";
@@ -1923,7 +1925,9 @@ class BRAF_Caracal_7: BRAF_Caracal_1
"Hoist_Hide",0,
"SEAT_Hide",1,
"Flir_Hide",1,
- "REVO_Hide",0
+ "REVO_Hide",0,
+ "UH15_Hide",0,
+ "AH15_Hide",1
};
hiddenSelectionsTextures[]=
{
@@ -1945,7 +1949,7 @@ class BRAF_Caracal_7: BRAF_Caracal_1
class BRAF_Caracal_8: BRAF_Caracal_2
{
author="BRAF TEAM";
- _generalMacro="BRAF_Caracal_5";
+ _generalMacro="BRAF_Caracal_8";
displayName="H-36 Caracal (SAR)";
editorPreview="\braf\braf_insignia\editorpreview\air\BRAF_Caracal_8.jpg";
faction="BRAF_FAB";
@@ -2012,13 +2016,15 @@ class BRAF_Caracal_8: BRAF_Caracal_2
"Hoist_Hide",1,
"SEAT_Hide",1,
"Flir_Hide",0,
- "REVO_Hide",1
+ "REVO_Hide",1,
+ "UH15_Hide",0,
+ "AH15_Hide",1
};
};
class BRAF_Caracal_9: BRAF_Caracal_3
{
author="BRAF TEAM";
- _generalMacro="BRAF_Caracal_6";
+ _generalMacro="BRAF_Caracal_9";
displayName="H-36 Caracal (Transport)";
editorPreview="\braf\braf_insignia\editorpreview\air\BRAF_Caracal_9.jpg";
faction="BRAF_FAB";
@@ -2085,6 +2091,116 @@ class BRAF_Caracal_9: BRAF_Caracal_3
"Hoist_Hide",0,
"SEAT_Hide",0,
"Flir_Hide",1,
- "REVO_Hide",0
+ "REVO_Hide",0,
+ "UH15_Hide",0,
+ "AH15_Hide",1
+ };
+};
+class BRAF_Caracal_10: BRAF_Caracal_2
+{
+ author="BRAF TEAM";
+ _generalMacro="BRAF_Caracal_10";
+ displayName="AH-15B Super Cougar (ASW)";
+ editorPreview="\braf\braf_insignia\editorpreview\air\BRAF_Caracal_6a.jpg";
+ faction="BRAF_NAVY";
+ canFloat=1;
+ waterDamageEngine=0.2;
+ waterEffect="HeliWater";
+ waterLeakiness=50;
+ waterPPInVehicle=1;
+ waterResistance=1;
+ waterResistanceCoef=0.5;
+ transportSoldier=0;
+ typicalCargo[]={};
+ cargoProxyIndexes[]={};
+ getInProxyOrder[]={};
+ class EventHandlers: EventHandlers
+ {
+ init="if (local (_this select 0)) then {[(_this select 0), """", [], false] call bis_fnc_initVehicle; [(_this select 0), ""Init""] call BRAF_fnc_efs;};";
+ };
+ class UserActions
+ {
+ class Arm_EFS
+ {
+ displayname=" Arm EFS ";
+ position="window_pos";
+ showWindow=1;
+ radius=10;
+ priority=1;
+ onlyForPlayer=0;
+ condition="getNumber (configOf this >> 'canFloat') == 1 AND this animationphase 'EFS_Cover_Hide' > 0.9 AND (player in crew this) AND ((this getVariable ['braf_efs_state','SAFE']) == 'SAFE')";
+ statement="[this, ""arm""] call BRAF_fnc_efs";
+ };
+ class Disarm_EFS: Arm_EFS
+ {
+ displayname=" Disarm EFS ";
+ condition="getNumber (configOf this >> 'canFloat') == 1 AND this animationphase 'EFS_Cover_Hide' > 0.9 AND (player in crew this) AND ((this getVariable ['braf_efs_state','ARMED']) == 'ARMED')";
+ statement="[this, ""disarm""] call BRAF_fnc_efs";
+ };
+ class Deploy_Floats: Arm_EFS
+ {
+ displayname=" Deploy Floats ";
+ condition="getNumber (configOf this >> 'canFloat') == 1 AND this animationphase 'EFS_Cover_Hide' > 0.9 AND (player in crew this) AND ((this getVariable ['braf_efs_state','ARMED']) == 'ARMED')";
+ statement="[this, ""deployfloats""] call BRAF_fnc_efs";
+ };
+ class NVG_ON
+ {
+ displayname="Turn NVG lights on";
+ position="window_pos";
+ showWindow=1;
+ radius=5;
+ priority=0;
+ onlyForPlayer=0;
+ condition="this animationphase 'NVG_Hide' > 0.9 AND (player in crew this)";
+ statement="this animate ['NVG_Hide',0]";
+ };
+ class NVG_OFF: NVG_ON
+ {
+ displayname="Turn NVG lights off";
+ condition="this animationphase 'NVG_Hide' < 0.1 AND (player in crew this)";
+ statement="this animate ['NVG_Hide',1]";
+ };
+ };
+ class CargoTurret;
+ class Turrets: Turrets
+ {
+ class BRAF_CopilotTurret: BRAF_CopilotTurret{};
+ class BRAF_Mansup_Gunner_Turret: CargoTurret
+ {
+ gunnerAction="passenger_inside_2";
+ gunnerName="MANSUP Operator";
+ gunnerGetInAction="GetInLow";
+ gunnerGetOutAction="GetOutLow";
+ memoryPointsGetInGunner="pos_cargo_r";
+ memoryPointsGetInGunnerDir="dir_cargo_r";
+ gunnerCompartments="Compartment2";
+ proxyIndex=3;
+ isPersonTurret=1;
+ minTurn=-180;
+ maxTurn=180;
+ initTurn=0;
+ minElev=-50;
+ maxElev=30;
+ initElev=0;
+ weapons[]={};
+ magazines[]={};
+ };
+ };
+ textureList[]=
+ {
+ "HU2",1
+ };
+ animationList[]=
+ {
+ "EFS_Hide",0,
+ "EFS_Cover_Hide",1,
+ "SAR_Hide",1,
+ "Pole_Hide",1,
+ "Hoist_Hide",0,
+ "SEAT_Hide",1,
+ "Flir_Hide",0,
+ "REVO_Hide",1,
+ "UH15_Hide",1,
+ "AH15_Hide",0
};
};
diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_as.paa b/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_as.paa
index ca27ba3..0f5ade4 100644
--- a/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_as.paa
+++ b/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_as.paa
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:240fea24b46326cf020cb0f279ebf9e304ad42c7a21503db173ff86c41a8c04c
-size 410594
+oid sha256:2b1d48691d2d97dc24845c8760e1186d73b9ff1c24a5e6222a207261fb53ec68
+size 6153072
diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_nohq.paa b/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_nohq.paa
index 6f7dafd..9dbc9a2 100644
--- a/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_nohq.paa
+++ b/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_nohq.paa
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:2b6024473cc1007f3564291c3c06d2ff57bf2b5038821542b4c900473e5adbd7
-size 5167580
+oid sha256:643eefc9179f33133275d4c3ba222d744903147acbbfbc97208c6c31a92b36d0
+size 11961020
diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_smdi.paa b/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_smdi.paa
index f1c13f0..d272f67 100644
--- a/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_smdi.paa
+++ b/braf_air/Braf_Helicopters/Braf_Caracal/data/Camo6_smdi.paa
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:7d2e9ce3cc766aa77420bf1e155ac4dd6c5d1e6c6d45261ef0ae4c61592283bf
-size 279677
+oid sha256:2d4ae0f50c6c5fb92910c10630295ecad0f96692cf7b21d3e22d868a478deb02
+size 4677910
diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/data/MB/Camo6_co.paa b/braf_air/Braf_Helicopters/Braf_Caracal/data/MB/Camo6_co.paa
index 2ecd7a8..fe986f9 100644
--- a/braf_air/Braf_Helicopters/Braf_Caracal/data/MB/Camo6_co.paa
+++ b/braf_air/Braf_Helicopters/Braf_Caracal/data/MB/Camo6_co.paa
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:d91bf34347ace7debe051ec0bd466485792ea57f4c609c9a59a5623c2d08ede5
-size 4695124
+oid sha256:f99058363eaeb1b6907550fcd883625a8a49f6195e208a3ac58debc40069a5b6
+size 4970064
diff --git a/braf_air/Braf_Helicopters/Braf_Caracal/model.cfg b/braf_air/Braf_Helicopters/Braf_Caracal/model.cfg
index a11c56f..70c0022 100644
--- a/braf_air/Braf_Helicopters/Braf_Caracal/model.cfg
+++ b/braf_air/Braf_Helicopters/Braf_Caracal/model.cfg
@@ -80,6 +80,9 @@ class CfgSkeletons
"EFS_cover","",
"EFS","EFS_cover",
+
+ "UH15","",
+ "AH15","",
"SAR","damagehide",
"hoist_hook","SAR",
@@ -900,6 +903,32 @@ class CfgModels
memory=0;
hideValue=1;
};
+ class UH15_Hide
+ {
+ source="UH15_Hide";
+ selection="uh15";
+ type="hide";
+ sourceAddress="clamp";
+ minPhase=0;
+ maxPhase=1;
+ minValue=0;
+ maxValue=1;
+ memory=0;
+ hideValue=1;
+ };
+ class AH15_Hide
+ {
+ source="AH15_Hide";
+ selection="ah15";
+ type="hide";
+ sourceAddress="clamp";
+ minPhase=0;
+ maxPhase=1;
+ minValue=0;
+ maxValue=1;
+ memory=0;
+ hideValue=1;
+ };
class mainTurret
{
type="rotationy";