diff --git a/.hemtt/base.toml b/.hemtt/base.toml
deleted file mode 100644
index 1737f32..0000000
--- a/.hemtt/base.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-name = "Project Hatchet"
-prefix = "hatchet"
-author = "Project Hatchet"
-mainprefix = "z"
-
-include = ["./include"]
-folder_optionals = true
-
-releasebuild = ["@zip {{modname}}", "@zip {{key_name}}"]
diff --git a/.sconsign.dblite b/.sconsign.dblite
index 2785199..45d3dab 100644
Binary files a/.sconsign.dblite and b/.sconsign.dblite differ
diff --git a/addons/core/$PBOPREFIX$ b/addons/core/$PBOPREFIX$
deleted file mode 100644
index 3c54247..0000000
--- a/addons/core/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\hatchet\addons\core
diff --git a/addons/core/CfgEventHandlers.hpp b/addons/core/CfgEventHandlers.hpp
deleted file mode 100644
index 61f69fb..0000000
--- a/addons/core/CfgEventHandlers.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-class Extended_PreStart_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preStart));
- };
-};
-
-class Extended_PreInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preInit));
- };
-};
-
-class Extended_PostInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_postInit));
- };
-};
diff --git a/addons/core/CfgUI.hpp b/addons/core/CfgUI.hpp
deleted file mode 100644
index 3ee97d4..0000000
--- a/addons/core/CfgUI.hpp
+++ /dev/null
@@ -1,31 +0,0 @@
-class RVAR(EngineOn) {
- condition = QUOTE(!(isEngineOn (vehicle hatchet_player)));
- label = CSTRING(EngineOn_Label);
- radius = 0.3;
- buttonDown = QUOTE(vehicle hatchet_player engineOn true);
- action = "EngineOn";
-};
-
-class RVAR(EngineOff) {
- condition = QUOTE(isEngineOn (vehicle hatchet_player));
- label = CSTRING(EngineOff_Label);
- radius = 0.3;
- buttonDown = QUOTE(vehicle hatchet_player engineOn false);
- action = "EngineOff";
-};
-
-class RVAR(LightOn) {
- condition = QUOTE(!(isLightOn (vehicle hatchet_player)));
- label = CSTRING(LightsOn_Label);
- radius = 0.3;
- buttonDown = QUOTE(vehicle hatchet_player setPilotLight true);
- action = "LightOn";
-};
-
-class RVAR(LightOff) {
- condition = QUOTE(isLightOn (vehicle hatchet_player));
- label = CSTRING(LightsOff_Label);
- radius = 0.3;
- buttonDown = QUOTE(vehicle hatchet_player setPilotLight false);
- action = "LightOff";
-};
diff --git a/addons/core/XEH_PREP.hpp b/addons/core/XEH_PREP.hpp
deleted file mode 100644
index 9dd3c75..0000000
--- a/addons/core/XEH_PREP.hpp
+++ /dev/null
@@ -1,10 +0,0 @@
-PREP(getVehicleConfig);
-PREP(handleVehicleChanged);
-PREP(hasModule);
-PREP(load);
-PREP(loadAll);
-PREP(perFrame);
-PREP(perSecond);
-PREP(shutDownAll);
-PREP(start);
-PREP(startLoops);
diff --git a/addons/core/XEH_postInit.sqf b/addons/core/XEH_postInit.sqf
deleted file mode 100644
index 57f1635..0000000
--- a/addons/core/XEH_postInit.sqf
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "script_component.hpp"
-
-["unit", {
- hatchet_player = (_this select 0);
-}, true] call CBA_fnc_addPlayerEventHandler;
-
-["vehicle", FUNC(handleVehicleChanged), true] call CBA_fnc_addPlayerEventHandler;
-["turret", {
- [hatchet_player, vehicle hatchet_player] call FUNC(handleVehicleChanged)
-}, true] call CBA_fnc_addPlayerEventHandler;
diff --git a/addons/core/XEH_preInit.sqf b/addons/core/XEH_preInit.sqf
deleted file mode 100644
index bbf60b5..0000000
--- a/addons/core/XEH_preInit.sqf
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "script_component.hpp"
-ADDON = false;
-#include "XEH_PREP.hpp"
-
-GVAR(paused) = false;
-
-ADDON = true;
diff --git a/addons/core/XEH_preStart.sqf b/addons/core/XEH_preStart.sqf
deleted file mode 100644
index a51262a..0000000
--- a/addons/core/XEH_preStart.sqf
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "script_component.hpp"
-#include "XEH_PREP.hpp"
diff --git a/addons/core/config.cpp b/addons/core/config.cpp
deleted file mode 100644
index 43549c2..0000000
--- a/addons/core/config.cpp
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- name = COMPONENT_NAME;
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"hatchet_main"};
- author = "Project Hatchet";
- VERSION_CONFIG;
- };
-};
-
-#include "CfgEventHandlers.hpp"
-#include "CfgUI.hpp"
diff --git a/addons/core/functions/fnc_getVehicleConfig.sqf b/addons/core/functions/fnc_getVehicleConfig.sqf
deleted file mode 100644
index 18813df..0000000
--- a/addons/core/functions/fnc_getVehicleConfig.sqf
+++ /dev/null
@@ -1,60 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_getVehicleConfig
- *
- * Function will look through the cfgVehicles for the vehicle
- * and look for relevant hatchet config subclasses, when it finds them
- * the most relevant one will be assigned to the vehicle's hatchet_core_config variable
- *
- * Params: (object) vehicle
- * Returns: (bool) success
- *
- * Author: Yax
- */
-
-params ["_vehicle"];
-
-private _configFound = false;
-private _configSources = [];
-
-_vehicle setVariable [QRVAR(config), nil];
-private _turretIndex = [hatchet_player] call EFUNC(util,getTurretIndex);
-
-if (hatchet_player == driver _vehicle) then {
- _configSources pushBack QRVAR(driver);
-};
-
-private _copilotTurretIndex = [_vehicle] call EFUNC(util,getTurretCopilot);
-if ((count _copilotTurretIndex) > 0 && (count _turretIndex) > 0 && {(_turretIndex # 0) == (_copilotTurretIndex # 0)}) then {
- _configSources pushBack QRVAR(copilot);
-};
-
-if (count _turretIndex > 0) then {
- _configSources pushBack format [QRVAR(turret_%1), (_turretIndex # 0)];
-};
-
-if (hatchet_player == gunner _vehicle) then {
- _configSources pushBack QRVAR(gunner);
-};
-
-if (_vehicle getCargoIndex hatchet_player > -1) then {
- _configSources pushBack QRVAR(cargo);
-};
-
-_configSources pushBack QUOTE(PREFIX);
-
-private _rootVehicleConfig = configOf _vehicle;
-{
- private _config = (_rootVehicleConfig >> _x);
- if (isClass _config) exitWith {
- _configFound = true;
- //if there was already a config present, a seat change happened, so do a shutdown of old systems
- //if (!isNil {_vehicle getVariable QRVAR(config)}) then {
- // [_vehicle] call FUNC(shutDown);
- //};
- _vehicle setVariable [QRVAR(config), _config];
- _vehicle setVariable [QGVAR(projectPrefix), getText (_config >> "projectPrefix")];
- };
-} forEach _configSources;
-
-_configFound
diff --git a/addons/core/functions/fnc_handleVehicleChanged.sqf b/addons/core/functions/fnc_handleVehicleChanged.sqf
deleted file mode 100644
index 6501830..0000000
--- a/addons/core/functions/fnc_handleVehicleChanged.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_handleVehicleChanged
- *
- * Function is triggered by cba vehicleChanged eventhandler
- * when called, it will check if the vehicle has any Hatchet config,
- * and if relevant, set up the functions for it
- *
- * Params: Array[(object) caller, (object) newVehicle]
- * Returns: nil
- *
- * Author: Yax
- */
-
-params ["_caller", "_newVehicle"];
-
-if (isNil "_caller" || isNil "_newVehicle") exitWith {};
-if !(_caller isEqualTo hatchet_player) exitWith {};
-
-call EFUNC(interaction,removeActions);
-
-if !(isNil QGVAR(vehicle)) then {
- [GVAR(vehicle)] call FUNC(shutDownAll);
-};
-
-private _isHatchetSetup = [_newVehicle] call FUNC(getVehicleConfig);
-
-//end the function if the vehicle isn't compatible
-if !(_isHatchetSetup) exitWith {
- _newVehicle setVariable [QGVAR(modules), nil];
- if !((vehicle hatchet_player) isEqualTo hatchet_player) then {
- call EFUNC(interaction,addActions);
- };
-};
-
-[_newVehicle] call FUNC(loadAll);
-[_newVehicle] call FUNC(startLoops);
-GVAR(vehicle) = _newVehicle;
-
-call EFUNC(interaction,addActions);
diff --git a/addons/core/functions/fnc_hasModule.sqf b/addons/core/functions/fnc_hasModule.sqf
deleted file mode 100644
index b5a26b1..0000000
--- a/addons/core/functions/fnc_hasModule.sqf
+++ /dev/null
@@ -1,25 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_hasModule
- *
- * Checks if a module exists
- *
- * Params: array[array[(object) vehicle, (string) module name, (optional, string) classname]
- * Returns: (boolean) has module
- *
- * Author: Yax
- */
-
-params ["_vehicle", "_moduleName", ["_className", nil]];
-
-private _vehicleModuleArray = _vehicle getVariable [QGVAR(modules), []];
-private _isClass = if (!isNil "_className") then [{_vehicle isKindOf _className}, {true}];
-private _hasModule = false;
-{ // forEach _vehicleModuleArray
- _name = _x # 0;
- if (_moduleName == _name) exitWith {
- _hasModule = true;
- };
-} forEach _vehicleModuleArray;
-
-(_hasModule && _isClass)
diff --git a/addons/core/functions/fnc_load.sqf b/addons/core/functions/fnc_load.sqf
deleted file mode 100644
index 34f169c..0000000
--- a/addons/core/functions/fnc_load.sqf
+++ /dev/null
@@ -1,43 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_load
- *
- * Loads a single module with default paths
- *
- * Params: array[array[(object) vehicle, (string) module name]
- * Returns: nothing
- *
- * Author: Yax
- */
-
-params ["_vehicle", "_moduleName"];
-
-private _vehicleModuleArray = _vehicle getVariable [QGVAR(modules), []];
-private _startUp = true;
-
-#define HANDLEDEFAULT(VAR,MODULENAME,PATH) private VAR = format[PATH, MODULENAME];
-HANDLEDEFAULT(_setup,_moduleName,"hatchet_%1_fnc_setup")
-HANDLEDEFAULT(_perFrame,_moduleName,"hatchet_%1_fnc_perFrame")
-HANDLEDEFAULT(_perSecond,_moduleName,"hatchet_%1_fnc_perSecond")
-HANDLEDEFAULT(_shutDown,_moduleName,"hatchet_%1_fnc_shutDown")
-
-if (_startUp && {_setup != ""}) then {
- private _func = missionNameSpace getVariable _setup;
- if (!isNil "_func" && {typeName _func == "CODE"}) then {
- _result = [_vehicle] call _func;
- if (typeName _result == "BOOL" && {!_result}) then {
- _startUp = false;
- };
- };
-};
-
-_vehicleModuleArray pushBack [
- _moduleName,
- _startUp,
- _setup,
- _perFrame,
- _perSecond,
- _shutDown
-];
-
-_vehicle setVariable [QGVAR(modules), _vehicleModuleArray];
diff --git a/addons/core/functions/fnc_loadAll.sqf b/addons/core/functions/fnc_loadAll.sqf
deleted file mode 100644
index a298342..0000000
--- a/addons/core/functions/fnc_loadAll.sqf
+++ /dev/null
@@ -1,57 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_loadAll
- *
- * Reads out relevant vehicle modules from config and stores them in vehicle variables
- *
- * Params: array[array[(object) vehicle]
- * Returns: nothing
- *
- * Author: Yax
- */
-
-params ["_vehicle"];
-
-private _vehicleModuleArray = [];
-
-private _vehicleConfig = _vehicle getVariable QRVAR(config);
-private _modules = "true" configClasses (_vehicleConfig >> "modules");
-
-private _projectPrefix = _vehicle getVariable [QGVAR(projectPrefix), ""];
-#define HANDLEDEFAULT(VAR,MODULENAME,PATH) if (VAR == "" && {!isNil{missionNameSpace getVariable format[PATH, MODULENAME]}}) then {VAR = format[PATH, MODULENAME];};
-
-{ //forEach _modules
- private _moduleConfig = _x;
- private _moduleName = configName _x;
- private _startUp = (getNumber (_moduleConfig >> "startOnEnter") == 1);
-
- private _setup = getText (_moduleConfig >> "setup");
- HANDLEDEFAULT(_setup,_moduleName,(_projectPrefix+"_%1_fnc_setup"))
- private _shutDown = getText (_moduleConfig >> "shutDown");
- HANDLEDEFAULT(_shutDown,_moduleName,(_projectPrefix+"_%1_fnc_shutDown"))
- private _perFrame = getText (_moduleConfig >> "perFrame");
- HANDLEDEFAULT(_perFrame,_moduleName,(_projectPrefix+"_%1_fnc_perFrame"))
- private _perSecond = getText (_moduleConfig >> "perSecond");
- HANDLEDEFAULT(_perSecond,_moduleName,(_projectPrefix+"_%1_fnc_perSecond"))
-
- if (_startUp && _setup != "") then {
- private _func = (missionNameSpace getVariable _setup);
- if (!isNil "_func" && typeName _func == "CODE") then {
- private _result = ([_vehicle] call _func);
- if (typeName _result == "BOOL" && {!_result}) then {
- _startUp = false;
- };
- };
- };
-
- _vehicleModuleArray pushBack [
- _moduleName,
- _startUp,
- _setup,
- _perFrame,
- _perSecond,
- _shutDown
- ];
-} forEach _modules;
-
-_vehicle setVariable [QGVAR(modules), _vehicleModuleArray];
diff --git a/addons/core/functions/fnc_perFrame.sqf b/addons/core/functions/fnc_perFrame.sqf
deleted file mode 100644
index 55f6c80..0000000
--- a/addons/core/functions/fnc_perFrame.sqf
+++ /dev/null
@@ -1,49 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_perFrame
- *
- * Function will run relevante modules' per frame functions
- *
- * Params: array[array[(object) vehicle, (scalar) last frame time], (scalar)pfhId]
- * Returns: nothing
- *
- * Author: Yax
- */
-
-params ["_args", "_pfhId"];
-_args params ["_vehicle", "_lastFrameTime"];
-
-//shutdown conditions
-if (
- !((vehicle hatchet_player) isEqualTo _vehicle) ||
- !(alive hatchet_player) ||
- !(alive _vehicle)
-) exitWith {
- [GVAR(vehicle)] call FUNC(shutDownAll);
- [_pfhId] call CBA_fnc_removePerFrameHandler;
- GVAR(perFrameHandler) = nil;
- if (!isNil {GVAR(drawHandler)}) then {
- removeMissionEventHandler ["Draw3d", GVAR(drawHandler)];
- GVAR(drawHandler) = nil;
- };
-};
-
-if (cba_missionTime == _lastFrameTime) exitWith {GVAR(paused) = true;};
-_args set [1, cba_missionTime];
-if (GVAR(paused)) then {
- // unpause
- [QGVAR(unPause), []] call CBA_fnc_localEvent;
-};
-GVAR(paused) = false;
-
-//frame time will be passed on to modules
-private _frameTime = (cba_missionTime - _lastFrameTime);
-//skip a frame when unpausing so time between frames stays normal
-if (_frameTime > 1) exitWith {};
-
-{ //forEach vehicle hatchet_core_modules
- if (_x # 1) then {
- private _func = missionNameSpace getVariable (_x # 3);
- if (!isNil {_func}) then {[_vehicle, _frameTime] call _func;};
- };
-} forEach (_vehicle getVariable [QGVAR(modules), []]);
diff --git a/addons/core/functions/fnc_perSecond.sqf b/addons/core/functions/fnc_perSecond.sqf
deleted file mode 100644
index 1c82595..0000000
--- a/addons/core/functions/fnc_perSecond.sqf
+++ /dev/null
@@ -1,40 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_perSecond
- *
- * Function will run relevante modules' per second functions
- *
- * Params: array[array[(object) vehicle], (scalar)pfhId]
- * Returns: nothing
- *
- * Author: Yax
- */
-
-params ["_args", "_pfhId"];
-_args params ["_vehicle"];
-
-// shutdown conditions
-if (
- !((vehicle hatchet_player) isEqualTo _vehicle) ||
- !(alive hatchet_player) ||
- !(alive _vehicle)
-) exitWith {
- [_pfhId] call CBA_fnc_removePerFrameHandler;
- GVAR(perSecondHandler) = nil;
-};
-
-if (GVAR(paused)) exitWith {};
-
-private _modules = (_vehicle getVariable [QGVAR(modules), []]);
-[_vehicle, _modules] spawn {
- params ["_vehicle", "_modules"];
- private _moduleDelay = 1 / ((count _modules) + 1);
- private ["_func"];
- { //forEach vehicle hatchet_core_modules
- sleep _moduleDelay;
- if (_x # 1) then {
- _func = missionNameSpace getVariable (_x # 4);
- if (!isNil {_func}) then {[_vehicle] call _func;};
- };
- } forEach _modules;
-};
diff --git a/addons/core/functions/fnc_shutDownAll.sqf b/addons/core/functions/fnc_shutDownAll.sqf
deleted file mode 100644
index 9cc038b..0000000
--- a/addons/core/functions/fnc_shutDownAll.sqf
+++ /dev/null
@@ -1,37 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_shutDownAll
- *
- * Reads out relevant vehicle modules from config and stores them in vehicle variables
- *
- * Params: array[array[(object) vehicle]
- * Returns: nothing
- *
- * Author: Yax
- */
-
-params ["_vehicle"];
-
-if (isNil "_vehicle") then {_vehicle = GVAR(vehicle)};
-
-[GVAR(perFrameHandler)] call CBA_fnc_removePerFrameHandler;
-[GVAR(perSecondHandler)] call CBA_fnc_removePerFrameHandler;
-
-if !(isNil QGVAR(drawHandler)) then {
- removeMissionEventHandler ["Draw3d", GVAR(drawHandler)];
-};
-
-GVAR(perFrameHandler) = nil;
-GVAR(perSecondHandler) = nil;
-GVAR(drawHandler) = nil;
-
-private ["_func"];
-{ //forEach vehicle hatchet_core_modules
- if (_x # 1) then {
- _func = missionNameSpace getVariable (_x # 5);
- if (!isNil {_func}) then {[_vehicle] call _func;};
- };
- _x set [1, false];
-} forEach (_vehicle getVariable [QGVAR(modules), []]);
-
-GVAR(vehicle) = nil;
diff --git a/addons/core/functions/fnc_start.sqf b/addons/core/functions/fnc_start.sqf
deleted file mode 100644
index 0e2f750..0000000
--- a/addons/core/functions/fnc_start.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_start
- *
- * Starts a loaded module
- *
- * Params: array[array[(object) vehicle, (string) module name]
- * Returns: nothing
- *
- * Author: Yax
- */
-
-params ["_vehicle", "_moduleName", ["_parameters", nil]];
-
-private _vehicleModuleArray = _vehicle getVariable [QGVAR(modules), []];
-
-private ["_moduleName", "_running", "_setup"];
-{ // forEach _vehicleModuleArray
- _module = _x;
- _name = _module # 0;
- if (_moduleName == _name) exitWith {
- _running = _module # 1;
- _setup = _module # 2;
- if (!_running) then {
- private _func = (missionNameSpace getVariable _setup);
- if (!isNil "_func" && typeName _func == "CODE") then {
- _running = ([_vehicle, _parameters] call _func);
- };
- };
- _module set [1, _running];
- _vehicleModuleArray set [_forEachIndex, _module];
- };
-} forEach _vehicleModuleArray;
diff --git a/addons/core/functions/fnc_startLoops.sqf b/addons/core/functions/fnc_startLoops.sqf
deleted file mode 100644
index 6543114..0000000
--- a/addons/core/functions/fnc_startLoops.sqf
+++ /dev/null
@@ -1,30 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_core_fnc_startLoops
- *
- * starts the per per frameHandlers and the draw3D eventHandler
- *
- * Params: ARRAY[(object) vehicle]
- * Returns: nil
- *
- * Author: Yax
- */
-
-params ["_vehicle"];
-
-private _vehicleConfig = _vehicle getVariable QRVAR(config);
-
-// set up draw3D handler
-if (isClass (_vehicleConfig >> "interaction")) then {
- [_vehicle, "interaction"] call FUNC(load);
-};
-
-// set up perFrameHandler
-if (isNil QGVAR(perFrameHandler)) then {
- GVAR(perFrameHandler) = [FUNC(perFrame), 0, [_vehicle, cba_missionTime]] call CBA_fnc_addPerFrameHandler;
-};
-
-// set up perSecondHandler for once per second
-if (isNil QGVAR(perSecondHandler)) then {
- GVAR(perSecondHandler) = [FUNC(perSecond), 1, [_vehicle]] call CBA_fnc_addPerFrameHandler;
-};
diff --git a/addons/core/functions/script_component.hpp b/addons/core/functions/script_component.hpp
deleted file mode 100644
index cdc3ded..0000000
--- a/addons/core/functions/script_component.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "../script_component.hpp"
diff --git a/addons/core/script_component.hpp b/addons/core/script_component.hpp
deleted file mode 100644
index 1fc9ed9..0000000
--- a/addons/core/script_component.hpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#define COMPONENT core
-#define COMPONENT_BEAUTIFIED Core
-#include "\z\hatchet\addons\main\script_mod.hpp"
-
-#ifdef DEBUG_ENABLED_CORE
- #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_CORE
- #define DEBUG_SETTINGS DEBUG_SETTINGS_CORE
-#endif
-
-#include "\z\hatchet\addons\main\script_macros.hpp"
diff --git a/addons/core/stringtable.xml b/addons/core/stringtable.xml
deleted file mode 100644
index 7873447..0000000
--- a/addons/core/stringtable.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-
-
-
-
- Engine On
- Motor An
-
-
- Engine Off
- Motor Aus
-
-
- Lights On
- Scheinwerfer Aus
-
-
- Lights Off
- Scheinwerfer Aus
-
-
-
diff --git a/addons/interaction/$PBOPREFIX$ b/addons/interaction/$PBOPREFIX$
deleted file mode 100644
index 2e76607..0000000
--- a/addons/interaction/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\hatchet\addons\interaction
diff --git a/addons/interaction/CfgActions.hpp b/addons/interaction/CfgActions.hpp
deleted file mode 100644
index 6b23d6c..0000000
--- a/addons/interaction/CfgActions.hpp
+++ /dev/null
@@ -1,15 +0,0 @@
-class CfgActions {
- class None;
- class EngineOn: None {
- show = 0;
- };
- class EngineOff: None {
- show = 0;
- };
- class LightOn: None {
- show = 0;
- };
- class LightOff: None {
- show = 0;
- };
-};
diff --git a/addons/interaction/CfgEventHandlers.hpp b/addons/interaction/CfgEventHandlers.hpp
deleted file mode 100644
index 61f69fb..0000000
--- a/addons/interaction/CfgEventHandlers.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-class Extended_PreStart_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preStart));
- };
-};
-
-class Extended_PreInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preInit));
- };
-};
-
-class Extended_PostInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_postInit));
- };
-};
diff --git a/addons/interaction/CfgSounds.hpp b/addons/interaction/CfgSounds.hpp
deleted file mode 100644
index 8a998e6..0000000
--- a/addons/interaction/CfgSounds.hpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#define SOUND(NAME,PATH) class PREFIX_NAME { name = QUOTE(NAME); sound[] = {QUOTE(\z\PREFIX\addons\COMPONENT\sounds\PATH.wss), 1, 1, 1}; titles[] = {}}
-
-class CfgSounds {
- SOUND(Switch_Sound,switch);
- SOUND(Switch_Sound_1,switch1);
- SOUND(Switch_Sound_2,switch2);
- SOUND(Switch_Sound_3,switch3);
- SOUND(Switch_Sound_4,switch4);
- SOUND(Switch_Sound_5,switch5);
- SOUND(HeavySwitch_Sound,heavySwitch);
- SOUND(dial_sound,dial);
-};
diff --git a/addons/interaction/XEH_PREP.hpp b/addons/interaction/XEH_PREP.hpp
deleted file mode 100644
index 7a9026f..0000000
--- a/addons/interaction/XEH_PREP.hpp
+++ /dev/null
@@ -1,29 +0,0 @@
-// Keys
-PREP(buttonDown);
-PREP(buttonUp);
-PREP(drag);
-PREP(dragStart);
-PREP(dragStop);
-PREP(knobAnimate);
-PREP(leverAnimate);
-
-// Pointing
-PREP(pointCalculate);
-PREP(pointDraw);
-PREP(pointNetReceive);
-PREP(pointNetSend);
-PREP(pointStart);
-
-PREP(addAction);
-PREP(addActions);
-PREP(checkInteraction);
-PREP(draw3D);
-PREP(drawLabel);
-PREP(findButton);
-PREP(loadAll);
-PREP(loadItem);
-PREP(perFrame);
-PREP(removeActions);
-PREP(scriptedInteract);
-PREP(setup);
-PREP(shutDown);
diff --git a/addons/interaction/XEH_postInit.sqf b/addons/interaction/XEH_postInit.sqf
deleted file mode 100644
index ad65520..0000000
--- a/addons/interaction/XEH_postInit.sqf
+++ /dev/null
@@ -1,71 +0,0 @@
-#include "script_component.hpp"
-
-[
- COMPONENT_NAME,
- QGVAR(ButtonPress),
- "Vehicle Interaction",
- {[vehicle hatchet_player, GVAR(currentButton)] call FUNC(buttonDown)},
- {[vehicle hatchet_player, GVAR(currentButton)] call FUNC(buttonUp)},
- [33, [false, false, false]],
- false
-] call CBA_fnc_addKeybind;
-
-[
- QGVAR(removeActions),
- "CHECKBOX",
- "Remove Vanilla Actions",
- [COMPONENT_NAME, "Actions"],
- [true],
- nil,
- {}
-] call CBA_fnc_addSetting;
-
-[
- QGVAR(updateEvery),
- "SLIDER",
- "Label update rates (frames between)",
- [COMPONENT_NAME, "Performance"],
- [0,10,5,0],
- nil,
- {}
-] call CBA_fnc_addSetting;
-
-[
- QGVAR(pointingEnabled),
- "CHECKBOX",
- "Enable pointing system(uses remoteCall)",
- [COMPONENT_NAME, "Performance"],
- [true],
- nil,
- {}
-] call CBA_fnc_addSetting;
-
-[
- QGVAR(showLabel),
- "CHECKBOX",
- "Show Label",
- [COMPONENT_NAME, "Labels"],
- [true],
- nil,
- {}
-] call CBA_fnc_addSetting;
-
-[
- QGVAR(showKeybind),
- "CHECKBOX",
- "Show Keybind",
- [COMPONENT_NAME, "Labels"],
- [true],
- nil,
- {}
-] call CBA_fnc_addSetting;
-
-
-["vtx_uh60m_enabled_jvmf","CHECKBOX","(DEBUG) Enable JVMF","UH-60M",[true],nil,{}] call CBA_Settings_fnc_init;
-["vtx_uh60m_enabled_fms","CHECKBOX","(DEBUG) Enable FMS","UH-60M",[true],nil,{}] call CBA_Settings_fnc_init;
-["vtx_uh60m_enabled_mfd","CHECKBOX","(DEBUG) Enable MFD","UH-60M",[true],nil,{}] call CBA_Settings_fnc_init;
-["vtx_uh60m_enabled_fd","CHECKBOX","(DEBUG) Enable FD","UH-60M",[true],nil,{}] call CBA_Settings_fnc_init;
-["vtx_uh60m_enabled_cas","CHECKBOX","(DEBUG) Enable CAS","UH-60M",[true],nil,{}] call CBA_Settings_fnc_init;
-["vtx_uh60m_enabled_aar","CHECKBOX","(DEBUG) Enable AAR","UH-60M",[true],nil,{}] call CBA_Settings_fnc_init;
-["vtx_uh60m_enabled_flir","CHECKBOX","(DEBUG) Enable FLIR","UH-60M",[true],nil,{}] call CBA_Settings_fnc_init;
-["vtx_uh60m_enabled_engine","CHECKBOX","(DEBUG) Enable ENGINE","UH-60M",[true],nil,{}] call CBA_Settings_fnc_init;
diff --git a/addons/interaction/XEH_preInit.sqf b/addons/interaction/XEH_preInit.sqf
deleted file mode 100644
index 72c09fa..0000000
--- a/addons/interaction/XEH_preInit.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "script_component.hpp"
-ADDON = false;
-#include "XEH_PREP.hpp"
-
-GVAR(updateIndex) = 0;
-GVAR(currentButton) = nil;
-GVAR(buttonHoldCode) = nil;
-GVAR(buttonRadius) = 1;
-GVAR(buttonHolding) = false;
-GVAR(knobHolding) = nil;
-GVAR(dragging) = false;
-
-GVAR(point_icons) = [];
-GVAR(point_lifetime) = 2;
-
-ADDON = true;
diff --git a/addons/interaction/XEH_preStart.sqf b/addons/interaction/XEH_preStart.sqf
deleted file mode 100644
index a51262a..0000000
--- a/addons/interaction/XEH_preStart.sqf
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "script_component.hpp"
-#include "XEH_PREP.hpp"
diff --git a/addons/interaction/config.cpp b/addons/interaction/config.cpp
deleted file mode 100644
index b3dad46..0000000
--- a/addons/interaction/config.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- name = COMPONENT_NAME;
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"hatchet_main"};
- author = "Project Hatchet";
- VERSION_CONFIG;
- };
-};
-
-#include "CfgActions.hpp"
-#include "CfgEventHandlers.hpp"
-#include "CfgSounds.hpp"
diff --git a/addons/interaction/functions/fnc_addAction.sqf b/addons/interaction/functions/fnc_addAction.sqf
deleted file mode 100644
index fe12d0c..0000000
--- a/addons/interaction/functions/fnc_addAction.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_addAction
- */
-
-params ["_label", "_code", "_condition", "_action"];
-
-private _actionConfig = (configFile >> "CfgActions" >> _action);
-private _actionId = hatchet_player addAction [
- _label,
- _code,
- nil,
- getNumber (_actionConfig >> "priority"),
- false,
- true,
- getText (_actionConfig >> "shortcut"),
- _condition
-];
-GVAR(actionIds) pushBack _actionId;
diff --git a/addons/interaction/functions/fnc_addActions.sqf b/addons/interaction/functions/fnc_addActions.sqf
deleted file mode 100644
index 1a90e0a..0000000
--- a/addons/interaction/functions/fnc_addActions.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_addActions
- */
-
-private _veh = vehicle hatchet_player;
-if !((driver _veh) isEqualto hatchet_player || {(gunner _veh isEqualTo hatchet_player) && isCopilotEnabled _veh}) exitWith {};
-
-// Engine
-{
- if !(_x in GVAR(actionIgnore)) then {
- private _config = (configFile >> (format [QRVAR(%1), _x]));
- [getText (_config >> "label"), getText (_config >> "buttonDown"), getText (_config >> "condition"), _x] call FUNC(addAction);
- };
-} forEach ["EngineOn", "EngineOff", "LightOn", "LightOff"];
-
diff --git a/addons/interaction/functions/fnc_buttonDown.sqf b/addons/interaction/functions/fnc_buttonDown.sqf
deleted file mode 100644
index da25ca9..0000000
--- a/addons/interaction/functions/fnc_buttonDown.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_buttonDown
- *
- * interaction button press down functionality
- */
-
-params ["_vehicle", "_button", ["_forced", false]];
-
-if (isNil {_vehicle getVariable QGVAR(points)}) exitWith {false};
-if (isNil QGVAR(currentButton) && {!_forced}) exitWith {};
-
-_button PARAMS;
-diag_log format ["%2: button down %1", _name, time];
-
-if !(_vehicle call compile _interactCondition) exitWith {};
-
-_buttonConfig BTNPARAMS;
-
-if !(_clickSound isEqualTo "") then {
- playSound _clickSound;
-};
-
-[_vehicle] call _buttonDown;
-[_vehicle, _position, 1, name hatchet_player] call FUNC(pointNetSend);
-
-if !(isNil "_buttonHold") then {
- GVAR(buttonHoldCode) = _buttonHold;
-};
-GVAR(buttonHolding) = true;
-GVAR(dragging_buttonDownTime) = time;
-
-true
diff --git a/addons/interaction/functions/fnc_buttonUp.sqf b/addons/interaction/functions/fnc_buttonUp.sqf
deleted file mode 100644
index e7d0457..0000000
--- a/addons/interaction/functions/fnc_buttonUp.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_buttonUp
- *
- * interaction button release functionality
- */
-
-GVAR(buttonHolding) = false;
-params ["_vehicle", "_button"];
-if (isNil{_vehicle getVariable QGVAR(points)}) exitWith {false};
-
-_button PARAMS;
-diag_log format ["%2: button up %1", _name, time];
-
-if !(_vehicle call compile _interactCondition) exitWith {};
-
-_buttonConfig BTNPARAMS;
-
-[_vehicle] call _buttonUp;
-GVAR(buttonHoldCode) = nil;
-if (!isNil "_knobClick") then {
- private _clickTime = time - GVAR(dragging_buttonDownTime);
- if (_clickTime < 0.25) then {
- systemChat format ["CLICK TIME %1", _clickTime];
- [_vehicle] call _knobClick;
- };
-};
-
-true
diff --git a/addons/interaction/functions/fnc_checkInteraction.sqf b/addons/interaction/functions/fnc_checkInteraction.sqf
deleted file mode 100644
index 8707a19..0000000
--- a/addons/interaction/functions/fnc_checkInteraction.sqf
+++ /dev/null
@@ -1,55 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_checkInteraction
- *
- * checks if a sub-item is valid for interaction
- *
- * params: (array)[
- * (string) name
- * (string) condition
- * (array) sub-items
- * OPTIONAL: (string) position type
- * OPTIONAL: (string) position
- * OPTIONAL: (string) label
- * OPTIONAL: (scalar) radius
- * OPTIONAL: (string) buttonDown code
- * OPTIONAL: (string) buttonUp code
- * OPTIONAL: (string) buttonHold
- * OPTIONAL: (string) buttonMove
- * ]
- *
- * returns: on success array, on failure nil
- */
-
-PARAMS;
-
-scopeName "main";
-
-// cut it off if the condition is false
-if (_condition != "" && {!(_vehicle call (compile _condition))}) exitWith {nil};
-
-if !(isNil "_positionType") then {
- // get the selection position coordinates
- if (_positionType == "anim") then {
- _position = _vehicle selectionPosition _position;
- };
- private _positionWorld = _vehicle modelToWorldVisual _position;
- private _screenPos = worldToScreen _positionWorld;
- // make sure the position is on the screen
- if (count _screenPos == 2) then {
- private _dis = (_screenPos distance GVAR(cursorPos));
- if (_dis < (_radius * GVAR(buttonRadius))) then {
- _dis breakOut "main";
- };
- };
-};
-
-private ["_result"];
-{ // forEach _subItems
- _result = [_x] call FUNC(findButton);
- if !(isNil "_result") then {
- _result breakOut "main";
- };
-} forEach _subItems;
-
-nil
diff --git a/addons/interaction/functions/fnc_drag.sqf b/addons/interaction/functions/fnc_drag.sqf
deleted file mode 100644
index dee00ea..0000000
--- a/addons/interaction/functions/fnc_drag.sqf
+++ /dev/null
@@ -1,33 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_drag
- *
- * interaction button knob drag
- */
-
-params ["_vehicle"];
-
-GVAR(currentButton) PARAMS;
-_knobConfig params KNOBPARAMS;
-diag_log format ["%2: dragging %1", _name, time];
-
-if (_positionType isEqualTo "anim") then {
- _position = _vehicle selectionPosition _position;
-};
-private _positionWorld = _vehicle modelToWorldVisual _position;
-private _screenPos = worldToScreen _positionWorld;
-// make sure the position is on the screen
-if (count _screenPos == 2) then {
- private _verticalDistance = 0.5 - (_screenPos # 1);
- //systemchat str (_verticalDistance / _dragRange) * _animRange;
- //systemChat str [abs _verticalDistance, abs GVAR(dragging_lastDragDistance), abs (abs GVAR(dragging_lastDragDistance) - abs _verticalDistance)];
- if (abs (abs GVAR(dragging_lastDragDistance) - abs _verticalDistance) > 0.02) then {
- systemChat str _verticalDistance;
- private _animRange = (_animLimits # 0) - (_animLimits # 1);
- GVAR(dragging_lastDragDistance) = _verticalDistance;
- private _dragEndPoint = GVAR(dragging_startAnimPhase) + ((_verticalDistance / _dragRange) * _animRange);
- _dragEndPoint = _dragEndPoint min (_animLimits # 1) max (_animLimits # 0);
- _vehicle animateSource [_animation, _dragEndPoint, 10];
- [_vehicle, _animation] call _dragging;
- };
-};
diff --git a/addons/interaction/functions/fnc_dragStart.sqf b/addons/interaction/functions/fnc_dragStart.sqf
deleted file mode 100644
index 7bfc083..0000000
--- a/addons/interaction/functions/fnc_dragStart.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_dragStart
- *
- * interaction button knob drag
- */
-
-params ["_vehicle"];
-
-GVAR(currentButton) PARAMS;
-_knobConfig params KNOBPARAMS;
-diag_log format ["%2: drag start %1", _name, time];
-
-if (isNil{_vehicle getVariable QGVAR(points)}) exitWith {false};
-if (!isNil QGVAR(knobHolding) && { GVAR(knobHolding) # 0 != _animation }) exitWith {false};
-
-GVAR(knobHolding) = GVAR(currentButton);
-GVAR(dragging) = true;
-GVAR(dragging_startAnimPhase) = _vehicle animationPhase _animation;
-GVAR(dragging_lastDragDistance) = 0;
-[_vehicle, GVAR(dragging_startAnimPhase)] call _dragStart;
diff --git a/addons/interaction/functions/fnc_dragStop.sqf b/addons/interaction/functions/fnc_dragStop.sqf
deleted file mode 100644
index a321b8a..0000000
--- a/addons/interaction/functions/fnc_dragStop.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_dragStop
- */
-
-params ["_vehicle"];
-
-GVAR(currentButton) PARAMS;
-_knobConfig params KNOBPARAMS;
-diag_log format ["%2: drag stop %1", _name, time];
-
-GVAR(dragging) = false;
-GVAR(knobHolding) = nil;
-[_vehicle, _vehicle animationPhase _animation] call _dragStop;
diff --git a/addons/interaction/functions/fnc_draw3D.sqf b/addons/interaction/functions/fnc_draw3D.sqf
deleted file mode 100644
index 472d1b6..0000000
--- a/addons/interaction/functions/fnc_draw3D.sqf
+++ /dev/null
@@ -1,47 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_draw3D
- *
- * runs the draw3D eventhandler code to check for interaction
- *
- */
-
-private _vehicle = vehicle hatchet_player;
-
-if !(cameraView isEqualTo "INTERNAL") exitWith {};
-if !(isNull curatorCamera) exitWith {};
-
-if (GVAR(updateIndex) >= GVAR(updateEvery) && !GVAR(dragging) && !GVAR(buttonHolding)) then {
- GVAR(updateIndex) = 0;
- GVAR(currentButton) = [_vehicle getVariable [QGVAR(points), []]] call FUNC(findButton);
-};
-GVAR(updateIndex) = GVAR(updateIndex) + 1;
-
-_this call FUNC(drawLabel);
-
-if (GVAR(crosshair)) then {
- ["+",-1, 0.485, 1, 0, 0, 794] spawn BIS_fnc_dynamicText;
-};
-
-if (GVAR(pointStart)) then {
- [_vehicle] call FUNC(pointCalculate);
-};
-[_vehicle] call FUNC(pointDraw);
-
-if (!isNil QGVAR(knobHolding) && !GVAR(dragging)) then {
- GVAR(knobHolding) PARAMS;
- _knobConfig params KNOBPARAMS;
- private _animationPhase = _vehicle animationPhase _animation;
- private _animationEnd =_vehicle getVariable ["knob_" + _animation, _animationPhase];
- if (
- (_animationPhase > _animationEnd - 0.02) &&
- (_animationPhase < _animationEnd + 0.02)
- ) then {
- GVAR(knobHolding) = nil;
- [_vehicle, _animationPhase] call _dragStop;
- _vehicle setVariable [("knob_" + _animation), nil];
- vxf_animating_keys deleteAt (vxf_animating_keys find _animation);
- } else {
- [_vehicle, _animationPhase] call _dragging;
- };
-};
diff --git a/addons/interaction/functions/fnc_drawLabel.sqf b/addons/interaction/functions/fnc_drawLabel.sqf
deleted file mode 100644
index 86f0905..0000000
--- a/addons/interaction/functions/fnc_drawLabel.sqf
+++ /dev/null
@@ -1,114 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_drawLabel
- *
- * interaction button release functionality
- */
-
-private _vehicle = vehicle hatchet_player;
-
-if (isNil QGVAR(currentButton)) exitWith {
- ["",0,0.4,0,0,0, 1301] spawn BIS_fnc_dynamicText;
- ["",0,0.4,0,0,0, 1302] spawn BIS_fnc_dynamicText;
-};
-
-GVAR(currentButton) PARAMS;
-if (_positionType == "anim") then {
- _position = _vehicle selectionPosition _position;
-};
-
-private _color = if (GVAR(buttonHolding)) then {[1,0,0,1]} else {[1,1,1,1]};
-private _size = if (GVAR(buttonHolding)) then {0.045} else {0.05};
-_label = if (GVAR(showLabel)) then {
- if (count _buttonConfig > 0 && {count _knobConfig == 0}) then {
- private _fmt = if (GVAR(showKeybind)) then {
- "[%1] %2"
- } else {
- "%2"
- };
- format [_fmt, (([COMPONENT_NAME, QGVAR(ButtonPress)] call CBA_fnc_getKeybind)# 5) call CBA_fnc_localizeKey, _label]
- } else {
- _label
- }
-} else {
- ""
-};
-
-drawIcon3D [
- "\a3\ui_f\data\IGUI\Cfg\Cursors\selected_ca.paa",
- _color,
- _vehicle modelToWorldVisual _position,
- 1,
- 1,
- 0,
- _label,
- 2,
- _size
-];
-
-if (count _knobConfig > 0) then {
- _knobConfig params KNOBPARAMS;
- if (inputAction "prevAction" > 0 && !GVAR(scrolledHolding)) then {
- [_vehicle, 1, _knobConfig] call FUNC(knobAnimate);
- };
- if (inputAction "nextAction" > 0 && !GVAR(scrolledHolding)) then {
- [_vehicle, -1, _knobConfig] call FUNC(knobAnimate);
- };
- if (GVAR(showKeybinds)) then {
- ["Scroll or drag to spin",0,0.6,0,0,0, 1303] spawn BIS_fnc_dynamicText;
- } else {
- ["",0,0.6,0,0,0, 1303] spawn BIS_fnc_dynamicText;
- };
-} else {
- ["",0,0.6,0,0,0, 1303] spawn BIS_fnc_dynamicText;
-};
-
-if (count _animConfig > 0 && count _knobConfig == 0) then {
- _animConfig params ANIMPARAMS;
- private _closestState = 0;
- private _closestDiff = 9999;
- private ["_diff"];
- private _animationPhase = (_vehicle animationPhase _animation);
- { // forEach _animationSteps
- _diff = abs(_animationPhase - _x);
- if (_diff < _closestDiff) then {
- _closestDiff = _diff;
- _closestState = _forEachIndex;
- };
- } forEach _animationSteps;
- private _currentState = _closestState;
- if (_currentState == -1) exitWith {
- ["",0,0.4,0,0,0, 1301] spawn BIS_fnc_dynamicText;
- ["",0,0.4,0,0,0, 1302] spawn BIS_fnc_dynamicText;
- };
- private _loopFirst = if (_animLooping) then {0} else {-1};
- private _loopLast = if (_animLooping) then {(count _animationSteps) - 1} else {-1};
- private _prevStep = if (_currentState == 0) then {_loopLast} else {_currentState - 1};
- private _nextStep = if (_currentState == (count _animationSteps) - 1) then {_loopFirst} else {_currentState + 1};
- if (GVAR(showKeybinds)) then {
- if (_prevStep > -1) then {
- [format ["Set to %2 with %1", actionKeysNames "prevAction", _animationLabels # _prevStep],(-safeZoneX)+(GVAR(cursorPos) # 0) - (safeZoneW / 2),((GVAR(cursorPos) # 1) - 0.1),0,0,0, 1301] spawn BIS_fnc_dynamicText;
- } else {
- ["",0,0.4,0,0,0, 1301] spawn BIS_fnc_dynamicText;
- };
- if (_nextStep > -1) then {
- [format ["Set to %2 with %1", actionKeysNames "nextAction", _animationLabels # _nextStep],(-safeZoneX)+(GVAR(cursorPos) # 0) - (safeZoneW / 2),((GVAR(cursorPos) # 1) + 0.1),0,0,0, 1302] spawn BIS_fnc_dynamicText;
- } else {
- ["",0,0.4,0,0,0, 1302] spawn BIS_fnc_dynamicText;
- };
- } else {
- ["",0,0.4,0,0,0, 1301] spawn BIS_fnc_dynamicText;
- ["",0,0.6,0,0,0, 1302] spawn BIS_fnc_dynamicText;
- };
- if (inputAction "prevAction" > 0 && _prevStep > -1) then {
- [_vehicle, _animation, _animationSteps # _prevStep, _animationLabels # _prevStep, _animationSpeed, _animStart, _animEnd, GVAR(currentButton)] call FUNC(leverAnimate);
- };
- if (inputAction "nextAction" > 0 && _nextStep > -1) then {
- [_vehicle, _animation, _animationSteps # _nextStep, _animationLabels # _nextStep, _animationSpeed, _animStart, _animEnd, GVAR(currentButton)] call FUNC(leverAnimate);
- };
-} else {
- ["",0,0.4,0,0,0, 1301] spawn BIS_fnc_dynamicText;
- ["",0,0.6,0,0,0, 1302] spawn BIS_fnc_dynamicText;
-};
-
-if (inputAction "prevAction" == 0 && inputAction "nextAction" == 0) then {GVAR(scrolledHolding) = false;};
diff --git a/addons/interaction/functions/fnc_findButton.sqf b/addons/interaction/functions/fnc_findButton.sqf
deleted file mode 100644
index fa154f4..0000000
--- a/addons/interaction/functions/fnc_findButton.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_findButton
- */
-
-params ["_points"];
-
-private _button = nil;
-private _buttonDis = 1000;
-
-{
- private _dis = _x call FUNC(checkInteraction);
- if !(isNil "_dis") then {
- if (_dis < _buttonDis) then {
- _button = _x;
- _buttonDis = _dis;
- };
- };
-} forEach _points;
-
-_button
diff --git a/addons/interaction/functions/fnc_knobAnimate.sqf b/addons/interaction/functions/fnc_knobAnimate.sqf
deleted file mode 100644
index c889207..0000000
--- a/addons/interaction/functions/fnc_knobAnimate.sqf
+++ /dev/null
@@ -1,35 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_knobAnimate
- *
- * interaction button animate knob scrollwheel functionality
- */
-
-params ["_vehicle", "_animDirection", "_knobConfig"];
-_knobConfig params KNOBPARAMS;
-diag_log format ["%2: knob animate %1", _name, time];
-
-if (isNil {_vehicle getVariable QGVAR(points)}) exitWith {false};
-if (!isNil QGVAR(knobHolding) && { GVAR(knobHolding) # 0 != _animation }) exitWith {false};
-
-private _animationPhase = (_vehicle animationPhase _animation);
-private _base = _vehicle getVariable [("knob_" + _animation), _animationPhase];
-private _endPoint = _base + (_scrollIncrement * _animDirection);
-_endPoint = _endPoint min (_animLimits # 1) max (_animLimits # 0);
-_vehicle setVariable [("knob_" + _animation), _endPoint];
-_vehicle animateSource [_animation, _endPoint, _animSpeed];
-GVAR(knobHolding) = GVAR(currentButton);
-
-GVAR(currentButton) PARAMS;
-
-//[] spawn {
-// showCommandingMenu "RscMainMenu";
-// showCommandingMenu "";
-//};
-
-if !(_vehicle call compile _interactCondition) exitWith {};
-if (_animation in vxf_animating_keys) exitWith {false};
-
-[_vehicle] call _dragStart;
-[_vehicle, _position, 1, name hatchet_player] call FUNC(pointNetSend);
-vxf_animating_keys pushBack _animation;
diff --git a/addons/interaction/functions/fnc_leverAnimate.sqf b/addons/interaction/functions/fnc_leverAnimate.sqf
deleted file mode 100644
index 29092d5..0000000
--- a/addons/interaction/functions/fnc_leverAnimate.sqf
+++ /dev/null
@@ -1,54 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_leverAnimate
- *
- * interaction button animate lever/switch functionality
- */
-
-params ["_vehicle", "_animation", "_animationTarget", "_animationTargetLabel", "_animationSpeed", "_animStart", "_animEnd", "_button"];
-
-if (isNil{_vehicle getVariable QGVAR(points)}) exitWith {false};
-if (_animation in vxf_animating_keys) exitWith {false};
-
-_button PARAMS;
-diag_log format ["%2: lever animate %1", _name, time];
-
-if !(_this call compile _interactCondition) exitWith {
- //[] spawn {
- // showCommandingMenu "RscMainMenu";
- // showCommandingMenu "";
- //};
-};
-
-if (_clickSound != "") then {
- playSound _clickSound;
-};
-
-[_vehicle, _animation, _animationTargetLabel, _animationTarget] call _animStart;
-[_vehicle, _position, 1, name hatchet_player] call FUNC(pointNetSend);
-vxf_animating_keys pushBack _animation;
-
-_vehicle animateSource [_animation, _animationTarget, _animationSpeed];
-
-#define OUTER_ARGS(ARRAY) ARRAY params ["_vehicle", "_animation", "_animationTarget", "_animationTargetLabel", "_animEnd"]
-#define INNER_ARGS \
- _this params ["_p1", "_startTime"]; \
- OUTER_ARGS(_p1)
-
-// Waits for 3 seconds, then begins a CBA waitUntil
-[{
- OUTER_ARGS(_this);
- [{
- INNER_ARGS;
- (_vehicle animationPhase _animation > _animationTarget - 0.02) &&
- { (_vehicle animationPhase _animation < _animationTarget + 0.02) }
- }, {
- INNER_ARGS;
- [_vehicle, _animation, _animationTargetLabel, _animationTarget] call _animEnd;
- vxf_animating_keys deleteAt (vxf_animating_keys find _animation);
- },
- [[_vehicle, _animation, _animationTarget, _animationTargetLabel, _animEnd], cba_missionTime]
- ] call CBA_fnc_waitUntilAndExecute;
-}, [
- _vehicle, _animation, _animationTarget, _animationTargetLabel, _animEnd
-], 3] call CBA_fnc_waitAndExecute;
diff --git a/addons/interaction/functions/fnc_loadAll.sqf b/addons/interaction/functions/fnc_loadAll.sqf
deleted file mode 100644
index 29592f7..0000000
--- a/addons/interaction/functions/fnc_loadAll.sqf
+++ /dev/null
@@ -1,21 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_loadAll
- *
- * loads interaction from config
- *
- * params: (array)[(object) vehicle]
- */
-
-params ["_vehicle"];
-
-private _vehicleInteraction = [];
-
-private _vehicleConfig = _vehicle getVariable QRVAR(config);
-private _interaction = "true" configClasses (_vehicleConfig >> "interaction");
-
-{ // forEach _interaction
- _vehicleInteraction pushBack ([_vehicle, _x] call FUNC(loadItem));
-} forEach _interaction;
-
-_vehicle setVariable [QGVAR(points), _vehicleInteraction];
diff --git a/addons/interaction/functions/fnc_loadItem.sqf b/addons/interaction/functions/fnc_loadItem.sqf
deleted file mode 100644
index 9c2a76a..0000000
--- a/addons/interaction/functions/fnc_loadItem.sqf
+++ /dev/null
@@ -1,137 +0,0 @@
-#include "script_component.hpp"
-/*
- * FUNC(loadItem)
- *
- * loads part of interaction from config
- *
- * params: (array)[(object) vehicle, (configClass) config]
- *
- * returns: (array)[
- * (string) name
- * (string) condition
- * (array) sub-items
- * OPTIONAL: (string) position type
- * OPTIONAL: (string) position
- * OPTIONAL: (string) label
- * OPTIONAL: (scalar) radius
- * OPTIONAL: (array) button config
- * OPTIONAL: (array) lever config
- * ]
- */
-
-params ["_vehicle", "_config"];
-
-private _result = [
- configName _config,
- getText (_config >> "condition")
-];
-
-private _subItems = [];
-private _subItemConfigs = "true" configClasses _config;
-{ //forEach _subItems
- _subItems pushBack ([_vehicle, _x] call FUNC(loadItem));
-} forEach _subItemConfigs;
-
-_result pushBack _subItems;
-
-private _positionType = getText (_config >> "positionType");
-private _position = getText (_config >> "position");
-if (_positionType == "static") then {
- _position = _vehicle selectionPosition _position;
-};
-if (_positionType == "coordinates") then {
- _positionType = "static";
- _position = getArray (_config >> "position");
-};
-private _label = getText (_config >> "label");
-private _radius = getNumber (_config >> "radius");
-private _interactCondition = getText (_config >> "interactionCondition");
-private _buttonDown = getText (_config >> "buttonDown");
-private _buttonUp = getText (_config >> "buttonUp");
-private _buttonHold = getText (_config >> "buttonHold");
-private _clickSound = getText (_config >> "clickSound");
-private _action = getText (_config >> "action");
-
-if !(_action isEqualTo "") then {
- if (GVAR(removeActions)) then {
- GVAR(actionIgnore) pushBack _action;
- };
-};
-
-private _buttonConfig = [];
-if (_buttonDown != "" || _buttonUp != "" || _buttonHold != "") then {
- _buttonConfig = [
- compile _buttonDown,
- compile _buttonUp,
- (if (_buttonHold != "") then {compile _buttonHold} else {nil})
- ];
-};
-
-private _animation = getText (_config >> "animation");
-private _animStates = (_config >> "animStates") call BIS_fnc_getCfgData;
-private _animLabels = (_config >> "animLabels") call BIS_fnc_getCfgData;
-private _animSpeed = getNumber (_config >> "animSpeed");
-private _animLooping = getNumber (_config >> "looping");
-private _animStart = getText (_config >> "animStart");
-private _animEnd = getText (_config >> "animEnd");
-private _animConfig = [];
-if (_animation != "" && ISFULLARRAY(_animStates) && ISFULLARRAY(_animLabels)) then {
- _animConfig = [
- _animation,
- (if (_animSpeed == 0) then {true} else {_animSpeed}),
- (_animLooping == 1),
- _animStates,
- _animLabels,
- compile _animStart,
- compile _animEnd
- ];
-};
-
-private _scrollIncrement = getNumber (_config >> "scrollIncrement");
-private _dragRange = getNumber (_config >> "dragRange");
-private _animLimits = (_config >> "animLimits") call BIS_fnc_getCfgData;
-private _dragStart = getText (_config >> "dragStart");
-private _dragging = getText (_config >> "dragging");
-private _dragStop = getText (_config >> "dragStop");
-private _knobConfig = [];
-if (_animation != "" && _dragRange > 0 && ISFULLARRAY(_animLimits)) then {
- _knobConfig = [
- _animation,
- _scrollIncrement,
- _dragRange,
- _animLooping,
- _animLimits,
- (if (_animSpeed == 0) then {true} else {_animSpeed}),
- compile _dragStart,
- (if (_dragging != "") then {compile _dragging} else {nil}),
- compile _dragStop
- ];
- _buttonConfig = [
- {_this call FUNC(dragStart)},
- {_this call FUNC(dragStop)},
- {_this call FUNC(drag)},
- compile _buttonUp
- ];
-};
-
-//check if there is sufficient data for an interaction
-if (
- _positionType != "" &&
- (typeName _position == "STRING" && {_position != ""}) || (typeName _position == "ARRAY") &&
- // _label != "" &&
- _radius > -1
-) then {
- _result = _result + [
- _positionType,
- _position,
- _label,
- _radius,
- _clickSound,
- _interactCondition,
- _buttonConfig,
- _animConfig,
- _knobConfig
- ];
-};
-
-_result
diff --git a/addons/interaction/functions/fnc_perFrame.sqf b/addons/interaction/functions/fnc_perFrame.sqf
deleted file mode 100644
index a6f8ab6..0000000
--- a/addons/interaction/functions/fnc_perFrame.sqf
+++ /dev/null
@@ -1,16 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_perFrame
- *
- * Runs per frame for interaction, handles button holding code
- *
- * Params: array[(object) vehicle, (scalar) frame time]
- */
-
-params ["_vehicle", "_frameTime"];
-
-if !(isNil QGVAR(buttonHoldCode)) then {
- _this call GVAR(buttonHoldCode);
-};
-
-GVAR(buttonRadius) = (call cba_fnc_getFov # 1);
diff --git a/addons/interaction/functions/fnc_pointCalculate.sqf b/addons/interaction/functions/fnc_pointCalculate.sqf
deleted file mode 100644
index 5307945..0000000
--- a/addons/interaction/functions/fnc_pointCalculate.sqf
+++ /dev/null
@@ -1,31 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_pointCalculate
- *
- * calculates pointing position and sends it to other crew
- *
- * params (array)[(object) vehicle]
- */
-
-params ["_vehicle"];
-
-GVAR(pointStart) = false;
-
-private _eye = eyePos hatchet_player;
-private _visualDiff = getPosVisual hatchet_player vectorDiff getPos hatchet_player;
-_eye = _eye vectorAdd _visualDiff;
-private _beginVec = (vectorNormalized (getCameraViewDirection hatchet_player)) vectorMultiply 0.5;
-private _begin = _eye vectorAdd _beginVec;
-private _endVec = (vectorNormalized (getCameraViewDirection hatchet_player)) vectorMultiply 5;
-private _end = _eye vectorAdd _endVec;
-private _intersections = lineIntersectsSurfaces [_begin, _end, hatchet_player, objNull, true, 1, "FIRE", "VIEW"];
-private _keyDownPos = if (count _intersections > 0) then {
- _intersections # 0 # 0
-} else {
- (eyePos hatchet_player vectorAdd _endVec)
-};
-
-if !(isNil {_keyDownPos}) then {
- private _pointPos = _vehicle worldToModelVisual ASLtoAGL _keyDownPos;
- [_vehicle, _pointPos, 0, name hatchet_player] call FUNC(pointNetSend);
-};
diff --git a/addons/interaction/functions/fnc_pointDraw.sqf b/addons/interaction/functions/fnc_pointDraw.sqf
deleted file mode 100644
index 752b6ef..0000000
--- a/addons/interaction/functions/fnc_pointDraw.sqf
+++ /dev/null
@@ -1,19 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_pointDraw
- *
- * draws pointing positions
- *
- * params (array)[(object) vehicle]
- */
-
-params ["_vehicle"];
-
-{
- if (cba_missionTime > (_x # 1) + GVAR(point_lifetime)) then {
- GVAR(point_icons) deleteAt _forEachIndex;
- } else {
- private _drawPos = if (typeName (_x # 0) == "STRING") then {_vehicle selectionPosition (_x # 0)} else {(_x # 0)};
- drawIcon3D [_x # 2, [1,0,0,1], _vehicle modelToWorldVisual _drawPos, 2, 2, 0, (_x # 3)];
- };
-} forEach GVAR(point_icons);
diff --git a/addons/interaction/functions/fnc_pointNetReceive.sqf b/addons/interaction/functions/fnc_pointNetReceive.sqf
deleted file mode 100644
index 49108ad..0000000
--- a/addons/interaction/functions/fnc_pointNetReceive.sqf
+++ /dev/null
@@ -1,17 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_pointNetReceive
- *
- * receives pointing positions and adds timestamps and textures
- *
- * params (array)[(positionModel) pointPos, (SCALAR) type, (string) player name]
- */
-
-params ["_pointPos", "_pointType", "_name"];
-
-private _pointTextures = [
- "\a3\ui_f\data\IGUI\Cfg\CrewAimIndicator\commander_ca.paa",
- "\a3\ui_f\data\IGUI\Cfg\Cursors\freelook_ca.paa"
-];
-
-GVAR(point_icons) pushBack [_pointPos, cba_missionTime, _pointTextures # _pointType, _name];
diff --git a/addons/interaction/functions/fnc_pointNetSend.sqf b/addons/interaction/functions/fnc_pointNetSend.sqf
deleted file mode 100644
index 4076ab7..0000000
--- a/addons/interaction/functions/fnc_pointNetSend.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_pointNetSend
- *
- * sends pointing positions
- *
- * params (array)[(object) vehicle, (positionModel) pointPos, (SCALAR) icon index, (string) label]
- */
-
-params ["_vehicle", "_pointPos", "_iconIndex", "_label"];
-
-if (GVAR(pointingEnabled)) then {
- [_pointPos, _iconIndex, _label] remoteExecCall [QFUNC(pointNetReceive), crew _vehicle];
-};
diff --git a/addons/interaction/functions/fnc_pointStart.sqf b/addons/interaction/functions/fnc_pointStart.sqf
deleted file mode 100644
index 42f9000..0000000
--- a/addons/interaction/functions/fnc_pointStart.sqf
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_pointStart
- *
- * used to point at something inside a vehicle, will draw a marker for other crew
- * this function only starts pointing, actual pointing code is handled inside draw3D
- *
- */
-
-private _vehicle = vehicle hatchet_player;
-if (isNil{_vehicle getVariable QGVAR(points)}) exitWith {false};
-
-GVAR(pointStart) = true;
-true
diff --git a/addons/interaction/functions/fnc_removeActions.sqf b/addons/interaction/functions/fnc_removeActions.sqf
deleted file mode 100644
index bb640fa..0000000
--- a/addons/interaction/functions/fnc_removeActions.sqf
+++ /dev/null
@@ -1,11 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_removeActions
- */
-
-{
- hatchet_player removeAction _x;
-} forEach GVAR(actionIds);
-
-GVAR(actionIds) = [];
-GVAR(actionIgnore) = [];
diff --git a/addons/interaction/functions/fnc_scriptedInteract.sqf b/addons/interaction/functions/fnc_scriptedInteract.sqf
deleted file mode 100644
index 378dd12..0000000
--- a/addons/interaction/functions/fnc_scriptedInteract.sqf
+++ /dev/null
@@ -1,29 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_scriptedInteract
- *
- * call a button or lever from a script
- */
-
-params ["_vehicle", "_config", ["_animationTargetLabel", nil]];
-
-private _vehicleConfig = _vehicle getVariable QRVAR(config);
-
-if (isNil "_vehicleConfig") exitWith {};
-
-private _configPath = _vehicleConfig >> "interaction";
-{_configPath = _configPath >> _x} forEach _config;
-private _interactionConfig = [_vehicle, _configPath] call FUNC(loadItem);
-
-if (isNil "_animationTargetLabel") exitWith {
- [_vehicle, _interactionConfig, true] call FUNC(buttonDown);
- [_vehicle, _interactionConfig, true] call FUNC(buttonUp);
-};
-
-_interactionConfig params ["_name","_condition","_subItems",["_positionType", nil],["_position", nil],["_label", nil],["_radius", nil],["_clickSound",""],["_interactCondition",{true}],["_buttonConfig", nil], ["_animConfig", nil], ["_knobConfig", nil]];
-_animConfig params ["_animation", "_animationSpeed", "_animLooping", "_animationSteps", "_animationLabels", "_animStart", "_animEnd"];
-
-private _stepIndex = _animationLabels find _animationTargetLabel;
-if (_stepIndex == -1) exitWith {};
-private _targetAnimStep = _animationSteps # _stepIndex;
-[_vehicle, _animation, _targetAnimStep, _animationTargetLabel, _animationSpeed, _animStart, _animEnd, _interactionConfig] call FUNC(leverAnimate);
diff --git a/addons/interaction/functions/fnc_setup.sqf b/addons/interaction/functions/fnc_setup.sqf
deleted file mode 100644
index e5cbadf..0000000
--- a/addons/interaction/functions/fnc_setup.sqf
+++ /dev/null
@@ -1,27 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_setup
- *
- * starts the interaction system
- *
- * params (array)[(object) vehicle]
- */
-
-params ["_vehicle"];
-
-GVAR(actionIds) = [];
-GVAR(actionIgnore) = [];
-
-_this call FUNC(loadAll);
-
-if (isNil {GVAR(drawHandler)}) then {
- GVAR(drawHandler) = addMissionEventHandler ["Draw3d", FUNC(draw3D)];
-};
-
-private _vehicleConfig = _vehicle getVariable RVAR(config);
-GVAR(crosshair) = (getNumber (_vehicleConfig >> "interaction" >> "crossHair") == 1);
-
-vxf_animating_keys = [];
-GVAR(cursorPos) = [0.5, 0.5];
-
-true
diff --git a/addons/interaction/functions/fnc_shutDown.sqf b/addons/interaction/functions/fnc_shutDown.sqf
deleted file mode 100644
index e34c5aa..0000000
--- a/addons/interaction/functions/fnc_shutDown.sqf
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "script_component.hpp"
-/*
- * hatchet_interaction_fnc_shutdown
- *
- * starts the interaction system
- *
- * params (array)[(object) vehicle]
- */
-
-call FUNC(removeActions);
diff --git a/addons/interaction/functions/script_component.hpp b/addons/interaction/functions/script_component.hpp
deleted file mode 100644
index cdc3ded..0000000
--- a/addons/interaction/functions/script_component.hpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "../script_component.hpp"
diff --git a/addons/interaction/script_component.hpp b/addons/interaction/script_component.hpp
deleted file mode 100644
index 89ee450..0000000
--- a/addons/interaction/script_component.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#define COMPONENT interaction
-#define COMPONENT_BEAUTIFIED Interaction
-#include "\z\hatchet\addons\main\script_mod.hpp"
-
-#ifdef DEBUG_ENABLED_INTERACTION
- #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_INTERACTION
- #define DEBUG_SETTINGS DEBUG_SETTINGS_INTERACTION
-#endif
-
-#include "\z\hatchet\addons\main\script_macros.hpp"
-#include "script_macros.hpp"
diff --git a/addons/interaction/script_macros.hpp b/addons/interaction/script_macros.hpp
deleted file mode 100644
index a7c4faf..0000000
--- a/addons/interaction/script_macros.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-#define PARAMS params ["_name","_condition","_subItems",["_positionType", nil],["_position", nil],["_label", nil],["_radius", nil],["_clickSound",""],["_interactCondition",{true}],["_buttonConfig", nil], ["_animConfig", nil], ["_knobConfig", nil]]
-#define BTNPARAMS params ["_buttonDown", "_buttonUp", "_buttonHold", ["_knobClick", nil]]
-#define ANIMPARAMS ["_animation", "_animationSpeed", "_animLooping", "_animationSteps", "_animationLabels", "_animStart", "_animEnd"]
-#define KNOBPARAMS ["_animation", "_scrollIncrement", "_dragRange", "_animLooping", "_animLimits", "_animSpeed", "_dragStart", "_dragging", "_dragStop"]
-#define FNC_STRING(NAME) (if(!isNil{missionNameSpace getVariable NAME}) then {missionNameSpace getVariable NAME} else {{nil}})
-#define ISFULLARRAY(ARR) (!isNil QUOTE(ARR) && {typeName ARR == "ARRAY"} && {count ARR > 0})
diff --git a/addons/interaction/sounds/dial.wss b/addons/interaction/sounds/dial.wss
deleted file mode 100644
index 8ef0330..0000000
Binary files a/addons/interaction/sounds/dial.wss and /dev/null differ
diff --git a/addons/interaction/sounds/heavySwitch.wss b/addons/interaction/sounds/heavySwitch.wss
deleted file mode 100644
index ef082fe..0000000
Binary files a/addons/interaction/sounds/heavySwitch.wss and /dev/null differ
diff --git a/addons/interaction/sounds/switch.wss b/addons/interaction/sounds/switch.wss
deleted file mode 100644
index b77b93e..0000000
Binary files a/addons/interaction/sounds/switch.wss and /dev/null differ
diff --git a/addons/interaction/sounds/switch1.wss b/addons/interaction/sounds/switch1.wss
deleted file mode 100644
index fbadb93..0000000
Binary files a/addons/interaction/sounds/switch1.wss and /dev/null differ
diff --git a/addons/interaction/sounds/switch2.wss b/addons/interaction/sounds/switch2.wss
deleted file mode 100644
index 375a063..0000000
Binary files a/addons/interaction/sounds/switch2.wss and /dev/null differ
diff --git a/addons/interaction/sounds/switch3.wss b/addons/interaction/sounds/switch3.wss
deleted file mode 100644
index 785709d..0000000
Binary files a/addons/interaction/sounds/switch3.wss and /dev/null differ
diff --git a/addons/interaction/sounds/switch4.wss b/addons/interaction/sounds/switch4.wss
deleted file mode 100644
index 533fb5c..0000000
Binary files a/addons/interaction/sounds/switch4.wss and /dev/null differ
diff --git a/addons/interaction/sounds/switch5.wss b/addons/interaction/sounds/switch5.wss
deleted file mode 100644
index 485e181..0000000
Binary files a/addons/interaction/sounds/switch5.wss and /dev/null differ
diff --git a/addons/main/$PBOPREFIX$ b/addons/main/$PBOPREFIX$
deleted file mode 100644
index 145fc49..0000000
--- a/addons/main/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\hatchet\addons\main
diff --git a/addons/main/config.cpp b/addons/main/config.cpp
deleted file mode 100644
index 68570ac..0000000
--- a/addons/main/config.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- name = QUOTE(COMPONENT);
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"cba_common"};
- author = "Project Hatchet";
- VERSION_CONFIG;
- };
-};
diff --git a/addons/main/script_component.hpp b/addons/main/script_component.hpp
deleted file mode 100644
index e40025b..0000000
--- a/addons/main/script_component.hpp
+++ /dev/null
@@ -1,17 +0,0 @@
-#define COMPONENT main
-#define COMPONENT_BEAUTIFIED Main
-#include "\z\hatchet\addons\main\script_mod.hpp"
-
-// #define DEBUG_MODE_FULL
-// #define DISABLE_COMPILE_CACHE
-// #define ENABLE_PERFORMANCE_COUNTERS
-
-#ifdef DEBUG_ENABLED_MAIN
- #define DEBUG_MODE_FULL
-#endif
-
-#ifdef DEBUG_SETTINGS_MAIN
- #define DEBUG_SETTINGS DEBUG_SETTINGS_MAIN
-#endif
-
-#include "\z\hatchet\addons\main\script_macros.hpp"
diff --git a/addons/main/script_macros.hpp b/addons/main/script_macros.hpp
deleted file mode 100644
index d1d3f3d..0000000
--- a/addons/main/script_macros.hpp
+++ /dev/null
@@ -1,14 +0,0 @@
-#include "\x\cba\addons\main\script_macros_common.hpp"
-
-#define DFUNC(var1) TRIPLES(ADDON,fnc,var1)
-
-#ifdef DISABLE_COMPILE_CACHE
- #undef PREP
- #define PREP(fncName) DFUNC(fncName) = compile preprocessFileLineNumbers QPATHTOF(functions\DOUBLES(fnc,fncName).sqf)
-#else
- #undef PREP
- #define PREP(fncName) [QPATHTOF(functions\DOUBLES(fnc,fncName).sqf), QFUNC(fncName)] call CBA_fnc_compileFunction
-#endif
-
-#define RVAR(var1) DOUBLES(PREFIX,var1)
-#define QRVAR(var1) QUOTE(RVAR(var1))
diff --git a/addons/main/script_mod.hpp b/addons/main/script_mod.hpp
deleted file mode 100644
index cb073d8..0000000
--- a/addons/main/script_mod.hpp
+++ /dev/null
@@ -1,16 +0,0 @@
-// COMPONENT should be defined in the script_component.hpp and included BEFORE this hpp
-
-#define MAINPREFIX z
-#define PREFIX hatchet
-#define SUBPREFIX addons
-
-#include "script_version.hpp"
-
-// MINIMAL required version for the Mod. Components can specify others..
-#define REQUIRED_VERSION 2.00
-
-#ifdef COMPONENT_BEAUTIFIED
- #define COMPONENT_NAME QUOTE(Hatchet - COMPONENT_BEAUTIFIED)
-#else
- #define COMPONENT_NAME QUOTE(Hatchet - COMPONENT)
-#endif
diff --git a/addons/main/script_version.hpp b/addons/main/script_version.hpp
deleted file mode 100644
index aba696b..0000000
--- a/addons/main/script_version.hpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#define MAJOR 0
-#define MINOR 2
-#define PATCH 0
-#define BUILD 0
diff --git a/addons/util/$PBOPREFIX$ b/addons/util/$PBOPREFIX$
deleted file mode 100644
index 579219b..0000000
--- a/addons/util/$PBOPREFIX$
+++ /dev/null
@@ -1 +0,0 @@
-z\hatchet\addons\util
diff --git a/addons/util/CfgEventHandlers.hpp b/addons/util/CfgEventHandlers.hpp
deleted file mode 100644
index c7a3aec..0000000
--- a/addons/util/CfgEventHandlers.hpp
+++ /dev/null
@@ -1,11 +0,0 @@
-class Extended_PreStart_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preStart));
- };
-};
-
-class Extended_PreInit_EventHandlers {
- class ADDON {
- init = QUOTE(call COMPILE_FILE(XEH_preInit));
- };
-};
diff --git a/addons/util/XEH_PREP.hpp b/addons/util/XEH_PREP.hpp
deleted file mode 100644
index 6a561a3..0000000
--- a/addons/util/XEH_PREP.hpp
+++ /dev/null
@@ -1,6 +0,0 @@
-PREP(pidCreate);
-PREP(pidReset);
-PREP(pidRun);
-
-PREP(getTurretCopilot);
-PREP(getTurretIndex);
diff --git a/addons/util/XEH_preInit.sqf b/addons/util/XEH_preInit.sqf
deleted file mode 100644
index a9c2702..0000000
--- a/addons/util/XEH_preInit.sqf
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "script_component.hpp"
-ADDON = false;
-#include "XEH_PREP.hpp"
-
-ADDON = true;
diff --git a/addons/util/XEH_preStart.sqf b/addons/util/XEH_preStart.sqf
deleted file mode 100644
index a51262a..0000000
--- a/addons/util/XEH_preStart.sqf
+++ /dev/null
@@ -1,2 +0,0 @@
-#include "script_component.hpp"
-#include "XEH_PREP.hpp"
diff --git a/addons/util/config.cpp b/addons/util/config.cpp
deleted file mode 100644
index ce28ef9..0000000
--- a/addons/util/config.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
-#include "script_component.hpp"
-
-class CfgPatches {
- class ADDON {
- name = COMPONENT_NAME;
- units[] = {};
- weapons[] = {};
- requiredVersion = REQUIRED_VERSION;
- requiredAddons[] = {"hatchet_main"};
- author = "Project Hatchet";
- VERSION_CONFIG;
- };
-};
-
-#include "CfgEventHandlers.hpp"
diff --git a/addons/util/functions/fnc_getTurretCopilot.sqf b/addons/util/functions/fnc_getTurretCopilot.sqf
deleted file mode 100644
index c139ded..0000000
--- a/addons/util/functions/fnc_getTurretCopilot.sqf
+++ /dev/null
@@ -1,22 +0,0 @@
-#include "script_component.hpp"
-/*
- * Author: commy2
- * Get the turret index of a vehicles copilot.
- *
- * Arguments:
- * 0: Vehicle