From bcae7de07e0d650735db18b49891d6a09a09fb6c Mon Sep 17 00:00:00 2001 From: johnb432 <58661205+johnb432@users.noreply.github.com> Date: Thu, 4 Jul 2024 12:17:07 +0200 Subject: [PATCH] Fixes & cleanup - Ignore key inputs when in Zeus - Slowed down reloading animation when prone to match "regular" reload time --- addons/pronelauncher/CfgMovesMaleSdr.hpp | 22 +++++----- addons/pronelauncher/XEH_postInit.sqf | 51 +++++++++++++----------- 2 files changed, 39 insertions(+), 34 deletions(-) diff --git a/addons/pronelauncher/CfgMovesMaleSdr.hpp b/addons/pronelauncher/CfgMovesMaleSdr.hpp index 5f4d8c207b..e158fe7a41 100644 --- a/addons/pronelauncher/CfgMovesMaleSdr.hpp +++ b/addons/pronelauncher/CfgMovesMaleSdr.hpp @@ -13,8 +13,8 @@ class CfgMovesMaleSdr: CfgMovesBasic { disableWeaponsLong = 0; enableMissile = 1; canPullTrigger = 1; - aimPrecision = 0.30000001; - speed = 1e+010; + aimPrecision = 0.3; + speed = 1e10; actions = "ACE_LauncherProneActions"; file = QPATHTOF(anim\ACE_Launcher_Lying.rtm); interpolateFrom[] = { @@ -82,7 +82,7 @@ class CfgMovesMaleSdr: CfgMovesBasic { // }; //}; class AmovPpneMrunSrasWlnrDf: AmovPpneMstpSrasWlnrDnon { - speed = 0.600541; + speed = 0.6; duty = 0.6; disableWeapons = 1; disableWeaponsLong = 1; @@ -91,7 +91,7 @@ class CfgMovesMaleSdr: CfgMovesBasic { actions = "ACE_LauncherProneActions"; }; class AmovPpneMrunSrasWlnrDfl: AmovPpneMrunSrasWlnrDf { - speed = 0.833333; + speed = 0.83; duty = 0.6; actions = "ACE_LauncherProneActions"; }; @@ -101,22 +101,22 @@ class CfgMovesMaleSdr: CfgMovesBasic { actions = "ACE_LauncherProneActions"; }; class AmovPpneMrunSrasWlnrDbl: AmovPpneMrunSrasWlnrDf { - speed = 0.702524; + speed = 0.7; duty = 0.6; actions = "ACE_LauncherProneActions"; }; class AmovPpneMrunSrasWlnrDb: AmovPpneMrunSrasWlnrDf { - speed = 0.702524; + speed = 0.7; duty = 0.6; actions = "ACE_LauncherProneActions"; }; class AmovPpneMrunSrasWlnrDbr: AmovPpneMrunSrasWlnrDf { - speed = 0.702524; + speed = 0.7; duty = 0.6; actions = "ACE_LauncherProneActions"; }; class AmovPpneMrunSrasWlnrDr: AmovPpneMrunSrasWlnrDf { - speed = 0.859341; + speed = 0.86; duty = 0.6; actions = "ACE_LauncherProneActions"; }; @@ -200,7 +200,7 @@ class CfgMovesMaleSdr: CfgMovesBasic { }; class LauncherProne_Reload_Start: AmovPpneMrunSrasWlnrDl { actions = "ACE_LauncherProneActions"; - speed = 0.7375; + speed = 0.5; duty = 0.6; disableWeapons = 1; disableWeaponsLong = 1; @@ -215,7 +215,7 @@ class CfgMovesMaleSdr: CfgMovesBasic { }; class LauncherProne_Reload_Mid: AmovPpneMrunSrasWlnrDr { actions = "ACE_LauncherProneActions"; - speed = 0.7375; + speed = 0.5; duty = 0.6; disableWeapons = 1; disableWeaponsLong = 1; @@ -227,7 +227,7 @@ class CfgMovesMaleSdr: CfgMovesBasic { }; class LauncherProne_Reload_End: AmovPpneMrunSrasWlnrDf { actions = "ACE_LauncherProneActions"; - speed = 0.7375; + speed = 0.5; duty = 0.6; disableWeapons = 1; disableWeaponsLong = 1; diff --git a/addons/pronelauncher/XEH_postInit.sqf b/addons/pronelauncher/XEH_postInit.sqf index 29d13abdf4..388c909dc6 100644 --- a/addons/pronelauncher/XEH_postInit.sqf +++ b/addons/pronelauncher/XEH_postInit.sqf @@ -1,38 +1,41 @@ #include "script_component.hpp" -addUserActionEventHandler ["Stand", "Activate", { // Stand (toggle) - if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; +// Stand (toggle) +addUserActionEventHandler ["Stand", "Activate", { + if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {}; private _launcherWeapon = secondaryWeapon ACE_player; - if ((_launcherWeapon == "") || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; + if (_launcherWeapon == "" || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; - if ((stance ACE_player) == "PRONE") then { - TRACE_1("stand toggle",stance ACE_player); + if (stance ACE_player == "PRONE") then { + LOG("stand toggle"); ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon"; ACE_player playMove "AmovPknlMstpSrasWlnrDnon_AmovPercMstpSrasWlnrDnon"; }; }]; -addUserActionEventHandler ["Crouch", "Activate", { // Crouch (toggle) - if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; +// Crouch (toggle) +addUserActionEventHandler ["Crouch", "Activate", { + if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {}; private _launcherWeapon = secondaryWeapon ACE_player; - if ((_launcherWeapon == "") || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; + if (_launcherWeapon == "" || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; - if ((stance ACE_player) == "PRONE") then { - TRACE_1("crouch toggle",stance ACE_player); + if (stance ACE_player == "PRONE") then { + LOG("crouch toggle"); ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon"; }; }]; -addUserActionEventHandler ["Prone", "Activate", { // Prone (toggle) - if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; +// Prone (toggle) +addUserActionEventHandler ["Prone", "Activate", { + if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {}; private _launcherWeapon = secondaryWeapon ACE_player; - if ((_launcherWeapon == "") || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; + if (_launcherWeapon == "" || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; TRACE_1("prone toggle",stance ACE_player); @@ -40,28 +43,30 @@ addUserActionEventHandler ["Prone", "Activate", { // Prone (toggle) ACE_player playMoveNow "ACE_LauncherProne"; }]; -addUserActionEventHandler ["MoveUp", "Activate", { // (X) Crouch / Stand Up - if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; +// (X) Crouch / Stand Up +addUserActionEventHandler ["MoveUp", "Activate", { + if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {}; private _launcherWeapon = secondaryWeapon ACE_player; - if ((_launcherWeapon == "") || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; + if (_launcherWeapon == "" || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; - if ((stance ACE_player) == "PRONE") then { - TRACE_1("moveUp from prone",stance ACE_player); + if (stance ACE_player == "PRONE") then { + LOG("moveUp from prone"); ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon"; }; }]; -addUserActionEventHandler ["MoveDown", "Activate", { // (Z) Go Prone / Stand Up - if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; +// (Z) Go Prone / Stand Up +addUserActionEventHandler ["MoveDown", "Activate", { + if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {}; private _launcherWeapon = secondaryWeapon ACE_player; - if ((_launcherWeapon == "") || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; + if (_launcherWeapon == "" || {currentWeapon ACE_player != _launcherWeapon}) exitwith {}; - if ((stance ACE_player) == "PRONE") then { - TRACE_1("moveDown from prone",stance ACE_player); + if (stance ACE_player == "PRONE") then { + LOG("moveDown from prone"); ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon"; ACE_player playMove "AmovPknlMstpSrasWlnrDnon_AmovPercMstpSrasWlnrDnon"; } else {