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
|
382028e662
|
Fix updating body part visuals (#5141)
|
2017-06-08 13:50:38 -05:00 |
|
PabstMirror
|
25a28778cb
|
Tweak randomness for wound bleeding and pain (#5113)
* Tweak randomness for wound bleeding and pain
* Scale damage to bodyPartDamage on multi part wounds
|
2017-06-05 11:51:53 -05:00 |
|
PabstMirror
|
6464883852
|
misc cleanup, 1 sec min delay for vital loop
|
2017-04-22 10:57:32 -05:00 |
|
PabstMirror
|
d403f20d71
|
Adjust addDamageToUnit for rewrite
|
2017-03-06 15:06:01 -06:00 |
|
ulteq
|
e817e13cfd
|
Only call 'handleIncapacitation' when it makes sense
* Minor injuries should not trigger incapacitation
|
2016-12-14 21:02:24 +01:00 |
|
ulteq
|
a2b964a993
|
Fixed bandage config lookup
|
2016-12-14 18:04:56 +01:00 |
|
ulteq
|
0a81baf498
|
Better and simpler bleeding rate calculation
|
2016-12-09 14:11:07 +01:00 |
|
ulteq
|
31bc54ff33
|
Further improved the wound merging logic
|
2016-12-09 10:55:24 +01:00 |
|
ulteq
|
3b82510751
|
Merge new wounds into existing wounds whenever possible
* Todo: separate 'amountOf' into two variables (wound count and bandage percentage)
|
2016-12-08 12:59:30 +01:00 |
|
ulteq
|
78bfc0c26d
|
Simplified damage storage
|
2016-12-08 11:38:43 +01:00 |
|
ulteq
|
627ea0ebdc
|
Dynamically translate different wound types
* Brings back minor, medium, large wounds
|
2016-12-07 21:56:13 +01:00 |
|
ulteq
|
7d6edd6c41
|
Brought the SQF variant of the woundsHandler back (for linux servers)
|
2016-12-06 10:59:29 +01:00 |
|
ulteq
|
a5ce5b4a34
|
Medical Rewrite - Continued (#4744)
|
2016-12-05 21:34:20 +01:00 |
|
commy2
|
347be3c222
|
handle vehicle crashes and add wounds for fall damage
|
2016-10-20 15:02:24 +02:00 |
|
commy2
|
1ea2a72f20
|
don't play scream by addPain function
|
2016-10-11 19:29:44 +02:00 |
|
commy2
|
2ad7c4c4ea
|
add addPain function, cap pain
|
2016-10-10 16:44:03 +02:00 |
|
commy2
|
4bc1c1db56
|
handle blood visuals
|
2016-10-07 04:21:01 +02:00 |
|
commy2
|
5613ec5d5a
|
treatment functions and unconsciousness rework
|
2016-10-06 00:54:57 +02:00 |
|
commy2
|
20d00d7cd9
|
make units scream when they're hit
|
2016-09-27 21:21:44 +02:00 |
|
commy2
|
5e35204811
|
woundHandler(SQF), fixes, improvements, more consistent variable naming
|
2016-09-27 17:29:49 +02:00 |
|
commy2
|
72e2bc72c0
|
don't exit loop prematurely
|
2016-09-27 11:57:37 +02:00 |
|
commy2
|
f90a91dfb5
|
add todo
|
2016-09-27 11:14:22 +02:00 |
|
commy2
|
7470d1f0f5
|
cleanup/improve parseConfigForinjuries
|
2016-09-27 11:05:38 +02:00 |
|
commy2
|
9f6baca424
|
port injury parse fnc to medical damage
|
2016-09-26 20:25:14 +02:00 |
|
commy2
|
4b9873d304
|
fix various issues with handleDamage engine component
|
2016-09-26 18:30:39 +02:00 |
|
Glowbal
|
27314c34b1
|
fix treatment functionality
|
2016-09-18 22:58:56 +02:00 |
|
Glowbal
|
7691af47f3
|
Further clean up
|
2016-09-18 13:33:22 +02:00 |
|
commy2
|
602d074898
|
integrate medical-engine handledamage into medical-damage component
|
2016-08-27 09:39:24 +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 |
|