Commit Graph

68 Commits

Author SHA1 Message Date
BrettMayson
e2154439a8
Medical Treatment - Add separate actions for colored body bags (#9598)
* medical treatment: separate actions for each bodybag

* remove extra icons
2023-10-30 16:54:29 -04:00
Grim
b8a9376a65
Medical Treatment - Use Laws of War bodybag model and add colored bodybags (#9371)
* add colored bodybags

* fix dogtags, add icons, revert item model to original

* Retexture ace's item model

* Keep original vehicle classname

* Update fnc_placeInBodyBagOrGrave.sqf

* fix displayName

---------

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-10-24 15:16:52 -04:00
Drofseh
8bf0772558
Medical Treatement - Add Grave Digging To Body Bags (#9442)
* add grave digging to body bags

* move buryBodyBag action to config, change grave ui icon to headstone

* improvements from code review

* switch direction check to man instead of bodybag, nominally allowing anything to be buried

---------

Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-10-01 14:55:13 -04:00
Drofseh
94f3b301e0
Medical Treatment - Add Grave Digging for Corpse Disposal (#9276)
* Add grave digging

* Update fnc_placeInBodyBagOrGrave.sqf

* Update fnc_placeInBodyBagOrGrave.sqf

* Update fnc_placeInBodyBagOrGrave.sqf

* Update addons/medical_treatment/functions/fnc_placeInBodyBag.sqf

Co-authored-by: BrettMayson <brett@mayson.io>

* Add setting to enable/disable

* improvements

- fix flipped bool in fnc_canDigGrave
- improve fnc_placeInBodyBagOrGrave.sqf by splitting out some checks and item assignment into separate bodybag and grave functions

* fix typo in variable

* Apply suggestions from code review

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Apply suggestions from code review

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* add to XEH_PREP and fix event for non-local patient

* Add interaction to check name on headstone

* Update addons/medical_treatment/XEH_postInit.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Simplify Setting

* Apply suggestions from code review

Co-authored-by: jonpas <jonpas33@gmail.com>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: jonpas <jonpas33@gmail.com>

* Make placeInBodyBagOrGrave more generic and use any grave class

* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf

Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>

* Update medical-treatment-framework.md

* Update docs/wiki/framework/medical-treatment-framework.md

Co-authored-by: jonpas <jonpas33@gmail.com>

* update docs

* Update addons/medical_treatment/functions/fnc_placeInBodyBagOrGrave.sqf

* Update addons/medical_treatment/functions/fnc_placeInGrave.sqf

* fix includes

---------

Co-authored-by: BrettMayson <brett@mayson.io>
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: Grim <69561145+LinkIsGrim@users.noreply.github.com>
2023-09-24 15:57:08 -04:00
KJW
fd3c9c967d
Medical Treatment - Improve Medical Actions underwater (#9096) 2023-05-15 23:47:00 -06:00
BrettMayson
e252ef67d6
Medical Treatment - Suture (#9020)
Co-authored-by: Walthzer <19926813+Walthzer@users.noreply.github.com>
2023-03-06 14:17:01 -06:00
PabstMirror
cdd7b6d81b
Medical Treatment - Allow diagnosing death/CA (invalidates old setting) (#8162)
* Medical Treatment - Allow diagnosing death/CA

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>

* Update addons/medical_treatment/stringtable.xml

Co-authored-by: mharis001 <34453221+mharis001@users.noreply.github.com>
2021-09-03 14:50:54 -05:00
pterolatypus
b2da1792e1
Medical Treatment - Settings to limit IVs to certain locations (#8116)
* Settings to limit IVs to certain locations

* Changed to one setting

* Reworded settings for consistency
2021-02-27 11:06:37 -06:00
mharis001
171fbf1e9e
Medical Treatment - Settings cleanup (#7973) 2020-10-30 23:40:10 -05:00
diwako
2b0db19807
Medical - Adjustable times for many treatment actions (#7951)
* adjustable times for most constant treatment times

* add new line, formatting

* cleanup merge

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:37:44 -05:00
Brett
9e3409fc6e
Medical - Allow placing unconscious in a body bag (#7941)
* medical: allow placing unconscious in a bodybag

* Always show body bag action on non-awake units

Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2020-10-29 11:37:36 -05:00
Daniel Gibson
174223bddf
Medical - Add Treatment Time Addon Settings (#7900)
* Added Addon Settings for several Medical Treatment Times

Tourniquets, IV Bags, Syringes, Splints, and Body Bags.

* Fixed stringtable indentation

* And again
2020-10-29 11:07:30 -05:00
Filip Maciejewski
6fb8991bd6
Medical - Prevent packing into bodybag for bodies in vehicle (#7731)
* Prevent packing into bodybag for bodies in vehicle

* Fix comment
2020-05-28 23:07:26 -05:00
diwako
db2900eeb9 Add setting for blood transfusion medic level 2020-01-16 00:28:02 +01:00
mharis001
62fccd6ff0 Medical Treatment - Add self PAK setting (#7382) 2020-01-04 12:42:51 +00:00
Josuan Albin
aec7a78a58 Remove Atropine (#7212)
* Change items to scope 1 to keep mission backwards compatibility
2019-10-05 22:25:29 +02:00
Josuan Albin
df8814e344 Add self stitching setting (#7134) 2019-08-12 20:05:59 +01:00
PabstMirror
de13ab0f47
Medical - Rework CPR and Bleeding in cardiac arrest (#7060)
* Medical - Rework CPR and Bleeding in cardiac arrest

* remove cprCreatesPulse, add cprSuccessChance

* hide cpr for basic diagnose

* Update addons/medical_statemachine/functions/fnc_enteredStateCardiacArrest.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-27 19:01:20 -05:00
PabstMirror
f04b26b93e
Medical - Finish splint/fracture (#7045)
* Medical - Finish splint/fracture

- Add replacement items

* Add splint models

* Add fracture sound effects

* Add treatment interaction icon
2019-06-22 16:47:35 -05:00
Katalam
d26fcb6f1a Changed animation for cpr (#6918) 2019-06-22 15:55:42 -05:00
mharis001
44050df98b Medical Treatment - Modernize and Cleanup (#6933)
* Modernize and cleanup medical_treatment

* One line for each old public function

* Fix litterCleanupDelay name

* 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

* fix merge for renamed files

* Fixes and code review changes

* Move medical logs clearing to treatment

* More cleanup work

* cleanup

* Apply suggestions from code review

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

* formating, rename bone images

* Fix args for setDead call in actionPlaceInBodyBag

* 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

* Fix merge

* Add PAK time coefficient setting

* Fix medication

* Add ace_medical_replacementItems config array

* checkItems performance improvement

* Treatment - cap max animation speed (#6995)

* Treatment - cap max animation speed

and add lock to prevent AF from reseting anim

* Update fnc_getBandageTime.sqf

* Use local version of setAnimSpeedCoef

* Revert "Use local version of setAnimSpeedCoef"

This reverts commit 36c22a9047.

* Move replacementItems compiling to preInit

* Improve replacementItems compiling

* Cleanup splint functions, use macros for fractures

* Rename splintCondition to canSplint

* Add cprCreatesPulse setting

* Cleanup remaining functions

* Capitalize stringtable entry names

* getStitchTime function and fix treatment locations

* Update addons/medical_treatment/functions/fnc_getHealTime.sqf

Co-Authored-By: SilentSpike <silentspike100+Github@gmail.com>
2019-06-03 10:31:46 -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
Katalam
55a7d53437 Medical - Add condition for surgicial kit (#6916)
* Added condition canStitch

* Update XEH_PREP.hpp

* Update addons/medical_treatment/functions/fnc_canStitch.sqf

Co-Authored-By: Katalam <39590058+Katalam@users.noreply.github.com>

* Added example, removed arguments information and changed > to isEqualTo

* Added example in canBandage too
2019-04-03 04:36:37 -07:00
SilentSpike
ac1651c6db Prevent bandaging when not bleeding (#6532) 2019-03-30 15:44:58 -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
SilentSpike
0e8ed5315e
Remove patient treatment animations (#6524)
* Prevent treatment animation on dead bodies

This was causing bodies to glitch out on dedicated servers according to
feedback

* Remove patient animation logic and setting
2018-08-12 12:28:48 +01:00
SilentSpike
9e5c4a7ed9
Move medical settings into their respective components (#6493)
* Transfer medical AI to CBA setting
* Neuter the old settings module

I've left the entry in CfgVehicles so that it doesn't cause errors on
older missions, but it's just a dumb logic now and does nothing.

* Remove medic setting
* Move increaseTraining setting
* Move fnc_adjustPainlevel to medical_status
* Move pain and bleed coefficients to medical_status
* Move advanced bandages to medical_treatment
* Move advanced medication to medical_treatment
* Move advanced diagnose to medical_treatment
* Move wound reopening and screams settings
* Move damage threshold settings
* Move showPain setting
* Move statemachine settings
* Move pain visualisation setting
* Move all treatment usage settings
* Move self IV setting
* Move remaining settings
* Sort treatment setting string categories
2018-08-06 17:08:43 +01:00
Thomas Kooi
e22f35da37 Remove medkit (#6473)
Due to be replaced by an alternative treatment option such as a split
2018-07-26 17:14:11 +01:00
SilentSpike
39b1d144e1
Vary time taken to bandage based on circumstances (#6467) 2018-07-25 09:35:04 +01:00
SilentSpike
4466f9e785
Strip medical component (#6442)
* Move litter to `treatment`
* Move eden object attributes to `treatment`
* Move treatment items to `treatment`
* Move bodybag handling to `treatment`
* Move state conditions to `statemachine`
* Move radio addon handling to `feedback`
* Move medical macros to `engine`
* Move medical extension to `damage`
* Fix texture and material paths after move
* Remove duplicate medical menu config
* Remove old faction class
* Remove a bunch of old code
2018-07-18 19:13:25 +01:00
SilentSpike
68ff7575eb
Move medical facility, vehicle and unit functions (#6440) 2018-07-18 11:09:48 +01:00
Thomas Kooi
19f3b753f0 Decrease treatment time of medication to 5s 2018-07-15 13:59:47 +02:00
SilentSpike
697aa5dc08 Fix medical status function calls 2018-05-08 10:45:30 +01:00
commy2
b9d792ebcd merge 2018-01-02 15:08:10 +01:00
Ľuboš Lendáč
38e7913caf Add HealTime modifiers to medical settings (#5188)
* Add modifiers of TreatmentTime of PAK and Medkit to settings

* Fix indents and stringtable tags

* Fix Healtime vars

* Absolute time for PAK to settings

* Add Medkit Healtime setting
2017-12-30 12:01:23 +00:00
Zakant
327124003c Fixed condition expression 2017-03-23 15:30:01 +01:00
Zakant
58ed8a6c81 Modified cpr condition 2017-03-23 13:41:49 +01:00
Zakant
86bf9f4262 Fixed progress callback 2017-03-23 13:34:25 +01:00
Zakant
c790d0eb3e Added failure callback 2017-03-23 13:32:49 +01:00
Zakant
477496e4f6 Added cpr start callback and function 2017-03-23 13:15:17 +01:00
Zakant
0d329e0f63 Added startCallback config entry 2017-03-23 13:03:19 +01:00
ulteq
cc19499e8f fieldDressing -> FieldDressing 2016-12-15 14:06:09 +01:00
ulteq
9ddaa01462 Always allow the use of tourniquets
* Even when advanced bandages are turned off
2016-12-15 14:05:08 +01:00
ulteq
91cbc0e4d4 Added new setting 'advancedDiagnose'
* Which allows to choose between the old basic- and advanced diagnose actions
2016-12-15 14:00:09 +01:00
ulteq
151d4a4bfe Settings overhaul
New settings:
* allowSelfIV
* showPainInMenu

Converted CBA -> ACE Settings:
* advancedBandages
* advancedMedication
* fatalInjuryCondition
* cardiacArrestTime

Fixed settings:
* useLocation_Epi
* medicSetting_Epi
* painCoefficient
2016-12-14 20:44:06 +01:00
PabstMirror
b87bdfe14a Fix body-bag action / cleanup 2016-12-09 21:03:52 -06:00
ulteq
ada43148e9 Removed deprecated revive settings 2016-12-09 17:07:05 +01:00
ulteq
c486f17539 Implemented Medkit (works like in ACE2) 2016-12-08 18:11:24 +01:00
ulteq
b81a5adcb9 Renamed 'healTime' calculation helper 2016-12-08 12:30:59 +01:00
ulteq
78bfc0c26d Simplified damage storage 2016-12-08 11:38:43 +01:00