Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,112 Commits 73 Branches 88 Tags 752 MiB
ed242fdea4
Commit Graph

541 Commits

Author SHA1 Message Date
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
Glowbal
635f3e31c9 Disable medical carry and drag 2015-04-01 19:56:00 +02:00
PabstMirror
559f0dbaea Unconc - dropping object handled in dragging 2015-03-26 16:32:44 -05:00
PabstMirror
6a71a04ad9 opps 2015-03-26 15:52:30 -05:00
PabstMirror
de644ba9b0 Medical - Reset captive status for respawning unit 2015-03-26 15:49:08 -05:00
PabstMirror
048be00a0f Medical - QGVAR(isUnconscious) -> "ACE_isUnconscious" 2015-03-26 15:47:08 -05:00
PabstMirror
2eefb1265d Medical - morphine icon for left leg 2015-03-26 15:16:28 -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
9f540e0473 fixed Missing unconcious effects #253 2015-03-26 08:43:30 +01:00
Glowbal
eb80831525 fixed script error with medical display patient information after check response 2015-03-25 22:18:52 +01:00
bux578
1f3c3ce34b fixed spelling of engl. autoinjector 
http://en.wikipedia.org/wiki/Epinephrine_autoinjector
 2015-03-25 18:22:45 +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
975ad5a399 Merge branch 'master' into medical-fixes 
Conflicts:
	addons/medical/CfgVehicles.hpp
 2015-03-24 22:07:15 +01:00
Glowbal
706e159815 Adjusted color of tourniquet message 2015-03-24 22:01:33 +01:00
Glowbal
2f729f67f1 Slightly increased the distance of medical actions 
Removed sub menu medical on torso
 2015-03-24 21:41:03 +01:00
Glowbal
7420f70020 Fixed #232 2015-03-24 21:26:20 +01:00
Glowbal
95489ed627 fixed missing handleDamage EH #235 2015-03-24 21:25:21 +01:00
Glowbal
53e7fe1ba5 fixed #227 2015-03-24 21:08:45 +01:00
Glowbal
f175467813 fixed #241 and #228 2015-03-24 21:08:13 +01:00
Nicolás Badano
77dc50f10f Some more fixes for self interaction inside vehicles 2015-03-24 16:06:03 -03:00
Nicolás Badano
4fb50fa71e Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-24 15:44:10 -03:00
Nicolás Badano
8b3648cf8d Configure exceptions for self actions inside vehicles 2015-03-24 15:43:49 -03:00
bux578
05896a55ea fix authors 2015-03-24 19:40:48 +01:00
bux578
60c50e0daf Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into ModuleIcons 2015-03-24 19:12:23 +01:00
Nicolás Badano
5e79970740 Switching nicknames 2015-03-24 01:18:00 -03:00
Nicolás Badano
a823fb2dca Tweaks on action names to: 
- Remove >> for submenus
- Split long action names in two lines
 2015-03-24 00:16:32 -03:00
bux578
ba42ec831b second batch of icons 2015-03-23 20:02:35 +01:00
PabstMirror
2329212060 Medical Action Stringtable 2015-03-23 13:52:26 -05:00
bux578
1114e12186 add first batch of module icons, naming conventions 2015-03-23 13:56:59 +01: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
9e43ab5c25 Merge branch 'master' into medical-advanced 2015-03-22 22:37:37 +01:00
Glowbal
4ff849c2fd Merge branch 'master' into medical-advanced 2015-03-22 22:34:07 +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
2d2687e759 Added self interact items 2015-03-22 17:28:48 +01:00
Glowbal
dd7dad1b90 define base class 2015-03-22 17:05:31 +01:00
Glowbal
f252b2c96f advanced medical JIP improvements 2015-03-22 17:04:42 +01:00
Glowbal
8b4c0c0e36 fixed postInit depending on setting 2015-03-22 15:16:42 +01:00
Glowbal
be9c09b605 Added cfgPatches dependancy on ace_modules 2015-03-22 12:49:04 +01:00
Glowbal
281bad1e7e Use of the ACE module instead of Module_F. 2015-03-22 12:44:26 +01:00
Glowbal
55e7e768ca removed systemChat messages 2015-03-22 11:21:17 +01:00
Glowbal
5063e9cff9 fixed config duplicate entry 2015-03-22 11:21:08 +01:00
Glowbal
ac4309237b Added drag/carry actions 2015-03-22 10:28:41 +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
Nicolás Badano
5dcf29ba80 Merge pull request #212 from KoffeinFlummi/interactivePelvis 
Move main interactions to pelvis; leave torso for medical
 2015-03-21 20:44:18 -03:00
