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
Nicolás Badano
6a83d0d9fc
clear canTreat caches before calling the last condition
2015-03-21 20:33:25 -03: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
f8ea603977
Added dynamic actions to unload patients (unconscious) from vehicles
2015-03-21 15:32:32 -03: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
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
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
88fb2765e3
Standardize actions across basic and advanced
2015-03-21 00:21:30 +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
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
Glowbal
62460e8b79
Fixes for animations and script error
2015-03-15 01:12:02 +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
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
Glowbal
1da67d7b48
First draft of triage card
2015-03-10 21:12:35 +01:00
PabstMirror
93a1cdaab6
setCaptivityStatus in setUnconsicous
2015-03-10 10:35:00 -05: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
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
9b856ea38b
Merge branch 'master' into Medical_Improvements
2015-03-09 21:08:18 +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
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
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
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
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
f8421b2589
Added support for viscosity adjustment from medication
2015-03-03 19:56:32 +01: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
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
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
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
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
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
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
df710235d5
Added useItems
...
Fixed header on hasItems
2015-02-22 19:50:14 +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
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
56dad70a9e
Removed redundant level checks
2015-02-22 12:26:08 +01: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
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
Glowbal
e21046459e
Fixed location checking in treatment call
2015-02-22 00:47:14 +01:00
Glowbal
ab045e49c8
Fixed incorrect function calls for location
2015-02-22 00:45:58 +01:00
Glowbal
1781629c13
Added isMedic, isMedicalVehicle, isInMedicalFacility and hasTourniquetAppliedTo functions.
2015-02-22 00:44:11 +01:00
Glowbal
b9213e8abc
Added use and has item functions for medical
2015-02-22 00:34:16 +01:00
Glowbal
c2b8e9031f
Increased the type and causes of injuries for advanced medical.
2015-02-22 00:25:07 +01:00
Glowbal
73c91af533
Added separate config parsing for basic and advanced
2015-02-22 00:24:50 +01:00
Glowbal
3f12af8b21
Added onTreatmentCompleted event calls
2015-02-21 23:17:20 +01:00
Glowbal
e5941e55fc
Added reactionToDamage and onTreatmentCompleted event
2015-02-21 23:14:21 +01:00
Glowbal
925aa094c7
Added place in bodybag function
2015-02-21 21:53:07 +01:00
Glowbal
46f28763b6
Added triage card and activity log
2015-02-21 21:47:10 +01:00
Glowbal
95ff4b151c
Added addHeartRateAdjustment function
2015-02-21 21:32:25 +01:00
Glowbal
72e2690b81
Fixed incorrect animation function call
2015-02-21 21:28:59 +01:00
Glowbal
909a87fdd3
Added tourniquet treatment functions
2015-02-21 21:26:39 +01:00
Glowbal
308e165cb6
Fixed headers
2015-02-21 21:25:37 +01:00
Glowbal
ead5f2ee79
Added new injury and treatment systems for advanced medical
2015-02-21 21:10:57 +01:00
Glowbal
b3e7431e67
Added new treatment framework
2015-02-21 21:09:57 +01:00
KoffeinFlummi
3482633fb1
Basic treatment structure
2015-02-20 22:04:01 +01:00
Glowbal
ab6879845c
Merge branch 'master' into standardize_ui
2015-02-19 21:42:47 +01:00
KoffeinFlummi
7e9a02089f
Merge branch 'medical-visuals' into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
2015-02-18 19:26:30 +01:00
KoffeinFlummi
58873e1c97
Pain Effect
2015-02-18 19:01:25 +01:00
Glowbal
13c2127574
Clean up of old CSE code
...
Removed all _F suffixes
Reorganized the RPEP list.
Removed unnecessary functions.
2015-02-14 20:29:07 +01:00
Glowbal
155503d4a1
Merged GUI into common.
...
Removed unnecessary GUI functions.
Updated displayIcon function to be more dynamic
Added client side settings for displaying icons.
2015-02-14 20:06:55 +01:00
Glowbal
cd5b06da78
Added _returnDamage parameter to damageCaching.
2015-02-13 23:00:23 +01:00
Glowbal
4441b7d0a5
Added missing include
2015-02-13 22:58:48 +01:00
Glowbal
4896198ec2
Merge branch 'medical-rewrite' of github.com:KoffeinFlummi/ACE3 into medical-rewrite
...
Conflicts:
addons/medical/functions/fnc_handleDamage.sqf
2015-02-13 22:57:43 +01:00
Glowbal
5b507ed9f5
Combined medium and advanced into one, with options to turn on other features.
...
Changed wounds for a more diverse variation.
Added handleDamage caching for advanced.
2015-02-13 22:55:13 +01:00
KoffeinFlummi
4ec19429ae
Fix initial value of bloodVolume
2015-02-10 23:13:14 +01:00
KoffeinFlummi
fba44f490d
First draft of death prevention
2015-02-10 13:33:40 +01:00
Glowbal
a609d00730
Implemented a setDead function. Allows for interception of all kills and using a revive script instead.
...
Added playInjuredSound for damaged units.
Fixed some mistakes with variable names.
2015-02-08 13:18:08 +01:00
Glowbal
a3c4c60b7f
Added possibility to add unconscious conditions.
2015-02-08 13:06:44 +01:00
Glowbal
633037c1b4
Replaced injuredCollection array for separate PFH for each unit.
2015-02-08 11:34:20 +01:00
Glowbal
0a161319d2
Added initial draft of setUnconscious
2015-02-08 10:25:03 +01:00
Glowbal
bf762bbdf1
Updated headers to correct format
...
Reorganized function names.
Added unit vitals loop
2015-02-08 10:01:32 +01:00
Glowbal
35de875382
Added cardiac arrest
2015-02-08 00:08:36 +01:00
Glowbal
b8be7775bd
Updated open wounds injuries to newest CMS version.
2015-02-08 00:07:49 +01:00
Glowbal
aadb289962
Added initial rewrite of CMS vitals script for medium and advanced medical.
2015-02-07 23:55:48 +01:00
Glowbal
26527489d6
Added initial medium wounds.
...
Fixed merge conflict.
2015-02-07 23:48:24 +01:00
KoffeinFlummi
35386f19d6
Merge branch 'medical-rewrite' of https://github.com/KoffeinFlummi/ACE3 into medical-rewrite
...
Conflicts:
addons/medical/XEH_preInit.sqf
addons/medical/functions/fnc_handleDamage.sqf
2015-02-06 13:48:28 +01:00
KoffeinFlummi
a2ee41f01d
First draft of basic damage handling.
2015-02-06 13:47:17 +01:00
Glowbal
0a403ff422
Added initial advanced medical handleDamage functionality.
2015-02-03 21:48:08 +01:00
Glowbal
a50276ddaf
Added a getTypeOfDamage function.
2015-02-03 21:47:45 +01:00
KoffeinFlummi
79aa8d1c7a
Use macros, remove var assignments
2015-02-03 20:14:34 +01:00
KoffeinFlummi
930fb51a20
Medical: First Draft
2015-02-03 20:09:25 +01:00
Nicolás Badano
74d0ae95ff
Change ACE_Settings from modules
2015-02-03 02:53:02 -03:00
Thomas Kooi
b28fa367cb
Fixed unconscious. Now functions properly again after move from common to medical.
2015-01-25 16:40:47 +01:00
Thomas Kooi
3c60af5a14
Fixed: Changed medicClass to isMedic.
2015-01-25 16:05:09 +01:00
Thomas Kooi
69c45cf54d
Fixed assignMedicalEquipment module
2015-01-25 16:02:49 +01:00
Thomas Kooi
5f8a00a45f
Removed last remaining spawns and sleeps in medical.
2015-01-25 15:41:29 +01:00
Thomas Kooi
8045ebb6ab
Fixed damage parsing for AI & non medical enabled units
2015-01-25 15:02:14 +01:00
Thomas Kooi
73d3869a04
Minor improvements made to handleDamage functions
2015-01-25 14:00:51 +01:00
Thomas Kooi
95cfe5ce3a
Minor code refactor
2015-01-24 21:16:51 +01:00
Thomas Kooi
8d34f98909
Moved relevant functions from common to medical.
...
Removed unnecessary event function.
2015-01-24 17:18:38 +01:00
Thomas Kooi
e06c5010bb
Moved GUI functionality to medical
2015-01-24 16:34:39 +01:00
Thomas Kooi
80f90751cd
Removed some spawns
2015-01-22 23:47:06 +01:00
Thomas Kooi
dce0b61d57
Added damage threshold module
...
Removed debug prints
2015-01-22 23:29:18 +01:00
Thomas Kooi
dc1098233e
Added broadcast flag to addOpenWounds, so we can stack call it followed by a broadcast.
...
Improvements made to assignOpenWounds, now better results for single hits.
2015-01-22 22:28:04 +01:00
Thomas Kooi
b173b21c51
Fixed advancedLocal treatment function. Now also selects primary weapon of caller when performing treatment.
2015-01-22 22:25:59 +01:00
Thomas Kooi
8137080bbc
Minor code clean up
2015-01-22 22:00:37 +01:00
