diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf index 432d3120..2ebe8349 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event1.sqf @@ -92,8 +92,7 @@ EPOCH_currentTargetMode = _currentTargetMode; _forceFatigue = "forceFatigue" in _criticalAttributes; _forceBloodRise = "forceBloodRise" in _criticalAttributes; }; - - [_curCtrl,_critical] call _scaleUI; + [_curCtrl,0.55] call epoch_2DCtrlHeartbeat; // todo make this reversable or even limited to a color range. _color = [_playerLimitMin,_playerLimitMax,_currentVarVal,1] call EPOCH_colorRange; _curCtrl ctrlSetTextColor _color; diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf index 130502bc..30887849 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf @@ -123,23 +123,6 @@ _fadeUI = { }; _bool }; -_scaleUI = { - params ["_ctrl","_bool"]; - private _oemScale = _ctrl getVariable ["ctrl_scale", 1]; - private _curScale = ctrlScale _ctrl; - if (_bool) then { - if (_curScale isEqualTo _oemScale) then { - [_ctrl, (_oemScale - 0.1), 0.5] call BIS_fnc_ctrlSetScale; - } else { - [_ctrl, _oemScale, 0.5] call BIS_fnc_ctrlSetScale; - }; - } else { - if !(_curScale isEqualTo _oemScale) then { - [_ctrl, _oemScale, 0.5] call BIS_fnc_ctrlSetScale; - }; - }; - _bool -}; _cursorTarget = objNull; diff --git a/Sources/epoch_code/gui/scripts/animations/Epoch_2DCtrlHearbeat.sqf b/Sources/epoch_code/gui/scripts/animations/Epoch_2DCtrlHeartbeat.sqf similarity index 100% rename from Sources/epoch_code/gui/scripts/animations/Epoch_2DCtrlHearbeat.sqf rename to Sources/epoch_code/gui/scripts/animations/Epoch_2DCtrlHeartbeat.sqf diff --git a/Sources/epoch_config/Configs/CfgClientFunctions.hpp b/Sources/epoch_config/Configs/CfgClientFunctions.hpp index e4c3ed9d..3359f4b9 100644 --- a/Sources/epoch_config/Configs/CfgClientFunctions.hpp +++ b/Sources/epoch_config/Configs/CfgClientFunctions.hpp @@ -196,7 +196,7 @@ class CfgClientFunctions { file = "epoch_code\gui\scripts\animations"; class 2DCtrlShake {}; - class 2DCtrlHearbeat {}; + class 2DCtrlHeartbeat {}; }; class config {