Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
15,039 Commits 73 Branches 88 Tags 752 MiB
6bc5193a79
Commit Graph

397 Commits

Author SHA1 Message Date
Thomas Kooi
9c00c6ffb5 Fix bunch of script errors related to getVars on start up of game 2018-07-15 13:01:26 +02:00
SilentSpike
54c398a007 Use macros for peripheral resistance 2018-05-23 10:52:47 +01:00
SilentSpike
de2d7f2fb8 Use macros for hemorrhage class tracking 2018-05-22 18:25:50 +01:00
SilentSpike
c9e11e62a1 Use macros for status state variables 2018-05-22 18:06:28 +01:00
SilentSpike
ff33f8e954 Use macro for unconscious variable 2018-05-22 17:21:24 +01:00
SilentSpike
563742bdd8 Fix heart rate and pain suppression adjustments 2018-05-11 16:11:01 +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
e0503129f0 Use blood bolume status macros 2018-05-10 17:44:02 +01:00
SilentSpike
4303a340de Fix stringtable duplicates and missing Key tag 2018-05-08 14:37:54 +01:00
SilentSpike
a16721a1ea Fix medical statemachine function calls 2018-05-08 11:12:01 +01:00
SilentSpike
697aa5dc08 Fix medical status function calls 2018-05-08 10:45:30 +01:00
SilentSpike
65f57361a4 Add blood pressure status macro 2018-05-08 09:28:16 +01:00
SilentSpike
7d55163463 Add missing PREPs 2018-04-27 15:43:41 +01:00
SilentSpike
895f08a215
Reset triage card on full heal (#6243) 2018-04-11 20:34:32 +01:00
commy2
b9d792ebcd merge 2018-01-02 15:08:10 +01:00
commy2
68228e9fef merge 2018-01-02 15:06:53 +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
commy2
4db844e596 merge 2017-12-23 01:47:43 +01:00
PabstMirror
32e73fa1b3 Fix addLoadPatientActions 2017-10-02 22:37:22 -05:00
PabstMirror
af48c6a86c Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/ACE_Medical_SelfActions.hpp
	addons/medical/CfgVehicles.hpp
	addons/medical/XEH_PREP.hpp
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical_treatment/functions/fnc_actionLoadUnit.sqf
 2017-10-02 22:29:30 -05:00
PabstMirror
4c28c4de22 Reset isLimping var 2017-09-26 17:43:54 -05:00
PabstMirror
0ff9a5bf64 Add error logging 2017-09-23 12:09:35 -05:00
PabstMirror
04db4add26 Remove unused addUnloadPatientActions 2017-09-23 11:58:49 -05:00
PabstMirror
bec55114fa Add load,unload and radial actions (#5270) 
- Add radial actions
- Revert back to using 'ACE_isUnconscious'
 2017-06-15 14:35:33 -05:00
PabstMirror
356a8f640a Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/functions/fnc_actionCheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulse.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionRemoveTourniquet.sqf
	addons/medical/functions/fnc_addHeartRateAdjustment.sqf
	addons/medical/functions/fnc_addToInjuredCollection.sqf
	addons/medical/functions/fnc_addUnconsciousCondition.sqf
	addons/medical/functions/fnc_addVitalLoop.sqf
	addons/medical/functions/fnc_canTreat.sqf
	addons/medical/functions/fnc_copyDeadBody.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_determineIfFatal.sqf
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_getBloodPressure.sqf
	addons/medical/functions/fnc_getBloodVolumeChange.sqf
	addons/medical/functions/fnc_getCardiacOutput.sqf
	addons/medical/functions/fnc_getHeartRateChange.sqf
	addons/medical/functions/fnc_getTriageStatus.sqf
	addons/medical/functions/fnc_getUnconsciousCondition.sqf
	addons/medical/functions/fnc_handleBandageOpening.sqf
	addons/medical/functions/fnc_handleCollisionDamage.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_advancedSetDamage.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_fractures.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_handleDamage_woundsOld.sqf
	addons/medical/functions/fnc_hasMedicalEnabled.sqf
	addons/medical/functions/fnc_hasTourniquetAppliedTo.sqf
	addons/medical/functions/fnc_isInStableCondition.sqf
	addons/medical/functions/fnc_isMedicalVehicle.sqf
	addons/medical/functions/fnc_itemCheck.sqf
	addons/medical/functions/fnc_medicationEffectLoop.sqf
	addons/medical/functions/fnc_modifyMedicalAction.sqf
	addons/medical/functions/fnc_moduleAdvancedMedicalSettings.sqf
	addons/medical/functions/fnc_moduleAssignMedicalFacility.sqf
	addons/medical/functions/fnc_moduleBasicMedicalSettings.sqf
	addons/medical/functions/fnc_moduleReviveSettings.sqf
	addons/medical/functions/fnc_parseConfigForInjuries.sqf
	addons/medical/functions/fnc_playInjuredSound.sqf
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_selectionNameToNumber.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setHitPointDamage.sqf
	addons/medical/functions/fnc_setStructuralDamage.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatment.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
	addons/medical/functions/fnc_treatmentAdvanced_CPRLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandage.sqf
	addons/medical/functions/fnc_treatmentAdvanced_bandageLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHeal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medication.sqf
	addons/medical/functions/fnc_treatmentAdvanced_medicationLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbag.sqf
	addons/medical/functions/fnc_treatmentBasic_bloodbagLocal.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentBasic_morphine.sqf
	addons/medical/functions/fnc_treatmentBasic_morphineLocal.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
	addons/medical/functions/fnc_treatmentTourniquet.sqf
	addons/medical/functions/fnc_treatmentTourniquetLocal.sqf
	addons/medical/functions/fnc_treatment_failure.sqf
	addons/medical/functions/fnc_treatment_success.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
	addons/medical/functions/fnc_useItem.sqf
	addons/medical/functions/fnc_vitalLoop.sqf
	addons/medical_blood/functions/fnc_hit.sqf
	addons/medical_treatment/functions/fnc_hasItem.sqf
	addons/medical_treatment/functions/fnc_useItems.sqf
 2017-06-10 10:21:18 -05:00
PabstMirror
9e1a9b9af9 Fix bad var names 2017-05-14 15:14:22 -05:00
PabstMirror
690e415ffe Minor cleanup 2017-03-25 11:36:37 -05:00
Zakant
1fb6521021 Added checkItem on loadout change (#5021) 2017-03-25 11:08:47 -05:00
Zakant
14e146cbeb Added missing dot 2017-03-23 18:44:45 +01:00
Zakant
7bd2725f29 Fixed space after if 2017-03-23 18:40:18 +01:00
Zakant
f8a2d404e2 Fixed more typos 2017-03-23 18:17:38 +01:00
Zakant
b5a48bb4dc Fixed newline after include 2017-03-23 17:32:03 +01:00
Zakant
ff823e0590 Fixed space 2017-03-23 17:27:53 +01:00
Zakant
ad1e233a29 Fixed indentation 2017-03-23 17:27:11 +01:00
Zakant
89cf679af3 Replaces return by 2017-03-23 17:26:16 +01:00
Zakant
07033061e3 Fixed function headers 2017-03-23 17:23:18 +01:00
Zakant
d47d183119 Fixed typo 2017-03-23 16:55:00 +01:00
Zakant
2cfeb5a10e Fixed missing bracket 2017-03-23 15:30:08 +01:00
Zakant
6ed90496a2 Added calculateBlood function 2017-03-23 15:30:03 +01: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
59c4485ef9 Only create pulse if their isn't any 2017-03-23 13:36:57 +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
918a62ebce Implemented cpr failure function 2017-03-23 13:32:14 +01:00
Zakant
d815bd8bdc Added cpr failure function and fixed PREP mistake 2017-03-23 13:30:40 +01:00
Zakant
a570a6862c Modified CPR success to work with pulse 2017-03-23 13:28:01 +01:00
Zakant
d9aab91f97 Implemented cpr progress function 2017-03-23 13:26:06 +01:00
Zakant
b1dc4e0c52 Added progress function, reorganized PREPs 2017-03-23 13:21:36 +01:00
Zakant
0cad7d0da6 Fixed arguments and function header 2017-03-23 13:19:25 +01:00
Zakant
5714374a99 Added function to PREP 2017-03-23 13:17:04 +01:00
Zakant
477496e4f6 Added cpr start callback and function 2017-03-23 13:15:17 +01:00
Zakant
c1238501d3 Added CPRcreatePulse setting 2017-03-23 13:14:38 +01:00
Zakant
0d329e0f63 Added startCallback config entry 2017-03-23 13:03:19 +01:00
ulteq
0ddfd5eb16 Disable wound reopening when advanced bandages are disabled 2016-12-15 14:51:24 +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
0de405fe2a Fix morphine when advanced medication is disabled 2016-12-15 12:58:06 +01:00
ulteq
0d0cf38028 Fix bandage reopening classname/category lookup 2016-12-14 21:17:39 +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
ulteq
dafefda04a Fixed typo 
Closes: https://github.com/acemod/ACE3/pull/4697
 2016-12-14 18:33:36 +01:00
ulteq
a2b964a993 Fixed bandage config lookup 2016-12-14 18:04:56 +01:00
ulteq
5d3f97ace7 Fix IV Bags work on limbs with a tourniquet applied 2016-12-14 12:36:51 +01:00
ulteq
6b611ffbbd Cleanup: 'handleBandageOpening' 2016-12-10 16:36:36 +01:00
ulteq
a3fd916d21 Do not restore blood volume in partial heal 2016-12-10 16:30:05 +01:00
ulteq
1bc1865313 Minor cleanup: 'treatmentBandageLocal' 2016-12-10 15:39:03 +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
82e88061fc Added 'DEFAULT_HEART_RATE' constant 2016-12-09 12:57:27 +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
9dee5a9083 Don't remove wounds on partial heal 2016-12-08 12:16:11 +01:00
ulteq
beb1c7036c Removed todo flag 2016-12-08 11:55:38 +01:00
ulteq
280943cb4d Fixed occluded medication (tourniquet removal logic) 2016-12-08 11:54:59 +01:00
ulteq
78bfc0c26d Simplified damage storage 2016-12-08 11:38:43 +01:00
ulteq
6ce1910a96 Fix partial heal 2016-12-07 18:53:12 +01:00
ulteq
8c5da66c43 Increase "basic medication" effectiveness of morphine 2016-12-07 18:41:42 +01:00
ulteq
0c8ebd6441 Slightly increase Tourniquet 'treatmentTime' 2016-12-07 17:56:59 +01:00
ulteq
09f6f2284b Tweaked morphine config 2016-12-07 17:46:16 +01:00
ulteq
5db75ac746 Fixed check blood pressure did not always account for tourniquets 2016-12-07 11:32:01 +01:00
ulteq
ab7af04530 Overhauled the medication system: 
* Refactored the old code
* Introduced 'timeTillMaxEffect' config entry for medication
 2016-12-06 20:42:10 +01:00
ulteq
b2838557fa Removed dead code 'hrCallback' 2016-12-06 18:55:54 +01:00
ulteq
fa77fb7194 Various fixes: 
* Fixed medication (morphine, epinephrine, ...)
* Fixed CPR
* Improved heart rate simulation
* Removed deprecated ace settings
 2016-12-06 17:26:11 +01:00
ulteq
92da5c80a0 Partly fixed Medication 
* Brings the heart rate adjustment (due to medication) back to life
* Restores the medication effect loop (needs testing)
 2016-12-06 12:58:12 +01:00
ulteq
a88be4f458 Fixed 'displayPatientInformation' 2016-12-05 23:00:02 +01:00
ulteq
624315524e Fixed typo 2016-12-05 21:39:47 +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
7e498ab762 setting for basic/advanced syringes 2016-10-20 02:14:11 +02:00
commy2
519ea25fc7 cleanup 2016-10-15 13:48:13 +02:00
commy2
633c6f0ce4 formating 2016-10-13 21:21:42 +02:00
commy2
6b84bd1ff6 fix misc. treatment actions 2016-10-13 21:11:13 +02:00
commy2
e03614757e fix misc. treatment actions 2016-10-13 21:08:41 +02:00
commy2
03fe2826dd remove some debug 2016-10-13 20:31:39 +02:00
commy2
f2dfc6dc0e fixes, tweaks 2016-10-13 20:17:21 +02:00
commy2
ba2d6fda8a treatment tweaks 2016-10-13 17:39:01 +02:00
commy2
fe2c6e8d85 basic <-> advanced 2016-10-13 17:14:43 +02:00
commy2
68d75beae6 manual merge 2016-10-13 16:56:57 +02:00
commy2
2d243d45f3 fix tourniquets 2016-10-13 10:28:28 +02:00
commy2
e1cbeeea16 fix tourniquets 2016-10-13 10:12:28 +02:00
commy2
5965326ca1 merge basic and adv. bandage actions 2016-10-13 09:47:52 +02:00
commy2
b1f0af7e1c merge basic and adv. bandage actions 2016-10-13 09:10:08 +02:00
commy2
68d199c5b2 merge basic and adv. bandage actions 2016-10-13 02:05:14 +02:00
commy2
4a06d19ce4 merge basic and adv. bandage actions 2016-10-13 01:55:10 +02:00
commy2
92fc4ec14b add a setting for 'basic' blood bags 2016-10-12 22:38:58 +02:00
commy2
a5d070f829 blood and unconsciousness fixes 2016-10-12 21:59:32 +02:00
commy2
3438ea0946 use liters for blood volume variable 2016-10-10 17:30:42 +02:00
commy2
4bc1c1db56 handle blood visuals 2016-10-07 04:21:01 +02:00
commy2
b698a88dc1 move modifyAction func to menu component 2016-10-07 01:58:40 +02:00
commy2
e9586ebccc use common header file for medical components 2016-10-06 22:40:36 +02:00
commy2
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00
commy2
feac296f9c use a new macro 2016-10-02 13:06:47 +02:00
commy2
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
commy2
490155270b QEGVAR vs QGVAR 2016-09-30 12:18:59 +02:00
commy2
1196cbb210 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-30 10:39:06 +02:00
commy2
96a1e74c85 synch anim speed acceleration 2016-09-30 10:38:27 +02:00
PabstMirror
60a7490b7e Fix some moved funcs/strings 2016-09-29 15:08:36 -05:00
commy2
03e24d8fd9 improve checkItems function 2016-09-29 21:32:54 +02:00
commy2
f53d324c0d simplifications in the treatment config 2016-09-29 20:29:44 +02:00
commy2
20a544e549 remove debug mode 2016-09-29 19:45:03 +02:00
commy2
ef8ad21446 fix inconsistencies in treatment time between basic and adv, fix item usage 2016-09-29 19:43:50 +02:00
commy2
e418cc05e9 cleanup, fix headers treatment has/use item functions 2016-09-29 19:31:48 +02:00
commy2
d3f6f040cd fix some problems with transitions from lowered weapon animations 2016-09-29 19:15:16 +02:00
commy2
2c7864c02b implement custom treatment sounds 2016-09-29 18:45:18 +02:00
commy2
ecd77630f5 some more animation time tweaks 2016-09-29 18:12:51 +02:00
commy2
36d244a868 'modernize' primary treatment functions, fix animation issues, add anim speed scaling 2016-09-29 16:00:19 +02:00
commy2
410c5f1d5f treatment debug 2016-09-28 20:46:46 +02:00
commy2
0decd72063 manual merge 2016-09-28 08:37:39 +02:00
commy2
7470d1f0f5 cleanup/improve parseConfigForinjuries 2016-09-27 11:05:38 +02:00
PabstMirror
39fa0b5d0e #4366 - Fix treatment animion with no weapon equiped 2016-09-21 15:55:29 -05:00
commy2
8937a27b96 port litter settings to treatment, stringtable fixes 2016-09-19 18:20:56 +02:00
commy2
c2f8007d36 port litter settings to treatment 2016-09-19 18:05:49 +02:00
commy2
10d4047b4c fix problems with ported treatment 2016-09-19 17:52:16 +02:00
commy2
158b1eed69 add server only event handler only on server machine 2016-09-19 10:05:16 +02:00
commy2
81d962f0d5 port litter to treatment 2016-09-19 09:55:30 +02:00
Glowbal
27314c34b1 fix treatment functionality 2016-09-18 22:58:56 +02:00
Glowbal
1c1e47c039 Enable treatmnet actions 2016-09-18 19:48:49 +02:00
Glowbal
811e1cd598 First set up clean up for medical rewrite 2016-09-18 12:05:36 +02:00
PabstMirror
f12feae7fe Fix some efuncs 2016-08-09 12:47:59 -05:00
PabstMirror
011c6a0d00 Fix merge conficlts 2016-08-09 12:14:30 -05:00
PabstMirror
6c63d3c23a Merge branch 'master' into medical-rewrite 2016-08-09 12:11:30 -05:00
Glowbal
131ef576b4 Add medical treatments and configuration 2016-07-15 12:23:47 +02:00
Glowbal
ab2075c328 Merge branch 'master' into medical-rewrite 
Conflicts:
	addons/medical/CfgEden.hpp
	addons/medical/functions/fnc_reviveStateLoop.sqf
	addons/medical/functions/fnc_serverRemoveBody.sqf
	addons/medical/functions/fnc_unconsciousPFH.sqf
 2016-07-15 11:50:58 +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
8c331937d0 Merge branch 'merge-basic-and-advanced' into medical-split-treatment 
Conflicts:
	addons/medical/ACE_Medical_Treatments.hpp
	addons/medical/config.cpp
	addons/medical_treatment/functions/fnc_addToTriageCard.sqf
 2016-06-30 11:41:03 +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