Glowbal
b5539db27f
Merge pull request #2767 from acemod/canTreatLocation
...
Fix medical location check when set to disabled for PAK/Surgical
2015-10-24 00:55:51 +02:00
Glowbal
57abe3b885
Merge pull request #2743 from acemod/medicalStuff
...
Medical Menu Fixes
2015-10-19 22:47:13 +02:00
PabstMirror
cfde11d2fa
Fix medic treatment location check as well
2015-10-19 01:45:30 -05:00
PabstMirror
aad6cab896
#2765 - Fix location check when set to disabled
2015-10-19 01:20:11 -05:00
Glowbal
76efdbcc1c
Merge pull request #2257 from jonpas/parseList
...
Parse List Common Function
2015-10-18 12:14:18 +02:00
PabstMirror
4ba0d72bfd
#2580 (1) - Fix bandages always created at terrain level.
2015-10-10 23:09:52 -05:00
Glowbal
58ea8d5e2c
Merge pull request #2543 from alef/feature/death_short_diagnose
...
Remove: pain diagnosis on dead patients
2015-10-04 09:34:10 +02:00
Glowbal
e36df978ec
Merge pull request #2646 from DerekSauer/FixArmaInjury
...
Fix healHitPointAfterAdvBandage - Issue #2498 .
2015-10-04 09:28:47 +02:00
PabstMirror
b0b755720c
#2672 - Use ACE_gameTime for triage card
2015-10-03 12:28:54 -05:00
Derek Sauer
f9352de489
Clarified comment slightly.
2015-09-30 20:34:51 -04:00
Derek Sauer
0a788a282e
Improved efficiency of wound counting.
...
Using a switch/case conditional since it offers early termination if a
matching condition is found before all conditions are checked. It also
unnecessary to use a conditional to confirm whether a limb is wounded or
not. Number of Wounds multiplied by Blood loss will return zero for
a fully bandaged body part, not incrementing the wound counter; or it will
return some other number which will increment the wound counter.
2015-09-30 20:27:40 -04:00
Derek Sauer
f69f4066e9
Fix capitalization on forEach and getVariable.
2015-09-30 06:17:54 -04:00
Derek Sauer
2824009317
Incorrectly retrieving list of current wounds.
...
Used the wrong method to retrieve the target's current wounds and was
getting an empty array. This caused bandaging any wound even once to
completely heal the target on the Arma side.
2015-09-29 17:00:49 -04:00
Derek Sauer
8d05214eb0
Resolve merge conflict from upstream pull.
2015-09-29 16:24:17 -04:00
Derek Sauer
954fad615a
Reformatted to follow ACE3 coding guidelines.
2015-09-29 06:36:36 -04:00
Derek Sauer
8619f02538
Take into account wounds that do no cause blood loss.
2015-09-29 06:19:49 -04:00
Derek Sauer
a864a3411c
Clarified a comment.
2015-09-28 21:32:04 -04:00
Derek Sauer
488541bba6
Fix for Arma wounds not being healed with healHitPointAfterAdvBandage.
2015-09-28 20:08:07 -04:00
jonpas
4521df0a57
Add synchronizedObjects vehicle support to assignObjectsInList with an optional parameter
2015-09-28 16:17:12 +02:00
jonpas
db2572acfd
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-28 16:06:32 +02:00
Glowbal
74805caa5d
Merge pull request #2565 from acemod/medVehAssignFix
...
assign vehicle module fix for prefilled veh
2015-09-28 15:02:48 +02:00
commy2
07774647e9
delay setUnconscious until the settings are inited, fix #148
2015-09-26 19:30:13 +02:00
PabstMirror
f93538eb9a
#2423 - assign vehicle module fix for prefilled veh
2015-09-21 21:44:52 -05:00
PabstMirror
079d88ded7
Merge pull request #2509 from acemod/miscFixNilFunctions
...
Fix some nil functions
2015-09-21 20:36:09 -05:00
PabstMirror
45e44251b6
Merge branch 'release'
...
Conflicts:
addons/repair/stringtable.xml
2015-09-21 17:14:53 -05:00
jonpas
2e3014daa3
Merge branch 'master' into parseList
...
Conflicts:
addons/common/functions/fnc_assignObjectsInList.sqf
2015-09-21 22:46:01 +02:00
PabstMirror
1d5217d165
Medical - delayedUnconsicous fix waitAndExecute
2015-09-21 12:43:35 -05:00
PabstMirror
86fae2c251
#2528 - addToLog date / missing string fullHeal
2015-09-20 13:19:51 -05:00
Alessandro Foresi
aabc437314
Remove: pain diagnosis on dead patients
2015-09-20 17:37:33 +02:00
PabstMirror
5f0d73bab6
Cleanup more stuff
2015-09-18 14:24:20 -05:00
PabstMirror
c62ea5e406
Fix some nil functions
2015-09-18 13:47:19 -05:00
commy2
7336e694c1
Merge pull request #2480 from acemod/340doanim2tweak
...
tweak doAnimation switchMove to do no akward camera jumps whenever possible
2015-09-17 22:46:54 +02:00
PabstMirror
5fc127e94c
#2491 - fix params
2015-09-17 11:34:32 -05:00
commy2
a09ca8fb80
tweak doAnimation switchMove to do no akward camera jumps whenever possible, fix #2474
2015-09-17 12:23:56 +02:00
Glowbal
7b7ad6eea8
fixed tweak to basic bandage
2015-09-14 23:18:20 +02:00
Glowbal
10ac127159
Fixed incorrect new damage value in handleDamage advanced.
...
The new handleDamage from BI added a new value to the parameters that we didn't account for in handleDamage advanced.
2015-09-14 21:15:57 +02:00
Glowbal
33ac78dbac
Addresses the large amount of bandages required in basic medical
...
This should restore the bandaging behavior back to how it is before the adjustments made to basic medical
2015-09-14 21:14:56 +02:00
Glowbal
8c60e76979
Tweaks made to improve determine if fatal algorithm
2015-09-14 21:13:58 +02:00
Glowbal
37639066c2
Include missing frame in the caching execution
2015-09-14 15:19:58 +02:00
Glowbal
6d4744b9ea
Increased duration of knock down for basic medical
2015-09-14 15:19:18 +02:00
bux578
9748abdb48
change order of BloodPressure readout, fix #2400
2015-09-12 10:58:29 +02:00
jonpas
e07b71faf0
Merge branch 'master' into parseList
...
Conflicts:
addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
2015-09-09 19:13:04 +02:00
commy2
adb1a11211
increase leg and arm armor value, more TRACE debug
2015-09-06 11:49:08 +02:00
ViperMaul
98202f4f38
Additional debug statements for caching and wounds.
2015-09-05 15:31:14 -07:00
jonpas
8fc061bfd6
Merge branch 'master' into parseList
2015-09-05 20:16:59 +02:00
Glowbal
dad96822be
Only add 1/4 of the new damage to pain instead of everything.
2015-09-05 13:27:02 +02:00
Glowbal
f15a1c033d
Added allowSelfTreatment attribute to treatment actions
2015-09-05 13:20:19 +02:00
Glowbal
a4e406658f
Reduced initial knockdown time for basic medical
2015-09-05 13:02:19 +02:00
Glowbal
17ad7ecb8c
replaced diag_logs by trace
2015-09-05 12:59:09 +02:00
Glowbal
9c0288cd3f
Removed debug message
2015-09-05 12:55:49 +02:00
