PabstMirror
5379503772
Fix deadman range, fix clacker transfer, use setShotParents ( #4689 )
2016-12-14 14:06:32 -06:00
ulteq
e817e13cfd
Only call 'handleIncapacitation' when it makes sense
...
* Minor injuries should not trigger incapacitation
2016-12-14 21:02:24 +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
Dystopian
4f20d1f7c6
add rearm to Vehicle Ammo boxes ( #4750 )
2016-12-14 13:18:04 -06:00
Dystopian
cc3b669fcd
Fix missing refuel menu on static fuel stations ( #4533 )
...
* fix static fuel stations
* Directly compile menus and remove XEH from buildings
2016-12-14 12:48:00 -06:00
PabstMirror
af4b3e31e1
Minor iv optimization
2016-12-14 11:50:31 -06:00
ulteq
dafefda04a
Fixed typo
...
Closes: https://github.com/acemod/ACE3/pull/4697
2016-12-14 18:33:36 +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
Glowbal
c8ef10341e
Merged branch release-v3.8.3 into master
2016-12-13 23:14:12 +01:00
Glowbal
0df98f794c
Prep 3.8.3
2016-12-12 19:50:16 +01:00
PabstMirror
06caea825b
AdvThrow - Make sure ammo setVar is not empty ( #4743 )
2016-12-12 19:33:34 +01:00
commy2
757ab78191
fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 ( #4742 )
2016-12-12 19:33:05 +01:00
PabstMirror
11b464b585
Fix blood drop selection if blood loss is high
...
close #4739
2016-12-12 19:32:23 +01:00
PabstMirror
de34d57d5b
Update SMG_02 base class for 1.66 ( #4718 )
2016-12-12 19:31:52 +01:00
PabstMirror
14c7e9af17
AF - Remove setVar when removing eh
2016-12-12 19:30:58 +01:00
Glowbal
b72541df23
Jpn translation v382 ( #4710 )
...
* jpn scopes translation
this is Japanese translation for scope
* fix jpn weather translation
Fix for Weather japanese translation
* fix jpn Repair translation
fix jpn Repair translation
* jpn zeus translation
Japanese localization for zeus
2016-12-12 19:29:58 +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
852f78b801
Classify the perceived pain intensity on all patient information outputs
...
Fixes : #2117
2016-12-10 15:24:20 +01:00
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
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
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
9cba0baade
manual merge
2016-12-05 20:18:15 +01:00
commy2
a83267b2ff
manual merge
2016-12-05 20:15:16 +01:00
PabstMirror
8d1f988f5d
AdvThrow - Make sure ammo setVar is not empty ( #4743 )
2016-12-02 12:44:39 -06:00
commy2
d75eeac1e4
fix usage of reserved variable "" in FUNC(getDetectorConfig), fix #4741 ( #4742 )
2016-12-02 10:09:48 -06:00
PabstMirror
4eba77f328
Fix blood drop selection if blood loss is high
...
close #4739
2016-12-01 20:36:10 -06:00
ulteq
3e0f85b4f1
RangeCard - Take bore height into account ( #4715 )
2016-12-01 21:20:51 +01:00
PabstMirror
3566e6e7f5
Update SMG_02 base class for 1.66 ( #4718 )
2016-12-01 12:05:28 -06:00
PabstMirror
321bb0bc57
Add frag definitions for remaining ammo ( #4736 )
...
Remove rpt warning
Close #342
2016-12-01 11:01:55 -06:00
ulteq
448dcddc55
ATragMX - cleanup and some fixes ( #4714 )
...
* ATragMX - Improved the default gun profiles
* Recalculated all muzzle velocities (based on 15 degrees Celsius)
* Recalculated all scope base angle (based on the new muzzle velocities)
* ATragMX - Removed lots of duplicate code
* Introduced dynamic simulation interval (based on muzzle velocity)
* ATragMX - Fixed simulation interval for the truing drop feature
2016-12-01 10:23:03 +01:00
ulteq
50e144672f
Ballistics - Cleanup ( #4721 )
...
* Ballistics - Removed 'caliber', 'hit' and 'typicalSpeed' entries
* from all vanilla ammo types
* Removed all unused ammo types
* Ballistics - Removed more unnecessary config entries
2016-12-01 10:21:59 +01:00
William Giokas
b9fbd2723a
Realisticweights: Updated cyrus weight
...
Cyrus was set to weigh 300 units (~30lb?). The NATO equivalent, the Noreen
Bad News (or MAR-10) weighed 130, or 13lbs, equivalent to it's real life
counterpart. This just changes the weight to 140, similar to that of the
SVDK, a possible real-life counterpart for this rifle.
2016-12-01 01:27:02 -06:00
BaerMitUmlaut
ac28bce578
Fixed state machine not running for units
2016-11-29 12:35:26 +01:00
PabstMirror
bc89a260ff
AF - Remove setVar when removing eh
2016-11-27 16:38:33 -06:00
ulteq
dff577d5d1
ATragMX - Simplified Coriolis calculation ( #4716 )
2016-11-27 09:56:23 +01:00
classic
05ddca5b90
Jpn translation v382 ( #4710 )
...
* jpn scopes translation
this is Japanese translation for scope
* fix jpn weather translation
Fix for Weather japanese translation
* fix jpn Repair translation
fix jpn Repair translation
* jpn zeus translation
Japanese localization for zeus
2016-11-25 18:50:07 +01:00
ulteq
aaebdc3752
ATragMX - Minimize the integration error ( #4703 )
...
* The goal is to keep the error below 0.1 MRAD
2016-11-25 10:29:49 +01:00
ulteq
7d22fce8da
Advanced Ballistics - New default simulation interval ( #4707 )
2016-11-25 00:15:41 +01:00
ulteq
b2ba95913a
ATragMX - Truing Drop fix ( #4704 )
...
* Fixes a bug in the truing drop feature that occurs when the zero range is greater than the truing range
2016-11-25 00:15:04 +01:00
Glowbal
050384e960
Merge branch 'release'
...
Conflicts:
docs/_config.yml
docs/_config_dev.yml
2016-11-25 00:08:32 +01:00
ulteq
87b9671757
AdvancedBallistics - Abort after adjusting the muzzle velocity ( #4700 )
...
* Always adjust the muzzle velocity when advanced ballistics is enabled
2016-11-24 00:11:25 +01:00
PabstMirror
a3c50a6c76
Add dev macro to quickly recompile functions ( #4699 )
2016-11-23 13:35:25 -06:00
Glowbal
9d08ad8238
Prep 3.8.2 release
2016-11-22 18:38:58 +01:00
ulteq
dcd4137491
Fixed several bugs in the unit conversion code
...
* Proper min, max capping for both metric and imperial units
* Fixed unit conversion issues on the interpolation table input fields
2016-11-21 21:20:48 +01:00
ulteq
cb3693f664
ATragMX - Fixes possible divison through zero
2016-11-21 21:20:48 +01:00
ulteq
dbb59c8fd1
New 'overwriteZeroRange' setting
2016-11-20 09:05:42 +01:00
ulteq
bb71885b42
Added config settings to optic_Nightstalker, optic_NVS and optic_TWS
2016-11-20 09:05:42 +01:00
