* Merge ACEX - first attempt
Backwards compatibility with XGVAR set of macros used on all settings and config entries
Public API functions not taken into account yet, many other things probably still missed
* Resolve issues
* Switch to addSetting, backward compatible CfgPatches, missed XGVAR.
* Remove unnecessary backwards compat
* Convert ACEX Categorised settings to initSettings / Fix Intel items magazine
* Apply suggestions from code review
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Remove maintainers from merged ACEX components
* Cleanup unused module and faction classes
* Sitting - Add more object configs by @Dystopian
https://github.com/acemod/ACEX/pull/255
* Translations - Add Japanese by @classicarma
https://github.com/acemod/ACEX/pull/259
* Kill Tracker - Add killtracker.inc public include file by @Freddo3000"
https://github.com/acemod/ACEX/pull/251
* Add ACEX authors and sort authors file
* acex - final tweaks (#8513)
* acex - handle old funcs
* replace thirst/hunger setvars to acex naming
fix macro
Revert "fix macro"
This reverts commit d807e5e804c43916eaa42d34a89af94c6d9a48ad.
Revert "replace thirst/hunger setvars to acex naming"
This reverts commit bafc607884932d6e339daedc7c22e25dddbdd868.
x
Co-authored-by: TyroneMF <TyroneMF@hotmail.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* 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
* Added Addon Settings for several Medical Treatment Times
Tourniquets, IV Bags, Syringes, Splints, and Body Bags.
* Fixed stringtable indentation
* And again
* Medical - Combine advancedBandages and woundReopening settings
* Improve German translation
Co-Authored-By: Jo David <github@jonathandavid.de>
* restore strings lost in merge
Co-authored-by: Jo David <github@jonathandavid.de>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
* Option for medical treatment to require holstering/lowering weapon, with an option for examine category items to still be available.
* Vehicles cause holster settings to be ignored.
Unsure whether to expand this into it's own setting (disallow all medical in vehicles? only allow if both medic and patient are in the same vehicle? what about people in the back of transports healing those in the cab?), but just going to leave it as is for now.
* Replace !isEqualTo with != in for performance reasons.
Resolves line 33 PR review.
* Merge settings, short circuit
* move logic to new file
* Cleanup medical settings
* Fix extra [
* Allow giving IV/blood to self by default
* Medical Blood - Settings improvements and cleanup (#7069)
* Add more blood settings and cleanup
* Fix include before header
* Update addons/medical_blood/functions/fnc_init.sqf
Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
* Disable debug
* Cleanup moved settings
* Fix remaining setting descriptions
* 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>