Nicolás Badano
6a83d0d9fc clear canTreat caches before calling the last condition 2015-03-21 20:33:25 -03:00
PabstMirror
3a6995fbec Cleanup medical Item classnames 2015-03-21 18:07:50 -05:00
Felix Wiegand
be4f21ea2e Merge pull request #215 from KoffeinFlummi/medical-itemcheck 
Medical itemcheck
 2015-03-21 22:41:06 +01:00
Glowbal
a7d8914884 Removed GVAR/QGVAR from items 2015-03-21 22:22:28 +01:00
Glowbal
b74eb550b0 Added advanced items 2015-03-21 22:08:42 +01:00
KoffeinFlummi
58237751b0 Woopsie 2015-03-21 22:01:20 +01:00
KoffeinFlummi
f6f910fb8a Replace vanilla items with ours. 2015-03-21 21:59:08 +01:00
Glowbal
d73f16861b Merge pull request #213 from KoffeinFlummi/medical-advanced 
Medical advanced
 2015-03-21 21:02:35 +01:00
Nicolás Badano
ce3ed988a2 Removed debug traces 2015-03-21 16:33:59 -03:00
Glowbal
89daf840f6 fixed incorrect macro 2015-03-21 20:08:52 +01:00
Nicolás Badano
4e32e584be Merge branch 'master' of github.com:KoffeinFlummi/ACE3 2015-03-21 15:33:36 -03:00
Nicolás Badano
f8ea603977 Added dynamic actions to unload patients (unconscious) from vehicles 2015-03-21 15:32:32 -03:00
PabstMirror
9578024693 Dupe stringtable entry 
`Item STR_ACE_MEDICAL_BANDAGING listed twice`
 2015-03-21 12:52:08 -05:00
Glowbal
7d6afdf1a9 Added triage card option 2015-03-21 17:30:49 +01:00
Glowbal
82ec93b84e Medical icons 2015-03-21 17:05:32 +01:00
Glowbal
7ae45fbeff Fixed canTreatCached 2015-03-21 16:47:51 +01:00
Glowbal
d0b14286ff Wrong function name 2015-03-21 16:34:42 +01:00
Glowbal
1d63e94fff canTreatCached 2015-03-21 16:33:14 +01:00
Glowbal
8de985d754 Added medical icons 2015-03-21 15:45:35 +01:00
Nicolás Badano
d7363a6dab Move main interactions to pelvis; leave torso for medical 2015-03-21 11:01:38 -03:00
Glowbal
4bcfd1a0ba Merge branch 'master' into medical-advanced 
Conflicts:
	addons/medical/functions/fnc_handleUnitVitals.sqf
 2015-03-21 14:54:37 +01:00
