Medical GUI - Peek Medical Info on Hit #9467

amsteadrayle · 2023-10-06T21:42:32Z

When merged this pull request will:

Temporarily show the player's patient information display when hit

IMPORTANT

If the contribution affects the documentation, please include your changes in this pull request so the documentation will appear on the website.
Development Guidelines are read, understood and applied.
Title of this PR uses our standard template Component - Add|Fix|Improve|Change|Make|Remove {changes}.

amsteadrayle · 2023-10-06T21:43:07Z

Like with my other PR, the goal with this is to provide the player with immediate feedback about their medical condition without interrupting gameplay.

Is Hit the best event to attach this to? Would HandleDamage or medical_injured be different or better in any way?

TODO:

Add setting to enable/disable
Add setting for duration
Fix flickering on subsequent hits before fadeout finishes
I think this can be fixed by changing the CBA_fnc_waitAndExecute to CBA_fnc_waitUntilAndExecute and checking the time elapsed since the last hit. Is there an existing, accepted implementation of that? Would there be a problem with multiple identical CBA_fnc_waitUntilAndExecute in this situation?
Show damaged body part
Is there a good way to do this? I've searched around a bunch and I haven't been able to figure anything out that would be straightforward. This is more of a hopeful goal at the moment.

LinkIsGrim · 2023-10-07T15:55:27Z

Event should be a matter of preference (as long as execution order is right). Tying to medical's injured event would be most appropriate and consistent with the rest of the components.

amsteadrayle · 2023-10-08T18:23:34Z

This now uses the medical_woundReceived event to know about the damaged body part.

Here's a quick demo, tweaked to still show my own info when remote controling a unit.
https://www.youtube.com/watch?v=VGBjroxGD70

addons/medical_gui/XEH_postInit.sqf

rautamiekka · 2023-10-08T19:11:21Z

addons/medical_gui/XEH_postInit.sqf

+    params ["_unit", "_allDamages", ""];
+    if !(GVAR(peekMedicalOnHit) && ACE_PLAYER == _unit) exitWith {};
+
+    private _bodypart = toLower (_allDamages select 0 select 1);


There're only ANSI chars, right ?

Suggested change

private _bodypart = toLower (_allDamages select 0 select 1);

private _bodypart = toLowerANSI (_allDamages select 0 select 1);

Probably, but I was just copying the existing usage from here:

ACE3/addons/medical_damage/functions/fnc_woundsHandlerBase.sqf

Line 44 in 78bb051

_bodyPart = toLower _bodyPart;

