Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes & cleanup

Browse Source 
- Ignore key inputs when in Zeus
- Slowed down reloading animation when prone to match "regular" reload time
This commit is contained in:
johnb432 2024-07-04 12:17:07 +02:00
parent 8a7ec9558a
commit bcae7de07e
2 changed files with 39 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
addons/pronelauncher/CfgMovesMaleSdr.hpp
View File

@ -13,8 +13,8 @@ class CfgMovesMaleSdr: CfgMovesBasic {
disableWeaponsLong = 0; disableWeaponsLong = 0;
enableMissile = 1; enableMissile = 1;
canPullTrigger = 1; canPullTrigger = 1;
aimPrecision = 0.30000001; aimPrecision = 0.3;
speed = 1e+010; speed = 1e10;
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
file = QPATHTOF(anim\ACE_Launcher_Lying.rtm); file = QPATHTOF(anim\ACE_Launcher_Lying.rtm);
interpolateFrom[] = { interpolateFrom[] = {
@ -82,7 +82,7 @@ class CfgMovesMaleSdr: CfgMovesBasic {
// }; // };
//}; //};
class AmovPpneMrunSrasWlnrDf: AmovPpneMstpSrasWlnrDnon { class AmovPpneMrunSrasWlnrDf: AmovPpneMstpSrasWlnrDnon {
speed = 0.600541; speed = 0.6;
duty = 0.6; duty = 0.6;
disableWeapons = 1; disableWeapons = 1;
disableWeaponsLong = 1; disableWeaponsLong = 1;
@ -91,7 +91,7 @@ class CfgMovesMaleSdr: CfgMovesBasic {
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
}; };
class AmovPpneMrunSrasWlnrDfl: AmovPpneMrunSrasWlnrDf { class AmovPpneMrunSrasWlnrDfl: AmovPpneMrunSrasWlnrDf {
speed = 0.833333; speed = 0.83;
duty = 0.6; duty = 0.6;
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
}; };
@ -101,22 +101,22 @@ class CfgMovesMaleSdr: CfgMovesBasic {
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
}; };
class AmovPpneMrunSrasWlnrDbl: AmovPpneMrunSrasWlnrDf { class AmovPpneMrunSrasWlnrDbl: AmovPpneMrunSrasWlnrDf {
speed = 0.702524; speed = 0.7;
duty = 0.6; duty = 0.6;
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
}; };
class AmovPpneMrunSrasWlnrDb: AmovPpneMrunSrasWlnrDf { class AmovPpneMrunSrasWlnrDb: AmovPpneMrunSrasWlnrDf {
speed = 0.702524; speed = 0.7;
duty = 0.6; duty = 0.6;
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
}; };
class AmovPpneMrunSrasWlnrDbr: AmovPpneMrunSrasWlnrDf { class AmovPpneMrunSrasWlnrDbr: AmovPpneMrunSrasWlnrDf {
speed = 0.702524; speed = 0.7;
duty = 0.6; duty = 0.6;
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
}; };
class AmovPpneMrunSrasWlnrDr: AmovPpneMrunSrasWlnrDf { class AmovPpneMrunSrasWlnrDr: AmovPpneMrunSrasWlnrDf {
speed = 0.859341; speed = 0.86;
duty = 0.6; duty = 0.6;
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
}; };
@ -200,7 +200,7 @@ class CfgMovesMaleSdr: CfgMovesBasic {
}; };
class LauncherProne_Reload_Start: AmovPpneMrunSrasWlnrDl { class LauncherProne_Reload_Start: AmovPpneMrunSrasWlnrDl {
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
speed = 0.7375; speed = 0.5;
duty = 0.6; duty = 0.6;
disableWeapons = 1; disableWeapons = 1;
disableWeaponsLong = 1; disableWeaponsLong = 1;
@ -215,7 +215,7 @@ class CfgMovesMaleSdr: CfgMovesBasic {
}; };
class LauncherProne_Reload_Mid: AmovPpneMrunSrasWlnrDr { class LauncherProne_Reload_Mid: AmovPpneMrunSrasWlnrDr {
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
speed = 0.7375; speed = 0.5;
duty = 0.6; duty = 0.6;
disableWeapons = 1; disableWeapons = 1;
disableWeaponsLong = 1; disableWeaponsLong = 1;
@ -227,7 +227,7 @@ class CfgMovesMaleSdr: CfgMovesBasic {
}; };
class LauncherProne_Reload_End: AmovPpneMrunSrasWlnrDf { class LauncherProne_Reload_End: AmovPpneMrunSrasWlnrDf {
actions = "ACE_LauncherProneActions"; actions = "ACE_LauncherProneActions";
speed = 0.7375; speed = 0.5;
duty = 0.6; duty = 0.6;
disableWeapons = 1; disableWeapons = 1;
disableWeaponsLong = 1; disableWeaponsLong = 1;

51
addons/pronelauncher/XEH_postInit.sqf
View File

@ -1,38 +1,41 @@
#include "script_component.hpp" #include "script_component.hpp"
addUserActionEventHandler ["Stand", "Activate", { // Stand (toggle) // Stand (toggle)
if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; addUserActionEventHandler ["Stand", "Activate", {
if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {};
private _launcherWeapon = secondaryWeapon ACE_player; 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 { if (stance ACE_player == "PRONE") then {
TRACE_1("stand toggle",stance ACE_player); LOG("stand toggle");
ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon"; ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon";
ACE_player playMove "AmovPknlMstpSrasWlnrDnon_AmovPercMstpSrasWlnrDnon"; ACE_player playMove "AmovPknlMstpSrasWlnrDnon_AmovPercMstpSrasWlnrDnon";
}; };
}]; }];
addUserActionEventHandler ["Crouch", "Activate", { // Crouch (toggle) // Crouch (toggle)
if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; addUserActionEventHandler ["Crouch", "Activate", {
if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {};
private _launcherWeapon = secondaryWeapon ACE_player; 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 { if (stance ACE_player == "PRONE") then {
TRACE_1("crouch toggle",stance ACE_player); LOG("crouch toggle");
ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon"; ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon";
}; };
}]; }];
addUserActionEventHandler ["Prone", "Activate", { // Prone (toggle) // Prone (toggle)
if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; addUserActionEventHandler ["Prone", "Activate", {
if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {};
private _launcherWeapon = secondaryWeapon ACE_player; 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); TRACE_1("prone toggle",stance ACE_player);
@ -40,28 +43,30 @@ addUserActionEventHandler ["Prone", "Activate", { // Prone (toggle)
ACE_player playMoveNow "ACE_LauncherProne"; ACE_player playMoveNow "ACE_LauncherProne";
}]; }];
addUserActionEventHandler ["MoveUp", "Activate", { // (X) Crouch / Stand Up // (X) Crouch / Stand Up
if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; addUserActionEventHandler ["MoveUp", "Activate", {
if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {};
private _launcherWeapon = secondaryWeapon ACE_player; 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 { if (stance ACE_player == "PRONE") then {
TRACE_1("moveUp from prone",stance ACE_player); LOG("moveUp from prone");
ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon"; ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon";
}; };
}]; }];
addUserActionEventHandler ["MoveDown", "Activate", { // (Z) Go Prone / Stand Up // (Z) Go Prone / Stand Up
if ((!alive ACE_player) || {!(isNull objectParent ACE_player)}) exitWith {}; addUserActionEventHandler ["MoveDown", "Activate", {
if (!alive ACE_player || {!isNull objectParent ACE_player} || {!isNull curatorCamera}) exitWith {};
private _launcherWeapon = secondaryWeapon ACE_player; 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 { if (stance ACE_player == "PRONE") then {
TRACE_1("moveDown from prone",stance ACE_player); LOG("moveDown from prone");
ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon"; ACE_player playMoveNow "AmovPpneMstpSrasWlnrDnon_AmovPknlMstpSrasWlnrDnon";
ACE_player playMove "AmovPknlMstpSrasWlnrDnon_AmovPercMstpSrasWlnrDnon"; ACE_player playMove "AmovPknlMstpSrasWlnrDnon_AmovPercMstpSrasWlnrDnon";
} else { } else {