Commit Graph

139 Commits

Author SHA1 Message Date
464ab0cefb Tools - Add HEMTT SQF support and fix commas are not semicolons (#9663)
Co-authored-by: johnb432 <58661205+johnb432@users.noreply.github.com>
Co-authored-by: PabstMirror <pabstmirror@gmail.com>
Co-authored-by: jonpas <jonpas33@gmail.com>
2023-12-07 03:20:47 +00:00
3442a47942 General - Remove deprecated functions (#8878) 2022-04-17 08:27:19 +01:00
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
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
2d0090422c move settings to sqf 2019-03-24 00:37:39 -05:00
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
3bf3629047 Fixes state machine (#6435) 2018-07-16 23:25:54 +02:00
535e285c2c Fix cardiac arrest time scale (#6244)
This was changed from minutes to seconds at some point, but not
everywhere. Just making it consistent.
2018-04-18 23:25:44 +01:00
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
a48d271368 Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits
Introduce small variation to length of cardiac arrest
2016-12-08 14:22:11 +01:00
ab7af04530 Overhauled the medication system:
* Refactored the old code
* Introduced 'timeTillMaxEffect' config entry for medication
2016-12-06 20:42:10 +01:00
9cba0baade manual merge 2016-12-05 20:18:15 +01:00
a83267b2ff manual merge 2016-12-05 20:15:16 +01:00
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06:00
39582914f7 Add 10% variation to cardiac arrest time
Gaussian distribution favours the average time setting. This introduces some unpredictability to cardiac arrest, but not enough to make users confused. Keeps the settings simple to again reduce confusion and improve overall UX.
2016-11-15 17:00:22 +00:00
24ada4dab3 Clarify the maximumCardiacArrestTime setting 2016-11-13 21:45:38 +00:00
27728172ed Clarify the allowDeathMode setting 2016-11-13 21:27:40 +00:00
dac4a4dc42 Merged instant death and execution into one setting 2016-11-09 19:01:55 +01:00
08a378bb2d Added execution system, improved instant death 2016-11-08 19:37:56 +01:00
0427814961 Started transition to CBA state machine, removed revive in favour of extended cardiac arrest 2016-11-07 22:21:07 +01:00
7e498ab762 setting for basic/advanced syringes 2016-10-20 02:14:11 +02:00
fe2c6e8d85 basic <-> advanced 2016-10-13 17:14:43 +02:00
68d75beae6 manual merge 2016-10-13 16:56:57 +02:00
b1f0af7e1c merge basic and adv. bandage actions 2016-10-13 09:10:08 +02:00
92fc4ec14b add a setting for 'basic' blood bags 2016-10-12 22:38:58 +02:00
05d30c5573 convert log macros to cba versions (#4282)
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
2016-10-02 12:55:31 +02:00
9f6baca424 port injury parse fnc to medical damage 2016-09-26 20:25:14 +02:00
c4d2383005 Increase blood bag flow rate for basic medical (#4306)
* Change blood bags

- Increase flow rate for basic medical
- Don't queue bags

* change to ivBags, reset var on init / fullHeal
2016-09-01 12:46:08 +02:00
2ac52fb430 remove static fix from vmedical component 2016-08-27 08:50:55 +02:00
e8eb729e04 Merge medical core and medical state. Add working version of the state machine, re-add sounds 2016-07-02 16:34:28 +02:00
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
e7dbcd7b58 Replace delayed execution functions with new CBA counterparts 2016-05-22 15:29:01 +02:00
46a239f9f6 precompile on game start 2016-02-22 15:20:36 +01:00
7d063d4dee Merge branch 'master' into medical-focus-feature
Conflicts:
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
44b526ab6d bodybag - hide player corpse and delete later
Fix #1301
2016-02-19 15:41:13 -06:00
f1797feead Make wound assignment consistent for dll/sqf
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
ff86359247 Merge branch 'master' into medical-focus-feature 2016-02-13 19:51:45 +01:00
ff4ba98e68 Pre-load again on mission load (save game) 2016-02-10 11:50:30 -06:00
e1b83b8172 Manually pre-load for StaticWeapons and Car
Fix #3168
2016-02-09 22:43:38 -06:00
e754c89c73 Remove non functional event driven handleDamage 2016-02-07 13:18:19 +01:00
575f362fb6 Add setting for limiting usage of Epinephrine in basic medical #1792
Part of focus feature medical #3134. Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
ee9a620a63 Merge branch '340handledamage' into medical-focus-feature 2016-01-16 22:03:28 +01:00
a5c45c137f Medical - addDamageToUnit Helper 2015-11-26 09:53:12 -06:00
8f6e9be636 Add method to deal with new hitpoints
This addition tries to deal with the new hitpoints introduced in Arma3 v1.50 and above. It converts new selection names to by the current medical system usable selection names.

This is only a temporarily patch, while we are still working on a larger overhaul to account both the new hitpoints and any potential new features / polishing.
2015-11-01 16:35:25 +01:00
573279bd30 add selection, collision, fall and drowning damage events 2015-10-02 23:19:14 +02:00
4514812523 Basic bandaging now works with new damage system 2015-09-05 11:51:46 +02:00
f15805d1f3 setStructuralDamage function 2015-08-31 20:05:38 +02:00
9edf1b1adf Implemented use conditions for PAK and SurgicalKit
It is now possible to only have a treatment action show up for stable (not bleeding) patients
2015-07-03 22:16:18 +02:00
91b54bfc3a Adds a back up function in sqf to assign open wounds. 2015-06-13 23:20:01 +02:00
46a73f3177 Added a function to calculate the PAK treatmentTime 2015-06-12 11:42:49 +02:00