Magnetar
1d34cc4cc0
Rewrite rectify. Medical - Add vehicle hint when loading unconscious ( #6822 )
...
* Rewrite rectify. Medical - Add vehicle hint when loading unconscious
* Fix copy paste
2019-03-17 17:54:50 +01:00
Magnetar
bb2d1e4e9e
Merge branch 'master' into medical-rewrite
2019-03-17 17:39:43 +01:00
SilentSpike
0e8ed5315e
Remove patient treatment animations ( #6524 )
...
* Prevent treatment animation on dead bodies
This was causing bodies to glitch out on dedicated servers according to
feedback
* Remove patient animation logic and setting
2018-08-12 12:28:48 +01:00
SilentSpike
923c25163f
Fix missing boolean return in CPR
2018-08-12 11:50:47 +01:00
Zakant
14d52ee77e
Remove CPR alive check ( #6492 )
2018-08-12 08:57:23 +01:00
Dedmen Miller
c1c5d6d63c
Remove collision of bandage litter ( #6495 )
...
* Remove littergeneric collision
* Remove collision/shadow from non-litter items
* Remove quik clot litter shadow
* Add empty shadowLOD to litter
2018-08-11 17:52:26 +01:00
Rutger "RedBery" Meijering
0a97ef3cc8
Fix event name overlap and macros ( #6514 )
2018-08-11 11:40:06 +01:00
Zakant
88238dd0b5
Fix wrong macro ( #6509 )
2018-08-08 09:54:17 +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
Zakant
60a8158246
Fix GUI bodypart string names ( #6490 )
...
* Fixed new names in stringtable
* Removed duplicated entries from stringtable
* Fixed comma
2018-08-02 09:43:30 +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
873ed90cc1
Introduce bleedout condition and fix IV hemorrhage ( #6470 )
...
* Introduce bleedout condition and fix IV hemorrhage
* Update patient info display hemorrhage values
* Update UI info hemorrhage values
2018-07-25 11:40:37 +01:00
SilentSpike
39b1d144e1
Vary time taken to bandage based on circumstances ( #6467 )
2018-07-25 09:35:04 +01:00
Glowbal
13cdb76dce
Fix some more stringtable usage
2018-07-18 23:20:31 +02:00
Thomas Kooi
245a18599e
Fix stringtable references
2018-07-18 23:19:27 +02: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
SilentSpike
68ff7575eb
Move medical facility, vehicle and unit functions ( #6440 )
2018-07-18 11:09:48 +01:00
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
