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.

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

Medical Feedback - Add indication of Fractures and applied CATs/Splints #8321

Merged
merged 11 commits into from
Oct 12, 2021

Conversation

10Dozen
Copy link
Contributor

@10Dozen 10Dozen commented Jul 20, 2021

When merged this pull request will:

  • Adds indication of the applied CATs and Splints to Stance indicator (appropriate icon will be drawn when at least 1 item of the type is appied)
  • Indication may be disabled via settings

Note:
CATs indicator is to remeber that tourniquet is applied (by player or by other person) and it should be removed when possible.
Splint indicator is pretty discussable, maybe it's better to show 'fractured' icon instead to give player notification that something is really bad with his body

20210720224105_1

@BaerMitUmlaut BaerMitUmlaut changed the title Adds the indication of applied CATs/Splints Medical Feedback - Add indication of applied CATs/Splints Jul 21, 2021
@10Dozen
Copy link
Contributor Author

10Dozen commented Jul 21, 2021

As discussed in Slack to be changed as:

  • show fractured status icon if any
  • show 'splinted' status icon if any AND splint effect settings is not 'fully heals' to indicate that player suffers some penalty

Also make icons a bit flexible by adding icon to the most top position, but sorted (1) fractures, (2) CATs, (3) splints

@10Dozen
Copy link
Contributor Author

10Dozen commented Jul 21, 2021

Updated logic of the indicators:

  1. Indicators fulfilled from top to bottom.
  2. Fractures are priority 1 and are always on top (if fractures enabled and player has any).
  3. Tourniquets has priority 2, icon drawn if player has any applied.
  4. Splinted fracture indicator has priority 3 and only shown when (a) fractures enabled, (b) fracture setting is 2 or 3 (penalty remains after usage of the splint), (c) player has any splinted fracture.

Indication

@veteran29 veteran29 added this to the 3.14.0 milestone Jul 22, 2021
@10Dozen 10Dozen requested a review from veteran29 July 22, 2021 11:48
@jonpas
Copy link
Member

jonpas commented Jul 23, 2021

Should "CAT" on the status indicator be "TQ"? I don't know what is usually used, but CAT is a specific tourniquet trademarked by whichever company makes it.

@10Dozen
Copy link
Contributor Author

10Dozen commented Jul 23, 2021

Should "CAT" on the status indicator be "TQ"? I don't know what is usually used, but CAT is a specific tourniquet trademarked by whichever company makes it.

Same as QuikClot. Using 'CAT' is good in terms of different languages - most of translations include [CAT], but TQ is not so widely used.

Anyway text may be removed at all, I was not sure that the icon is self-explanatory. I can make new one if somebody provide an example (photo or icon). Maybe something like this?
https://user-images.githubusercontent.com/9357337/126798993-ee0798ac-09ad-4dac-bed4-c2ce1f14a898.png
https://user-images.githubusercontent.com/9357337/126798968-7e9c88c2-2301-4a03-8242-3166b54d243c.png
Silhouette will be pretty specific.

@10Dozen 10Dozen changed the title Medical Feedback - Add indication of applied CATs/Splints Medical Feedback - Add indication of Fractures and applied CATs/Splints Jul 23, 2021
@jonpas
Copy link
Member

jonpas commented Jul 23, 2021

Yeah, that's fine then.

@10Dozen
Copy link
Contributor Author

10Dozen commented Jul 23, 2021

Updated icon for tourniquet, now icons are:
image

@jonpas
Copy link
Member

jonpas commented Jul 23, 2021

Nice and uniform! 👌

addons/medical_feedback/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_feedback/stringtable.xml Outdated Show resolved Hide resolved
addons/medical_feedback/initSettings.sqf Outdated Show resolved Hide resolved
10Dozen and others added 2 commits October 11, 2021 11:44
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
@jonpas jonpas changed the title Medical Feedback - Add indication of Fractures and applied CATs/Splints Medical Feedback - Add indication of Fractures and applied CATs/Splints Oct 12, 2021
@jonpas jonpas merged commit 3d93155 into acemod:master Oct 12, 2021
@jonpas jonpas added kind/feature Release Notes: **ADDED:** and removed kind/added feature labels Oct 14, 2021
AndreasBrostrom pushed a commit to AndreasBrostrom/ACE3 that referenced this pull request Dec 3, 2021
…ts (acemod#8321)

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/feature Release Notes: **ADDED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants