Commit Graph

667 Commits

Author SHA1 Message Date
PabstMirror
c6991fde54 re-add brackets 2015-05-18 21:33:24 +02:00
Glowbal
2621c5a36c fixed incorrect private var name 2015-05-18 21:33:12 +02:00
Glowbal
c76e22463a consistent usage of brackets 2015-05-18 21:32:58 +02:00
PabstMirror
5a4ef610ec Use PFEH array instead of setVariable 2015-05-18 21:32:47 +02:00
PabstMirror
2c3a5b0603 Start vital tracking after treatment 2015-05-18 21:32:22 +02:00
PabstMirror
f511de0a49 Calculate vitals interval on first run 2015-05-18 21:32:05 +02:00
Glowbal
853c654b4d fixes #1195 units do not display injuries
Is caused because the system thinks medical is disabled for basic units, while this obviously is not the case.
2015-05-18 21:00:32 +02:00
Glowbal
fc99d07f7c fixes #1155 2015-05-18 21:00:18 +02:00
jaynus
c17df2acb8 Change to execNextFrame. 2015-05-18 21:00:06 +02:00
jaynus
1c69f4faa4 Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112 2015-05-18 20:59:56 +02:00
Glowbal
d9da4211f7 Merge branch 'master' into medicalExtension 2015-05-17 09:51:41 +02:00
Glowbal
556b9ad7d8 removed debug prints 2015-05-17 00:47:42 +02:00
Glowbal
4d8f24d2ae Removed old sqf version. 2015-05-17 00:44:45 +02:00
Glowbal
1d7bfa239f Temp added old sqf version for easy performance comparison 2015-05-17 00:08:34 +02:00
Glowbal
e3dd1eaf47 Using extension for handleDamage wounds instead of sqf 2015-05-16 23:21:03 +02:00
Glowbal
23a1bc86ca Loading config data to extension 2015-05-16 23:20:38 +02:00
PabstMirror
1d64e5917f re-add brackets 2015-05-15 02:32:19 -05:00
Glowbal
56aec85616 fixed incorrect private var name 2015-05-15 09:25:57 +02:00
Glowbal
4b245c0fc4 consistent usage of brackets 2015-05-15 09:25:00 +02:00
PabstMirror
39bc7d06be Use PFEH array instead of setVariable 2015-05-15 02:15:03 -05:00
PabstMirror
8dbca1d3de Start vital tracking after treatment 2015-05-14 22:18:53 -05:00
PabstMirror
8abd3c1fef Calculate vitals interval on first run 2015-05-14 22:16:44 -05:00
Glowbal
d42d0ef69d Merge pull request #1164 from acemod/litterFixes
Litter distribution fix and "floating litter over water" fix (medical)
2015-05-14 16:17:10 +02:00
jaynus
20bd5957e3 Change to execNextFrame. 2015-05-14 07:15:52 -07:00
Glowbal
abadf05342 Merge remote-tracking branch 'gienkov/module-translations'
Conflicts:
	addons/medical/stringtable.xml
2015-05-14 16:01:41 +02:00
jaynus
b13d44fb6b Fixed: Litter spawning at huge radius, floating litter over water. Fixes #1112 2015-05-13 17:29:09 -07:00
Glowbal
a4d0af4b67 Fix medical vehicle return value
Could fix #1142
2015-05-13 15:55:03 +02:00
Grzegorz Sikora
6a821715a0 Stringtable modules
Conflicts:
	addons/missionmodules/CfgVehicles.hpp
	addons/respawn/CfgVehicles.hpp