Glowbal
946ade63e5 Merge branch 'master' into medical-advanced 2015-03-21 14:40:59 +01:00
Glowbal
ff5c8e911d Added InteractionMenuClosed event for closing the patient information display 2015-03-21 14:40:51 +01:00
Glowbal
77210581f5 Added corners to triage card 2015-03-21 14:40:26 +01:00
KoffeinFlummi
75517f7ce4 Replace setDamage with setDead 2015-03-21 14:40:23 +01:00
Glowbal
7c30127ffb Disabled unimplemented medical systems 2015-03-21 10:55:40 +01:00
Glowbal
bc082783c9 check if unit is in a vehicle before checking the vehicle 2015-03-21 10:55:27 +01:00
Glowbal
b5c6e52416 fixed #201 2015-03-21 10:54:52 +01:00
KoffeinFlummi
a060e4bea5 Apply translations to epipen and morphine actions 2015-03-21 00:31:47 +01:00
KoffeinFlummi
b1ed80a23d Remove trailing whitespace in medical stringtable 2015-03-21 00:28:19 +01:00
KoffeinFlummi
510538bc53 Remove superfluous todo 2015-03-21 00:26:14 +01:00
KoffeinFlummi
88fb2765e3 Standardize actions across basic and advanced 2015-03-21 00:21:30 +01:00
KoffeinFlummi
6f8b5cc676 Fix missing dollar sign 2015-03-20 23:53:25 +01:00
KoffeinFlummi
33d4bf2f5a Add localization for basic treatments and actions 2015-03-20 18:21:03 +01:00
KoffeinFlummi
9082712ff7 Replace Original with English keys in stringtable 2015-03-20 17:54:26 +01:00
KoffeinFlummi
66078a047b Wut. 2015-03-20 07:52:41 +01:00
KoffeinFlummi
07570fccd4 Make isMedic even prettier 2015-03-19 22:34:12 +01:00
KoffeinFlummi
5589b80c70 Rewrite and fix isMedic 2015-03-19 22:27:12 +01:00
KoffeinFlummi
97082e4ce3 Simplify condition checking in canTreat. 2015-03-19 22:01:40 +01:00
KoffeinFlummi
69e0ebf107 Add injury texts 2015-03-19 21:31:56 +01:00
KoffeinFlummi
102d86d7d1 Merge remote-tracking branch 'origin/master' into medical-basic 2015-03-19 21:30:27 +01:00
Glowbal
3dda70a4af fixed variable name 2015-03-19 21:14:42 +01:00
Glowbal
42de257c6e Merge branch 'master' into Medical_Dragging 2015-03-18 18:21:05 +01:00
Glowbal
be4ba6144f Removed unnecessary line 2015-03-18 18:17:42 +01:00
KoffeinFlummi
b470276f7f Close dialogs when falling unconscious. 2015-03-17 08:03:11 +01:00
KoffeinFlummi
8a3e3d4b52 Remove superfluous todo 2015-03-17 08:02:55 +01:00
KoffeinFlummi
056625f0fe Check leg/arm damage in setHitPointDamage as well. 2015-03-17 07:53:50 +01:00
KoffeinFlummi
17fd051c79 Rename Bloodbag action to BloodIV 2015-03-17 07:53:35 +01:00
KoffeinFlummi
99899d6562 Move advanced bloodloss handling to advanced 2015-03-15 03:26:10 +01:00
KoffeinFlummi
4cc1b08196 Add basic bleeding 2015-03-15 03:26:00 +01:00
KoffeinFlummi
d640367ff2 Add isInMedicalVehicle function 2015-03-15 03:25:31 +01:00
KoffeinFlummi
77ae997993 Don't handle unit vitals when game is paused 2015-03-15 01:48:50 +01:00
KoffeinFlummi
7f19ab7750 Only run JIP updates for wounds in advanced 2015-03-15 01:46:23 +01:00
Glowbal
62460e8b79 Fixes for animations and script error 2015-03-15 01:12:02 +01:00
Glowbal
2bee533a8c Added AGM stringtables for drag, carry, load & unload 2015-03-14 09:51:08 +01:00
Glowbal
dcf3a73518 Added copyDeadBody function 2015-03-14 09:48:16 +01:00
Glowbal
99b1986059 Added setting for allowing movement of dead bodies 2015-03-14 09:37:19 +01:00
PabstMirror
93262f3b92 Use ace_isUnconscious in anim changed EH 2015-03-13 00:45:12 -05:00
PabstMirror
55fcc60453 Merge branch 'master' into captivesMedicalInegration 2015-03-12 22:44:24 -05:00
Glowbal
4ce524ed3c First draft of carry and drop unit 2015-03-12 21:16:49 +01:00
KoffeinFlummi
82f73117f4 Merge branch 'master' into medical-basic 2015-03-12 07:35:57 +01:00
KoffeinFlummi
a3069e3356 Fix wrong pain variable in patient information 2015-03-12 07:35:29 +01:00
KoffeinFlummi
ef491a7c76 Add basic information to dialog 2015-03-12 07:34:29 +01:00
KoffeinFlummi
809f6754cc Add pain & painkiller reduction over time 2015-03-12 07:33:44 +01:00
PabstMirror
dd026cea0f Medical - add tourniquet p3d and other missing tex 
Ported tourniquet from cse
add missing textures for other items
fix paths in rvmats
 2015-03-11 23:52:58 -05:00
