ACE3/addons
SilentSpike 8483a4bcdc Medical - Fix severity of wound bleeding and adjust cardiac output calculations (#7010)
* Fix severity of wound bleeding

I'm simplifying the nastiness calculations so that the wound config
specifies the worst wound and we scale it between 25% to 100% based
on the wound damage and number of wounds recieved.

Similarly I've updated the wound configs to more reasonable maximum
bleeding values based on the fact that they're percentages of cardiac
output being bled.

* Limit variance of pain modifier

This is to avoid unexpectedly high pain for small wounds or unexpectedly
small pain for large wounds

* Make more wounds increase chance for nastiness

Rather than guarantee

* Adjust worst damage scaling

This handles torso wounds better as they're typically around 0.3-0.6 for
6.5mm shots which makes them roughly medium sized.

* Fix cardiac output calculation

Previously the calculation didn't make sense as it wasn't outputting
a value in l/s. This method of calculation makes more logical sense and
provides a point of reference for what the bleeding values actually
represent (percentage of the blood being pumped that is lost - which now
has an actual volumetric value).

* Fix blood pressure after change to cardiac output

* Fix heartrate skyrocketing between 5l and 4l blood

Pretty sure someone accidnentally got these conditions the wrong way
around. This way blood pressure will first drop and then heart rate will
later go up to compensate.

* Fix comment typo

Co-Authored-By: PabstMirror <pabstmirror@gmail.com>
2019-06-10 11:23:21 -05:00
..
advanced_ballistics Russian translations (#7005) 2019-06-03 09:59:13 -05:00
advanced_fatigue Translations - German (#6920) 2019-06-08 10:35:42 -05:00
advanced_throwing Add Feature Camera Player EH and Handling (#6573) 2018-10-12 14:59:40 +02:00
ai Translations - German (#6920) 2019-06-08 10:35:42 -05:00
aircraft Update addons/aircraft/XEH_preInit.sqf 2019-05-03 19:13:54 +02:00
apl Fix Armake problems (#6697) 2018-11-29 11:18:22 +01:00
arsenal Translations - German (#6920) 2019-06-08 10:35:42 -05:00
atragmx Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
attach Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
backpacks [WIP] Fix script errors reporting wrong line numbers (#6407) 2018-09-17 14:19:29 -05:00
ballistics Translations - German (#6920) 2019-06-08 10:35:42 -05:00
captives Russian translations (#7005) 2019-06-03 09:59:13 -05:00
cargo Translations - German (#6920) 2019-06-08 10:35:42 -05:00
chemlights Russian translations (#7005) 2019-06-03 09:59:13 -05:00
common Translations - German (#6920) 2019-06-08 10:35:42 -05:00
concertina_wire Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
cookoff Translations - German (#6920) 2019-06-08 10:35:42 -05:00
dagr Trivial code fixes (#6858) 2019-03-10 21:42:08 -05:00
disarming More trivial code cleanup (#6859) 2019-03-21 08:52:32 -05:00
disposable Disposable - Add warning for addons using ace_disposable (#6963) 2019-05-06 10:05:04 -05:00
dogtags Translations - German (#6920) 2019-06-08 10:35:42 -05:00
dragging Merge pull request #4064 from acemod/medical-rewrite 2019-03-30 15:20:15 -05:00
explosives Translations - German (#6920) 2019-06-08 10:35:42 -05:00
fastroping Translations - German (#6920) 2019-06-08 10:35:42 -05:00
fcs FCS - Skip adding firedEH until needed (#6965) 2019-04-27 14:04:47 -05:00
finger Russian translations (#7005) 2019-06-03 09:59:13 -05:00
flashlights Translations - German (#6920) 2019-06-08 10:35:42 -05:00
flashsuppressors Correct new Chinese stringtable identifiers (#5334) 2017-07-10 16:47:26 +02:00
fonts Cleanup (#5463) 2017-08-29 17:47:01 -05:00
frag Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
gestures cfgSkeletons indentation formatting fixes (#6796) 2019-01-31 19:22:33 -06:00
gforces Translations - German (#6920) 2019-06-08 10:35:42 -05:00
goggles Russian translations (#7005) 2019-06-03 09:59:13 -05:00
grenades Russian translations (#7005) 2019-06-03 09:59:13 -05:00
gunbag Move gunbag type from inheritance to config property (#7022) 2019-06-04 20:00:55 -05:00
hearing Translations - German (#6920) 2019-06-08 10:35:42 -05:00
hellfire Russian translations (#7005) 2019-06-03 09:59:13 -05:00
hitreactions Russian translations (#7005) 2019-06-03 09:59:13 -05:00
hot Translations - German (#6920) 2019-06-08 10:35:42 -05:00
huntir Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
interact_menu Translations - German (#6920) 2019-06-08 10:35:42 -05:00
interaction Translations - German (#6920) 2019-06-08 10:35:42 -05:00
inventory Inventory - Cache inventory postInit config lookups (#6803) 2019-02-17 11:41:48 -06:00
javelin MissileGuidance - Allow using vanilla fire mode key (#6732) 2019-01-30 22:11:01 -06:00
kestrel4500 Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
laser Russian translations (#7005) 2019-06-03 09:59:13 -05:00
laserpointer Merge pull request #6208 from Max255PL/laserbeam 2018-09-18 20:54:42 +02:00
logistics_uavbattery Make small UAVs battery life more realistic (#6647) 2018-10-26 16:15:37 +02:00
logistics_wirecutter Add berlin wall compatibility (#6982) 2019-05-05 19:03:57 -05:00
magazinerepack Translations - German (#6920) 2019-06-08 10:35:42 -05:00
main Vector - New reticle using CBA scripted optics (#6981) 2019-05-27 10:46:07 -05:00
map Russian translations (#7005) 2019-06-03 09:59:13 -05:00
map_gestures Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
maptools Russian translations (#7005) 2019-06-03 09:59:13 -05:00
markers Russian translations (#7005) 2019-06-03 09:59:13 -05:00
maverick Russian translations (#7005) 2019-06-03 09:59:13 -05:00
medical Translations - German (#6920) 2019-06-08 10:35:42 -05:00
medical_ai Translations - German (#6920) 2019-06-08 10:35:42 -05:00
medical_blood Translations - German (#6920) 2019-06-08 10:35:42 -05:00
medical_damage Medical - Fix severity of wound bleeding and adjust cardiac output calculations (#7010) 2019-06-10 11:23:21 -05:00
medical_engine Medical Treatment - Modernize and Cleanup (#6933) 2019-06-03 10:31:46 -05:00
medical_feedback Translations - German (#6920) 2019-06-08 10:35:42 -05:00
medical_gui Medical Menu - Hide categories if they don't have any actions (#6988) 2019-06-08 17:23:09 -05:00
medical_statemachine Translations - German (#6920) 2019-06-08 10:35:42 -05:00
medical_status Medical - Fix severity of wound bleeding and adjust cardiac output calculations (#7010) 2019-06-10 11:23:21 -05:00
medical_treatment Unblacklist vanilla medical items from arsenal (#7017) 2019-06-09 08:16:55 -04:00
medical_vitals Medical - Fix severity of wound bleeding and adjust cardiac output calculations (#7010) 2019-06-10 11:23:21 -05:00
microdagr Russian translations (#7005) 2019-06-03 09:59:13 -05:00
minedetector Minedetector - Cache detectableClasses (#6805) 2019-02-17 12:31:34 -06:00
missileguidance Use checkVisibility to test LOS for missile seekers (#7014) 2019-06-04 20:20:07 -05:00
missionmodules Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
mk6mortar Russian translations (#7005) 2019-06-03 09:59:13 -05:00
modules [WIP] Fix script errors reporting wrong line numbers (#6407) 2018-09-17 14:19:29 -05:00
movement Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
mx2a Add Chinese translation Modify grammar (#6400) 2018-06-22 19:14:11 -05:00
nametags Translations - German (#6920) 2019-06-08 10:35:42 -05:00
nightvision Translations - German (#6920) 2019-06-08 10:35:42 -05:00
nlaw Russian translations (#7005) 2019-06-03 09:59:13 -05:00
noidle Cleanup (#5463) 2017-08-29 17:47:01 -05:00
noradio Russian translations (#7005) 2019-06-03 09:59:13 -05:00
norearm Cleanup (#5463) 2017-08-29 17:47:01 -05:00
optics Add Feature Camera Player EH and Handling (#6573) 2018-10-12 14:59:40 +02:00
optionsmenu Update Japanese translations (#6705) 2018-11-27 00:09:32 +01:00
overheating Russian translations (#7005) 2019-06-03 09:59:13 -05:00
overpressure Translations - German (#6920) 2019-06-08 10:35:42 -05:00
parachute Russian translations (#7005) 2019-06-03 09:59:13 -05:00
pylons Translations - German (#6920) 2019-06-08 10:35:42 -05:00
quickmount Translations - German (#6920) 2019-06-08 10:35:42 -05:00
rangecard Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
realisticnames Russian translations (#7005) 2019-06-03 09:59:13 -05:00
realisticweights Update SMG_02 base class for 1.66 (#4718) 2016-12-12 19:31:52 +01:00
rearm Russian translations (#7005) 2019-06-03 09:59:13 -05:00
recoil More trivial code cleanup (#6859) 2019-03-21 08:52:32 -05:00
refuel Russian translations (#7005) 2019-06-03 09:59:13 -05:00
reload Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
reloadlaunchers [WIP] Fix script errors reporting wrong line numbers (#6407) 2018-09-17 14:19:29 -05:00
repair Translations - German (#6920) 2019-06-08 10:35:42 -05:00
respawn Translations - German (#6920) 2019-06-08 10:35:42 -05:00
safemode Safe Mode - Fix disabled laser on safety switch (#6639) 2019-03-12 11:26:20 -05:00
sandbag Fix Armake problems (#6697) 2018-11-29 11:18:22 +01:00
scopes Translations - German (#6920) 2019-06-08 10:35:42 -05:00
slideshow Russian translations (#7005) 2019-06-03 09:59:13 -05:00
smallarms Fix 5.56 Reload Tracer mags are not tracer (#5660) 2017-10-29 16:41:26 +01:00
spectator Russian translations (#7005) 2019-06-03 09:59:13 -05:00
spottingscope Spotting scope - New reticle using CBA scripted optics (#6964) 2019-05-27 10:46:21 -05:00
switchunits Russian translations (#7005) 2019-06-03 09:59:13 -05:00
tacticalladder Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
tagging More trivial code cleanup (#6859) 2019-03-21 08:52:32 -05:00
thermals Cleanup (#5463) 2017-08-29 17:47:01 -05:00
trenches Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
tripod Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
ui UI - Fix selective UI in cargo (#6585) 2019-03-10 21:40:28 -05:00
vector Vector - New reticle using CBA scripted optics (#6981) 2019-05-27 10:46:07 -05:00
vehiclelock Russian translations (#7005) 2019-06-03 09:59:13 -05:00
vehicles Translations - German (#6920) 2019-06-08 10:35:42 -05:00
viewdistance Remove BOM from stringtables 2018-10-07 11:30:15 +02:00
weaponselect Translations - German (#6920) 2019-06-08 10:35:42 -05:00
weather Russian translations (#7005) 2019-06-03 09:59:13 -05:00
winddeflection remove weather dependancy from winddeflection (#6975) 2019-05-03 16:56:56 +02:00
yardage450 Cleanup spacing on call COMPILE_FILE 2019-02-14 12:43:02 -06:00
zeus Translations - German (#6920) 2019-06-08 10:35:42 -05:00