From 6c8064097fb3515d9bbae67f928a76d5a96cc665 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 28 Mar 2015 11:19:39 +0100 Subject: [PATCH 1/3] delete old resting, farewell --- addons/resting/$PBOPREFIX$ | 1 - addons/resting/CfgEventHandlers.hpp | 12 - addons/resting/CfgMoves.hpp | 1389 ----------------- addons/resting/CfgSounds.hpp | 14 - addons/resting/CfgWeapons.hpp | 22 - addons/resting/README.md | 12 - addons/resting/XEH_postInit.sqf | 23 - addons/resting/XEH_preInit.sqf | 11 - addons/resting/config.cpp | 21 - addons/resting/data/icons/icon_bipod.paa | Bin 5625 -> 0 bytes .../resting/functions/fnc_getIntersection.sqf | 70 - addons/resting/functions/fnc_hasBipod.sqf | 22 - addons/resting/functions/fnc_pfhCheckRest.sqf | 41 - addons/resting/functions/fnc_restWeapon.sqf | 66 - addons/resting/functions/fnc_unRestWeapon.sqf | 53 - addons/resting/functions/script_component.hpp | 1 - addons/resting/script_component.hpp | 19 - addons/resting/sounds/weaponrest_rest.wav | Bin 19866 -> 0 bytes addons/resting/sounds/weaponrest_unrest.wav | Bin 77354 -> 0 bytes addons/resting/stringtable.xml | 69 - 20 files changed, 1846 deletions(-) delete mode 100644 addons/resting/$PBOPREFIX$ delete mode 100644 addons/resting/CfgEventHandlers.hpp delete mode 100644 addons/resting/CfgMoves.hpp delete mode 100644 addons/resting/CfgSounds.hpp delete mode 100644 addons/resting/CfgWeapons.hpp delete mode 100644 addons/resting/README.md delete mode 100644 addons/resting/XEH_postInit.sqf delete mode 100644 addons/resting/XEH_preInit.sqf delete mode 100644 addons/resting/config.cpp delete mode 100644 addons/resting/data/icons/icon_bipod.paa delete mode 100644 addons/resting/functions/fnc_getIntersection.sqf delete mode 100644 addons/resting/functions/fnc_hasBipod.sqf delete mode 100644 addons/resting/functions/fnc_pfhCheckRest.sqf delete mode 100644 addons/resting/functions/fnc_restWeapon.sqf delete mode 100644 addons/resting/functions/fnc_unRestWeapon.sqf delete mode 100644 addons/resting/functions/script_component.hpp delete mode 100644 addons/resting/script_component.hpp delete mode 100644 addons/resting/sounds/weaponrest_rest.wav delete mode 100644 addons/resting/sounds/weaponrest_unrest.wav delete mode 100644 addons/resting/stringtable.xml diff --git a/addons/resting/$PBOPREFIX$ b/addons/resting/$PBOPREFIX$ deleted file mode 100644 index 94f2a89f81..0000000000 --- a/addons/resting/$PBOPREFIX$ +++ /dev/null @@ -1 +0,0 @@ -z\ace\addons\resting \ No newline at end of file diff --git a/addons/resting/CfgEventHandlers.hpp b/addons/resting/CfgEventHandlers.hpp deleted file mode 100644 index beb3c4d419..0000000000 --- a/addons/resting/CfgEventHandlers.hpp +++ /dev/null @@ -1,12 +0,0 @@ - -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/resting/CfgMoves.hpp b/addons/resting/CfgMoves.hpp deleted file mode 100644 index 3c4ab85a5c..0000000000 --- a/addons/resting/CfgMoves.hpp +++ /dev/null @@ -1,1389 +0,0 @@ -// CODE BELOW TAKEN FROM TMR, PREFIXES EDITED FOR COMPATABILITY - -#define ACE_SWAY_DEPLOY 0.02 -#define ACE_SWAY_DEPLOYPRONE 0.01 -#define ACE_SWAY_RESTED 0.04 //0.08 -#define ACE_SWAY_RESTEDPRONE 0.02 //0.04 -#define ACE_DEPLOY_TURNSPEED 0.1 - -// Arma 3 doesn't respect turnSpeed. - -class CfgMovesBasic { - class Default; - - class Actions { - class RifleStandActions; - class RifleStandActions_ace_deploy : RifleStandActions { - stop = "AmovPercMstpSrasWrflDnon_ace_deploy"; - default = "AmovPercMstpSrasWrflDnon_ace_deploy"; - turnL = "AmovPercMstpSrasWrflDnon_ace_deploy"; - turnR = "AmovPercMstpSrasWrflDnon_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLStandActions; - class RifleAdjustLStandActions_ace_deploy : RifleAdjustLStandActions { - stop = "AadjPercMstpSrasWrflDleft_ace_deploy"; - default = "AadjPercMstpSrasWrflDleft_ace_deploy"; - AdjustL = "AadjPercMstpSrasWrflDleft_ace_deploy"; - turnL = "AadjPercMstpSrasWrflDleft_ace_deploy"; - turnR = "AadjPercMstpSrasWrflDleft_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRStandActions; - class RifleAdjustRStandActions_ace_deploy : RifleAdjustRStandActions { - stop = "AadjPercMstpSrasWrflDright_ace_deploy"; - default = "AadjPercMstpSrasWrflDright_ace_deploy"; - AdjustRight = "AadjPercMstpSrasWrflDright_ace_deploy"; - turnL = "AadjPercMstpSrasWrflDright_ace_deploy"; - turnR = "AadjPercMstpSrasWrflDright_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFStandActions; - class RifleAdjustFStandActions_ace_deploy : RifleAdjustFStandActions { - stop = "AadjPercMstpSrasWrflDup_ace_deploy"; - default = "AadjPercMstpSrasWrflDup_ace_deploy"; - AdjustF = "AadjPercMstpSrasWrflDup_ace_deploy"; - turnL = "AadjPercMstpSrasWrflDup_ace_deploy"; - turnR = "AadjPercMstpSrasWrflDup_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBStandActions; - class RifleAdjustBStandActions_ace_deploy : RifleAdjustBStandActions { - stop = "AadjPercMstpSrasWrflDdown_ace_deploy"; - default = "AadjPercMstpSrasWrflDdown_ace_deploy"; - AdjustB = "AadjPercMstpSrasWrflDdown_ace_deploy"; - turnR = "AadjPercMstpSrasWrflDdown_ace_deploy"; - turnL = "AadjPercMstpSrasWrflDdown_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleKneelActions; - class RifleKneelActions_ace_deploy : RifleKneelActions { - stop = "AmovPknlMstpSrasWrflDnon_ace_deploy"; - default = "AmovPknlMstpSrasWrflDnon_ace_deploy"; - crouch = "AmovPknlMstpSrasWrflDnon_ace_deploy"; // TODO: this might cause issues - turnL = "AmovPknlMstpSrasWrflDnon_ace_deploy"; - turnR = "AmovPknlMstpSrasWrflDnon_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLKneelActions; - class RifleAdjustLKneelActions_ace_deploy : RifleAdjustLKneelActions { - stop = "AadjPknlMstpSrasWrflDleft_ace_deploy"; - default = "AadjPknlMstpSrasWrflDleft_ace_deploy"; - turnL = "AadjPknlMstpSrasWrflDleft_ace_deploy"; - turnR = "AadjPknlMstpSrasWrflDleft_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRKneelActions; - class RifleAdjustRKneelActions_ace_deploy : RifleAdjustRKneelActions { - stop = "AadjPknlMstpSrasWrflDright_ace_deploy"; - default = "AadjPknlMstpSrasWrflDright_ace_deploy"; - turnL = "AadjPknlMstpSrasWrflDright_ace_deploy"; - turnR = "AadjPknlMstpSrasWrflDright_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFKneelActions; - class RifleAdjustFKneelActions_ace_deploy : RifleAdjustFKneelActions { - stop = "AadjPknlMstpSrasWrflDup_ace_deploy"; - default = "AadjPknlMstpSrasWrflDup_ace_deploy"; - turnL = "AadjPknlMstpSrasWrflDup_ace_deploy"; - turnR = "AadjPknlMstpSrasWrflDup_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBKneelActions; - class RifleAdjustBKneelActions_ace_deploy : RifleAdjustBKneelActions { - stop = "AadjPknlMstpSrasWrflDdown_ace_deploy"; - default = "AadjPknlMstpSrasWrflDdown_ace_deploy"; - turnL = "AadjPknlMstpSrasWrflDdown_ace_deploy"; - turnR = "AadjPknlMstpSrasWrflDdown_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleProneActions; - class RifleProneActions_ace_deploy : RifleProneActions { - stop = "AmovPpneMstpSrasWrflDnon_ace_deploy"; - default = "AmovPpneMstpSrasWrflDnon_ace_deploy"; - turnL = "AmovPpneMstpSrasWrflDnon_ace_deploy"; - turnR = "AmovPpneMstpSrasWrflDnon_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLProneActions; - class RifleAdjustLProneActions_ace_deploy : RifleAdjustLProneActions { - stop = "AadjPpneMstpSrasWrflDleft_ace_deploy"; - default = "AadjPpneMstpSrasWrflDleft_ace_deploy"; - turnL = "AadjPpneMstpSrasWrflDleft_ace_deploy"; - turnR = "AadjPpneMstpSrasWrflDleft_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRProneActions; - class RifleAdjustRProneActions_ace_deploy : RifleAdjustRProneActions { - stop = "AadjPpneMstpSrasWrflDright_ace_deploy"; - default = "AadjPpneMstpSrasWrflDright_ace_deploy"; - turnL = "AadjPpneMstpSrasWrflDright_ace_deploy"; - turnR = "AadjPpneMstpSrasWrflDright_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFProneActions; - class RifleAdjustFProneActions_ace_deploy : RifleAdjustFProneActions { - stop = "aadjppnemstpsraswrfldup_ace_deploy"; - default = "aadjppnemstpsraswrfldup_ace_deploy"; - turnL = "aadjppnemstpsraswrfldup_ace_deploy"; - turnR = "aadjppnemstpsraswrfldup_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBProneActions; - class RifleAdjustBProneActions_ace_deploy : RifleAdjustBProneActions { - stop = "AadjPpneMstpSrasWrflDdown_ace_deploy"; - default = "AadjPpneMstpSrasWrflDdown_ace_deploy"; - turnL = "AadjPpneMstpSrasWrflDdown_ace_deploy"; - turnR = "AadjPpneMstpSrasWrflDdown_ace_deploy"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - ////////////////////////////////////////////////////////////////////// - - class RifleStandActions_ace_rested : RifleStandActions { - stop = "AmovPercMstpSrasWrflDnon_ace_rested"; - default = "AmovPercMstpSrasWrflDnon_ace_rested"; - turnL = "AmovPercMstpSrasWrflDnon_ace_rested"; - turnR = "AmovPercMstpSrasWrflDnon_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLStandActions_ace_rested : RifleAdjustLStandActions { - stop = "AadjPercMstpSrasWrflDleft_ace_rested"; - default = "AadjPercMstpSrasWrflDleft_ace_rested"; - AdjustL = "AadjPercMstpSrasWrflDleft_ace_rested"; - turnL = "AadjPercMstpSrasWrflDleft_ace_rested"; - turnR = "AadjPercMstpSrasWrflDleft_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRStandActions_ace_rested : RifleAdjustRStandActions { - stop = "AadjPercMstpSrasWrflDright_ace_rested"; - default = "AadjPercMstpSrasWrflDright_ace_rested"; - AdjustRight = "AadjPercMstpSrasWrflDright_ace_rested"; - turnL = "AadjPercMstpSrasWrflDright_ace_rested"; - turnR = "AadjPercMstpSrasWrflDright_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFStandActions_ace_rested : RifleAdjustFStandActions { - stop = "AadjPercMstpSrasWrflDup_ace_rested"; - default = "AadjPercMstpSrasWrflDup_ace_rested"; - AdjustF = "AadjPercMstpSrasWrflDup_ace_rested"; - turnL = "AadjPercMstpSrasWrflDup_ace_rested"; - turnR = "AadjPercMstpSrasWrflDup_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBStandActions_ace_rested : RifleAdjustBStandActions { - stop = "AadjPercMstpSrasWrflDdown_ace_rested"; - default = "AadjPercMstpSrasWrflDdown_ace_rested"; - AdjustB = "AadjPercMstpSrasWrflDdown_ace_rested"; - turnR = "AadjPercMstpSrasWrflDdown_ace_rested"; - turnL = "AadjPercMstpSrasWrflDdown_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleKneelActions_ace_rested : RifleKneelActions { - stop = "AmovPknlMstpSrasWrflDnon_ace_rested"; - default = "AmovPknlMstpSrasWrflDnon_ace_rested"; - crouch = "AmovPknlMstpSrasWrflDnon_ace_rested"; - turnL = "AmovPknlMstpSrasWrflDnon_ace_rested"; - turnR = "AmovPknlMstpSrasWrflDnon_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLKneelActions_ace_rested : RifleAdjustLKneelActions { - stop = "AadjPknlMstpSrasWrflDleft_ace_rested"; - default = "AadjPknlMstpSrasWrflDleft_ace_rested"; - turnL = "AadjPknlMstpSrasWrflDleft_ace_rested"; - turnR = "AadjPknlMstpSrasWrflDleft_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRKneelActions_ace_rested : RifleAdjustRKneelActions { - stop = "AadjPknlMstpSrasWrflDright_ace_rested"; - default = "AadjPknlMstpSrasWrflDright_ace_rested"; - turnL = "AadjPknlMstpSrasWrflDright_ace_rested"; - turnR = "AadjPknlMstpSrasWrflDright_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFKneelActions_ace_rested : RifleAdjustFKneelActions { - stop = "AadjPknlMstpSrasWrflDup_ace_rested"; - default = "AadjPknlMstpSrasWrflDup_ace_rested"; - turnL = "AadjPknlMstpSrasWrflDup_ace_rested"; - turnR = "AadjPknlMstpSrasWrflDup_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBKneelActions_ace_rested : RifleAdjustBKneelActions { - stop = "AadjPknlMstpSrasWrflDdown_ace_rested"; - default = "AadjPknlMstpSrasWrflDdown_ace_rested"; - turnL = "AadjPknlMstpSrasWrflDdown_ace_rested"; - turnR = "AadjPknlMstpSrasWrflDdown_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleProneActions_ace_rested : RifleProneActions { - stop = "AmovPpneMstpSrasWrflDnon_ace_rested"; - default = "AmovPpneMstpSrasWrflDnon_ace_rested"; - turnL = "AmovPpneMstpSrasWrflDnon_ace_rested"; - turnR = "AmovPpneMstpSrasWrflDnon_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustLProneActions_ace_rested : RifleAdjustLProneActions { - stop = "AadjPpneMstpSrasWrflDleft_ace_rested"; - default = "AadjPpneMstpSrasWrflDleft_ace_rested"; - turnL = "AadjPpneMstpSrasWrflDleft_ace_rested"; - turnR = "AadjPpneMstpSrasWrflDleft_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustRProneActions_ace_rested : RifleAdjustRProneActions { - stop = "AadjPpneMstpSrasWrflDright_ace_rested"; - default = "AadjPpneMstpSrasWrflDright_ace_rested"; - turnL = "AadjPpneMstpSrasWrflDright_ace_rested"; - turnR = "AadjPpneMstpSrasWrflDright_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustFProneActions_ace_rested : RifleAdjustFProneActions { - stop = "aadjppnemstpsraswrfldup_ace_rested"; - default = "aadjppnemstpsraswrfldup_ace_rested"; - turnL = "aadjppnemstpsraswrfldup_ace_rested"; - turnR = "aadjppnemstpsraswrfldup_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class RifleAdjustBProneActions_ace_rested : RifleAdjustBProneActions { - stop = "AadjPpneMstpSrasWrflDdown_ace_rested"; - default = "AadjPpneMstpSrasWrflDdown_ace_rested"; - turnL = "AadjPpneMstpSrasWrflDdown_ace_rested"; - turnR = "AadjPpneMstpSrasWrflDdown_ace_rested"; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - ////////////////////////////////////////////////////////////////////// - // FFV - ////////////////////////////////////////////////////////////////////// - - class passenger_inside_1Actions; - class passenger_inside_1Actions_ace_deploy : passenger_inside_1Actions { - stop = "passenger_inside_1_Aim_ace_deploy"; - default = "passenger_inside_1_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_2Actions; - class passenger_inside_2Actions_ace_deploy : passenger_inside_2Actions { - stop = "passenger_inside_2_Aim_ace_deploy"; - default = "passenger_inside_2_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_3Actions; - class passenger_inside_3Actions_ace_deploy : passenger_inside_3Actions { - stop = "passenger_inside_3_Aim_ace_deploy"; - default = "passenger_inside_3_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_4Actions; - class passenger_inside_4Actions_ace_deploy : passenger_inside_4Actions { - stop = "passenger_inside_4_Aim_ace_deploy"; - default = "passenger_inside_4_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_bench_1Actions; - class passenger_bench_1Actions_ace_deploy : passenger_bench_1Actions { - stop = "passenger_bench_1_Aim_ace_deploy"; - default = "passenger_bench_1_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_1Actions; - class passenger_boat_1Actions_ace_deploy : passenger_boat_1Actions { - stop = "passenger_boat_1_Aim_ace_deploy"; - default = "passenger_boat_1_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_2Actions; - class passenger_boat_2Actions_ace_deploy : passenger_boat_2Actions { - stop = "passenger_boat_2_Aim_ace_deploy"; - default = "passenger_boat_2_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_3Actions; - class passenger_boat_3Actions_ace_deploy : passenger_boat_3Actions { - stop = "passenger_boat_3_Aim_ace_deploy"; - default = "passenger_boat_3_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_4Actions; - class passenger_boat_4Actions_ace_deploy : passenger_boat_4Actions { - stop = "passenger_boat_4_Aim_ace_deploy"; - default = "passenger_boat_4_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_1Actions; - class passenger_flatground_1Actions_ace_deploy : passenger_flatground_1Actions { - stop = "passenger_flatground_1_Aim_ace_deploy"; - default = "passenger_flatground_1_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_2Actions; - class passenger_flatground_2Actions_ace_deploy : passenger_flatground_2Actions { - stop = "passenger_flatground_2_Aim_ace_deploy"; - default = "passenger_flatground_2_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_3Actions; - class passenger_flatground_3Actions_ace_deploy : passenger_flatground_3Actions { - stop = "passenger_flatground_3_Aim_ace_deploy"; - default = "passenger_flatground_3_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_4Actions; - class passenger_flatground_4Actions_ace_deploy : passenger_flatground_4Actions { - stop = "passenger_flatground_4_Aim_ace_deploy"; - default = "passenger_flatground_4_Aim_ace_deploy"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - ////////////////////////////////////////////////////////////////////// - - class passenger_inside_1Actions_ace_rested : passenger_inside_1Actions { - stop = "passenger_inside_1_Aim_ace_rested"; - default = "passenger_inside_1_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_2Actions_ace_rested : passenger_inside_2Actions { - stop = "passenger_inside_2_Aim_ace_rested"; - default = "passenger_inside_2_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_3Actions_ace_rested : passenger_inside_3Actions { - stop = "passenger_inside_3_Aim_ace_rested"; - default = "passenger_inside_3_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_inside_4Actions_ace_rested : passenger_inside_4Actions { - stop = "passenger_inside_4_Aim_ace_rested"; - default = "passenger_inside_4_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_bench_1Actions_ace_rested : passenger_bench_1Actions { - stop = "passenger_bench_1_Aim_ace_rested"; - default = "passenger_bench_1_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_1Actions_ace_rested : passenger_boat_1Actions { - stop = "passenger_boat_1_Aim_ace_rested"; - default = "passenger_boat_1_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_2Actions_ace_rested : passenger_boat_2Actions { - stop = "passenger_boat_2_Aim_ace_rested"; - default = "passenger_boat_2_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_3Actions_ace_rested : passenger_boat_3Actions { - stop = "passenger_boat_3_Aim_ace_rested"; - default = "passenger_boat_3_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_boat_4Actions_ace_rested : passenger_boat_4Actions { - stop = "passenger_boat_4_Aim_ace_rested"; - default = "passenger_boat_4_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_1Actions_ace_rested : passenger_flatground_1Actions { - stop = "passenger_flatground_1_Aim_ace_rested"; - default = "passenger_flatground_1_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_2Actions_ace_rested : passenger_flatground_2Actions { - stop = "passenger_flatground_2_Aim_ace_rested"; - default = "passenger_flatground_2_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_3Actions_ace_rested : passenger_flatground_3Actions { - stop = "passenger_flatground_3_Aim_ace_rested"; - default = "passenger_flatground_3_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - - class passenger_flatground_4Actions_ace_rested : passenger_flatground_4Actions { - stop = "passenger_flatground_4_Aim_ace_rested"; - default = "passenger_flatground_4_Aim_ace_rested"; - turnL = ""; - turnR = ""; - turnSpeed = ACE_DEPLOY_TURNSPEED; - limitFast = 1; - }; - }; -}; - -class CfgMovesMaleSdr : CfgMovesBasic { - class States { - class AmovPercMstpSrasWrflDnon; - class AmovPercMstpSrasWrflDnon_ace_deploy : AmovPercMstpSrasWrflDnon { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"AmovPercMstpSrasWrflDnon_ace_deploy", 0.02}; - ConnectFrom[] = {"AmovPercMstpSrasWrflDnon_ace_deploy", 0.02}; - InterpolateFrom[] = {"AmovPercMstpSrasWrflDnon", 0.02}; - InterpolateTo[] = {"AmovPercMstpSrasWrflDnon", 0.02}; - }; - - class aadjpercmstpsraswrfldup; - class aadjpercmstpsraswrfldup_ace_deploy : aadjpercmstpsraswrfldup { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustFStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldup_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldup_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldup", 0.02}; - }; - - class aadjpercmstpsraswrflddown; - class aadjpercmstpsraswrflddown_ace_deploy : aadjpercmstpsraswrflddown { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustBStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrflddown_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrflddown_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrflddown", 0.02}; - }; - - class aadjpercmstpsraswrfldright; - class aadjpercmstpsraswrfldright_ace_deploy : aadjpercmstpsraswrfldright { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustRStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldright_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldright_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldright", 0.02}; - }; - - class aadjpercmstpsraswrfldleft; - class aadjpercmstpsraswrfldleft_ace_deploy : aadjpercmstpsraswrfldleft { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustLStandActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldleft_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldleft_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldleft", 0.02}; - }; - - class aadjpknlmstpsraswrfldup; - class aadjpknlmstpsraswrfldup_ace_deploy : aadjpknlmstpsraswrfldup { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustFKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldup_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldup_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldup", 0.02}; - }; - - class amovpknlmstpsraswrfldnon; - class amovpknlmstpsraswrfldnon_ace_deploy : amovpknlmstpsraswrfldnon { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"amovpknlmstpsraswrfldnon_ace_deploy", 0.02}; - ConnectFrom[] = {"amovpknlmstpsraswrfldnon_ace_deploy", 0.02}; - InterpolateFrom[] = {"amovpknlmstpsraswrfldnon", 0.02}; - InterpolateTo[] = {"amovpknlmstpsraswrfldnon", 0.02}; - }; - - class aadjpknlmstpsraswrflddown; - class aadjpknlmstpsraswrflddown_ace_deploy : aadjpknlmstpsraswrflddown { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustBKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrflddown_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrflddown_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrflddown", 0.02}; - }; - - class aadjpknlmstpsraswrfldleft; - class aadjpknlmstpsraswrfldleft_ace_deploy : aadjpknlmstpsraswrfldleft { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustLKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldleft_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldleft_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldleft", 0.02}; - }; - - class aadjpknlmstpsraswrfldright; - class aadjpknlmstpsraswrfldright_ace_deploy : aadjpknlmstpsraswrfldright { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "RifleAdjustRKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldright_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldright_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldright", 0.02}; - }; - - class aadjppnemstpsraswrfldup; - class aadjppnemstpsraswrfldup_ace_deploy : aadjppnemstpsraswrfldup { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleAdjustFProneActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldup_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldup_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldup", 0.02}; - }; - - class amovppnemstpsraswrfldnon; - class amovppnemstpsraswrfldnon_ace_deploy : amovppnemstpsraswrfldnon { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleProneActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"amovppnemstpsraswrfldnon_ace_deploy", 0.02}; - ConnectFrom[] = {"amovppnemstpsraswrfldnon_ace_deploy", 0.02}; - InterpolateFrom[] = {"amovppnemstpsraswrfldnon", 0.02}; - InterpolateTo[] = {"amovppnemstpsraswrfldnon", 0.02}; - }; - - class aadjppnemstpsraswrflddown; - class aadjppnemstpsraswrflddown_ace_deploy : aadjppnemstpsraswrflddown { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleAdjustBKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrflddown_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrflddown_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrflddown", 0.02}; - }; - - class aadjppnemstpsraswrfldleft; - class aadjppnemstpsraswrfldleft_ace_deploy : aadjppnemstpsraswrfldleft { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleAdjustLKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldleft_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldleft_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldleft", 0.02}; - }; - - class aadjppnemstpsraswrfldright; - class aadjppnemstpsraswrfldright_ace_deploy : aadjppnemstpsraswrfldright { - aimPrecision = ACE_SWAY_DEPLOYPRONE; - actions = "RifleAdjustRKneelActions_ace_deploy"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldright_ace_deploy", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldright_ace_deploy", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldright", 0.02}; - }; - - ///////////////////////////////////////////////////////////////////////////// - - class AmovPercMstpSrasWrflDnon_ace_rested : AmovPercMstpSrasWrflDnon { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"AmovPercMstpSrasWrflDnon_ace_rested", 0.02}; - ConnectFrom[] = {"AmovPercMstpSrasWrflDnon_ace_rested", 0.02}; - InterpolateFrom[] = {"AmovPercMstpSrasWrflDnon", 0.02}; - InterpolateTo[] = {"AmovPercMstpSrasWrflDnon", 0.02}; - }; - - class aadjpercmstpsraswrfldup_ace_rested : aadjpercmstpsraswrfldup { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustFStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldup_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldup_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldup", 0.02}; - }; - - class aadjpercmstpsraswrflddown_ace_rested : aadjpercmstpsraswrflddown { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustBStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrflddown_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrflddown_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrflddown", 0.02}; - }; - - class aadjpercmstpsraswrfldright_ace_rested : aadjpercmstpsraswrfldright { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustRStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldright_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldright_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldright", 0.02}; - }; - - class aadjpercmstpsraswrfldleft_ace_rested : aadjpercmstpsraswrfldleft { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustLStandActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpercmstpsraswrfldleft_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpercmstpsraswrfldleft_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpercmstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjpercmstpsraswrfldleft", 0.02}; - }; - - class aadjpknlmstpsraswrfldup_ace_rested : aadjpknlmstpsraswrfldup { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustFKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldup_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldup_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldup", 0.02}; - }; - - class amovpknlmstpsraswrfldnon_ace_rested : amovpknlmstpsraswrfldnon { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"amovpknlmstpsraswrfldnon_ace_rested", 0.02}; - ConnectFrom[] = {"amovpknlmstpsraswrfldnon_ace_rested", 0.02}; - InterpolateFrom[] = {"amovpknlmstpsraswrfldnon", 0.02}; - InterpolateTo[] = {"amovpknlmstpsraswrfldnon", 0.02}; - }; - - class aadjpknlmstpsraswrflddown_ace_rested : aadjpknlmstpsraswrflddown { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustBKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrflddown_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrflddown_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrflddown", 0.02}; - }; - - class aadjpknlmstpsraswrfldleft_ace_rested : aadjpknlmstpsraswrfldleft { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustLKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldleft_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldleft_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldleft", 0.02}; - }; - - class aadjpknlmstpsraswrfldright_ace_rested : aadjpknlmstpsraswrfldright { - aimPrecision = ACE_SWAY_RESTED; - actions = "RifleAdjustRKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjpknlmstpsraswrfldright_ace_rested", 0.02}; - ConnectFrom[] = {"aadjpknlmstpsraswrfldright_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjpknlmstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjpknlmstpsraswrfldright", 0.02}; - }; - - class aadjppnemstpsraswrfldup_ace_rested : aadjppnemstpsraswrfldup { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleAdjustFProneActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldup_ace_rested", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldup_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldup", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldup", 0.02}; - }; - - class amovppnemstpsraswrfldnon_ace_rested : amovppnemstpsraswrfldnon { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleProneActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"amovppnemstpsraswrfldnon_ace_rested", 0.02}; - ConnectFrom[] = {"amovppnemstpsraswrfldnon_ace_rested", 0.02}; - InterpolateFrom[] = {"amovppnemstpsraswrfldnon", 0.02}; - InterpolateTo[] = {"amovppnemstpsraswrfldnon", 0.02}; - }; - - class aadjppnemstpsraswrflddown_ace_rested : aadjppnemstpsraswrflddown { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleAdjustBKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrflddown_ace_rested", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrflddown_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrflddown", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrflddown", 0.02}; - }; - - class aadjppnemstpsraswrfldleft_ace_rested : aadjppnemstpsraswrfldleft { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleAdjustLKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldleft_ace_rested", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldleft_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldleft", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldleft", 0.02}; - }; - - class aadjppnemstpsraswrfldright_ace_rested : aadjppnemstpsraswrfldright { - aimPrecision = ACE_SWAY_RESTEDPRONE; - actions = "RifleAdjustRKneelActions_ace_rested"; - aiming = "aimingLying"; - speed = 0.01; - onLandEnd = true; - onLandBeg = true; - - ConnectTo[] = {"aadjppnemstpsraswrfldright_ace_rested", 0.02}; - ConnectFrom[] = {"aadjppnemstpsraswrfldright_ace_rested", 0.02}; - InterpolateFrom[] = {"aadjppnemstpsraswrfldright", 0.02}; - InterpolateTo[] = {"aadjppnemstpsraswrfldright", 0.02}; - }; - - ////////////////////////////////////////////////////////////////////// - // FFV - ////////////////////////////////////////////////////////////////////// - - class passenger_bench_1_Aim; - class passenger_bench_1_Aim_ace_deploy : passenger_bench_1_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_bench_1Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_bench_1_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_bench_1_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_bench_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_bench_1_Aim", 0.02}; - }; - - class passenger_inside_1_Aim; - class passenger_inside_1_Aim_ace_deploy : passenger_inside_1_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_inside_1Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_1_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_inside_1_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_inside_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_1_Aim", 0.02}; - }; - - class passenger_inside_2_Aim; - class passenger_inside_2_Aim_ace_deploy : passenger_inside_2_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_inside_2Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_2_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_inside_2_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_inside_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_2_Aim", 0.02}; - }; - - class passenger_inside_3_Aim; - class passenger_inside_3_Aim_ace_deploy : passenger_inside_3_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_inside_3Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_3_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_inside_3_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_inside_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_3_Aim", 0.02}; - }; - - class passenger_inside_4_Aim; - class passenger_inside_4_Aim_ace_deploy : passenger_inside_4_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_inside_4Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_4_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_inside_4_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_inside_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_4_Aim", 0.02}; - }; - - class passenger_boat_1_Aim; - class passenger_boat_1_Aim_ace_deploy : passenger_boat_1_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_boat_1Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_1_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_boat_1_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_boat_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_1_Aim", 0.02}; - }; - - class passenger_boat_2_Aim; - class passenger_boat_2_Aim_ace_deploy : passenger_boat_2_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_boat_2Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_2_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_boat_2_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_boat_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_2_Aim", 0.02}; - }; - - class passenger_boat_3_Aim; - class passenger_boat_3_Aim_ace_deploy : passenger_boat_3_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_boat_3Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_3_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_boat_3_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_boat_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_3_Aim", 0.02}; - }; - - class passenger_boat_4_Aim; - class passenger_boat_4_Aim_ace_deploy : passenger_boat_4_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_boat_4Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_4_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_boat_4_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_boat_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_4_Aim", 0.02}; - }; - - class passenger_flatground_1_Aim; - class passenger_flatground_1_Aim_ace_deploy : passenger_flatground_1_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_flatground_1Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_1_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_flatground_1_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_flatground_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_1_Aim", 0.02}; - }; - - class passenger_flatground_2_Aim; - class passenger_flatground_2_Aim_ace_deploy : passenger_flatground_2_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_flatground_2Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_2_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_flatground_2_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_flatground_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_2_Aim", 0.02}; - }; - - class passenger_flatground_3_Aim; - class passenger_flatground_3_Aim_ace_deploy : passenger_flatground_3_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_flatground_3Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_3_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_flatground_3_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_flatground_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_3_Aim", 0.02}; - }; - - class passenger_flatground_4_Aim; - class passenger_flatground_4_Aim_ace_deploy : passenger_flatground_4_Aim { - aimPrecision = ACE_SWAY_DEPLOY; - actions = "passenger_flatground_4Actions_ace_deploy"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_4_Aim_ace_deploy", 0.02}; - ConnectFrom[] = {"passenger_flatground_4_Aim_ace_deploy", 0.02}; - InterpolateFrom[] = {"passenger_flatground_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_4_Aim", 0.02}; - }; - - ////////////////////////////////////////////////////////////////////// - - class passenger_bench_1_Aim_ace_rested : passenger_bench_1_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_bench_1Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_bench_1_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_bench_1_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_bench_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_bench_1_Aim", 0.02}; - }; - - class passenger_inside_1_Aim_ace_rested : passenger_inside_1_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_inside_1Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_1_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_inside_1_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_inside_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_1_Aim", 0.02}; - }; - - class passenger_inside_2_Aim_ace_rested : passenger_inside_2_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_inside_2Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_2_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_inside_2_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_inside_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_2_Aim", 0.02}; - }; - - class passenger_inside_3_Aim_ace_rested : passenger_inside_3_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_inside_3Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_3_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_inside_3_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_inside_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_3_Aim", 0.02}; - }; - - class passenger_inside_4_Aim_ace_rested : passenger_inside_4_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_inside_4Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_inside_4_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_inside_4_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_inside_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_inside_4_Aim", 0.02}; - }; - - class passenger_boat_1_Aim_ace_rested : passenger_boat_1_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_boat_1Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_1_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_boat_1_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_boat_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_1_Aim", 0.02}; - }; - - class passenger_boat_2_Aim_ace_rested : passenger_boat_2_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_boat_2Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_2_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_boat_2_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_boat_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_2_Aim", 0.02}; - }; - - class passenger_boat_3_Aim_ace_rested : passenger_boat_3_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_boat_3Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_3_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_boat_3_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_boat_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_3_Aim", 0.02}; - }; - - class passenger_boat_4_Aim_ace_rested : passenger_boat_4_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_boat_4Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_boat_4_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_boat_4_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_boat_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_boat_4_Aim", 0.02}; - }; - - class passenger_flatground_1_Aim_ace_rested : passenger_flatground_1_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_flatground_1Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_1_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_flatground_1_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_flatground_1_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_1_Aim", 0.02}; - }; - - class passenger_flatground_2_Aim_ace_rested : passenger_flatground_2_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_flatground_2Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_2_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_flatground_2_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_flatground_2_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_2_Aim", 0.02}; - }; - - class passenger_flatground_3_Aim_ace_rested : passenger_flatground_3_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_flatground_3Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_3_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_flatground_3_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_flatground_3_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_3_Aim", 0.02}; - }; - - class passenger_flatground_4_Aim_ace_rested : passenger_flatground_4_Aim { - aimPrecision = ACE_SWAY_RESTED; - actions = "passenger_flatground_4Actions_ace_rested"; - aiming = "aimingDefault"; - speed = 0.01; - onLandEnd = false; - onLandBeg = false; - - ConnectTo[] = {"passenger_flatground_4_Aim_ace_rested", 0.02}; - ConnectFrom[] = {"passenger_flatground_4_Aim_ace_rested", 0.02}; - InterpolateFrom[] = {"passenger_flatground_4_Aim", 0.02}; - InterpolateTo[] = {"passenger_flatground_4_Aim", 0.02}; - }; - }; -}; diff --git a/addons/resting/CfgSounds.hpp b/addons/resting/CfgSounds.hpp deleted file mode 100644 index b55d4d9ae8..0000000000 --- a/addons/resting/CfgSounds.hpp +++ /dev/null @@ -1,14 +0,0 @@ -class CfgSounds { - class GVAR(rest) - { - name=QGVAR(rest); - sound[]={QUOTE(PATHTOF(sounds\weaponrest_rest.wav)),1,1}; - titles[]={}; - }; - class GVAR(unrest) - { - name=QGVAR(unrest); - sound[]={QUOTE(PATHTOF(sounds\weaponrest_unrest.wav)),1,1}; - titles[]={}; - }; -}; \ No newline at end of file diff --git a/addons/resting/CfgWeapons.hpp b/addons/resting/CfgWeapons.hpp deleted file mode 100644 index 56bef2c033..0000000000 --- a/addons/resting/CfgWeapons.hpp +++ /dev/null @@ -1,22 +0,0 @@ -class CfgWeapons { - class Rifle_Long_Base_F; - class arifle_MX_Base_F; - - class arifle_MX_SW_F : arifle_MX_Base_F { - ACE_Bipod = 1; - }; - - class LMG_Mk200_F : Rifle_Long_Base_F { - ACE_Bipod = 1; - }; - class LMG_Zafir_F: Rifle_Long_Base_F { - ACE_Bipod = 1; - }; - - class LRR_base_F : Rifle_Long_Base_F { - ACE_Bipod = 1; - }; - class GM6_base_F : Rifle_Long_Base_F { - ACE_Bipod = 1; - }; -}; diff --git a/addons/resting/README.md b/addons/resting/README.md deleted file mode 100644 index 477ced17b5..0000000000 --- a/addons/resting/README.md +++ /dev/null @@ -1,12 +0,0 @@ -ace_resting -=========== - -Introduces weapon resting and bipod deployment, allowing the player to increase the stability of his weapon. - - -## Maintainers - -The people responsible for merging changes to this component or answering potential questions. - -- [KoffeinFlummi](https://github.com/KoffeinFlummi) -- [commy2](https://github.com/commy2) diff --git a/addons/resting/XEH_postInit.sqf b/addons/resting/XEH_postInit.sqf deleted file mode 100644 index bd78ae0044..0000000000 --- a/addons/resting/XEH_postInit.sqf +++ /dev/null @@ -1,23 +0,0 @@ -// by esteldunedain -#include "script_component.hpp" - -if !(hasInterface) exitWith {}; - -// Add keybinds -["ACE3", QGVAR(RestWeapon), localize "STR_ACE_Resting_RestWeapon", -{ - // Conditions: canInteract - if !([ACE_player, objNull, []] call EFUNC(common,canInteractWith)) exitWith {false}; - // Conditions: specific - if !([ACE_player] call EFUNC(common,canUseWeapon) && - {inputAction 'reloadMagazine' == 0} && - {!weaponLowered ACE_player} && - {speed ACE_player < 1}) exitWith {false}; - - // Statement - [ACE_player, vehicle ACE_player, currentWeapon ACE_player] call FUNC(restWeapon); - // Return false so it doesn't block other actions - false -}, -{false}, -[15, [false, false, false]], false] call cba_fnc_addKeybind; diff --git a/addons/resting/XEH_preInit.sqf b/addons/resting/XEH_preInit.sqf deleted file mode 100644 index 6a2a2040b7..0000000000 --- a/addons/resting/XEH_preInit.sqf +++ /dev/null @@ -1,11 +0,0 @@ -#include "script_component.hpp" - -ADDON = false; - -PREP(getIntersection); -PREP(hasBipod); -PREP(pfhCheckRest); -PREP(restWeapon); -PREP(unRestWeapon); - -ADDON = true; diff --git a/addons/resting/config.cpp b/addons/resting/config.cpp deleted file mode 100644 index f1cc20c6e2..0000000000 --- a/addons/resting/config.cpp +++ /dev/null @@ -1,21 +0,0 @@ -#include "script_component.hpp" - -class CfgPatches { - class ADDON { - units[] = {}; - weapons[] = {}; - requiredVersion = REQUIRED_VERSION; - requiredAddons[] = {"ace_common"}; - author[] = {"KoffeinFlummi", "TaoSensai", "esteldunedain"}; - authorUrl = "https://github.com/KoffeinFlummi/"; - VERSION_CONFIG; - }; -}; - -#include "CfgEventHandlers.hpp" - -#include "CfgWeapons.hpp" - -#include "CfgMoves.hpp" - -#include "CfgSounds.hpp" \ No newline at end of file diff --git a/addons/resting/data/icons/icon_bipod.paa b/addons/resting/data/icons/icon_bipod.paa deleted file mode 100644 index c2b6a2fb3e1b92e0b33034dbd7dbffc855baa9e0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 5625 zcmeGg3s6*5^gebU5tF-+Y)U{bilpV3&g7<{?%R~lIx0KGBd0CC*hd+t5= z-1EQZKAuKLTjHif$6K_7kmly*Q4F7DnSnS3Ks?$qJqmFS9>m{>ii#EB|1x;8{0PYo zAY_Aqkkjz=4g?|)0vsMNj3CzBFl(-sQbI&gG-xhLsZR3uK?N5;hQ}L5RhU-hz4}8N z>WfaC(G+-kRR_A4paaOTby8$4VAX)54|Qeh?NvFK%{XrZ0YK4oLpf z5J^E^X+=1b7Zjoq{x%etQoHN7Zdt~0758{z>y*+frQsUdv2N5Wp0f3gEmz4y@-)}ad`^`txhgQnOrn6!cLvS<_BisM-INTQ6Zk>5iE}Tj!2JTpK_*S~YeN(fDyH z{c{qf=W@CcWtMnrXQq78+{N?<^@VsMemH6Q!0|Y16D*d8t+no^dN%BGR8q;|lb@hG z9Js!qvAq!dovF(2e`xs(=Z;jCzqYtI@n(64mRF|NwWf74ZF!zweFj%zyp%wMc%8{%6dVtiO(+3HI(Wa4kNt<;AVag8Xxo>ohn z%N#P(mw>C{L$mlVDwzbnvb4L!?prp-P`|{u^Q3+4Ls?rPu< zz=bxf>pE4a#J``PAcS68y0`k;k8^PUhp#;$11?HQwHI97`4F8v1bjs&rDocEg3{nR zLY^F#2lXi|Ha86AgYtY!yx-H_%{E;v(bwa84)S4O8I{Xua{<}|^?fGm+BWmyv%_&7 zfD2{$xPt8m{Y9_s&A8mPexk_p`jZ!+Iu+3GU9dT<(;mp|D%Z=UihO4W(|kCCSY=+o4E@Rn9@UYrof;>#aQ9Q)<=0ZtGRo)8B?2OW#0Ctn1Z&(E$BoKs)9`Ash%3 zA-2juKA^w*9<KPXDj>g?z5HuGgY|BEO8!GZ^FFsRd$^Puq-ZM|D$cWb zfR{4jzh5tx(>4cUk7GOpPm+?={4+rQjcbA88=vg92V9wI=~aE8yKjaB?47m$r#2EJ zWR=GbfOuLN9J~`A`MZ=_9#hf9(hl-6Yz@@J1+uvs(-xfIe}`lFPW*5$1S33ZX!pcz zE-7_WMjDhsxMsmQL>KZfy(|)s#SL%H*3q*_jmKnuTX?uHG1qVFDjl+PpOO~W6T=8p zx8ski5sdKQJRCzee71@aGiNgL!#02XN9HA_oyxI`2k+3vPruu8FrCc<3r-iW zx9iG?9_ax*1~vk6Kl=~Ql@cT1B*67N^qE77kL($eDIaz76Mzi^BfOE{)QfONo6>8l znS4AyvcY7G{&>*WNblJkXjOXn%fJZl+sUJ8HZ63uHl4>y2y|hbca1~d|80m9udQ$m z@mxFA^?pUBvic^gg43~ zy7HUksAQ+2FDIt#-k#tra$lot*VA03=K`g~AgB~b58E52JM4R_>2U|fgVDrTvzJP* zj`SDKL%e9Md1~7xMmJq^bk{3w6YRzL7w-shW_4Afd_Ax2{k8us`h0#&KLQ4EKaPhs zWp0kAO|D(J3u z4q#ybx97OPy4myJ$(YaNfo7D`k=PaLY1y;;Rrvv121a-zfA7s1X)aR|mdEKX}I1x+y> "CfgWeapons" >> _weapon; - -getNumber (_config >> "ACE_Bipod") == 1 || -getNumber (_config >> "AGM_Bipod") == 1 || -{getNumber (_config >> "tmr_autorest_deployable") == 1} diff --git a/addons/resting/functions/fnc_pfhCheckRest.sqf b/addons/resting/functions/fnc_pfhCheckRest.sqf deleted file mode 100644 index 0f6fea300b..0000000000 --- a/addons/resting/functions/fnc_pfhCheckRest.sqf +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Author: KoffeinFlummi, edited by commy2 and esteldunedain - * - * PFH that check for player moving away, changing weapon, etc - * and unrests the weapon if necessary - * - * Arguments: - * 0: unit - * 1: vehicle - * 2: weapon - * 3: rested position - * - * Return Values: - * None - * - */ -#include "script_component.hpp" - -EXPLODE_2_PVT(_this,_params,_pfhId); -EXPLODE_4_PVT(_params,_unit,_vehicle,_weapon,_restedPosition); - -if !(_unit getVariable ["ACE_weaponRested", false]) exitWith { - [_pfhId] call cba_fnc_removePerFrameHandler; -}; - -private ["_intersects"]; -_intersects = _params call FUNC(getIntersection); - -if ( - _unit != ACE_player - || {_vehicle != vehicle _unit} - || {inputAction "reloadMagazine" != 0} - || {weaponLowered _unit} - || {speed _unit > 1} - || {currentWeapon _unit != _weapon} - || {getPosASL _unit distanceSqr _restedPosition > 1} - || {!(true in _intersects)} -) exitWith { - [_pfhId] call cba_fnc_removePerFrameHandler; - [_unit, _vehicle, _weapon] call FUNC(unRestWeapon); -}; diff --git a/addons/resting/functions/fnc_restWeapon.sqf b/addons/resting/functions/fnc_restWeapon.sqf deleted file mode 100644 index 75d16a62be..0000000000 --- a/addons/resting/functions/fnc_restWeapon.sqf +++ /dev/null @@ -1,66 +0,0 @@ -/* - * Author: KoffeinFlummi, edited by commy2 and esteldunedain - * - * Rests the player's weapon if possible. - * - * Arguments: - * None - * - * Return Values: - * None - * - */ -#include "script_component.hpp" - -EXPLODE_3_PVT(_this,_unit,_vehicle,_weapon); - -if (_weapon != primaryWeapon _unit) exitWith {}; - -if (_unit getVariable ["ACE_weaponRested", false]) exitWith {_this call FUNC(unRestWeapon)}; - -// exit if this is not an available animation -if (!isClass (configFile >> "CfgMovesMaleSdr" >> "States" >> format ["%1_ace_deploy", animationState _unit])) exitWith {}; - -// CHECK FOR APPROPRIATE SURFACE -private "_intersects"; -_intersects = _this call FUNC(getIntersection); - -if (true in _intersects) then { - _unit setVariable ["ACE_weaponRested", true]; - if (_unit == ACE_PLAYER) then { - [QGVAR(bipodDeployed), true, QUOTE(PATHTOF(data\icons\icon_bipod.paa)), [1,1,1,1], -1] call EFUNC(common,displayIcon); - }; - - private "_restedPosition"; - _restedPosition = getPosASL _unit; - - // REST THE WEAPON - addCamShake CAMSHAKE; - playSound QGVAR(rest); - - if ([_weapon] call FUNC(hasBipod) && {_intersects select 3}) then { - _unit setVariable ["ACE_bipodDeployed", true]; - - _unit setUnitRecoilCoefficient (BIPODRECOIL * unitRecoilCoefficient _unit); - //[_unit, format ["%1_ace_deploy", animationState _unit], 2] call EFUNC(common,doAnimation); - _unit switchMove format ["%1_ace_deploy", animationState _unit]; - - private "_picture"; - _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); - [localize "STR_ACE_Resting_BipodDeployed", _picture] call EFUNC(common,displayTextPicture); - - } else { - _unit setVariable ["ACE_bipodDeployed", false]; - - _unit setUnitRecoilCoefficient (RESTEDRECOIL * unitRecoilCoefficient _unit); - //[_unit, format ["%1_ace_rested", animationState _unit], 2] call EFUNC(common,doAnimation); - _unit switchMove format ["%1_ace_rested", animationState _unit]; - - private "_picture"; - _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); - [localize "STR_ACE_Resting_WeaponRested", _picture] call EFUNC(common,displayTextPicture); - }; - - // Launch a PFH to check for player moving away, changing weapon, etc - [FUNC(pfhCheckRest), 0.2, [_unit, _vehicle, _weapon, _restedPosition] ] call CBA_fnc_addPerFrameHandler; -}; diff --git a/addons/resting/functions/fnc_unRestWeapon.sqf b/addons/resting/functions/fnc_unRestWeapon.sqf deleted file mode 100644 index ef5a52b824..0000000000 --- a/addons/resting/functions/fnc_unRestWeapon.sqf +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Author: KoffeinFlummi, edited by commy2 and esteldunedain - * - * Un Rests the player's weapon - * - * Arguments: - * 0: unit - * 1: vehicle - * 2: weapon - * - * Return Values: - * None - * - */ -#include "script_component.hpp" - -EXPLODE_3_PVT(_this,_unit,_vehicle,_weapon); - -addCamShake CAMSHAKE; - -private "_animation"; -_animation = animationState _unit; - -if (_unit getVariable ["ACE_bipodDeployed", false]) then { - _unit setUnitRecoilCoefficient (unitRecoilCoefficient _unit / BIPODRECOIL); - if (_animation find "_ace_deploy" != -1) then { - //[_unit, [_animation, "_ace_deploy", ""] call CBA_fnc_replace, 2] call EFUNC(common,doAnimation); - _unit switchMove ([_animation, "_ace_deploy", ""] call CBA_fnc_replace); - }; - - private "_picture"; - _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); - [localize "STR_ACE_Resting_BipodUndeployed", _picture] call EFUNC(common,displayTextPicture); - -} else { - _unit setUnitRecoilCoefficient (unitRecoilCoefficient _unit / RESTEDRECOIL); - if (_animation find "_ace_rested" != -1) then { - //[_unit, [_animation, "_ace_rested", ""] call CBA_fnc_replace, 2] call EFUNC(common,doAnimation); - _unit switchMove ([_animation, "_ace_rested", ""] call CBA_fnc_replace); - }; - - private "_picture"; - _picture = getText (configFile >> "CfgWeapons" >> _weapon >> "picture"); - [localize "STR_ACE_Resting_WeaponLifted", _picture] call EFUNC(common,displayTextPicture); -}; -playSound QGVAR(unrest); - -_unit setVariable ["ACE_weaponRested", false]; -_unit setVariable ["ACE_bipodDeployed", false]; - -if (_unit == ACE_PLAYER) then { - [QGVAR(bipodDeployed), false, "", [1,1,1,1], -1] call EFUNC(common,displayIcon); -}; \ No newline at end of file diff --git a/addons/resting/functions/script_component.hpp b/addons/resting/functions/script_component.hpp deleted file mode 100644 index 9a1f2912f9..0000000000 --- a/addons/resting/functions/script_component.hpp +++ /dev/null @@ -1 +0,0 @@ -#include "\z\ace\addons\resting\script_component.hpp" \ No newline at end of file diff --git a/addons/resting/script_component.hpp b/addons/resting/script_component.hpp deleted file mode 100644 index f6d28bc482..0000000000 --- a/addons/resting/script_component.hpp +++ /dev/null @@ -1,19 +0,0 @@ -#define COMPONENT resting -#include "\z\ace\Addons\main\script_mod.hpp" - -#ifdef DEBUG_ENABLED_RESTING - #define DEBUG_MODE_FULL -#endif - -#ifdef DEBUG_SETTINGS_RESTING - #define DEBUG_SETTINGS DEBUG_SETTINGS_RESTING -#endif - -#include "\z\ace\Addons\main\script_macros.hpp" - -#define RESTEDRECOIL 0.6 -#define BIPODRECOIL 0.3 -#define MAXDISTANCE 1 -#define MAXANGLE 15 -#define MAXHEIGHT 0.45 -#define CAMSHAKE [1,0.5,5] diff --git a/addons/resting/sounds/weaponrest_rest.wav b/addons/resting/sounds/weaponrest_rest.wav deleted file mode 100644 index fce6386425bc3dec26b8eda01649e9643549e4c8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19866 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 K8Xg_Z*na^jA(k)z diff --git a/addons/resting/sounds/weaponrest_unrest.wav b/addons/resting/sounds/weaponrest_unrest.wav deleted file mode 100644 index 72518ddbbf761d6442b8d0c41a05da1c1fbbeae2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 77354 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 - - - - - Rest Weapon - Waffe auflegen - Apoyar el arma - Oprzyj broń - Zapřít zbraň - Appuyer l'arme - Зафиксировать оружие - Fegyver kitámasztása - Apoiar Arma - Appoggia l'arma - - - - Bipod deployed - Zweibein ausgeklappt - Bípode desplegado - Dwójnóg rozstawiony - Dvojnožka rozložena - Bipied déployé - Сошки установлены - Állványon - Bipé apoiado - Bipiede appoggiato - - - Weapon rested - Waffe aufgelegt - Arma apoyada - Broń oparta - Zbraň zapřena - Arme appuyée - Оружие зафиксировано - Fegyver kitámasztva - Arma apoiada - Arma appoggiata - - - - Bipod undeployed - Zweibein eingeklappt - Bípode plegado - Dwójnóg złożony - Dvojnožka rozložena - Bipied replié - Сошки убраны - Állvány csukva - Bipé recolhido - Bipiede richiuso - - - Weapon lifted - Waffe gehoben - Arma levantada - Broń podniesiona - Zbraň zdvihnuta - Arme relevée - Оружие не зафиксировано - Fegyver nincs támasztva - Arma levantada - Arma sollevata - - - - From b10d3b26ce0ef93d8c86aa4e7664743f8cb574d9 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 28 Mar 2015 11:23:13 +0100 Subject: [PATCH 2/3] replace variables with new scripting commands --- addons/recoil/functions/fnc_burstDispersion.sqf | 4 ++-- addons/recoil/functions/fnc_camShake.sqf | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/addons/recoil/functions/fnc_burstDispersion.sqf b/addons/recoil/functions/fnc_burstDispersion.sqf index 9467e922ff..c038d1fb4d 100644 --- a/addons/recoil/functions/fnc_burstDispersion.sqf +++ b/addons/recoil/functions/fnc_burstDispersion.sqf @@ -41,8 +41,8 @@ if (time - _lastFired < 0.45) then { // Maximum possible dispersion (without _sightsBurst mod) _maxBurst = 50; - if (_unit getVariable [QUOTE(EGVAR(resting,weaponRested)), false]) then {_maxBurst = 25}; - if (_unit getVariable [QUOTE(EGVAR(resting,bipodDeployed)), false]) then {_maxBurst = 18}; + if (isWeaponRested _unit) then {_maxBurst = 25}; + if (isWeaponDeployed _unit) then {_maxBurst = 18}; // Cap the dispersion _burst = (_burst min _maxBurst) + _sightsBurst; diff --git a/addons/recoil/functions/fnc_camShake.sqf b/addons/recoil/functions/fnc_camShake.sqf index cfe179d67b..ad9a98c4d4 100644 --- a/addons/recoil/functions/fnc_camShake.sqf +++ b/addons/recoil/functions/fnc_camShake.sqf @@ -48,8 +48,8 @@ if (_unit != vehicle _unit) then { _powerCoef = (call compile format ["%1", _powerCoef]) * RECOIL_COEF; }; -if (_unit getVariable [QUOTE(EGVAR(resting,weaponRested)), false]) then {_powerMod = _powerMod - 0.07}; -if (_unit getVariable [QUOTE(EGVAR(resting,bipodDeployed)), false]) then {_powerMod = _powerMod - 0.11}; +if (isWeaponRested _unit) then {_powerMod = _powerMod - 0.07}; +if (isWeaponDeployed _unit) then {_powerMod = _powerMod - 0.11}; private "_camshake"; _camshake = [ From 55d7c0f0e6ddfcb02b14a2e8fca25617918ef997 Mon Sep 17 00:00:00 2001 From: commy2 Date: Sat, 4 Apr 2015 20:02:02 +0200 Subject: [PATCH 3/3] remove scripted recoil --- addons/recoil/CfgEventHandlers.hpp | 43 ------ addons/recoil/XEH_preInit.sqf | 8 - addons/recoil/config.cpp | 137 +----------------- .../recoil/functions/fnc_burstDispersion.sqf | 62 -------- addons/recoil/functions/fnc_camShake.sqf | 61 -------- addons/recoil/functions/script_component.hpp | 12 -- 6 files changed, 6 insertions(+), 317 deletions(-) delete mode 100644 addons/recoil/CfgEventHandlers.hpp delete mode 100644 addons/recoil/XEH_preInit.sqf delete mode 100644 addons/recoil/functions/fnc_burstDispersion.sqf delete mode 100644 addons/recoil/functions/fnc_camShake.sqf delete mode 100644 addons/recoil/functions/script_component.hpp diff --git a/addons/recoil/CfgEventHandlers.hpp b/addons/recoil/CfgEventHandlers.hpp deleted file mode 100644 index 1bf256e028..0000000000 --- a/addons/recoil/CfgEventHandlers.hpp +++ /dev/null @@ -1,43 +0,0 @@ -class Extended_PreInit_EventHandlers { - class ADDON { - init = QUOTE(call COMPILE_FILE(XEH_preInit) ); - }; -}; - -class Extended_FiredBis_EventHandlers { - class CAManBase { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == ACE_player) then {_this call FUNC(camShake); _this call FUNC(burstDispersion);};); - }; - }; - class Tank { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class Car { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class Helicopter { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class Plane { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class Ship_F { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; - class StaticWeapon { - class ADDON { - clientFiredBis = QUOTE(if (_this select 0 == vehicle ACE_player) then {_this call FUNC(camShake);};); - }; - }; -}; diff --git a/addons/recoil/XEH_preInit.sqf b/addons/recoil/XEH_preInit.sqf deleted file mode 100644 index 2df8a83ebd..0000000000 --- a/addons/recoil/XEH_preInit.sqf +++ /dev/null @@ -1,8 +0,0 @@ -#include "script_component.hpp" - -ADDON = false; - -PREP(burstDispersion); -PREP(camShake); - -ADDON = true; diff --git a/addons/recoil/config.cpp b/addons/recoil/config.cpp index db08a49143..2b003e6c65 100644 --- a/addons/recoil/config.cpp +++ b/addons/recoil/config.cpp @@ -6,14 +6,12 @@ class CfgPatches { weapons[] = {}; requiredVersion = REQUIRED_VERSION; requiredAddons[] = {"ace_common"}; - author[] = {"KoffeinFlummi", "TaoSensai", "commy2"}; + author[] = {"KoffeinFlummi","TaoSensai","commy2"}; authorUrl = "https://github.com/Taosenai/tmr"; VERSION_CONFIG; }; }; -#include "CfgEventHandlers.hpp" - // DOC: http://forums.bistudio.com/showthread.php?94464-explaining-the-cfgRecoils-array class CfgRecoils { #define KICKBACK 0.07 @@ -114,17 +112,18 @@ class CfgRecoils { recoil_single_titan[] = {0,0,0}; }; -class CfgCameraShake { +/*class CfgCameraShake { // Seems to be ignored by Arma defaultCaliberCoefWeaponFire = 0; -}; +};*/ // Completely disable BI's camshake on fire. -class CfgMovesBasic { +/*class CfgMovesBasic { class Default { camShakeFire = 0; }; }; + class CfgMovesMaleSdr : CfgMovesBasic { class States { class AmovPercMstpSlowWrflDnon; @@ -183,128 +182,4 @@ class CfgMovesMaleSdr : CfgMovesBasic { camShakeFire = 0; }; }; -}; - -// Ammo -class CfgAmmo { - class MissileCore; - class MissileBase: MissileCore { - GVAR(shakeMultiplier) = 2; - }; - - class BombCore; - class LaserBombCore: BombCore { - GVAR(shakeMultiplier) = 2; - }; - class Bo_Mk82: BombCore { - GVAR(shakeMultiplier) = 2; - }; - - class RocketCore; - class ArtilleryRocketCore: RocketCore { - GVAR(shakeMultiplier) = 1.4; - }; - class RocketBase: RocketCore { - GVAR(shakeMultiplier) = 1.4; - }; - - class BulletCore; - class BulletBase: BulletCore { - GVAR(shakeMultiplier) = 1; - }; - - class ShotgunCore; - class ShotgunBase: ShotgunCore { - GVAR(shakeMultiplier) = 1.1; - }; - - class ShellCore; - class ShellBase: ShellCore { - GVAR(shakeMultiplier) = 3; - }; - - class SubmunitionCore; - class SubmunitionBase: SubmunitionCore { - GVAR(shakeMultiplier) = 3; - }; - - class ShotDeployCore; - class ShotDeployBase: ShotDeployCore { - GVAR(shakeMultiplier) = 3; - }; -}; - -// Weapons -// 1. Set the recoil profiles for all fire modes. -// 2. Set the shake multiplier. This determines the camshake for the weapon. -// Ex: GVAR(shakeMultiplier) = 1; (disabled currently) - -class CfgWeapons { - class CannonCore; - class autocannon_Base_F: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class autocannon_35mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class cannon_120mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class mortar_155mm_AMOS: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class mortar_82mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - - // No camshake for gatlings - class gatling_20mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class gatling_25mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - class gatling_30mm: CannonCore { - GVAR(shakeMultiplier) = 0; - }; - - class MGunCore; - class MGun: MGunCore { - GVAR(shakeMultiplier) = 0; - }; - // No camshake for smoke launchers - class SmokeLauncher: MGun { - GVAR(shakeMultiplier) = 0; - }; - - // No camshake for coax machine guns - class LMG_RCWS; - class LMG_M200: LMG_RCWS { - GVAR(shakeMultiplier) = 0; - }; - class LMG_coax: LMG_RCWS { - GVAR(shakeMultiplier) = 0; - }; - class LMG_Minigun: LMG_RCWS { - GVAR(shakeMultiplier) = 0; - }; -}; - -// Vehicles -class CfgVehicles { - class LandVehicle; - class Tank: LandVehicle { - GVAR(enableCamshake) = 1; - }; - class Car: LandVehicle { - GVAR(enableCamshake) = 1; - }; - class StaticWeapon: LandVehicle { - GVAR(enableCamshake) = 1; - }; - - class Allvehicles; - class Air: Allvehicles { - GVAR(enableCamshake) = 1; - }; -}; +};*/ diff --git a/addons/recoil/functions/fnc_burstDispersion.sqf b/addons/recoil/functions/fnc_burstDispersion.sqf deleted file mode 100644 index c038d1fb4d..0000000000 --- a/addons/recoil/functions/fnc_burstDispersion.sqf +++ /dev/null @@ -1,62 +0,0 @@ -// TMR: Small Arms - Recoil initialization and functions -// (C) 2013 Ryan Schultz. See LICENSE. -// Edited for compatability in ACE by KoffeinFlummi -// Edited by commy2 - -#include "script_component.hpp" - -private ["_unit", "_weapon", "_projectile"]; - -_unit = _this select 0; -_weapon = _this select 1; -_projectile = _this select 6; - -if (_weapon in ["Throw", "Put"]) exitWith {}; - -private ["_lastFired", "_burst"]; - -_lastFired = _unit getVariable [QUOTE(GVAR(lastFired)), -1]; -_burst = _unit getVariable [QUOTE(GVAR(burst)), 0]; - -if (time - _lastFired < 0.45) then { - private "_startDisperse"; - _burst = _burst + 1; - _unit setVariable [QUOTE(GVAR(burst)), _burst, false]; - - _startDisperse = [1, 3] select (cameraView == "GUNNER"); - - if (_burst > _startDisperse) then { - // Reset burst size for calcs - _burst = _burst - _startDisperse; - - // Increase dispersion cap if player is not using sights - _sightsBurst = [30, 0] select (cameraView == "GUNNER"); - - // Increase initial dispersion and cap if player is moving - if (speed _unit > 0.5) then { - _sightsBurst = 25; - _burst = _burst + 15; - }; - - // Maximum possible dispersion (without _sightsBurst mod) - _maxBurst = 50; - - if (isWeaponRested _unit) then {_maxBurst = 25}; - if (isWeaponDeployed _unit) then {_maxBurst = 18}; - - // Cap the dispersion - _burst = (_burst min _maxBurst) + _sightsBurst; - - // Add random variance - _elevAngle = (_burst / 300) - random (_burst / 300) * 2; - _travAngle = (_burst / 260) - random (_burst / 260) * 2; - - [_projectile, _travAngle, _elevAngle] call EFUNC(common,changeProjectileDirection); - }; -} else { - - // Long enough delay, reset burst - _unit setVariable [QUOTE(GVAR(burst)), 0, false]; -}; - -_unit setVariable [QUOTE(GVAR(lastFired)), time, false]; diff --git a/addons/recoil/functions/fnc_camShake.sqf b/addons/recoil/functions/fnc_camShake.sqf deleted file mode 100644 index ad9a98c4d4..0000000000 --- a/addons/recoil/functions/fnc_camShake.sqf +++ /dev/null @@ -1,61 +0,0 @@ -// TMR: Small Arms - Recoil initialization and functions -// (C) 2013 Ryan Schultz. See LICENSE. -// Edited for compatability in ACE by KoffeinFlummi -// Edited by commy2 - -#include "script_component.hpp" - -#define BASE_POWER 0.40 -#define BASE_TIME 0.19 -#define BASE_FREQ 13 -#define RECOIL_COEF 40 - -private ["_unit", "_weapon", "_muzzle", "_ammo"]; - -_unit = _this select 0; -_weapon = _this select 1; -_muzzle = _this select 2; -_ammo = _this select 4; - -if (_weapon in [handgunWeapon _unit, "Throw", "Put"]) exitWith {}; - -private ["_powerMod", "_timeMod", "_freqMod", "_powerCoef"]; - -_powerMod = ([0, -0.1, -0.1, 0, -0.2] select (["STAND", "CROUCH", "PRONE", "UNDEFINED", ""] find stance _unit)) + ([0, -1, 0, -1] select (["INTERNAL", "EXTERNAL", "GUNNER", "GROUP"] find cameraView)); -_timeMod = 0; -_freqMod = 0; - -_powerCoef = 0; -if (_unit != vehicle _unit) then { - _powerCoef = getNumber (configFile >> "CfgWeapons" >> _weapon >> QUOTE(GVAR(shakeMultiplier))); - _powerCoef = _powerCoef * getNumber (configFile >> "CfgAmmo" >> _ammo >> QUOTE(GVAR(shakeMultiplier))); -} else { - private ["_type", "_config", "_recoil"]; - - _type = ["recoil", "recoilProne"] select (stance _unit == "PRONE"); - - _config = configFile >> "CfgWeapons" >> _weapon; - _recoil = if (_muzzle == _weapon) then { - getText (_config >> _type) - } else { - getText (_config >> _muzzle >> _type) - }; - - _recoil = getArray (configFile >> "CfgRecoils" >> _recoil); - if (count _recoil < 2) exitWith {}; - - _powerCoef = _recoil select 1; - _powerCoef = (call compile format ["%1", _powerCoef]) * RECOIL_COEF; -}; - -if (isWeaponRested _unit) then {_powerMod = _powerMod - 0.07}; -if (isWeaponDeployed _unit) then {_powerMod = _powerMod - 0.11}; - -private "_camshake"; -_camshake = [ - _powerCoef * (BASE_POWER + _powerMod) max 0, - BASE_TIME + _timeMod max 0, - BASE_FREQ + _freqMod max 0 -]; - -addCamShake _camshake; diff --git a/addons/recoil/functions/script_component.hpp b/addons/recoil/functions/script_component.hpp deleted file mode 100644 index d104528384..0000000000 --- a/addons/recoil/functions/script_component.hpp +++ /dev/null @@ -1,12 +0,0 @@ -#define COMPONENT recoil -#include "\z\ace\Addons\main\script_mod.hpp" - -#ifdef DEBUG_ENABLED_RECOIL - #define DEBUG_MODE_FULL -#endif - -#ifdef DEBUG_SETTINGS_RECOIL - #define DEBUG_SETTINGS DEBUG_SETTINGS_RECOIL -#endif - -#include "\z\ace\Addons\main\script_macros.hpp"