2015-05-12 18:25:40 +02:00
Glowbal
e6a8f0b295 Merge pull request #1103 from SilentSpike/medical_typofix
Trivial variable name fix for moduleAssignMedicalVehicle function
2015-05-10 22:37:54 +02:00
SilentSpike
eff5ce03d6 false -> 0 2015-05-10 20:58:17 +01:00
SilentSpike
518cfdab9e isMedic -> medicClass 2015-05-10 20:19:32 +01:00
SilentSpike
d321ed2753 Changed function variable to match other medical vehicle functions 2015-05-10 19:56:35 +01:00
Glowbal
e674229dde enabledFor > enableFor 2015-05-08 20:10:40 +02:00
Glowbal
ae47c78552 Make treatment execute before createLitter 2015-05-04 00:20:28 +02:00
Glowbal
b86012a6b1 Ensure that litterCondition is always code #1000 2015-05-04 00:16:12 +02:00
PabstMirror
436e50411a Medical - Fix Uncon PFEH argument changes 2015-05-01 22:42:43 -05:00
PabstMirror
bded34fa23 I suck at git
redo reverted stuff here
2015-05-01 15:03:05 -05:00
Glowbal
80162627ec Fixed spelling of enableUnconsciousnessAI 2015-05-01 18:49:59 +02:00
Glowbal
5beca63ae2 Added missing private 2015-05-01 11:51:23 +02:00
KoffeinFlummi
e06e1a2f89 Make preventDeath work 2015-05-01 01:38:36 +02:00
KoffeinFlummi
cb82b20464 Let setUncon handle AI unconsciousness 2015-05-01 01:38:16 +02:00
KoffeinFlummi
48770f77d2 Rename caching variables in basic HD 2015-05-01 01:37:58 +02:00
KoffeinFlummi
67bd2b4e2f Reduce animation forcing delay 2015-05-01 01:36:09 +02:00
KoffeinFlummi
98e44e86d8 Offload ejecting to unloadPerson 2015-05-01 01:35:50 +02:00
KoffeinFlummi
f7f416c8d3 Proper privates and alignment 2015-05-01 01:34:38 +02:00
KoffeinFlummi
aa9f1c53c7 Whoops 2015-05-01 01:34:18 +02:00
KoffeinFlummi
53835605ea Merge remote-tracking branch 'origin/master' into basic-med-options
Conflicts:
	addons/medical/functions/fnc_getBloodLoss.sqf
	addons/medical/functions/fnc_handleDamage_basic.sqf
