Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Circulation - Check pulse fixes #735

Merged
merged 6 commits into from
Feb 20, 2025
Merged

Circulation - Check pulse fixes #735

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
dcdc93c
small fixes
Cplhardcore Feb 20, 2025
6b942f5
Update fnc_checkPulseLocal.sqf
Cplhardcore Feb 20, 2025
88c7674
Update fnc_checkPulseLocal.sqf
Cplhardcore Feb 20, 2025
7a4df3b
Merge branch 'dev-Tomcat' into small-fixes
Cplhardcore Feb 20, 2025
d97813e
f*** tabs
Cplhardcore Feb 20, 2025
ad4aeb0
Merge branch 'small-fixes' of https://github.com/Cplhardcore/KAM into…
Cplhardcore Feb 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions addons/circulation/functions/fnc_checkPulseLocal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* None
*
* Example:
* [player, cursorObject, "Head"] call ace_medical_treatment_fnc_checkPulseLocal
* [player, cursorObject, "Head"] call kat_circulation_fnc_checkPulseLocal
*
* Public: No
*/
Expand All @@ -37,10 +37,11 @@ private _heartRateOutput = ACELSTRING(medical_treatment,Check_Pulse_Output_5);
private _logOutput = ACELSTRING(medical_treatment,Check_Pulse_None);

if (_heartRate > 1) then {
if ([_medic, QACEGVAR(medical,numericalPulse)] call ACEFUNC(medical_treatment,isMedic)) then {
if ([_medic, ACEGVAR(medical_treatment,numericalPulse)] call ACEFUNC(common,isMedic)) then {
if (GVAR(hardcoreDiagnose)) then {
_heartRateOutput = LSTRING(Check_Pulse_Output);
_logOutput = format [LLSTRING(Pulse_Output), (round(_heartRateOutput / 5) * 5)];
_heartRate = (round(_heartRate / 5) * 5);
_logOutput = format [LLSTRING(Pulse_Output), _heartRate];
} else {
_heartRateOutput = ACELSTRING(medical_treatment,Check_Pulse_Output_1);
_logOutput = str round _heartRate;
Expand All @@ -60,7 +61,5 @@ if (_heartRate > 1) then {
};
};
};

[_patient, "quick_view", ACELSTRING(medical_treatment,Check_Pulse_Log), [_medic call ACEFUNC(common,getName), _logOutput]] call ACEFUNC(medical_treatment,addToLog);

[QEGVAR(common,displayTextStructured), [[_heartRateOutput, _patient call ACEFUNC(common,getName), round _heartRate], 1.5, _medic], _medic] call CBA_fnc_targetEvent;
[QACEGVAR(common,displayTextStructured), [[_heartRateOutput, _patient call ACEFUNC(common,getName), round _heartRate], 1.5, _medic], _medic] call CBA_fnc_targetEvent;
4 changes: 2 additions & 2 deletions addons/circulation/functions/fnc_checkPulseStethLocal.sqf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
* None
*
* Example:
* [player, cursorObject, "Head"] call ace_medical_treatment_fnc_checkPulseStethLocal
* [player, cursorObject, "Head"] call kat_circulation_fnc_checkPulseStethLocal
*
* Public: No
*/
Expand Down Expand Up @@ -43,4 +43,4 @@ if (_heartRate > 1) then {

[_patient, "quick_view", ACELSTRING(medical_treatment,Check_Pulse_Log), [_medic call ACEFUNC(common,getName), _logOutput]] call ACEFUNC(medical_treatment,addToLog);

[QEGVAR(common,displayTextStructured), [[_heartRateOutput, _patient call ACEFUNC(common,getName), round _heartRate], 1.5, _medic], _medic] call CBA_fnc_targetEvent;
[QACEGVAR(common,displayTextStructured), [[_heartRateOutput, _patient call ACEFUNC(common,getName), round _heartRate], 1.5, _medic], _medic] call CBA_fnc_targetEvent;
Loading