Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
11,444 Commits 73 Branches 88 Tags 752 MiB
d47ea1d25a
Commit Graph

11444 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
PabstMirror
a451ad356e Close patient display when interaction menu closes 2016-12-09 21:35:26 -06:00
PabstMirror
c2f9010183 opps 2016-12-09 21:29:23 -06: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
PabstMirror
ee864b2c46 Fix medkit string, fix overpressure 2016-12-09 13:48:54 -06:00
ulteq
8afc4083d0 Advanced Ballistics - Improved spin drift calculation (#4755) 2016-12-09 13:22:53 -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
0a81baf498 Better and simpler bleeding rate calculation 2016-12-09 14:11:07 +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
PabstMirror
cc6150303f Add setting for blood bag flow rate (#4751) 2016-12-09 11:33:01 +01:00
ulteq
31bc54ff33 Further improved the wound merging logic 2016-12-09 10:55:24 +01:00
PabstMirror
c431a7d236 Ignore UAV AI hitpoints 2016-12-08 15:53:52 -06:00
ulteq
c486f17539 Implemented Medkit (works like in ACE2) 2016-12-08 18:11:24 +01:00
BaerMitUmlaut
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
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
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
627ea0ebdc Dynamically translate different wound types 
* Brings back minor, medium, large wounds
 2016-12-07 21:56:13 +01:00
ulteq
89c68364ef Fix pain suppression not affecting 'setCustomAimCoef' 2016-12-07 19:51:28 +01:00
ulteq
708ac207fd Make Avulsions even less likely 2016-12-07 19:10:12 +01:00
ulteq
6ce1910a96 Fix partial heal 2016-12-07 18:53:12 +01:00
ulteq
66803a4b4d Fix damage coloring 2016-12-07 18:53:04 +01:00
ulteq
8c5da66c43 Increase "basic medication" effectiveness of morphine 2016-12-07 18:41:42 +01:00
ulteq
74fefb6f69 New body part colors: 
* Red bleeding
* Blue tourniquet
* Yellow/Orange damage
 2016-12-07 18:28:35 +01:00
ulteq
7f1678b7e6 Increased wake up chance 2016-12-07 18:19:35 +01:00
ulteq
0c8ebd6441 Slightly increase Tourniquet 'treatmentTime' 2016-12-07 17:56:59 +01:00
ulteq
4da07bd2a4 Attemp to reduce 'Avulsion' likelihood 2016-12-07 17:47:02 +01:00
ulteq
09f6f2284b Tweaked morphine config 2016-12-07 17:46:16 +01:00
ulteq
45aa80bed7 Fix leg damage always counted as #vehiclecrash 2016-12-07 16:39:22 +01:00
ulteq
03f7451c99 Fixed incorrect debug output 2016-12-07 11:41:58 +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
02ac4c4084 Fixed minor bug in the heart rate calculation 2016-12-06 17:40:05 +01:00
ulteq
faa2b619ab Removed overly verbose debug logs 2016-12-06 17:35:52 +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
978a81fb0a Removed dead code 2016-12-06 14:37:48 +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
7d6edd6c41 Brought the SQF variant of the woundsHandler back (for linux servers) 2016-12-06 10:59:29 +01:00
ulteq
db547a53b7 Increased unconsciousness wake up interval 2016-12-06 10:58:43 +01:00
PabstMirror
c47772eddc Fix stringtables 2016-12-05 19:40:26 -06:00
ulteq
46340fe8d8 Fixed accident 2016-12-05 23:03:25 +01:00
ulteq
a88be4f458 Fixed 'displayPatientInformation' 2016-12-05 23:00:02 +01:00