Commit Graph

150 Commits

Author SHA1 Message Date
Glowbal
9d2e76e67a More component name fixes and small clean up 2018-07-15 16:24:04 +02:00
Thomas Kooi
78d91edae2 Fix statemachine not running 2018-07-15 14:21:41 +02:00
Thomas Kooi
19f3b753f0 Decrease treatment time of medication to 5s 2018-07-15 13:59:47 +02:00
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