mirror of
https://github.com/acemod/ACE3.git
synced 2024-08-30 18:23:18 +00:00
some more animation time tweaks
This commit is contained in:
parent
36d244a868
commit
ecd77630f5
@ -13,18 +13,19 @@ GVAR(animDurations) = [] call CBA_fnc_createNamespace;
|
||||
{
|
||||
GVAR(animDurations) setVariable _x;
|
||||
} forEach [
|
||||
["AinvPknlMstpSlayWnonDnon_medic", 9],
|
||||
["AinvPknlMstpSlayWnonDnon_medicOther", 8.5],
|
||||
["AinvPpneMstpSlayWnonDnon_medic", 7.5],
|
||||
["AinvPpneMstpSlayWnonDnon_medicOther", 8.5],
|
||||
["AinvPknlMstpSlayWnonDnon_medic", 7.5],
|
||||
["AinvPpneMstpSlayWnonDnon_medic", 7],
|
||||
["AinvPknlMstpSlayWrflDnon_medic", 7],
|
||||
["AinvPknlMstpSlayWrflDnon_medicOther", 7],
|
||||
["AinvPpneMstpSlayWrflDnon_medic", 9.5],
|
||||
["AinvPpneMstpSlayWrflDnon_medicOther", 9],
|
||||
["AinvPknlMstpSlayWlnrDnon_medic", 14],
|
||||
["AinvPknlMstpSlayWpstDnon_medic", 10],
|
||||
["AinvPknlMstpSlayWpstDnon_medicOther", 10],
|
||||
["AinvPknlMstpSlayWlnrDnon_medic", 9],
|
||||
["AinvPknlMstpSlayWpstDnon_medic", 9.5],
|
||||
["AinvPpneMstpSlayWpstDnon_medic", 10],
|
||||
["AinvPknlMstpSlayWnonDnon_medicOther", 8.5],
|
||||
["AinvPpneMstpSlayWnonDnon_medicOther", 8.5],
|
||||
["AinvPknlMstpSlayWrflDnon_medicOther", 7],
|
||||
["AinvPpneMstpSlayWrflDnon_medicOther", 9],
|
||||
["AinvPknlMstpSlayWlnrDnon_medicOther", 9],
|
||||
["AinvPknlMstpSlayWpstDnon_medicOther", 10],
|
||||
["AinvPpneMstpSlayWpstDnon_medicOther", 8.5]
|
||||
];
|
||||
|
||||
|
@ -90,6 +90,22 @@ private _wpn = ["non", "rfl", "lnr", "pst"] param [["", primaryWeapon _caller, s
|
||||
|
||||
_callerAnim = [_callerAnim, "[wpn]", _wpn] call CBA_fnc_replace;
|
||||
|
||||
// this one is missing
|
||||
if (_callerAnim == "AinvPknlMstpSlayWlnrDnon_medic") then {
|
||||
_callerAnim = "AinvPknlMstpSlayWlnrDnon_medicOther";
|
||||
};
|
||||
|
||||
private _animDuration = GVAR(animDurations) getVariable _callerAnim;
|
||||
|
||||
// these animations have transitions that take a bit longer...
|
||||
if (weaponLowered _caller) then {
|
||||
_animDuration = _animDuration + 0.5;
|
||||
};
|
||||
|
||||
if (binocular _caller != "" && {binocular _caller == currentWeapon _caller}) then {
|
||||
_animDuration = _animDuration + 1.0;
|
||||
};
|
||||
|
||||
if (vehicle _caller == _caller && {_callerAnim != ""}) then {
|
||||
private _endInAnim = "AmovP[pos]MstpS[stn]W[wpn]Dnon";
|
||||
|
||||
@ -145,8 +161,6 @@ TRACE_1("",_treatmentTime);
|
||||
] call EFUNC(common,progressBar);
|
||||
|
||||
// speed up animation depending on treatment time
|
||||
private _animDuration = GVAR(animDurations) getVariable _callerAnim;
|
||||
|
||||
if (!isNil "_animDuration") then {
|
||||
_caller setAnimSpeedCoef (_animDuration / _treatmentTime);
|
||||
TRACE_2("",_animDuration,_treatmentTime);
|
||||
|
Loading…
Reference in New Issue
Block a user