Commit Graph

1054 Commits

Author SHA1 Message Date
Grim
892671c770
Medical - Prevent running FUNC(deserializeState) in scheduled environment (#9662)
Run deserializeState in unscheduled
2023-12-11 14:03:36 -08: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
Tim Beswick
29b5eb97a9
Medical - Handle wound hashmaps deserialized as CBA_namespaces (#9245) 2023-07-09 17:33:51 +03: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
jonpas
76e1aafb33
Use function documentation script (#6897)
Co-authored-by: Björn Dahlgren <bjorn@dahlgren.io>
2023-04-30 23:03:35 +02:00
pterolatypus
73a7dbdc1e
Medical - Rework wound handling (#8278)
- Add stackable wound handler system for easy 3rd party extensibility and overriding of default wound handler.
- Change mapping from wound type -> damage types, to damage type -> wound types. Improves the semantics and makes configuration easier to reason about.
- Allow damage types to influence wound properties (bleed, size, etc.) with configurable variance parameters.
- Allow configuration of wound type variance per damage type. Enabling more logically driven variance for sensible but still varied end results.
- Improve handling of non-selection-specific damage events. The wound handler now receives all incoming damages and may apply damage to multiple selections (previously only ever one) if the damage type is not configured to be selection specific (with new config property `selectionSpecific`).
- Add debug script for testing explosion damage events at varied ranges.
- Add custom fire wound handler.
2022-02-17 20:03:12 +00:00
mjc4wilton
5bad6899cb
Medical - Add option to prevent scripted injuries on invulnerable units (#8599)
* Medical - Add option to prevent scripted injuries on invulnerable units

* Update docs

* Change from CBA setting to optional parameter

* Update header arguments to follow coding guidelines

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

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

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

* Increase readibility

* Fix trace macro

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

* Update addons/medical/functions/fnc_addDamageToUnit.sqf

Co-authored-by: jonpas <jonpas33@gmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: BaerMitUmlaut <BaerMitUmlaut@users.noreply.github.com>
2021-11-08 12:03:59 -06:00
PabstMirror
7bc6fdfa66
Cleanup - Trim all trailing whitespace (#8651) 2021-10-30 16:42:03 -05:00
mharis001
0fe54b895a
Medical - Clean up namespaces used by (de-)serializing functions (#8514) 2021-10-14 02:10:20 -04:00
BaerMitUmlaut
88bbb0dd69
Medical - Add functions to serialize / deserialize the medical state of a unit (#7944) 2021-07-23 15:49:04 +02:00
PabstMirror
f9d181c72e
Medical - Fix addDamageToUnit (#7247) 2019-10-20 16:48:26 -05:00
PabstMirror
b236cf9a65
Medical - Fix addDamageToUnit (#7228) 2019-10-05 15:31:40 -05:00
PabstMirror
f5782fd1ff
Medical - Various debugging and fix cpr anim speed (#7122)
* Medical - Various debugging and fix cpr anim speed

* Update fnc_setCardiacArrest.sqf
2019-08-06 08:10:33 -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
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
PabstMirror
0d7709673a
Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS (#6966)
* Medical Feedback - Fix DISABLE_VANILLA_DAMAGE_EFFECTS

* Keep compatibilty with old ace_medical_lastDamageSource var name
2019-04-27 14:04:31 -05:00
PabstMirror
56811403f2
Medical - add eh for setUnconscious helper func (#6937) 2019-04-16 16:47:13 -05:00
PabstMirror
9588b13942 Zeus/Medical - Fix modules for rewrite (#6914)
* Zeus/Medical - Fix modules for rewrite

* move wakeup logic to medical_treatment
2019-04-03 06:17:17 -07:00
mharis001
30b99fa20a Medical Rewrite - Remove dropDownTriageCard function (#6907)
* Remove dropDownTriageCard function

* Delete fnc_updateTourniquets.sqf
2019-03-30 16:06:36 -05:00
PabstMirror
f2b9bf3a17 Update headers 2019-03-30 11:07:54 -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
PabstMirror
c492f184b4 move dev funcs to folder 2019-03-23 19:55:04 -05:00
Magnetar
cc11ad051d Formatting. Lazy eval 2019-03-21 14:34:51 +01:00
Magnetar
bb2d1e4e9e Merge branch 'master' into medical-rewrite 2019-03-17 17:39:43 +01:00
Cyruz143
a18f4180ac Medical - Adding option to convert vanilla medical gear (#6680)
* Adding option to convert vanilla medical gear

* Better wording on setting description

* Shortern var names

* Shorter settings title

* 3 options (enabled, just remove, disabled)
2019-01-03 14:26:22 -06:00
PabstMirror
f57d5ac180
Medical - Skip distance check if in same vehicle (#6757)
* Medical - Skip distance check if in same vehicle

* Update addons/medical/functions/fnc_displayPatientInformation.sqf

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-01-02 09:56:26 -06:00
PabstMirror
f4f67e262d
Medical - Add vehicle hint when loading unconc (#6759) 2019-01-02 09:55:25 -06:00
diwako
88eb743485 Medical - Show tourniquets in Medical and Patient information (#6681)
* Show tourniquets in Medical and Patient information

* Ace styling

* Move tourniquet update function to medical
2018-12-06 13:41:23 -06:00
commy2
8541716bee Medical - optimize handle damage caching (#6657)
* optimize handle damage caching

* delete some rogue code

* it was 2 all along

* add calls
2018-11-01 13:05:56 -05:00
commy2
5aa8c1dca0 make setUnconscious not reset firing mode (#6519) 2018-09-18 11:35:40 -05:00
Dedmen Miller
e2ac18a05d [WIP] Fix script errors reporting wrong line numbers (#6407)
* advanced_ballistics

* advanced_fatigue

* advanced_throwing

* ai

* aircraft

* arsenal

* atragmx

* attach

* backpacks

* ballistics

* captives

* cargo

* chemlights

* common

* concertina_wire

* cookoff

* dagr

* disarming

* disposable

* dogtags

* dragging

* explosives

* fastroping

* fcs

* finger

* frag

* gestures

* gforces

* goggles

* grenades

* gunbag

* hearing

* hitreactions

* huntir

* interact_menu

* interaction

* inventory

* kestrel4500

* laser

* laserpointer

* logistics_uavbattery

* logistics_wirecutter

* magazinerepack

* map

* map_gestures

* maptools

* markers

* medical

* medical_ai

* medical_blood

* medical_menu

* microdagr

* minedetector

* missileguidance

* missionmodules

* mk6mortar

* modules

* movement

* nametags

* nightvision

* nlaw

* optics

* optionsmenu

* overheating

* overpressure

* parachute

* pylons

* quickmount

* rangecard

* rearm

* recoil

* refuel

* reload

* reloadlaunchers

* repair

* respawn

* safemode

* sandbag

* scopes

* slideshow

* spectator

* spottingscope

* switchunits

* tacticalladder

* tagging

* trenches

* tripod

* ui

* vector

* vehiclelock

* vehicles

* viewdistance

* weaponselect

* weather

* winddeflection

* yardage450

* zeus

* arsenal defines.hpp

* optionals

* DEBUG_MODE_FULL 1

* DEBUG_MODE_FULL 2

* Manual fixes

* Add SQF Validator check for #include after block comment

* explosives fnc_openTimerUI

* fix uniqueItems
2018-09-17 14:19:29 -05:00
SilentSpike
7fcd12c792
Reset default state on respawn (#6518)
* Reset default state on respawn
* Remove old getUnitState function
* Add locality check
2018-08-12 10:14: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
Dedmen Miller
7a0a00ea09 Cleanup using SQFLint (#6485)
* Use private
* Fix wrong spacing
* Fix wrong variable being used
* Cleanup empty line after header
* ace_common_fnc_getCountOfItem
* Remove useless _return variable
* Naming
2018-08-02 15:02:10 +01:00
Dedmen Miller
6bd8542eed Move #includes before function headers (#6484) 2018-07-30 10:22:14 +01:00
Thomas Kooi
c9ad92e92d
Disable debugging (#6482) 2018-07-30 00:07:30 +02: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
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
ec7a9a133e
Fix required addons in medical restructure (#6441) 2018-07-18 19:19:28 +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
TheMagnetar
3bf3629047 Fixes state machine (#6435) 2018-07-16 23:25:54 +02:00
Magnetar
9b5c5bc866 Fix QGVAR medical variables 2018-07-16 15:35:34 +02:00
Glowbal
f552acd7da Fix incorrect macro usages with whitespace 2018-07-15 16:25:14 +02:00
Glowbal
9d2e76e67a More component name fixes and small clean up 2018-07-15 16:24:04 +02:00
Thomas Kooi
14db38e0f0 Fix various namespace issues with medical 2018-07-15 15:00:16 +02:00
Josuan Albin
09855f133a Fix typo in med and issue related to unconsciousness (#6411)
* Fix adenosine displayname being wrong in some medical interactions

* Fix unconscious units waking up while being carried staying muted
2018-06-28 00:06:12 -05:00
SilentSpike
ff33f8e954 Use macro for unconscious variable 2018-05-22 17:21:24 +01:00
SilentSpike
1dc934e1b1 Use macros for unit variables
Improves the way medical is storing variables in object space by having
a common list of variables names as macros. Makes the code a bit cleaner
and ensured consistency across components. Also a handy reference for
when working on medical to see what values are all stored.
2018-05-11 15:28:25 +01:00
SilentSpike
33a5fb46f5 Fix patient information display 2018-05-08 14:51:32 +01:00
SilentSpike
697aa5dc08 Fix medical status function calls 2018-05-08 10:45:30 +01:00