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 - Show tourniquets in Medical and Patient information #6681

Merged
merged 3 commits into from
Dec 6, 2018

Conversation

diwako
Copy link
Contributor

@diwako diwako commented Nov 16, 2018

When merged this pull request will:
Show applied tourniquets in the medical menu and Patient information view
tourniquets

Adds 4 new images for each tourniquet
Adds code to handle the opacity of all 4 new UI entries respectively for the medical menu and the Patient information view

I know the medical rewrite is in the works, but this might be months and maybe like a year away. That is why I thought adding this in the mean time has some benefits even if it will be removed in the future.

@jonpas
Copy link
Member

jonpas commented Nov 16, 2018

Is that using rewrite pictures or your custom ones? (If I am not mistaken rewrite does it a bit differently anyways?)

@diwako
Copy link
Contributor Author

diwako commented Nov 16, 2018

Correct, I use the rewrite picture for the 4 tourniquets. In the rewrite iirc it uses the same image for all 4 but with rotation and so on. In mine I just made 4 images all like the separate body part images.

@TheMagnetar
Copy link
Member

Why don't work on rewrite instead?

@diwako
Copy link
Contributor Author

diwako commented Nov 16, 2018

Why don't work on rewrite instead?

I do not have any real knowledge about the rewrite so far, right now I am just reacting to some things that I think are missing and a temp solution would be neat until the big update hits.

addons/medical_menu/ui/menu.hpp Outdated Show resolved Hide resolved
addons/medical_menu/functions/fnc_updateTourniquets.sqf Outdated Show resolved Hide resolved
addons/medical_menu/functions/fnc_updateTourniquets.sqf Outdated Show resolved Hide resolved
addons/medical_menu/functions/fnc_updateTourniquets.sqf Outdated Show resolved Hide resolved
addons/medical_menu/functions/fnc_updateTourniquets.sqf Outdated Show resolved Hide resolved
@diwako
Copy link
Contributor Author

diwako commented Nov 16, 2018

Updated pr with requested changes

Copy link
Member

@jonpas jonpas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me!

@diwako
Copy link
Contributor Author

diwako commented Nov 18, 2018

Anything else needs changing?

@thojkooi thojkooi added kind/enhancement Release Notes: **IMPROVED:** status/needs merging labels Nov 18, 2018
@thojkooi thojkooi added this to the 3.13.0 milestone Nov 18, 2018
@severgun
Copy link
Contributor

Images are so weird.

@PabstMirror PabstMirror merged commit 88eb743 into acemod:master Dec 6, 2018
@PabstMirror PabstMirror modified the milestones: 3.13.0, 3.12.6 Feb 23, 2019
@diwako diwako deleted the show_tourniquets branch April 1, 2019 19:13
BaerMitUmlaut pushed a commit that referenced this pull request Aug 5, 2019
* Show tourniquets in Medical and Patient information

* Ace styling

* Move tourniquet update function to medical
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/enhancement Release Notes: **IMPROVED:**
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants