Arcanum
f86420c0d7
Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite-kill-ai
2017-06-18 12:30:03 +02:00
Zakant
bdea0fcdba
[Medical Rewrite] Adding respawn compatibility ( #5020 )
...
* Added respawn transition
* Removed respawn transition from statemachine and added manual transition comment
* Changed transiton to manual. Added easy way to get current status as well
* Updated event reference
* Fixed manualTransition call
* Minor headers changes
2017-06-17 18:28:16 -05:00
Zakant
b5f6169341
Remove legacy code ( #4960 )
2017-06-17 14:01:59 -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
SilentSpike
a53f68a347
Use getUnitTrait for medics, engineers and EOD ( #5246 )
2017-06-10 11:41:01 +01:00
Phyma
ffaa195fe5
Conform function headers to coding guidelines ( #5255 )
...
* Fixed headers to work with silentspike python script
* Fixed rest of the files
* Fixed ace-team
2017-06-08 15:31:51 +02:00
Ľuboš Lendáč
b91e892710
Merge branch 'medical-rewrite' into medical-rewrite-kill-ai
2017-06-05 22:54:03 +02:00
PabstMirror
f715edabc9
Fix debug
2017-06-05 12:30:54 -05:00
PabstMirror
f98b268419
Split setUnconscious func, add spontaneousWakeUpChance setting ( #5114 )
2017-06-05 11:42:46 -05:00
Cuel
5b9c70a738
Fix zeus RC units using player damage treshold ( #5219 )
...
* Fix zeus RC units using player damage treshold
Closes #5218
* add pabstmirrors suggestion
use gvar
2017-06-02 11:21:57 -05:00
PabstMirror
7bccf2f6be
Fix IVs not showing in patient display ( #5230 )
...
Fix #5192 for 3.10
2017-06-01 10:28:47 -05:00
Arcanum
9895881ad9
Add options to disable AI going unconscious and for AI to die instantly
2017-05-22 22:16:18 +02:00
Arcanum
e3f9e65fb7
Revert "Add function to check if AI and condition from fatal"
...
This reverts commit 31e1e2964b
2017-05-22 21:11:25 +02:00
Arcanum
31e1e2964b
Add function to check if AI and condition from fatal
2017-05-22 20:53:00 +02:00
PabstMirror
9e1a9b9af9
Fix bad var names
2017-05-14 15:14:22 -05:00
PabstMirror
0cdb2ce238
Increase max weapon index for large modsets ( #5054 )
2017-05-12 13:12:39 -05:00
PabstMirror
fdb14cea20
Fix IvBags in displayPatientInformation
2017-04-29 13:05:39 -05:00
PabstMirror
e667931626
More debug monitor stuff
2017-04-29 12:58:35 -05:00
PabstMirror
c6fc4d0a13
Clenaup / Debug
2017-04-26 10:16:09 -05:00
PabstMirror
9139a52a38
Add more debug
2017-04-22 13:45:56 -05:00
PabstMirror
6464883852
misc cleanup, 1 sec min delay for vital loop
2017-04-22 10:57:32 -05:00
PabstMirror
690e415ffe
Minor cleanup
2017-03-25 11:36:37 -05:00
PabstMirror
80d7ef5b67
blood effects moved to UI
2017-03-25 11:27:18 -05:00
PabstMirror
e3af1b55a5
Merge branch 'medical-rewrite' into medical-rewrite-effects
2017-03-18 09:56:42 -05:00
PabstMirror
d403f20d71
Adjust addDamageToUnit for rewrite
2017-03-06 15:06:01 -06:00
Dedmen Miller
512592b79d
Prevent starting additional vital loops on full heal ( #4885 )
2017-03-02 17:22:16 -06:00
PabstMirror
97ec22bd9a
Switch heartbeat to waitAndExec, allow switching pain settings
2017-02-18 22:11:40 -06:00
commy2
9d68fbf987
fix script error caused by new arguments passed to handleDamage ( #4866 )
...
* fix script error caused by new arguments passed to handleDamage
* Copy array to not break other handleDamage ehs
* Resize to 7
2017-02-02 13:03:13 -06:00
ViperMaul
59c58b1269
Add settings function handler
2017-01-19 17:19:54 -06:00
ulteq
1e79f35e43
Always visualize bandaged wounds
...
* Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled
2016-12-15 15:01:02 +01:00
ulteq
70a2dc30e7
Refactored 'showPainInMenu' setting
...
* showPainInMenu -> on/off switch
* medicSetting_PainVisualization -> 3 way switch on who can see it
2016-12-15 14:45:58 +01:00
ulteq
0de405fe2a
Fix morphine when advanced medication is disabled
2016-12-15 12:58:06 +01:00
ulteq
65f0f56474
Implemented 'showPainInMenu'
2016-12-14 21:30:28 +01:00
ulteq
8146cb427e
Revert "Implemented 'showPainInMenu' logic"
...
This reverts commit 964711a38b
2016-12-14 21:23:26 +01:00
ulteq
964711a38b
Implemented 'showPainInMenu' logic
2016-12-14 20:55:03 +01:00
ulteq
196a3999a4
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2016-12-14 20:44:22 +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
PabstMirror
af4b3e31e1
Minor iv optimization
2016-12-14 11:50:31 -06: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
852f78b801
Classify the perceived pain intensity on all patient information outputs
...
Fixes : #2117
2016-12-10 15:24:20 +01:00
PabstMirror
3907d2dc9f
Cleanup moved functions
2016-12-09 21:27:42 -06:00
PabstMirror
b87bdfe14a
Fix body-bag action / cleanup
2016-12-09 21:03:52 -06:00
ulteq
05b9208d3c
Change debug
2016-12-09 18:43:32 +01:00
ulteq
03f9ba1bad
Improved simulation of tourniquet pain:
...
* Made use of the new pain level helper function
2016-12-09 17:48:27 +01:00
ulteq
ada43148e9
Removed deprecated revive settings
2016-12-09 17:07:05 +01:00
ulteq
bfda932384
Different max. bleeding rates for different body parts
2016-12-09 15:54:33 +01:00
ulteq
a809047ac4
Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite
2016-12-09 12:57:42 +01:00
ulteq
82e88061fc
Added 'DEFAULT_HEART_RATE' constant
2016-12-09 12:57:27 +01:00