PabstMirror
5ab9ad87f9 QGVAR typo 2015-03-11 13:33:45 -05:00
KoffeinFlummi
fabecdd0d3 Merge branch 'master' into medical-basic 2015-03-11 18:20:16 +01:00
KoffeinFlummi
a641a5db8b Make use of fnc_setUnconscious 2015-03-11 18:08:29 +01:00
KoffeinFlummi
8d22b61a2d Assign structural damage to torso 2015-03-11 18:08:00 +01:00
Nicolás Badano
c573b1048d Made medical diagnosis statements run on hover 2015-03-11 00:38:31 -03:00
Glowbal
1da67d7b48 First draft of triage card 2015-03-10 21:12:35 +01:00
Glowbal
a4d73e1b01 DEFUNC -> DFUNC 2015-03-10 19:51:51 +01:00
PabstMirror
93a1cdaab6 setCaptivityStatus in setUnconsicous 2015-03-10 10:35:00 -05:00
Glowbal
e741c8a12b Config stuff 2015-03-09 22:36:25 +01:00
Glowbal
4b171f9507 Indentation 2015-03-09 22:27:01 +01:00
Glowbal
6b91cefb90 Minor fixes and added pain status 2015-03-09 22:23:37 +01:00
Glowbal
8cc0361cb4 localization and displayText fixes 2015-03-09 22:08:43 +01:00
Glowbal
8a3eac2aa0 Added medical actions to sub menu 
Added statements
 2015-03-09 22:08:32 +01:00
Glowbal
f62335f71c Fixed custom conditions 2015-03-09 21:42:09 +01:00
Glowbal
5afc651519 fixed incorrect tourniquet classname 2015-03-09 21:41:58 +01:00
Glowbal
6aae11944b config fixes 2015-03-09 21:41:43 +01:00
Glowbal
a37afec70e fixed inheritance of treatment classes 2015-03-09 21:14:39 +01:00
Glowbal
9b856ea38b Merge branch 'master' into Medical_Improvements 2015-03-09 21:08:18 +01:00
Glowbal
f7159084c3 Made the menu slightly wider 2015-03-09 21:05:11 +01:00
Glowbal
aeb4c91792 Added interaction menu actions for advanced medical 2015-03-09 21:05:01 +01:00
Glowbal
f6fbef980a Added support for bandaging a specific injury class on a selection 2015-03-09 20:03:17 +01:00
Glowbal
fc1a52d48b Added events for unconscious 2015-03-08 17:52:40 +01:00
Glowbal
85cbe5eb5f Added support for locality switch and killed units 2015-03-08 17:50:06 +01:00
Glowbal
252663fd81 Readded checkBloodPressure and checkPulse actions. 2015-03-08 17:13:17 +01:00
Glowbal
c7edd83296 Improvements made for airway implementation 2015-03-08 15:58:35 +01:00
Glowbal
cf82966d57 fixed pain with advanced medical 2015-03-08 15:13:44 +01:00
Glowbal
4ed19dce75 Fixed injured sounds 2015-03-08 15:13:32 +01:00
Glowbal
784a5e9fcb Synchronizing of vital values across the net every 10-25 seconds 2015-03-08 13:56:24 +01:00
Glowbal
2e07aabd41 wrong function name 2015-03-08 12:28:17 +01:00
Glowbal
e6042ca04f Added revive state / prevent death and unconscious conditions 2015-03-08 12:27:52 +01:00
Glowbal
d016874583 Expanded the medical settings 2015-03-08 12:05:52 +01:00
Nicolás Badano
31a50ee7aa Merge pull request #158 from KoffeinFlummi/linkBelt 
Link belt
 2015-03-07 13:00:26 -03:00
