commy2
da70854568
manual merge
2016-05-18 11:48:27 +02:00
Glowbal
04b61ff32e
Fix missing semicolon
2016-05-14 10:37:29 +02:00
Glowbal
180a0f9d84
Merge pull request #3462 from acemod/medicalLoops
...
Cleanup medical PFHs
2016-05-14 09:39:14 +02:00
BaerMitUmlaut
7fcbe93b71
Cleaned up excessive whitespace
2016-05-03 02:32:44 +02:00
BaerMitUmlaut
65ccf66d00
Fixed redundant privates in setCardiacArrest
2016-04-18 15:23:04 +02:00
jonpas
85b4366368
Use new QPATHTOF and QPATHTOEF macros
2016-04-08 20:34:50 +02:00
PabstMirror
bcde9f8ed6
Filter minor falling damage to non-leg hitpoints
2016-03-28 01:15:58 -05:00
PabstMirror
3232654e13
Close #3565 -Fix spelling of local var _woundEffectiveness
2016-03-08 11:02:54 -06:00
PabstMirror
e3deebff7e
Fix empty callback for hr adjustment
...
Fix #3526
Same issue as #3384
2016-03-03 13:23:53 -06:00
commy2
467075ad67
replace timePFH with CBA_missionTime
2016-03-02 11:01:39 +01:00
PabstMirror
fe967ff2bd
Don't read medic setting that is not in module
2016-02-29 14:07:15 -06:00
esteldunedain
9e682253f3
Move the dead body cleanup PFH to a loop using waitAndExecute
2016-02-28 23:33:51 -03:00
esteldunedain
90a54397ae
Move the litter cleanup PFH to a loop using waitAndExecute
2016-02-28 23:20:26 -03:00
esteldunedain
4b702f68df
Make loops non public
2016-02-28 23:10:15 -03:00
esteldunedain
94e8bee348
Move the pfh from setDead to a waitAndExecute loop: reviveStepLoop
2016-02-28 23:08:25 -03:00
esteldunedain
12895e7983
Remove unneeded parameter
2016-02-28 22:58:09 -03:00
esteldunedain
0e82cdfe82
Move to a function and comments the function that tracks the effects of medications over time. Use waitAndExecute instead of a pfh for better performance.
2016-02-28 22:50:04 -03:00
esteldunedain
21d4939abb
Optimize the computation of tourniquet pain. Fix pain not being able to decrease when above 10
2016-02-28 22:08:59 -03:00
esteldunedain
35e13d5357
Fixes
2016-02-28 20:55:05 -03:00
esteldunedain
bbb84ec7d1
Move the tourniquet loop to handleUnitVitals. Makes the tourniquet pain compatible with swapping localities
2016-02-28 20:50:28 -03:00
esteldunedain
085860c770
Restore addToInjuredCollection as a deprecated function
2016-02-28 20:32:02 -03:00
esteldunedain
bed51ac8a4
Fix waitAndExecute syntax
2016-02-28 20:26:05 -03:00
esteldunedain
3bbabac2d7
Rename and add comments to the function that tracks the units vital loop. Use waitAndExecute instead of a pfh for better performance.
2016-02-28 20:12:56 -03:00
Glowbal
e0a65aa543
Add registering last damage source
2016-02-26 22:58:49 +01:00
jokoho48
b2d2bec2cf
Merge branch 'master' of https://github.com/acemod/ACE3 into delayUnconCaptiv
...
# Conflicts:
# addons/medical/functions/fnc_setUnconscious.sqf
2016-02-23 15:31:38 +01:00
PabstMirror
2467fa7b0c
Fix empty callbacks in medical/repair
2016-02-21 11:34:25 -06:00
PabstMirror
3fbd6cff18
Merge pull request #3368 from acemod/fixNils
...
Fix some undefined functions / strings
2016-02-20 19:49:07 -06:00
Glowbal
7d063d4dee
Merge branch 'master' into medical-focus-feature
...
Conflicts:
addons/medical/functions/fnc_treatmentAdvanced_CPR.sqf
2016-02-21 00:37:30 +01:00
PabstMirror
8b932fd5a0
Fix some undefined functions / strings
2016-02-20 16:58:45 -06:00
Thomas Kooi
2930fab6c6
Merge pull request #3354 from acemod/playerBodybags
...
Fix bagging respawning players (alt)
2016-02-20 17:26:07 +01:00
Thomas Kooi
4f10d551d6
Merge pull request #2949 from gienkov/fixWoundCount
...
ceil number of wounds
2016-02-20 16:56:17 +01:00
PabstMirror
dffcbc7650
Cleanup events
2016-02-19 15:45:37 -06:00
PabstMirror
44b526ab6d
bodybag - hide player corpse and delete later
...
Fix #1301
2016-02-19 15:41:13 -06:00
Thomas Kooi
95532ea521
Merge pull request #3333 from acemod/medicalEvents
...
Replace execRemoteFnc in ace_medical
2016-02-19 12:00:00 +01:00
commy2
be8f7f9cc0
Merge pull request #3276 from acemod/156selectapply
...
replace filter and map with select and apply
2016-02-18 14:23:02 +01:00
esteldunedain
88eae19646
Replace execRemoteFnc in ace_medical
2016-02-17 22:54:43 -03:00
PabstMirror
be742c13cd
Merge branch 'master' into 155selectRandom
2016-02-17 15:58:19 -06:00
Thomas Kooi
26cb6bd6a3
Merge pull request #3326 from acemod/makeAdvMedicalWoundsConsistant
...
Make wound assignment consistent for dll/sqf
2016-02-17 18:34:28 +01:00
PabstMirror
40396fc69e
Remove debug
2016-02-17 09:37:08 -06:00
PabstMirror
f1797feead
Make wound assignment consistent for dll/sqf
...
Dll now exits on first match for threshold damage (exitWith)
Remove random wound in sqf to match dll
Fix backblast threshold order
Add lower vehiclecrash threshold
Add dll version logging
2016-02-16 12:19:18 -06:00
PabstMirror
5c9dfd7dc5
Handle enemy causing veh explode, fix revive unload
...
Fix #3269
2016-02-15 22:23:37 -06:00
PabstMirror
9441b548be
Fix vehicle crashes not being fatal to non-drivers
...
Fix #3306
2016-02-15 17:11:04 -06:00
Ivan Krouglyi
0a226b5ee9
Update fnc_treatment_success.sqf
...
Error at 84 line - you forget ";"
2016-02-13 03:29:42 +03:00
commy2
82086efca0
manual merge
2016-02-10 10:11:33 +01:00
Glowbal
e754c89c73
Remove non functional event driven handleDamage
2016-02-07 13:18:19 +01:00
Glowbal
575f362fb6
Add setting for limiting usage of Epinephrine in basic medical #1792
...
Part of focus feature medical #3134 . Default settings are inline with old default.
2016-02-07 13:10:38 +01:00
Glowbal
84878c3d8b
Merge branch 'master' into medical-focus-feature
2016-02-07 12:11:25 +01:00
commy2
ac007e6995
replace more map with apply
2016-02-06 12:08:04 +01:00
PabstMirror
35333cbe9d
Merge branch 'cargoCleanup'
2016-02-04 12:51:52 -06:00
PabstMirror
336184dfaa
Change medication removal from array
2016-02-04 10:00:33 -06:00
PabstMirror
3cc10a27ce
Tourniquets block medication until released
...
Close #2704
2016-02-03 14:40:26 -06:00
PabstMirror
c0eccc67c3
Change all SCALAR to NUMBER in headers
2016-01-28 18:19:15 -06:00
PabstMirror
17a882fe4d
Add findUnloadPosition integration
2016-01-26 18:01:01 -06:00
PabstMirror
04bccf47d7
Replace all use of deprecated commands
2016-01-19 09:39:07 -06:00
Glowbal
7de1a7bc6c
add initial implementation of drowning and collision damage handling
2016-01-17 13:21:18 +01:00
Glowbal
209d10065b
Fix missing event log entries #3134
2016-01-17 12:28:37 +01:00
Glowbal
6e42a10d47
Add selectionDamage implementation
2016-01-17 12:28:08 +01:00
Glowbal
ee9a620a63
Merge branch '340handledamage' into medical-focus-feature
2016-01-16 22:03:28 +01:00
PabstMirror
c2f780e95f
#1259 - Medical Locations Boost Training
2016-01-09 23:54:48 -06:00
jokoho48
daf2fc2669
remove ccp issue in settings
...
prevent setCaptive if unit is wake up
2016-01-06 18:01:24 +01:00
jokoho48
6d49bbda28
add delay to Unconsciousness Captivity(posible fix for #3121 )
2016-01-06 17:46:59 +01:00
Glowbal
c042703786
Merge branch 'release'
2016-01-05 22:55:34 +01:00
commy2
7eaa55f9df
Merge pull request #3022 from acemod/bodybagevent
...
add event for placing units in body bags
2016-01-05 21:59:47 +01:00
PabstMirror
fb0738bd30
Merge branch 'master' into release
2015-12-31 20:27:26 -06:00
Glowbal
c1fa81f28b
Fix tabs in sqf files
2015-12-21 17:05:48 +01:00
PabstMirror
74aec45921
Fix medical menu not closing on range, litter dir
...
- Medical Menu didn't close when target moved out of range
- Litter was always created in the same direction
2015-12-19 20:50:57 -06:00
PabstMirror
886c13f6a9
Merge pull request #3013 from acemod/bloodyLitter
...
Fix litter for adv - Add bloody p3d for Pack/qClot
2015-12-14 19:23:51 -06:00
commy2
7f63d51ccb
add event for placing units in body bags
2015-12-12 18:21:11 +01:00
PabstMirror
db50b5313d
getName can return raw or sanatized html tags
2015-12-11 12:01:50 -06:00
PabstMirror
e9be05209a
Fix litter for adv - Add bloody p3d for Pack/qClot
...
Fix #2950
Get correct bloodLossOnSelection for both basic and advanced
Adds bloody versions of packing bandage and quickClot
2015-12-10 22:58:44 -06:00
PabstMirror
cae9f436f6
Merge branch 'release'
2015-12-08 15:14:33 -06:00
gienkov
1132efaf48
ceil number of wounds
2015-12-06 02:57:21 +01:00
PabstMirror
b13656e54b
addDamageToUnit - Disable debug / testing code
2015-12-05 12:19:34 -06:00
PabstMirror
875b3980ac
Don't update openWounds if not bandaged
...
Fix #2921
2015-12-03 15:23:38 -06:00
commy2
411a8d58f3
fix more setVariable and getVariable capitalization
2015-11-30 17:53:57 +01:00
commy2
5a1aae6028
manual merge
2015-11-30 17:44:15 +01:00
commy2
a9ebcf8543
fix setVariable and getVariable capitalization
2015-11-30 17:27:09 +01:00
commy2
b3950bd7f0
fix forEach capitalization
2015-11-30 17:23:48 +01:00
commy2
2b05f6f451
fix isNil capitalization
2015-11-30 17:22:16 +01:00
commy2
5e41643cff
fix pushBack capitalization
2015-11-30 17:21:28 +01:00
commy2
d9b90258bc
fix typeOf capitalization
2015-11-30 17:19:57 +01:00
commy2
34d351c652
fix exitWith capitalization
2015-11-30 17:14:05 +01:00
commy2
ff4406e411
manual merge, more selectRandom command useage
2015-11-29 16:48:23 +01:00
commy2
e5c4d35969
1.55 use new selectRandom command
2015-11-29 16:33:25 +01:00
Thomas Kooi
5282e95668
Merge pull request #2876 from acemod/medicalTranslateHP
...
Medical Fixes
2015-11-28 20:58:08 +01:00
Thomas Kooi
cef01baf0b
Merge pull request #2856 from acemod/isEqualTypeRepalcement
...
1.54 - Replace typeName with isEqualType
2015-11-28 20:36:07 +01:00
PabstMirror
5850f78c1f
Merge branch 'master' into isEqualTypeRepalcement
2015-11-27 21:08:21 -06:00
PabstMirror
6031eb8c6e
Add all wound types to bandage treatment configs
...
Fix by adding all config entries;
instead of trying to modify classname
2015-11-27 14:19:26 -06:00
PabstMirror
e51f658ce0
Try base wound class in bandage treatment configs
...
Gets the correct wound for the bandage treatment config
Used for selecting most effective bandage and reopening
_className was something like "velocityWoundMedium"
but configs only had base class "velocityWound"
2015-11-26 23:18:39 -06:00
PabstMirror
a5c45c137f
Medical - addDamageToUnit Helper
2015-11-26 09:53:12 -06:00
PabstMirror
988a5c76bb
Medical - 1.54 Changes
...
1.54 Armor
Translate selectiosn to hitpoints
Calc newDamage using hitIndex (because sel is translated)
Fix isFalling never being reset
Cache hitpointIndex to reset damage
Normalize Limb Armor to 1.54
Cleanup
Cleanup
2015-11-25 11:49:20 -06:00
Thomas Kooi
801120fb39
Merge pull request #2841 from acemod/medicalAiBandage
...
Move bandage log before basic exit
2015-11-20 22:28:55 +01:00
PabstMirror
69b53af1d3
1.54 - Replace typeName with isEqualType
2015-11-20 11:40:31 -06:00
commy2
a57d1bca75
replace local keyword with private
2015-11-17 17:43:07 +01:00
PabstMirror
c3e6990d00
#2528 (6) - Move bandage log before basic exit
...
In advanced medical without enableFor AI. Bandaging an AI would exit
before adding log.
2015-11-12 01:06:29 -06:00
Thomas Kooi
ec1187e79b
Merge pull request #2830 from acemod/mixedMedicalDisplay
...
Display basicMed wounds for AI in mixed mode
2015-11-10 08:33:21 +01:00
PabstMirror
c326bc2f87
#2772 - Display basicMed wounds for AI in mixed mode
2015-11-06 01:05:25 -06:00
PabstMirror
1cebe613fa
Fix Capitialzation
2015-11-04 14:38:32 -06:00
PabstMirror
c5da32e470
Medical Handle Damage - check hitpoints if selection is weird
2015-11-04 14:36:26 -06:00
PabstMirror
a3443cae43
Merge pull request #2780 from acemod/fixTimeInComments
...
Changed ACE_time back to time in comments where appropriate
2015-11-04 13:04:05 -06:00
