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
12,396 Commits 73 Branches 88 Tags 752 MiB
3bbc1d21e4
Commit Graph

1014 Commits

Author SHA1 Message Date
Arcanum
e3f9e65fb7 Revert "Add function to check if AI and condition from fatal" 
This reverts commit 31e1e2964b.
 2017-05-22 21:11:25 +02:00
Arcanum
31e1e2964b Add function to check if AI and condition from fatal 2017-05-22 20:53:00 +02:00
PabstMirror
9e1a9b9af9 Fix bad var names 2017-05-14 15:14:22 -05:00
PabstMirror
0cdb2ce238 Increase max weapon index for large modsets (#5054) 2017-05-12 13:12:39 -05:00
PabstMirror
fdb14cea20 Fix IvBags in displayPatientInformation 2017-04-29 13:05:39 -05:00
PabstMirror
e667931626 More debug monitor stuff 2017-04-29 12:58:35 -05:00
BaerMitUmlaut
f12d69e231 Added proper addon basics to status, moved more functions into status 2017-04-26 22:05:40 +02:00
PabstMirror
c6fc4d0a13 Clenaup / Debug 2017-04-26 10:16:09 -05:00
PabstMirror
9139a52a38 Add more debug 2017-04-22 13:45:56 -05:00
PabstMirror
6464883852 misc cleanup, 1 sec min delay for vital loop 2017-04-22 10:57:32 -05:00
BaerMitUmlaut
b89bc86e00 Added seperate vitals component 2017-04-02 00:27:50 +02:00
BaerMitUmlaut
676c9a5451 Added seperate status component 2017-04-01 20:41:45 +02:00
BaerMitUmlaut
c4863c756c Moved statemachine into seperate component 2017-04-01 19:50:26 +02:00
PabstMirror
690e415ffe Minor cleanup 2017-03-25 11:36:37 -05:00
PabstMirror
80d7ef5b67 blood effects moved to UI 2017-03-25 11:27:18 -05:00
Zakant
f1fbf6a8eb Removed legacy code 2017-03-23 15:29:52 +01:00
Zakant
5c89232306 Removed cardiac arrest check 2017-03-23 12:59:40 +01:00
PabstMirror
e3af1b55a5 Merge branch 'medical-rewrite' into medical-rewrite-effects 2017-03-18 09:56:42 -05:00
PabstMirror
d403f20d71 Adjust addDamageToUnit for rewrite 2017-03-06 15:06:01 -06:00
Dedmen Miller
512592b79d Prevent starting additional vital loops on full heal (#4885) 2017-03-02 17:22:16 -06:00
PabstMirror
97ec22bd9a Switch heartbeat to waitAndExec, allow switching pain settings 2017-02-18 22:11:40 -06:00
commy2
9d68fbf987 fix script error caused by new arguments passed to handleDamage (#4866) 
* fix script error caused by new arguments passed to handleDamage

* Copy array to not break other handleDamage ehs

* Resize to 7
 2017-02-02 13:03:13 -06:00
ViperMaul
59c58b1269 Add settings function handler 2017-01-19 17:19:54 -06:00
ulteq
1e79f35e43 Always visualize bandaged wounds 
* Even when GVAR(advancedBandages) or GVAR(woundReopening) are disabled
 2016-12-15 15:01:02 +01:00
ulteq
70a2dc30e7 Refactored 'showPainInMenu' setting 
* showPainInMenu -> on/off switch
* medicSetting_PainVisualization -> 3 way switch on who can see it
 2016-12-15 14:45:58 +01:00
ulteq
0de405fe2a Fix morphine when advanced medication is disabled 2016-12-15 12:58:06 +01:00
ulteq
65f0f56474 Implemented 'showPainInMenu' 2016-12-14 21:30:28 +01:00
ulteq
8146cb427e Revert "Implemented 'showPainInMenu' logic" 
This reverts commit 964711a38b.
 2016-12-14 21:23:26 +01:00
ulteq
964711a38b Implemented 'showPainInMenu' logic 2016-12-14 20:55:03 +01:00
ulteq
196a3999a4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-14 20:44:22 +01:00
ulteq
151d4a4bfe Settings overhaul 
New settings:
* allowSelfIV
* showPainInMenu

Converted CBA -> ACE Settings:
* advancedBandages
* advancedMedication
* fatalInjuryCondition
* cardiacArrestTime

Fixed settings:
* useLocation_Epi
* medicSetting_Epi
* painCoefficient
 2016-12-14 20:44:06 +01:00
PabstMirror
af4b3e31e1 Minor iv optimization 2016-12-14 11:50:31 -06:00
ulteq
a2b964a993 Fixed bandage config lookup 2016-12-14 18:04:56 +01:00
ulteq
5d3f97ace7 Fix IV Bags work on limbs with a tourniquet applied 2016-12-14 12:36:51 +01:00
ulteq
852f78b801 Classify the perceived pain intensity on all patient information outputs 
Fixes: #2117
 2016-12-10 15:24:20 +01:00
PabstMirror
3907d2dc9f Cleanup moved functions 2016-12-09 21:27:42 -06:00
PabstMirror
b87bdfe14a Fix body-bag action / cleanup 2016-12-09 21:03:52 -06:00
ulteq
05b9208d3c Change debug 2016-12-09 18:43:32 +01:00
ulteq
03f9ba1bad Improved simulation of tourniquet pain: 
* Made use of the new pain level helper function
 2016-12-09 17:48:27 +01:00
ulteq
ada43148e9 Removed deprecated revive settings 2016-12-09 17:07:05 +01:00
ulteq
bfda932384 Different max. bleeding rates for different body parts 2016-12-09 15:54:33 +01:00
ulteq
a809047ac4 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-12-09 12:57:42 +01:00
ulteq
82e88061fc Added 'DEFAULT_HEART_RATE' constant 2016-12-09 12:57:27 +01:00
PabstMirror
cc6150303f Add setting for blood bag flow rate (#4751) 2016-12-09 11:33:01 +01:00
BaerMitUmlaut
a48d271368 Merge pull request #4668 from acemod/medical-rewrite-cardiacArrestLimits 
Introduce small variation to length of cardiac arrest
 2016-12-08 14:22:11 +01:00
ulteq
3b82510751 Merge new wounds into existing wounds whenever possible 
* Todo: separate 'amountOf' into two variables (wound count and bandage percentage)
 2016-12-08 12:59:30 +01:00
ulteq
78bfc0c26d Simplified damage storage 2016-12-08 11:38:43 +01:00
ulteq
627ea0ebdc Dynamically translate different wound types 
* Brings back minor, medium, large wounds
 2016-12-07 21:56:13 +01:00
ulteq
66803a4b4d Fix damage coloring 2016-12-07 18:53:04 +01:00
ulteq
74fefb6f69 New body part colors: 
* Red bleeding
* Blue tourniquet
* Yellow/Orange damage
 2016-12-07 18:28:35 +01:00
ulteq
03f7451c99 Fixed incorrect debug output 2016-12-07 11:41:58 +01:00
ulteq
5db75ac746 Fixed check blood pressure did not always account for tourniquets 2016-12-07 11:32:01 +01:00
ulteq
ab7af04530 Overhauled the medication system: 
* Refactored the old code
* Introduced 'timeTillMaxEffect' config entry for medication
 2016-12-06 20:42:10 +01:00
ulteq
02ac4c4084 Fixed minor bug in the heart rate calculation 2016-12-06 17:40:05 +01:00
ulteq
faa2b619ab Removed overly verbose debug logs 2016-12-06 17:35:52 +01:00
ulteq
fa77fb7194 Various fixes: 
* Fixed medication (morphine, epinephrine, ...)
* Fixed CPR
* Improved heart rate simulation
* Removed deprecated ace settings
 2016-12-06 17:26:11 +01:00
ulteq
978a81fb0a Removed dead code 2016-12-06 14:37:48 +01:00
ulteq
92da5c80a0 Partly fixed Medication 
* Brings the heart rate adjustment (due to medication) back to life
* Restores the medication effect loop (needs testing)
 2016-12-06 12:58:12 +01:00
ulteq
a88be4f458 Fixed 'displayPatientInformation' 2016-12-05 23:00:02 +01:00
ulteq
a5ce5b4a34 Medical Rewrite - Continued (#4744) 2016-12-05 21:34:20 +01:00
SilentSpike
39582914f7 Add 10% variation to cardiac arrest time 
Gaussian distribution favours the average time setting. This introduces some unpredictability to cardiac arrest, but not enough to make users confused. Keeps the settings simple to again reduce confusion and improve overall UX.
 2016-11-15 17:00:22 +00:00
SilentSpike
24ada4dab3 Clarify the maximumCardiacArrestTime setting 2016-11-13 21:45:38 +00:00
SilentSpike
27728172ed Clarify the allowDeathMode setting 2016-11-13 21:27:40 +00:00
BaerMitUmlaut
b4569f0a96 Fix bracket 2016-11-13 18:11:18 +01:00
BaerMitUmlaut
dac4a4dc42 Merged instant death and execution into one setting 2016-11-09 19:01:55 +01:00
BaerMitUmlaut
08a378bb2d Added execution system, improved instant death 2016-11-08 19:37:56 +01:00
BaerMitUmlaut
928ded0e66 Fixed instant death and PREP 2016-11-07 23:46:10 +01:00
BaerMitUmlaut
ba9fc9240c Removed traces of old state machine 2016-11-07 23:44:33 +01:00
BaerMitUmlaut
0427814961 Started transition to CBA state machine, removed revive in favour of extended cardiac arrest 2016-11-07 22:21:07 +01:00
commy2
fc39ac14b7 don't knock out if pain is removed 2016-10-20 13:49:52 +02:00
commy2
be56b4d806 knock out due to pain 2016-10-20 13:46:28 +02:00
commy2
7e498ab762 setting for basic/advanced syringes 2016-10-20 02:14:11 +02:00
commy2
f2dfc6dc0e fixes, tweaks 2016-10-13 20:17:21 +02:00
commy2
e38845bf45 add ace_kill event handler 2016-10-12 23:20:22 +02:00
commy2
a5d070f829 blood and unconsciousness fixes 2016-10-12 21:59:32 +02:00
commy2
be71e6fa7b Merge branch 'medical-rewrite-blood' into medical-rewrite 2016-10-12 04:05:50 +02:00
commy2
b0b9037f24 simplify lost some/much blood macros 2016-10-11 19:44:20 +02:00
commy2
d1df47919d support neg numbers to remove pain in addPain 2016-10-11 19:36:04 +02:00
commy2
1ea2a72f20 don't play scream by addPain function 2016-10-11 19:29:44 +02:00
commy2
e2d174837a move IV transufsion rate macro to blood config 2016-10-10 18:20:58 +02:00
commy2
c2f7366d32 blood volume unit vitals 2016-10-10 17:46:17 +02:00
commy2
3438ea0946 use liters for blood volume variable 2016-10-10 17:30:42 +02:00
commy2
fc079abd46 function header 2016-10-10 16:53:25 +02:00
commy2
2ad7c4c4ea add addPain function, cap pain 2016-10-10 16:44:03 +02:00
commy2
4bc1c1db56 handle blood visuals 2016-10-07 04:21:01 +02:00
commy2
d4dd1626a5 delete some unused/moved functions from medical main component 2016-10-07 00:19:51 +02:00
commy2
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00
commy2
05d30c5573 convert log macros to cba versions (#4282) 
* convert log macros to cba versions

* Add changes to AB

* remove obsolete macro
 2016-10-02 12:55:31 +02:00
commy2
f185742e68 manual merge 2016-10-02 12:51:29 +02:00
commy2
c93e9e3f3b fix playSoundInjured wrong args 2016-09-30 13:03:43 +02:00
PabstMirror
60a7490b7e Fix some moved funcs/strings 2016-09-29 15:08:36 -05:00
commy2
7470d1f0f5 cleanup/improve parseConfigForinjuries 2016-09-27 11:05:38 +02:00
commy2
9f6baca424 port injury parse fnc to medical damage 2016-09-26 20:25:14 +02:00
PabstMirror
3c53a314d4 Merge remote-tracking branch 'refs/remotes/origin/master' into cba-log-macros 2016-09-22 15:10:30 -05:00
commy2
81d962f0d5 port litter to treatment 2016-09-19 09:55:30 +02:00
Glowbal
b74245c323 Merged branch medical-rewrite into medical-rewrite 2016-09-18 19:48:58 +02:00
Glowbal
1c1e47c039 Enable treatmnet actions 2016-09-18 19:48:49 +02:00
commy2
031bb1ec91 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-09-18 15:17:01 +02:00
commy2
a5dcdf102f use TRACE macros for parseConfig function 2016-09-18 14:17:18 +02:00
Glowbal
9263cb0f7d Fix handleDamage not working 2016-09-18 14:05:05 +02:00