Glowbal
657cf14515 Indentation 2015-03-07 13:57:36 +01:00
Glowbal
239ffdc4d2 headers 2015-03-07 13:47:28 +01:00
Glowbal
9590661cc5 Removed left overs 2015-03-07 13:39:09 +01:00
Glowbal
79b3df9815 fixed bodybag classname 2015-03-07 13:37:31 +01:00
Glowbal
dc29cad4cd Added items for curator and medical supply crate 2015-03-07 13:36:56 +01:00
Glowbal
5718649639 Added medic, medical vehicle and medical facility modules 2015-03-07 13:25:28 +01:00
Glowbal
bf8c9dc6f9 Implemented support for different medic roles 2015-03-07 13:16:32 +01:00
Glowbal
d780592629 Fixed issue with addToInjuredCollection 2015-03-07 13:06:50 +01:00
Glowbal
1c05f3578c Added moduleMedicalSettings 2015-03-07 13:06:33 +01:00
Glowbal
f322884176 Added medical settings module 2015-03-06 22:54:44 +01:00
Glowbal
e2acb2385b Support for a max damage value for wounds 2015-03-06 22:41:20 +01:00
KoffeinFlummi
a45486cfc8 Remove superfluous todos 2015-03-06 07:36:13 +01:00
KoffeinFlummi
8b11759fe4 Fix faulty interaction config 2015-03-06 07:32:23 +01:00
Nicolás Badano
6b43c7bc20 Merge branch 'master' into linkBelt 
Conflicts:
	addons/common/XEH_preInit.sqf
	addons/interact_menu/functions/fnc_renderMenu.sqf
 2015-03-05 22:48:31 -03:00
Glowbal
a724fb406a Added triage status 2015-03-05 20:55:38 +01:00
Glowbal
bfb6a726ca Activity log is now used by all logs 2015-03-05 18:53:38 +01:00
Glowbal
199cd05aa0 New variant of the medical information display 2015-03-05 18:43:44 +01:00
Glowbal
3a40a21433 Improvements made to the advanced handleDamage system 2015-03-05 18:42:32 +01:00
Glowbal
10f30fa543 Improvements and fixes for injured loop and enabledFor check 2015-03-05 18:42:08 +01:00
Glowbal
8215abb69d Fixed variable default values 2015-03-05 18:40:55 +01:00
Glowbal
64121c3376 Added injuries to injury list 2015-03-03 23:34:44 +01:00
Glowbal
3fc29673bb More fixes and improvements for wounds 2015-03-03 23:26:54 +01:00
Glowbal
e4756efaa0 Optimization for new wound system 2015-03-03 22:13:22 +01:00
Glowbal
c5a27d3cd7 Support for unlimited dosages 2015-03-03 20:16:04 +01:00
Glowbal
7f2d41b1a8 Added onOverDose callback. Allows for medication specific side effects. 2015-03-03 20:12:57 +01:00
Glowbal
7750f2d1b2 Added support for callbacks with heart rate changes through medication 2015-03-03 20:07:09 +01:00
Glowbal
83cdef770a Can no longer go below zero 2015-03-03 19:58:58 +01:00
Glowbal
8f76832177 Added pain killer medication class draft 2015-03-03 19:57:52 +01:00
Glowbal
f8421b2589 Added support for viscosity adjustment from medication 2015-03-03 19:56:32 +01:00
Nicolás Badano
8fd13f3fe5 Activate bandaging conditions 2015-03-03 00:04:15 -03:00
Nicolás Badano
8b761e3528 Bandage actions moved from base to second level 2015-03-01 18:28:05 -03:00
Glowbal
7307796e89 Fixed array 2015-03-01 18:03:24 +01:00
Glowbal
076c5abf88 Added a displayName for the wounds 2015-03-01 18:02:56 +01:00
Glowbal
f690e54af3 Added displayPatientInformation draft 2015-03-01 16:04:53 +01:00
Glowbal
4b584846b4 Replaced disableUserInput by setDisableUserInputStatus 
Makes use of the wrapper around disableUserInput, so it will play nice with others
 2015-03-01 14:27:44 +01:00
