75 Commits

Author	SHA1	Message	Date
ulteq	0ddfd5eb16	Disable wound reopening when advanced bandages are disabled	2016-12-15 14:51:24 +01:00
ulteq	0de405fe2a	Fix morphine when advanced medication is disabled	2016-12-15 12:58:06 +01:00
ulteq	0d0cf38028	Fix bandage reopening classname/category lookup	2016-12-14 21:17:39 +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
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	6b611ffbbd	Cleanup: 'handleBandageOpening'	2016-12-10 16:36:36 +01:00
ulteq	a3fd916d21	Do not restore blood volume in partial heal	2016-12-10 16:30:05 +01:00
ulteq	1bc1865313	Minor cleanup: 'treatmentBandageLocal'	2016-12-10 15:39:03 +01:00
ulteq	82e88061fc	Added 'DEFAULT_HEART_RATE' constant	2016-12-09 12:57:27 +01:00
ulteq	c486f17539	Implemented Medkit (works like in ACE2)	2016-12-08 18:11:24 +01:00
ulteq	b81a5adcb9	Renamed 'healTime' calculation helper	2016-12-08 12:30:59 +01:00
ulteq	9dee5a9083	Don't remove wounds on partial heal	2016-12-08 12:16:11 +01:00
ulteq	beb1c7036c	Removed todo flag	2016-12-08 11:55:38 +01:00
ulteq	280943cb4d	Fixed occluded medication (tourniquet removal logic)	2016-12-08 11:54:59 +01:00
ulteq	78bfc0c26d	Simplified damage storage	2016-12-08 11:38:43 +01:00
ulteq	6ce1910a96	Fix partial heal	2016-12-07 18:53:12 +01:00
ulteq	8c5da66c43	Increase "basic medication" effectiveness of morphine	2016-12-07 18:41:42 +01:00
ulteq	5db75ac746	Fixed check blood pressure did not always account for tourniquets	2016-12-07 11:32:01 +01:00
ulteq	ab7af04530	Overhauled the medication system: ... * Refactored the old code * Introduced 'timeTillMaxEffect' config entry for medication	2016-12-06 20:42:10 +01:00
ulteq	b2838557fa	Removed dead code 'hrCallback'	2016-12-06 18:55:54 +01:00
ulteq	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
ulteq	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
ulteq	a88be4f458	Fixed 'displayPatientInformation'	2016-12-05 23:00:02 +01:00
ulteq	624315524e	Fixed typo	2016-12-05 21:39:47 +01:00
ulteq	a5ce5b4a34	Medical Rewrite - Continued (#4744)	2016-12-05 21:34:20 +01:00
commy2	370faf9b48	cleanup	2016-10-20 13:38:26 +02:00
commy2	7e498ab762	setting for basic/advanced syringes	2016-10-20 02:14:11 +02:00
commy2	519ea25fc7	cleanup	2016-10-15 13:48:13 +02:00
commy2	633c6f0ce4	formating	2016-10-13 21:21:42 +02:00
commy2	6b84bd1ff6	fix misc. treatment actions	2016-10-13 21:11:13 +02:00
commy2	e03614757e	fix misc. treatment actions	2016-10-13 21:08:41 +02:00
commy2	03fe2826dd	remove some debug	2016-10-13 20:31:39 +02:00
commy2	f2dfc6dc0e	fixes, tweaks	2016-10-13 20:17:21 +02:00
commy2	68d75beae6	manual merge	2016-10-13 16:56:57 +02:00
commy2	2d243d45f3	fix tourniquets	2016-10-13 10:28:28 +02:00
commy2	e1cbeeea16	fix tourniquets	2016-10-13 10:12:28 +02:00
commy2	5965326ca1	merge basic and adv. bandage actions	2016-10-13 09:47:52 +02:00
commy2	68d199c5b2	merge basic and adv. bandage actions	2016-10-13 02:05:14 +02:00
commy2	92fc4ec14b	add a setting for 'basic' blood bags	2016-10-12 22:38:58 +02:00
commy2	a5d070f829	blood and unconsciousness fixes	2016-10-12 21:59:32 +02:00
commy2	3438ea0946	use liters for blood volume variable	2016-10-10 17:30:42 +02:00
commy2	4bc1c1db56	handle blood visuals	2016-10-07 04:21:01 +02:00
commy2	b698a88dc1	move modifyAction func to menu component	2016-10-07 01:58:40 +02:00
commy2	5613ec5d5a	treatment functions and unconsciousness rework	2016-10-06 00:54:57 +02:00
commy2	feac296f9c	use a new macro	2016-10-02 13:06:47 +02:00
commy2	f185742e68	manual merge	2016-10-02 12:51:29 +02:00
commy2	490155270b	QEGVAR vs QGVAR	2016-09-30 12:18:59 +02:00
commy2	1196cbb210	Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite	2016-09-30 10:39:06 +02:00
commy2	96a1e74c85	synch anim speed acceleration	2016-09-30 10:38:27 +02:00