2015-05-01 01:25:16 +02:00
KoffeinFlummi
d59436c588 Only force animation when necessary 2015-04-30 22:19:31 +02:00
KoffeinFlummi
8fda984903 Fix missing semicolon 2015-04-30 22:17:25 +02:00
KoffeinFlummi
965a976daf Reorganize AI unconsciousness 2015-04-30 22:16:45 +02:00
KoffeinFlummi
f28a806938 Remove max unconsciousness time again 2015-04-30 22:15:40 +02:00
KoffeinFlummi
270c3adc1e Do it again, but properly this time 2015-04-30 22:06:10 +02:00
KoffeinFlummi
85669a9e92 Convert Medical stringtable key names to lowercase 2015-04-30 22:01:09 +02:00
Glowbal
432a0102e8 Improved unloadPerson function
Removed caller parameter.
2015-04-30 20:44:43 +02:00
KoffeinFlummi
fd152c580b Merge branch 'master' into basic-med-options
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/functions/fnc_setUnconscious.sqf
2015-04-30 18:39:33 +02:00
PabstMirror
48f7455ef1 Opps2 2015-04-30 01:23:23 -05:00
PabstMirror
d71bba0359 opps 2015-04-30 01:21:41 -05:00
PabstMirror
eb5af0cd89 Medical Private Variables 2015-04-30 01:17:26 -05:00
PabstMirror
f90834eeab Unused 2015-04-29 16:57:24 -05:00
PabstMirror
5fef446c00 EFUNC for dragging calls 2015-04-29 16:53:09 -05:00
PabstMirror
a39e869728 Fix extra {} wraped
Error position: <if ({[_unit] call ace_medical_fnc_setDea>
Error if: Type code, expected Bool
File z\ace\addons\medical\functions\fnc_handleDamage.sqf, line 50
2015-04-29 16:44:47 -05:00
Glowbal
aaa8171457 Implemented prevent instant death #839 2015-04-29 22:54:58 +02:00
Glowbal
614a93ef12 fixes #838 2015-04-29 22:04:46 +02:00
Glowbal
87465b8b10 fixes #829 2015-04-29 21:49:24 +02:00
Glowbal
a854b90b00 Increased level at which a lot of blood message gets shown in basic medical 2015-04-28 22:19:30 +02:00
Glowbal
f606c24854 fixes #901 2015-04-28 20:47:11 +02:00
Glowbal
95d83554da Added local treatment through remoteExec for basic 2015-04-28 20:32:02 +02:00
Glowbal
c38fe384e3 added default values for getvar's 2015-04-28 19:30:35 +02:00
Glowbal
450e324f7b adjusted damage handling (adv medical) 2015-04-27 16:42:12 +02:00
Glowbal
e4db44d73c adjusted damage parsing 2015-04-27 16:36:00 +02:00
Glowbal
b520a1072b Merge branch 'master' into medicalImprovements 2015-04-27 15:41:20 +02:00
commy2
6aea424f6d Merge pull request #872 from acemod/muteuncon
mute unconsious units
2015-04-26 17:40:51 +02:00
commy2
8976b6983d mute unconsious units 2015-04-26 16:47:36 +02:00
bux578
b2dd065429 remove comment 2015-04-26 12:27:06 +02:00
bux578
171cea998e add most of the translations 2015-04-26 09:36:51 +02:00
Glowbal
11d86248a7 Reorganised module and settings #809 2015-04-25 22:20:28 +02:00
Glowbal
6799903e4b Also display different color for advanced 2015-04-25 12:45:04 +02:00
Glowbal
1415adc2bd removed local diagnose action. Added localization 2015-04-25 12:35:07 +02:00
Glowbal
4cef2a1fa4 Merge branch 'master' into streamlinedBasicDiagnosis 2015-04-25 12:12:24 +02:00
KoffeinFlummi
d7b961043b Remove animation reset before falling unconscious
This caused the unit to briefly move to the default animation,
which looked shite.
2015-04-24 22:20:16 +02:00
KoffeinFlummi
d1c95ba8a1 Add maximum unconsciousness time option 2015-04-23 11:31:27 +02:00
KoffeinFlummi
84e1937515 Add damage threshold to basic 2015-04-22 23:50:37 +02:00
KoffeinFlummi
d10f4d543d Enable unit specific bleeding coefficient 2015-04-22 22:38:48 +02:00
KoffeinFlummi
74ca85cbd9 Change getBloodLoss to expect an array 2015-04-22 22:36:41 +02:00
KoffeinFlummi
f6eeb5e3ba Add pain coefficient 2015-04-22 22:29:31 +02:00
Glowbal
1df42b17c2 close all dialogs 2015-04-20 22:22:09 +02:00
Glowbal
f7719f0e0a tab 2015-04-20 22:08:31 +02:00
Glowbal
842bfe0b98 enabled advanced wounds setting 2015-04-20 22:00:11 +02:00
Glowbal
8be7ccaab7 setting for moving unit from group on unconscious 2015-04-20 21:37:30 +02:00
esteldunedain
7953919b89 Merge branch 'simpleDiagnosis' into streamlinedBasicDiagnosis 2015-04-20 10:24:59 -03:00
esteldunedain
1e3b44e32e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 into streamlinedBasicDiagnosis 2015-04-20 10:24:24 -03:00
Glowbal
17899db086 added some missing privates 2015-04-19 19:49:56 +02:00
Glowbal
5e82c51926 Merge branch 'master' into medicalFixes 2015-04-19 18:45:07 +02:00
jaynus
aad8d6b785 Fixed: max litter scalar array, have internal values. 2015-04-19 09:04:42 -07:00
Glowbal
f6bbeb6bd6 switched back to old init method 2015-04-19 17:28:47 +02:00
Glowbal
8a7b3a1b33 Removed damage thresholds from basic medical 2015-04-19 13:08:28 +02:00
Glowbal
b71ac1485d Merge branch 'master' into medicalFixes 2015-04-19 12:06:54 +02:00
jaynus
ca74ce721d Use cleanup settings, and force server TTL on the events. 2015-04-18 11:48:44 -07:00
jaynus
e54c68f7f9 handle cleanup 2015-04-18 11:37:06 -07:00
jaynus
852b4df61d Settings changes. createVehicleLocal derp. 2015-04-18 11:16:18 -07:00
jaynus
c438d9e790 Merge remote-tracking branch 'origin/master' into localMedicalGarbage 2015-04-18 11:12:22 -07:00
Glowbal
22456a4301 use pain instead 2015-04-18 19:49:29 +02:00
jaynus
f31e3c1fd4 litter simulation createVehicleLocal /w temporal network sync. 2015-04-18 08:31:03 -07:00
jaynus
c952a97de8 Revert "synced events implemented into litter."
This reverts commit 32df4a2adc.
2015-04-17 19:38:05 -07:00
jaynus
32df4a2adc synced events implemented into litter. 2015-04-17 19:33:07 -07:00
esteldunedain
c423e9d743 Merge remote-tracking branch 'origin/medicalFixes' into simpleDiagnosis
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/ACE_Medical_SelfActions.hpp
2015-04-17 20:02:51 -03:00
esteldunedain
a5c3e86cd3 Fixes 2015-04-17 20:00:43 -03:00
esteldunedain
cce9e1f04c Simple diagnose 2015-04-17 19:38:03 -03:00
esteldunedain
1d208b4efc Modify Function for medical actions 2015-04-17 19:36:03 -03:00
Glowbal
d1a09ae7fc fixed vehicle crashes for adv 2015-04-17 23:15:41 +02:00
Glowbal
bc4d102d08 changed variable initialization - everything is now done local 2015-04-17 22:43:31 +02:00
Glowbal
f5effca216 fixed handleDamage basic 2015-04-17 22:21:15 +02:00
Glowbal
6d18e484c1 Cache condition for target instead of caller 2015-04-17 22:02:43 +02:00
Glowbal
fa7bb5f9c6 Added unconscious state check 2015-04-17 21:28:47 +02:00
Glowbal
008c36ac76 fixes #699 2015-04-17 21:27:57 +02:00
Glowbal
eb731b1169 fixes #653 2015-04-17 21:07:09 +02:00
Glowbal
31bc09a9a3 fixed AI standing up before being killed
Doesn't matter if we enable AI again on dead units
2015-04-17 21:06:30 +02:00
Glowbal
9b4435827e Added setting for unconscious animations on treatment 2015-04-17 20:51:57 +02:00
Glowbal
80139521bc fixes #691 2015-04-17 20:49:24 +02:00
Glowbal
b333e6e662 Keep units longer unconscious, instead of quickly fading in/out 2015-04-17 20:40:24 +02:00
Glowbal
847ee7e229 Moved unconscious event, so it won't conflict in case the unit is still being carried 2015-04-17 20:38:02 +02:00
Glowbal
8b7e46c45f fixes #656 2015-04-17 20:26:28 +02:00
Glowbal
c86be12668 fixes #599 2015-04-17 20:24:05 +02:00
Glowbal
111a350a84 Merge branch 'master' into advMedicalEventSync 2015-04-17 20:11:53 +02:00
PabstMirror
6e077de829 Medical - Use default value instead of 0 for getVar
#683 - should prevent people getting knocked out from any damage source
if the variables are undefined
2015-04-17 12:13:23 -05:00
esteldunedain
9de834e156 Prototype of simplified diagnosis for basic medical. The left gui is completely scraped. Instead, the medical interaction points are color coded to reflect theier damage (bleeding rate). 2015-04-17 00:04:27 -03:00
Glowbal
59ae4623ff Derp 2015-04-16 00:17:17 +02:00
Glowbal
0f4b7d0977 fixes #347
Please??
2015-04-16 00:14:05 +02:00
Glowbal
c88479d54d staged work 2015-04-15 19:45:42 +02:00
PabstMirror
a36739c697 Merge pull request #418 from acemod/flashbangTweaks
Flashbang tweaks
2015-04-14 23:23:15 -05:00
Glowbal
af255604ac Switched to event based sync system for open wounds 2015-04-14 21:17:36 +02:00
KoffeinFlummi
71b19b4621 Remove duplicate bleeding code 2015-04-14 20:40:38 +02:00
KoffeinFlummi
ba377dfd3a Show seperate message for "scratches"; localize 2015-04-14 20:40:17 +02:00
KoffeinFlummi
c6118901b4 Merge branch 'master' into basic-medical-tweaks 2015-04-14 20:35:17 +02:00
KoffeinFlummi
7ca36cdb65 Always show wounds, even for very low damage 2015-04-14 20:28:19 +02:00
PabstMirror
bf3e3d3b64 #542 - ACE_fakeWeapon not found 2015-04-13 03:46:42 -05:00
PabstMirror
70dbae5a25 #527 - Unconscious switching groups 2015-04-13 00:32:07 -05:00
KoffeinFlummi
664cc7077d Reduce blood loss rate 2015-04-12 18:06:57 +02:00
KoffeinFlummi
f794eaac43 Merge branch 'master' into basic-medical-tweaks
Conflicts:
	addons/medical/ACE_Medical_Actions.hpp
	addons/medical/functions/fnc_handleDamage_basic.sqf
	addons/medical/stringtable.xml
2015-04-12 18:00:22 +02:00
PabstMirror
3be70556ab Medical: adjustPainLevels from outside functions 2015-04-11 21:21:33 -05:00
Glowbal
e00f0ea4c3 No longer creates a new waitAndExec for every handleDamage call 2015-04-11 22:47:10 +02:00
Glowbal
97fa40b4c1 Make use of new global variables for selections and hitpoints 2015-04-11 22:31:38 +02:00
Glowbal
6cc115a628 We already determine the new damage in caching, so we will use that value instead of recalculating it here 2015-04-11 22:31:17 +02:00
Glowbal
e8d2a00994 Added GVAR(HITPOINTS) and GVAR(SELECTIONS) variables
No longer have to recreate the selection and hitpoint arrays every time
2015-04-11 22:30:52 +02:00
Glowbal
c69f71ba71 formatting 2015-04-11 22:29:32 +02:00
Glowbal
51906e341d Removed unused variables 2015-04-11 22:29:11 +02:00
Glowbal
082ab5155e Minor performance improvements
Before avg: 0.0858495ms
After avg: 0.0701045ms
2015-04-11 21:27:49 +02:00
PabstMirror
adc7db9ae9 #456 - Fix AI rotating while dead (disableAI func)
Still some small head movements, but I don't know how to fix that.
2015-04-10 15:02:40 -05:00
Glowbal
093d340ee7 Changed: Dragging/carrying now works for units with broken legs
Added unload and load of unconscious units
2015-04-09 21:23:10 +02:00
Glowbal
0926397ab4 Removed deadcode and obvious comments 2015-04-09 20:13:46 +02:00
Glowbal
39cbf21278 Removed deprecated carry functions 2015-04-09 20:12:30 +02:00
KoffeinFlummi
a209e49f1c Remove partname from patientInfoDisplay for basic. 2015-04-08 07:39:16 +02:00
KoffeinFlummi
5bd1ee7ecd Do not use a treshold for unassigned damage. 2015-04-08 07:21:34 +02:00
Glowbal
ffbe9f0c71 Setting for getting rid of hitpoint damage after adv medical damage 2015-04-07 21:06:48 +02:00
Glowbal
2b341c2a8b left over CSE function calls removed 2015-04-07 20:50:44 +02:00
Glowbal
545014b073 missing return value 2015-04-07 20:47:36 +02:00
Glowbal
ac3bda3135 improvements to displayPatientInformation. Bandaged wounds should be more clear now 2015-04-07 20:19:32 +02:00
Glowbal
526e24f133 formatting 2015-04-07 19:56:54 +02:00
Glowbal
3d82cb8eac Removed deprecated onTreatmentCompleted event 2015-04-07 19:54:24 +02:00
Glowbal
12493f8595 Improved wounds configuration (missing maxDamage values added) 2015-04-07 00:57:05 +02:00
Glowbal
c7549a13a4 Improved pain reduction 2015-04-07 00:41:53 +02:00
Glowbal
4c6dad69f9 Should fix #347. Could not reproduce but this at least fixes some issues (which most likely caused the error) 2015-04-06 19:43:27 +02:00
Glowbal
ce4cdd3722 staged bodybag fixes 2015-04-06 15:11:54 +02:00
Glowbal
661d93e82c Working commit 2015-04-06 14:51:17 +02:00
Glowbal
8e176eff55 Fixed treatment locations 2015-04-06 14:32:37 +02:00
Glowbal
10a1108aae Added support for customizable treatment location limitation 2015-04-06 14:11:10 +02:00
Glowbal
2657677bd8 Added support for TFR/ACRE on unconscious 2015-04-06 14:09:59 +02:00
jaynus
e3ad83e109 Merge pull request #286 from KoffeinFlummi/lasers
Self designating lasers, Javelin Guidance, DAGR laser guidance, Comanche updated HUDS
2015-04-05 13:26:54 -07:00
Glowbal
9e3bb8ac95 fixed triage card 2015-04-05 22:07:38 +02:00
Glowbal
12d10b8bf7 Blood loss for basic (from AGM medical) 2015-04-05 21:38:15 +02:00
Glowbal
147bb92541 Added setting to disable variable sync (recommended on) 2015-04-05 20:23:07 +02:00
Glowbal
7ffd690a71 Changed: IVs are now synced and medics can see a unit is receiving an IV 2015-04-05 20:11:54 +02:00
Glowbal
89015c94d4 Removed rouge system chat and diag_log messages 2015-04-05 19:42:55 +02:00
Glowbal
2c0bec2b07 disabled injury visualization for bandaged wounds 2015-04-05 19:36:40 +02:00
Glowbal
171ebf827a No litter created when in vehicle 2015-04-05 19:28:57 +02:00
Glowbal
a0bbbdb0b7 fixed place in bodybag 2015-04-05 19:27:53 +02:00
Glowbal
dca75c5557 Implemented bandaged wounds setting (adv) 2015-04-05 19:26:33 +02:00
Glowbal
e3e17d8fcb Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-04-05 15:51:42 +02:00
Glowbal
c210efcef0 fixed #312 Error occurred with undefined damageTypes. In this case; getting run over by a vehicle. 2015-04-05 15:51:28 +02:00
Glowbal
32625b446b fixed animation being reset even when inside a vehicle 2015-04-05 13:03:09 +02:00
jaynus
ab0d289762 Merge remote-tracking branch 'origin/master' into lasers 2015-04-04 16:56:03 -07:00
Glowbal
7f9043897c wake up by epinephrine in revive state 2015-04-04 22:50:38 +02:00
Glowbal
551c36d690 fixed treatment didnt work inside vehicles 2015-04-04 22:48:52 +02:00
Glowbal
a56e8745c3 fixed module settings 2015-04-04 21:59:18 +02:00
Glowbal
d37094dc7a Work around for self treatment when cursorMenu from interact is used.
Executing it one frame later works fine, but otherwise the loading bar will fail.
2015-04-04 21:52:00 +02:00
Glowbal
5c3ee0dd1a Added settings to modules & fixed medicalVehicle module 2015-04-04 21:51:18 +02:00
Glowbal
89ec817ce3 Added setting for litter cleanup delay 2015-04-04 21:26:41 +02:00
Glowbal
1d33ce52b3 added support for adjustable settings for consumeItem and medicalLevel 2015-04-04 21:20:24 +02:00
Glowbal
93d9088410 fixed cardiac arrest 2015-04-04 21:20:03 +02:00
Glowbal
e3aaac7005 Only select primary weapon if no current weapon is selected 2015-04-04 20:49:30 +02:00
Glowbal
e78fc55b45 changed; When standing before treatment, the caller will now move into crouch instead of standing up again. 2015-04-04 20:21:52 +02:00
Glowbal
ddb01e7865 Improved unconscious wakeup animations 2015-04-04 20:21:06 +02:00
Glowbal
2420db78a1 CreateLitter now supports conditions and is selection specific.
Format:
litter[] = {
   {"SelectionName", "Condition", {"litterClassname"} },
   ...
};

The array with litter classnames also support 2d arrays. ie:
{"SelectionName", "Condition", {{"litterClassname"}} }
Of array entries it will select a random classname.
2015-04-04 20:20:29 +02:00
Glowbal
08e1949078 Improved patient unconscious animation 2015-04-04 18:08:41 +02:00
Glowbal
31b7ade057 Support unconscious animation for patient upon treatment 2015-04-04 17:33:20 +02:00
Glowbal
b54179696a fixed basic revive 2 2015-04-04 16:28:09 +02:00
Glowbal
18900cb82c fixed revive for basic 2015-04-04 16:27:44 +02:00
Glowbal
3a117e9b4d fixed incorrect unit used for fullheal (was healing caller) 2015-04-04 16:26:49 +02:00
Glowbal
914c5ffd0f fixed bandage optional parameter 2015-04-04 12:14:21 +02:00
Glowbal
7c296c413d Litter has a more random spread 2015-04-04 12:13:55 +02:00
Glowbal
2645b102f0 Replaced waitAndExec for single PFH with 30s delay 2015-04-04 02:28:14 +02:00
Glowbal
83fbc1ff10 Added setting to toggle litter creation on/off 2015-04-04 01:47:56 +02:00
Glowbal
7f45d25ee5 Added litter for medical treatment 2015-04-04 01:42:13 +02:00
Glowbal
7230687ea2 corrected revive setting classes 2015-04-04 00:30:59 +02:00
Nou
6541600d44 Switch everything to use modelToWorldVisual instead of modelToWorld. 2015-04-03 15:26:27 -07:00
Glowbal
d3c9d111e1 fullHeal now resets reviveState 2015-04-03 23:58:46 +02:00
Glowbal
4ddb496d8b Added max Revive lives 2015-04-03 23:56:32 +02:00
Glowbal
a6ce961ca1 Usage of isBeingCarried and isBeingDragged 2015-04-03 22:45:16 +02:00
Glowbal
244bac8562 Merge branch 'master' into medicalAdvanced 2015-04-03 22:42:09 +02:00
Glowbal
05389e7e25 Implemented useItems for treatment (basic and adv)
Will remove items on treatment start. Add again on treatmentFailure.
Based upon consumeItem config setting.
2015-04-03 22:40:36 +02:00
Glowbal
038ed5f23e Removed deprecated returnDamage parameters 2015-04-03 21:59:47 +02:00
Glowbal
1ef262c119 Support for enableOverdosing setting in advanced 2015-04-03 21:53:58 +02:00
Glowbal
c3ddbb4be7 Prevent the usage of the blood loss coefficient to increase blood volume on bleeding 2015-04-03 21:51:44 +02:00
Glowbal
ecf16ad9f1 fixed prevent instant death setting 2015-04-03 21:49:46 +02:00
PabstMirror
604e851423 Medical - isBeingCarried 2015-04-03 14:37:04 -05:00
Glowbal
d4a6dd1038 Removed the options to enable fractures and airway through mission module 2015-04-03 21:32:49 +02:00
Glowbal
1b02cb2e82 examine actions now use activity log 2015-04-03 21:03:39 +02:00
Glowbal
43efc21f27 Only display the activity log in the activity list. 2015-04-03 21:03:22 +02:00
Glowbal
8d7ac1f930 Added selected bodypart text
Changed "No injuries on bodypart" to still display if the generic messages have entries
2015-04-03 20:26:24 +02:00
PabstMirror
254a25b139 Medical - isBeingDragged func 2015-04-03 13:16:48 -05:00
Glowbal
b92978fb80 Now resets the proper hasMovedOut value 2015-04-03 20:11:20 +02:00
Glowbal
e68e487769 fixed units not moving out of unconscious animation 2015-04-03 20:07:39 +02:00
Glowbal
d5f0cf5cbd Incorrect value for airwayStatus 2015-04-03 20:06:53 +02:00
Glowbal
14e00940cd fixed incorrect airwayStatus values for initialization (adv medical) 2015-04-03 18:59:22 +02:00
Glowbal
368002cc79 fixed undefined _selectionName variable #289 2015-04-03 08:48:10 +02:00
Glowbal
c174ccf396 fixed script error when performing treatment with secondary weapon selected 2015-04-02 22:58:00 +02:00
Glowbal
57b093f845 Added minimum lethal damage for injury types in adv medical 2015-04-02 22:57:35 +02:00
Glowbal
b267a52ec6 Fixed support for custom damage types 2015-04-02 22:57:02 +02:00
Glowbal
6f630d4c03 Changed setUnconscious contract to support a minimum unconscious time 2015-04-02 22:55:23 +02:00
Glowbal
7252966a78 Replaced advanced wounds event sync by regular setvariable public 2015-04-01 20:03:44 +02:00
PabstMirror
559f0dbaea Unconc - dropping object handled in dragging 2015-03-26 16:32:44 -05:00
PabstMirror
048be00a0f Medical - QGVAR(isUnconscious) -> "ACE_isUnconscious" 2015-03-26 15:47:08 -05:00
PabstMirror
3f137d357d Medical - carryObj func moved 2015-03-26 15:05:50 -05:00
commy2
9a0f0cb47b stuff from medical 2015-03-26 16:58:41 +01:00
Glowbal
eb80831525 fixed script error with medical display patient information after check response 2015-03-25 22:18:52 +01:00
Glowbal
b6133eb73e removed diag_log calls 2015-03-24 23:10:03 +01:00
Glowbal
3b17cc68e1 medical_onUnconscious is now a globalEvent instead of targetEvent.
Feature request by commy.
2015-03-24 22:10:41 +01:00
Glowbal
706e159815 Adjusted color of tourniquet message 2015-03-24 22:01:33 +01:00
Glowbal
53e7fe1ba5 fixed #227 2015-03-24 21:08:45 +01:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Glowbal
15edb0bff2 fixes 2015-03-22 23:24:24 +01:00
Glowbal
d7de92c60d Merge branch 'master' into Medical_Dragging
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
2015-03-22 22:41:36 +01:00
Glowbal
1bb32dcfcb fixed missing condition variable 2015-03-22 22:20:44 +01:00
Glowbal
4995016a66 Switched to canInteractConditions 2015-03-22 20:59:57 +01:00
Glowbal
7bc6fa3c3b Disable interaction for objects 2015-03-22 20:39:22 +01:00
Glowbal
6eac193825 Replaced deleting of body by hiding it 2015-03-22 20:37:55 +01:00
Glowbal
f252b2c96f advanced medical JIP improvements 2015-03-22 17:04:42 +01:00
Glowbal
55e7e768ca removed systemChat messages 2015-03-22 11:21:17 +01:00
Glowbal
0428a1d558 Added canDrag 2015-03-22 10:28:33 +01:00
Glowbal
7b519fc2e0 Merge branch 'master' into Medical_Dragging
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/stringtable.xml
2015-03-22 09:46:58 +01:00