Glowbal
d5e5ab24f2 Improvements made to heart rate effects 2015-03-01 14:06:44 +01:00
Glowbal
91a52a4b76 Added support for JIP injury synchronizing 
Enabled heart beat sounds
 2015-03-01 12:33:05 +01:00
Glowbal
fb763a9d57 Added load and unload actions 2015-03-01 10:44:08 +01:00
Glowbal
769b855255 Added readme 2015-03-01 10:36:52 +01:00
Glowbal
bbfe84565a Added heartbeat sounds 2015-03-01 10:33:51 +01:00
Glowbal
ba4fc66965 Fixed config mistake 2015-03-01 10:28:42 +01:00
Glowbal
8726e7f1d2 Added CMS equipment items. 2015-03-01 10:25:37 +01:00
Glowbal
437f0fbd8a Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-03-01 00:13:27 +01:00
Glowbal
9d7e94ca09 Added initial UI element for displaying injuries 2015-03-01 00:13:08 +01:00
KoffeinFlummi
e7c0c78e5d Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 2015-02-28 23:36:13 +01:00
KoffeinFlummi
eeb2f6e8bb Fix script error in setUnconscious 2015-02-28 23:35:53 +01:00
Glowbal
69801a65b0 Removed dead code 2015-02-28 23:34:14 +01:00
Glowbal
a29cbf6977 Fixed incorrect config variable name 2015-02-28 22:45:12 +01:00
Glowbal
6310d7b582 Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-02-28 22:38:54 +01:00
Glowbal
8f253620c1 Fixed handleDamage wounds 2015-02-28 22:37:39 +01:00
KoffeinFlummi
1689829f93 Get treatment callback structure working 2015-02-28 22:10:20 +01:00
Glowbal
d50466ac67 Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-02-28 21:09:56 +01:00
Glowbal
68626f54fc Missing semicolon 2015-02-28 21:09:39 +01:00
KoffeinFlummi
309d42f2e6 God damnit 2015-02-28 21:02:15 +01:00
KoffeinFlummi
46cb963630 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
 2015-02-28 20:58:19 +01:00
KoffeinFlummi
f5fe57232c Derp 2: The Rederpening 2015-02-28 20:56:55 +01:00
KoffeinFlummi
aea448efe7 Derp 2015-02-28 20:54:23 +01:00
KoffeinFlummi
7f9daeb2f6 Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_init.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
 2015-02-28 20:50:59 +01:00
Glowbal
15afb8846a Fixed private array and added event listener 2015-02-28 20:50:08 +01:00
Glowbal
18998bb619 Split up the openWounds through the ACE event system 
Based upon the suggestions from Jaynus
 2015-02-28 20:48:34 +01:00
