Commit Graph

19 Commits

Author SHA1 Message Date
PabstMirror
a3aef6a066
General - Cleanup spaces in macros (#9769)
Co-authored-by: LinkIsGrim <salluci.lovi@gmail.com>
2024-02-05 14:04:24 -03:00
jonpas
742626ff1a
General - Relative script_component.hpp includes (#9378)
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
2023-09-12 20:58:10 +02:00
Kyle Mckay
02365609b5
Medical - Change medical to use hashmaps for wound storage (#8926)
* Refactor medical to use hashmaps for wound storage

- We most frequently want to access wounds by body part, so this makes
  that a constant time lookup.
- The body part index is no longer stored in every wound since it's
  inherent in the wound storage.
- Using body part names as the keys of the hashmap to improve code
  clarity (no more magic numbers).

closes #6468

* Add deserilization migration from old wound arrays

Will migrate from old form array wound storage to the new hashmap
strucutre during deserlization. This is relevant for communities piping
medical state out to a database or similar between sessions.

* fix issue with suture stitching

* change version number in comment

---------

Co-authored-by: Salluci <salluci.lovi@gmail.com>
2023-06-24 08:11:56 +03:00
GhostIsSpooky
374a5b632f
Medical - Refactor Clear Trauma Setting (#8345)
* Refactor Clear Trauma

Add in setting for clearing trauma after stitching a wound, make clearing trauma after bandage clear trauma of individual wounds as they're bandaged instead of all at once when fully bandaged.

* Make git diff slightly prettier.

* Update fnc_bandageLocal.sqf

* Style pass

* once more for the diff

* fix stupid

* Ddd trauma/visuals on bandage reopening
2021-10-12 10:08:10 +02:00
Daniel Gibson
185c15de0e
Medical - Add Global Wound Reopen Chance Modifer (#7747)
* Added Bandage Reopening Chance Modifier

* Added Wound Reopen Chance Addon Setting

* Fixed dumb error in localization setup

* Credit!

* Resolved issue with Addon Settings definition & removed testing values.

* PR Feedback #1

- Removed unnecessary whitespace on LN 46
- Call global var directly at LN 87
- Updated Wound Reopen Chance localized name & description

* PR Feedback #2

- Increased reopen coefficient upper limit from 2 to 5.

* Changed author credit to reflect GitHub email.
2020-06-13 15:52:30 -05:00
mharis001
08a7d2706e Add wounds var macros (#7058) 2019-06-22 13:36:27 -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
847d2d4179
Medical - Improve adjustment calcs / wound blood loss / medications (#6910)
* 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>

* Update addons/medical_treatment/functions/fnc_onMedicationUsage.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-04-27 14:12:11 -05:00
Dedmen Miller
6bd8542eed Move #includes before function headers (#6484) 2018-07-30 10:22:14 +01:00
Thomas Kooi
36f2c5fcc9 Minor code clean up (#6474)
* Minor code clean up
* refactor(medical): shorten some code
* refactor(medical): use macros for tourniquets
* refactor(medical): pull cache expiry values into script_macros_medical
2018-07-29 22:43:14 +01:00
ulteq
0d0cf38028 Fix bandage reopening classname/category lookup 2016-12-14 21:17:39 +01:00
ulteq
6b611ffbbd Cleanup: 'handleBandageOpening' 2016-12-10 16:36:36 +01:00
ulteq
a5ce5b4a34 Medical Rewrite - Continued (#4744) 2016-12-05 21:34:20 +01:00
commy2
370faf9b48 cleanup 2016-10-20 13:38:26 +02:00
commy2
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
commy2
7470d1f0f5 cleanup/improve parseConfigForinjuries 2016-09-27 11:05:38 +02:00
Glowbal
131ef576b4 Add medical treatments and configuration 2016-07-15 12:23:47 +02:00
Glowbal
3aa88c80bf Add first step in medical rewrite
Split up medical core and medical damage. Move out all other functionality
2016-06-30 17:33:29 +02:00
Glowbal
a8831a0d16 Change split medical in two components
- medical component is responsible for the injuries and common functionality
- medical_treatment component is responsible for offering treatment functionality
2016-06-13 17:00:56 +02:00