Ya, seen exactly that one before and it annoys me a lot (assuming I ain't wrong).

Why this? We don't do it anywhere else.

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

addons/medical_gui/XEH_postInit.sqf

LinkIsGrim · 2023-10-08T23:24:54Z

addons/medical_gui/initSettings.sqf

+[
+    QGVAR(peekMedicalOnHit),
+    "CHECKBOX",
+    [LSTRING(PeekMedicalOnHit_DisplayName), LSTRING(PeekMedicalOnHit_Description)],
+    [ELSTRING(medical,Category), LSTRING(SubCategory)],
+    true,
+    false // isGlobal
+] call CBA_fnc_addSetting;


This should not be local IMO.

Some might prefer defaulting to off.

I set it local to allow servers to leave it to player preference. Particularly thinking about if somone wants to disable it while a server allows it. But I don't feel too strongly about it.

I do agree with defaulting to off, on second thought.

Local can always be overwritten.

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

LinkIsGrim · 2023-10-09T17:02:59Z

Looks good, solve merge conflicts.

addons/medical_gui/initSettings.sqf

amsteadrayle · 2023-10-09T17:59:56Z

Those setting limits were intentional. 0 seconds is too short to actually parse any information, and 1 second is still very short. The upper limit being 10 seconds was just an extreme in case anyone felt like looking for that long.
The timing is different from the manual peek because you don't control when or how long it appears.

LinkIsGrim · 2023-10-09T18:07:15Z

There's no harm in reducing the lower end of the time range.

10 seconds is too much time IMO. 5 is an eternity during a firefight already.

I guess default time could've been kept as it was but since this feature is off by default, anyone using it will be looking at settings anyway.

Basic implementation of medical status peek on hit

bcf6318

amsteadrayle changed the title ~~WIP - Medical GUI - Basic implementation of medical status peek on hit~~ WIP - Medical GUI - Temporarily show medical status on hit Oct 6, 2023

amsteadrayle changed the title ~~WIP - Medical GUI - Temporarily show medical status on hit~~ WIP - Medical GUI - Temporarily show player's patient information on hit Oct 6, 2023

amsteadrayle added 4 commits October 8, 2023 13:01

Fix flickering on repeated hits

ef9be90

Overhaul to show damaged body part

d10cbc1

Add setting to enable/disable

412e977

Add setting for duration

d4ca605

amsteadrayle changed the title ~~WIP - Medical GUI - Temporarily show player's patient information on hit~~ Medical GUI - Temporarily show player's patient information on hit Oct 8, 2023

rautamiekka suggested changes Oct 8, 2023

View reviewed changes

Fix capitalization

1f0ed90

Co-authored-by: Jouni Järvinen <rautamiekka@users.noreply.github.com>

LinkIsGrim reviewed Oct 8, 2023

View reviewed changes

LinkIsGrim added this to the 3.16.1 milestone Oct 8, 2023

LinkIsGrim added the kind/feature Release Notes: **ADDED:** label Oct 8, 2023

amsteadrayle and others added 2 commits October 8, 2023 19:48

Use recommended equality check

b0b01dc

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>

Default to off

6a18fac

Merge branch 'master' into medicalPeekOnHit

ee58b5c

LinkIsGrim reviewed Oct 9, 2023

View reviewed changes

addons/medical_gui/initSettings.sqf Outdated Show resolved Hide resolved

change setting limits

bba1e2c

LinkIsGrim modified the milestones: 3.16.1, 3.16.0 Oct 9, 2023

LinkIsGrim changed the title ~~Medical GUI - Temporarily show player's patient information on hit~~ Medical GUI - Peek Medical Info on Hit Oct 9, 2023

LinkIsGrim approved these changes Oct 9, 2023

View reviewed changes

LinkIsGrim merged commit 941207c into acemod:master Oct 9, 2023
4 of 5 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Medical GUI - Peek Medical Info on Hit #9467

Medical GUI - Peek Medical Info on Hit #9467

amsteadrayle commented Oct 6, 2023

amsteadrayle commented Oct 6, 2023 •

edited

LinkIsGrim commented Oct 7, 2023

amsteadrayle commented Oct 8, 2023

rautamiekka Oct 8, 2023

amsteadrayle Oct 8, 2023

rautamiekka Oct 8, 2023 •

edited

LinkIsGrim Oct 8, 2023

LinkIsGrim Oct 8, 2023

amsteadrayle Oct 8, 2023

veteran29 Oct 9, 2023

LinkIsGrim commented Oct 9, 2023

amsteadrayle commented Oct 9, 2023

LinkIsGrim commented Oct 9, 2023

	private _bodypart = toLower (_allDamages select 0 select 1);
	private _bodypart = toLowerANSI (_allDamages select 0 select 1);

Medical GUI - Peek Medical Info on Hit #9467

Medical GUI - Peek Medical Info on Hit #9467

Conversation

amsteadrayle commented Oct 6, 2023

IMPORTANT

amsteadrayle commented Oct 6, 2023 • edited

LinkIsGrim commented Oct 7, 2023

amsteadrayle commented Oct 8, 2023

rautamiekka Oct 8, 2023

Choose a reason for hiding this comment

amsteadrayle Oct 8, 2023

Choose a reason for hiding this comment

rautamiekka Oct 8, 2023 • edited

Choose a reason for hiding this comment

LinkIsGrim Oct 8, 2023

Choose a reason for hiding this comment

LinkIsGrim Oct 8, 2023

Choose a reason for hiding this comment

amsteadrayle Oct 8, 2023

Choose a reason for hiding this comment

veteran29 Oct 9, 2023

Choose a reason for hiding this comment

LinkIsGrim commented Oct 9, 2023

amsteadrayle commented Oct 9, 2023

LinkIsGrim commented Oct 9, 2023

amsteadrayle commented Oct 6, 2023 •

edited

rautamiekka Oct 8, 2023 •

edited