KoffeinFlummi
424f156977 Various Cleanups 2015-02-28 20:46:36 +01:00
Glowbal
d293008586 Fixed indentation 2015-02-28 19:28:05 +01:00
Glowbal
451f8b6d0b Fixed advanced medical handleDamage chain. Now supports killing units. 2015-02-28 19:22:46 +01:00
Glowbal
f1445a4c45 Fixed script errors 2015-02-28 18:59:37 +01:00
Glowbal
9986fddf6b Fixed undefined _bloodPressure 2015-02-28 18:46:44 +01:00
Glowbal
5e65d5e9a8 Added support for displayText on treatment actions 2015-02-28 15:46:37 +01:00
KoffeinFlummi
8c6df1b00c Fix indentation in treatment 2015-02-28 15:23:12 +01:00
KoffeinFlummi
bde6ec1996 Indentation in CfgVehicles 2015-02-28 15:19:49 +01:00
KoffeinFlummi
2873bdf0ed Add basic anims; add system for prone/self anims 2015-02-28 15:10:58 +01:00
Glowbal
cff3e23d38 More work done on medical 
Added TODOs for remoteFuncExecs to be replaced by event system
Added usage of displayTextStructed events
Fixed useItem calls instead of useItems
 2015-02-28 13:17:17 +01:00
