Commit Graph

1054 Commits

Author SHA1 Message Date
b89bc86e00 Added seperate vitals component 2017-04-02 00:27:50 +02:00
676c9a5451 Added seperate status component 2017-04-01 20:41:45 +02:00
c4863c756c Moved statemachine into seperate component 2017-04-01 19:50:26 +02:00
690e415ffe Minor cleanup 2017-03-25 11:36:37 -05:00
80d7ef5b67 blood effects moved to UI 2017-03-25 11:27:18 -05:00
f1fbf6a8eb Removed legacy code 2017-03-23 15:29:52 +01:00
5c89232306 Removed cardiac arrest check 2017-03-23 12:59:40 +01:00
e3af1b55a5 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-03-18 09:56:42 -05:00
d403f20d71 Adjust addDamageToUnit for rewrite 2017-03-06 15:06:01 -06:00
512592b79d Prevent starting additional vital loops on full heal (#4885) 2017-03-02 17:22:16 -06:00
97ec22bd9a Switch heartbeat to waitAndExec, allow switching pain settings 2017-02-18 22:11:40 -06:00
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
59c58b1269 Add settings function handler 2017-01-19 17:19:54 -06:00
1e79f35e43 Always visualize bandaged wounds
* Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled
2016-12-15 15:01:02 +01:00
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
0de405fe2a Fix morphine when advanced medication is disabled 2016-12-15 12:58:06 +01:00
65f0f56474 Implemented 'showPainInMenu' 2016-12-14 21:30:28 +01:00
8146cb427e Revert "Implemented 'showPainInMenu' logic"
This reverts commit 964711a38b.
2016-12-14 21:23:26 +01:00
964711a38b Implemented 'showPainInMenu' logic 2016-12-14 20:55:03 +01:00
196a3999a4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-14 20:44:22 +01:00
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
af4b3e31e1 Minor iv optimization 2016-12-14 11:50:31 -06:00
a2b964a993 Fixed bandage config lookup 2016-12-14 18:04:56 +01:00
5d3f97ace7 Fix IV Bags work on limbs with a tourniquet applied 2016-12-14 12:36:51 +01:00
852f78b801 Classify the perceived pain intensity on all patient information outputs
Fixes: #2117
2016-12-10 15:24:20 +01:00
3907d2dc9f Cleanup moved functions 2016-12-09 21:27:42 -06:00
b87bdfe14a Fix body-bag action / cleanup 2016-12-09 21:03:52 -06:00
05b9208d3c Change debug 2016-12-09 18:43:32 +01:00
03f9ba1bad Improved simulation of tourniquet pain:
* Made use of the new pain level helper function
2016-12-09 17:48:27 +01:00
ada43148e9 Removed deprecated revive settings 2016-12-09 17:07:05 +01:00
bfda932384 Different max. bleeding rates for different body parts 2016-12-09 15:54:33 +01:00
a809047ac4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-09 12:57:42 +01:00
82e88061fc Added 'DEFAULT_HEART_RATE' constant 2016-12-09 12:57:27 +01:00
cc6150303f Add setting for blood bag flow rate (#4751) 2016-12-09 11:33:01 +01:00
a48d271368 Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits
Introduce small variation to length of cardiac arrest
2016-12-08 14:22:11 +01:00
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
78bfc0c26d Simplified damage storage 2016-12-08 11:38:43 +01:00
627ea0ebdc Dynamically translate different wound types
* Brings back minor, medium, large wounds
2016-12-07 21:56:13 +01:00
66803a4b4d Fix damage coloring 2016-12-07 18:53:04 +01:00
74fefb6f69 New body part colors:
* Red bleeding
* Blue tourniquet
* Yellow/Orange damage
2016-12-07 18:28:35 +01:00
03f7451c99 Fixed incorrect debug output 2016-12-07 11:41:58 +01:00
5db75ac746 Fixed check blood pressure did not always account for tourniquets 2016-12-07 11:32:01 +01:00
ab7af04530 Overhauled the medication system:
* Refactored the old code
* Introduced 'timeTillMaxEffect' config entry for medication
2016-12-06 20:42:10 +01:00
02ac4c4084 Fixed minor bug in the heart rate calculation 2016-12-06 17:40:05 +01:00
faa2b619ab Removed overly verbose debug logs 2016-12-06 17:35:52 +01:00
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
978a81fb0a Removed dead code 2016-12-06 14:37:48 +01:00
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
a88be4f458 Fixed 'displayPatientInformation' 2016-12-05 23:00:02 +01:00
a5ce5b4a34 Medical Rewrite - Continued (#4744) 2016-12-05 21:34:20 +01:00