Commit Graph

18 Commits

Author SHA1 Message Date
PabstMirror
6ce625a52f
Cleanup spaces in config macros (#9621)
* Cleanup spaces in config macros

* remove extra whitespace before call

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-11-05 12:36:00 -06:00
Grim
cdf6889b7d
Medical GUI - Increase Medical Menu side panel height (#9484)
taller side panels

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-27 20:55:30 -04:00
Grim
97b68fc7ae
Medical GUI - Fix Medical Menu triage button position (#9515)
fix
2023-10-18 00:51:27 -04:00
amsteadrayle
f2ae068e9f
Medical GUI - Fix action button width (#9497)
Fix action button width
2023-10-15 18:58:48 -04:00
amsteadrayle
863d88ff41
Medical GUI - Add divider bars for triage and toggle category buttons (#9496)
* Add divider bars for triage and toggle category buttons

* Tweak vertical position of category icons

* Fix spacing
2023-10-15 18:45:45 -04:00
amsteadrayle
b54be029df
Medical GUI - Move target name to middle header (#9483)
* Switch "status" header to player name

* Set title to "Medical Menu"

* Remove unused STATUS strings

* Switch to existing MedicalMenu string

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

* Revert "Remove unused STATUS strings"

This reverts commit 62c1ced06a.

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-14 19:27:57 -04:00
amsteadrayle
f774eaf787
Medical GUI - Fix asymmetry in the medical menu (#9486)
* Fix assymmetry in the medical menu

* Add center divider in Activity/Quick View panel
2023-10-13 16:33:19 -04:00
amsteadrayle
503373bb83
Medical GUI - Improve toggle button icon and tooltip (#9485)
Improve toggle button icon and tooltip
2023-10-13 07:46:42 -04:00
amsteadrayle
e52594112d
Medical GUI - Add keybinds to navigate the Medical Menu (#9477)
* Add keybinds to select categories and body parts

* Add some comments, rearrange, remove debug prints

* Remove unneeded escape key handling

* Replace function with inline code
2023-10-12 12:50:48 -04:00
amsteadrayle
2eb914836c
Medical GUI - Add R and L labels on body image (#9480)
Add R and L labels on body image
2023-10-12 12:44:13 -04:00
amsteadrayle
008cd5a851
Medical GUI - Add outline to selected body part in Medical Menu (#9471)
* Add functionality to show selected body part on body image

* Add controls for patient information display

* Receive selected body part through argument

* Improve selected check

* Add body part outline textures

* Second pass at outline textures

* Third pass at outline textures

* Add setting for outline color

* Fix capitalization

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

* Fix capitalization

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

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-11 05:25:28 -04:00
PabstMirror
65d5ccf600
Medical GUI - Dynamically create any number of action buttons (#9332)
* Medical Gui - Dynamically create any number of action buttons

* Fix right alignment, add h-spacing, fix 2.14 select
2023-08-25 10:32:39 -05:00
Will/KJW
3e35984610
Medical GUI - Improve Selected Category colouration (#9324)
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-08-16 20:32:53 +02:00
BrettMayson
a40b0d48f2
HEMTT v10 Compatibility (#9105)
* HEMTT v10 Compatibility

* Update addons/field_rations/CfgUIGrids.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* fix PabstMirror review

* optionals

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Adapt to HEMTT v0.10.0-a14

* Revert End empty macro definitions with semi-colon

* Disable old HEMTT build step in CI

* Add missing include and fix macro usage and include casings

* End empty macro definitions with semi-colon (HEMTT v0.10)

* Update addons/disarming/functions/fnc_showItemsInListbox.sqf

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* cleanup test code

* arty - keep style same as before

* fix fire screams

* Update script_component.hpp

* Keep old hemtt/workflow/sqfc

* Update arma.yml

* Update arma.yml

* Update CfgUIGrids.hpp

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-02-01 23:28:55 -06:00
Filip Maciejewski
79ca6f5141
Medical - Add Patient Info to Layout Editor (#7745)
* Move GVAR(RscPatientInfo) contents into ControlsGroup

* Add CfgUIGrids for Medical PatientInfo

* Move Medical PatientInfo to Layout Editor position

* Uniform macro names

* Apply suggestions from code review

* Add IGUI category translation

* Update addons/medical_gui/stringtable.xml

Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>

* Update addons/medical_gui/CfgUIGrids.hpp

Co-authored-by: PabstMirror <pabstmirror@gmail.com>

* Remove redundant translations

Co-authored-by: Blutze <37950828+Blutze@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-06-13 15:53:50 -05:00
PabstMirror
e56cc0d74e
Limping / Splint Treatment (#6947)
* Improve adjustment calcs / wound blood loss / medications

fix func descriptions

Calc wound blood loss on events

reorder includes so scritpmacroMed has global effect

trivial optimization for getCardiacOutput

Fix var

Fix wounds not reopening (nil _category)

Fix surgical kit inherting canBandage conditional

debug hitpoints

Update ACE_Medical_Treatment_Actions.hpp

Use woundBleeding for IS_BLEEDING macro

rework medication vars

comments

Reset var in init / fullHeal

Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* Change wound data array

Drop unique id and merge classId and category

* Splinting and treatment and gui

* Add arm fractures and aim effects

* localizations and event

* fix

* cleanup

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* formating, rename bone images

* Apply suggestions from code review

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>

* disable calls to extension

* Update fnc_onMedicationUsage.sqf

* Medical - Skip unneeded setVars on initUnit (#6949)

*  Medical - Transfer state machine state on locality (#6950)

* Medical - Transfer state machine state on locality

* Fix feedback isUnconscious var

* Exclude AI

* Make UAV excludes consistant, formating

* Update fnc_treatmentFullHealLocal.sqf

* reset fractures on respawn
2019-05-11 23:13:59 -05:00
PabstMirror
751ddb64ac
Handle old public funcs, fix strings (#6890)
* Handle old public funcs, fix strings

* Update addons/medical/XEH_preInit.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-03-24 22:17:46 -05:00
mharis001
8d2bba4b35
Rewrite Medical GUI (#6831)
* Add a macro for the bloodloss scaling factor

* Adjust bloodloss threshold for red icon

* Remove bloodloss color scaling factor

The issue is actually the other way round, the factor of 20 would
instantly make bodyparts red on taking a wound.

* Implemet 10 color steps provided by ShackTac

This replaces the old method of colouring the interaction menu icons
and body image selections with a new method that has 10 distinct color
steps (matching across the icons and the body image).

* Use macros for constants

* Implement blue damage colouring

This re-adds visualisation for colouring based on damage. The case where
a limb has a tourniquet will hopefully be handled by an overlayed icon.

* Tidy up file structure

* Move patient information display to medical_ui

* Make common colour conversion code into functions

* Add tourniquet icon overlay to body image

* Fix mispelling I forgot to commit

* Update icon paths to new white cross icon

* Clean mess after rebase

* Add new medical menu gui

* Add updating injury list and body image

* Add updating treatment category buttons

* Update onMenuClose function

* Delete unused functions

* Add action buttons and triage card to menu

* Move medical menu PFH to separate function

* Move setTriageStatus to treatment

* Add triage select dropdown

* Add toggle button action

* Fix mouse moving randomly when opening

* Add logs list update and remove unused functions

* Hide tourniquet icons by default

* Remove CfgInGameUI (already in feedback)

* Update patient info display

* Update triage card display

* Add settings to control interact menu actions

* Cleanup files/paths

* Move triage status update to common function

* Add icons for interact menu actions

* Modify icon color for interact menu actions

* Update canOpenMenu for new setting

* Hide pain information for unconscious

* Stringtable cleanup

* Use switch for pain text

* Change minor triage status to minimal

* Fix injury list to use new stringtable entry names

* Fix medical actions check when disabled

* Skip distance check in same vehicle

* More cleanup

* Fix CI error

* Requested changes

* Fix INJURIES string

* Fix include after comment block

* Fix missing ;

Co-Authored-By: mharis001 <34453221+mharis001@users.noreply.github.com>
2019-03-24 18:17:48 -04:00