Glowbal
65137b347b Replaced quote(func for quote(dfunc 2015-02-28 13:02:05 +01:00
Glowbal
bbc2a62476 Rewrite of unconscious. Now supports basic method of unconsciousness. 2015-02-28 12:05:22 +01:00
Glowbal
1e377d460e now also resets used medication on init 2015-02-28 11:48:11 +01:00
Glowbal
6d01a00901 Added storage for all logs 2015-02-28 11:47:35 +01:00
Glowbal
05d2d9de6b Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_preInit.sqf
 2015-02-28 11:43:38 +01:00
Glowbal
49e04ae7bb Added more treatment options and variables to init 2015-02-28 11:41:27 +01:00
KoffeinFlummi
fe79e624ff Derp 2015-02-26 07:41:56 +01:00
KoffeinFlummi
ddadabc661 Merge branch 'master' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite 
Conflicts:
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
	addons/medical/config.cpp
	addons/medical/equipment/Atropin-pen_used.p3d
	addons/medical/equipment/Bandage-Pack.p3d
	addons/medical/equipment/Bandage-elastic.p3d
	addons/medical/functions/fnc_ActionCheckPulse.sqf
	addons/medical/functions/fnc_ActioncheckBloodPressure.sqf
	addons/medical/functions/fnc_actionCarryUnit.sqf
	addons/medical/functions/fnc_actionCheckBloodPressureLocal.sqf
	addons/medical/functions/fnc_actionCheckPulseLocal.sqf
	addons/medical/functions/fnc_actionCheckResponse.sqf
	addons/medical/functions/fnc_actionDragUnit.sqf
	addons/medical/functions/fnc_actionLoadUnit.sqf
	addons/medical/functions/fnc_actionPlaceInBodyBag.sqf
	addons/medical/functions/fnc_actionRemoveTourniquet.sqf
	addons/medical/functions/fnc_actionUnloadUnit.sqf
	addons/medical/functions/fnc_cleanUpCopyOfBody.sqf
	addons/medical/functions/fnc_getBloodVolumeChange.sqf
	addons/medical/functions/fnc_getUnconsciousCondition.sqf
	addons/medical/functions/fnc_handleDropUnit.sqf
	addons/medical/functions/fnc_handleHeal.sqf
	addons/medical/functions/fnc_handleTreatment_Action_AirwayLocal.sqf
	addons/medical/functions/fnc_handleTreatment_Action_BandageLocal.sqf
	addons/medical/functions/fnc_handleTreatment_Action_CPR.sqf
	addons/medical/functions/fnc_handleTreatment_Action_Stitching.sqf
	addons/medical/functions/fnc_handleTreatment_Action_fullHeal.sqf
	addons/medical/functions/fnc_handleTreatment_Action_fullHealLocal.sqf
	addons/medical/functions/fnc_handleTreatment_Category_Advanced.sqf
	addons/medical/functions/fnc_handleTreatment_Category_Airway.sqf
	addons/medical/functions/fnc_handleTreatment_Category_Bandaging.sqf
	addons/medical/functions/fnc_handleTreatment_Category_Medication.sqf
	addons/medical/functions/fnc_handleUnitVitals.sqf
	addons/medical/functions/fnc_initalizeModuleCMS.sqf
	addons/medical/functions/fnc_makeCopyOfBody.sqf
	addons/medical/functions/fnc_moduleAssignMedicalEquipment.sqf
	addons/medical/functions/fnc_moduleBasicRevive.sqf
	addons/medical/functions/fnc_onKilled.sqf
	addons/medical/functions/fnc_onStartMovingUnit.sqf
	addons/medical/functions/fnc_onTreatmentCompleted.sqf
	addons/medical/functions/fnc_registerUnconsciousCondition.sqf
	addons/medical/functions/fnc_setDead.sqf
	addons/medical/functions/fnc_setUnconscious.sqf
	addons/medical/ui/define.hpp
	addons/medical/ui/menu.hpp
 2015-02-24 22:35:05 +01:00
KoffeinFlummi
daff184f75 More work on basic callbacks. 2015-02-24 22:09:31 +01:00
Glowbal
65eb69fece Added examine actions 2015-02-23 20:35:36 +01:00
Glowbal
4a64716420 Added support for displaying a treatment icon for the action 2015-02-23 18:19:35 +01:00
Glowbal
fe0363ab48 Now dynamically collects the available damageTypes 2015-02-23 16:18:33 +01:00
Glowbal
bb89816a70 Replaced FUNC for DFUNC 2015-02-23 10:23:09 +01:00
Glowbal
df710235d5 Added useItems 
Fixed header on hasItems
 2015-02-22 19:50:14 +01:00
Glowbal
bcb5bb59f6 Basic actions can now use any of the advanced treatment items. 2015-02-22 18:46:49 +01:00
Glowbal
cbfb413f22 Changed: an array now means that it can be any of the given items 2015-02-22 18:42:30 +01:00
Glowbal
8b3e5ac8e2 Added hasItems function 2015-02-22 18:38:06 +01:00
Glowbal
2b061e8de3 Added itemConsumed attribute 2015-02-22 18:34:59 +01:00
Glowbal
b05e09ccb8 Added advanced treatment actions 2015-02-22 18:33:46 +01:00
KoffeinFlummi
ca930a5717 Add basic treatments, rename onProgress 2015-02-22 17:45:46 +01:00
Glowbal
ab6bc998c2 Added canAccessMedicalEquipment check 2015-02-22 15:01:31 +01:00
Glowbal
7f6a647b4d Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite 2015-02-22 12:26:19 +01:00
Glowbal
56dad70a9e Removed redundant level checks 2015-02-22 12:26:08 +01:00
Kieran
c8bf9d2ce1 Changed 'impacted' to 'crushed' 
Changed "Impacted Tissue" to "Crushed tissue", as its a bit more to-the-point (less chance for confusion), and still accurate
 2015-02-22 21:25:28 +10:00
Kieran
7ea31f8b05 Added causes to contusions - ace_med_treatment.hpp 
Added vehiclecrash and falling to contusion causes.
(As those two situations commonly do result in bruising)
 2015-02-22 21:21:27 +10:00
Glowbal
9dc33c659d Now takes selections into account 2015-02-22 10:56:46 +01:00
Glowbal
bdaec01112 Added medication overdose and wearoff. 2015-02-22 10:27:57 +01:00
Glowbal
fa2d0c6b06 Specified bleeding rate more accurately for subclasses 2015-02-22 09:40:36 +01:00
Glowbal
8e539bfb56 Added ability to use subclasses for injuries. 
Allows for usage of minor, medium and large injury variants.
 2015-02-22 09:27:01 +01:00
Glowbal
e091ba1fd1 Added hasMedicalEnabled 2015-02-22 00:49:38 +01:00