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.

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

USAF AAR Compatibility #466

Merged
merged 2 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion addons/UH60/config.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ class CfgPatches {

class CfgEditorSubcategories {
class vtx_h60 {
displayName = "H-60 Pack";
displayName = "Hatchet H-60 Pack";
};
};

Expand Down
Binary file removed addons/uh60_aar/Data/Basket/Basket.p3d
Binary file not shown.
71 changes: 0 additions & 71 deletions addons/uh60_aar/Data/Basket/Basket.rvmat

This file was deleted.

Binary file removed addons/uh60_aar/Data/Basket/Basket_as.paa
Binary file not shown.
Binary file removed addons/uh60_aar/Data/Basket/Basket_co.paa
Binary file not shown.
Binary file removed addons/uh60_aar/Data/Basket/Basket_nohq.paa
Binary file not shown.
Binary file removed addons/uh60_aar/Data/Basket/Basket_smdi.paa
Binary file not shown.
10 changes: 0 additions & 10 deletions addons/uh60_aar/XEH_PREP.hpp
Original file line number Diff line number Diff line change
@@ -1,11 +1 @@
PREP(setup);
PREP(attachToHelo);
PREP(detachFromHelo);
PREP(handleConnection);
PREP(initBaskets);
PREP(initTanker);
PREP(isConnectedBasket);
PREP(perFrame);
PREP(perSecond);
PREP(positionBaskets);
PREP(probe);
22 changes: 11 additions & 11 deletions addons/uh60_aar/config.cpp
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
#include "script_component.hpp"

class CfgPatches {
class ADDON {
name = COMPONENT_NAME;
units[] = {"VTX_KV44"};
weapons[] = {};
requiredVersion = REQUIRED_VERSION;
requiredAddons[] = {"vtx_UH60"};
author = "";
authors[] = {""};
VERSION_CONFIG;
};
class CfgPatches
{
class USAF_Hatchet_AAR
{
requiredAddons[]= {"USAF_Main"};
requiredVersion= 1.62;
version=1;
units[]={};
weapons[]={};
skipWhenMissingDependencies = 1;
};
};

#include "CfgEventHandlers.hpp"
Expand Down
65 changes: 7 additions & 58 deletions addons/uh60_aar/config/cfgVehicles.hpp
Original file line number Diff line number Diff line change
@@ -1,60 +1,9 @@
class cfgVehicles {
class Land_Screwdriver_V1_F;
class vtx_aar_basket : Land_Screwdriver_V1_F {
author = "Project Hatchet Studio";
displayName = "AAR Basket";
model = "z\vtx\addons\uh60_aar\Data\Basket\Basket.p3d";
};

// TANKER
class VTOL_01_vehicle_base_F;
class B_T_VTOL_01_vehicle_F: VTOL_01_vehicle_base_F {
class EventHandlers;
};
class VTX_KV44: B_T_VTOL_01_vehicle_F {
displayName = "KV-44X Tanker";
displayNameShort = "KV-44X Tanker";
class EventHandlers: EventHandlers {
class vtx_aar {
init = "_this call vtx_uh60_aar_fnc_initTanker";
};
};
};

// HELICOPTER
class Helicopter_Base_F;
class Helicopter_Base_H: Helicopter_Base_F{
class vxf_driver;
class vxf_copilot;
}; // Helicopter_Base_H
class Heli_Transport_01_base_F: Helicopter_Base_H {
class vxf_driver: vxf_driver {
class modules;
}; // vxf_driver
class vxf_copilot: vxf_copilot {
class modules;
}; // vxf_copilot
}; // Heli_Transport_01_base_F
class vtx_H60_base: Heli_Transport_01_base_F {
class vxf_driver: vxf_driver {
class modules: modules {
class aar {
startOnEnter = 1;
probePos[] = {1.2,11.5,-1.1};
probeCondition = "(_this animationPhase ""fuelProbe_Extend"") > 0.95";
fillRate = 0.016;
}; // fms
}; // modules
}; // vxf_driver
class vxf_copilot: vxf_copilot {
class modules: modules {
class aar {
startOnEnter = 1;
probePos[] = {1.2,11.5,-1.1};
probeCondition = "(_this animationPhase ""fuelProbe_Extend"") > 0.95";
fillRate = 0.016;
}; // fms
}; // modules
}; // vxf_copilot
}; // vtx_H60_base
class Heli_Transport_01_base_F;
class vtx_H60_base: Heli_Transport_01_base_F
{
USAF_RefuelType="hose";
USAF_RefuelPoint[]={1.21,11.89,-1.15};
USAF_RefuelAnimation="Fuelprobe_Extend";
};
};
6 changes: 0 additions & 6 deletions addons/uh60_aar/functions/fnc_attachToHelo.sqf

This file was deleted.

5 changes: 0 additions & 5 deletions addons/uh60_aar/functions/fnc_detachFromHelo.sqf

This file was deleted.

21 changes: 0 additions & 21 deletions addons/uh60_aar/functions/fnc_handleConnection.sqf

This file was deleted.

18 changes: 0 additions & 18 deletions addons/uh60_aar/functions/fnc_initBaskets.sqf

This file was deleted.

13 changes: 0 additions & 13 deletions addons/uh60_aar/functions/fnc_initTanker.sqf

This file was deleted.

23 changes: 0 additions & 23 deletions addons/uh60_aar/functions/fnc_isConnectedBasket.sqf

This file was deleted.

6 changes: 0 additions & 6 deletions addons/uh60_aar/functions/fnc_perFrame.sqf

This file was deleted.

14 changes: 0 additions & 14 deletions addons/uh60_aar/functions/fnc_perSecond.sqf

This file was deleted.

28 changes: 0 additions & 28 deletions addons/uh60_aar/functions/fnc_positionBaskets.sqf

This file was deleted.

20 changes: 0 additions & 20 deletions addons/uh60_aar/functions/fnc_setup.sqf

This file was deleted.