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
11,434 Commits 73 Branches 88 Tags 752 MiB
918a62ebce
Commit Graph

1666 Commits

Author SHA1 Message Date
ulteq
89c68364ef Fix pain suppression not affecting 'setCustomAimCoef' 2016-12-07 19:51:28 +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
7f1678b7e6 Increased wake up chance 2016-12-07 18:19: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
db547a53b7 Increased unconsciousness wake up interval 2016-12-06 10:58:43 +01:00
PabstMirror
c47772eddc Fix stringtables 2016-12-05 19:40:26 -06: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
commy2
9cba0baade manual merge 2016-12-05 20:18:15 +01:00
commy2
a83267b2ff manual merge 2016-12-05 20:15:16 +01:00
BaerMitUmlaut
ac28bce578 Fixed state machine not running for units 2016-11-29 12:35:26 +01:00
PabstMirror
a3c50a6c76 Add dev macro to quickly recompile functions (#4699) 2016-11-23 13:35:25 -06: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
27916e8455 Merge branch 'medical-rewrite' of https://github.com/acemod/ACE3 into medical-rewrite 2016-11-13 18:03:12 +01:00
PabstMirror
5463e9dff8 Merge branch 'master' into medical-rewrite 2016-11-09 13:12:42 -06:00
Karan Singh
09b89a0bbc Fix typo in Eden Options (#4615) 
* Fix typo in Eden Options

This fixes a typo in line 25, ace_isMeidc_temp to ace_isMedic_temp

* Fix L13
 2016-11-09 13:07:29 -06: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
BaerMitUmlaut
a65f1d19fa Added state machine debug functionality 2016-11-07 22:19:55 +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
370faf9b48 cleanup 2016-10-20 13:38:26 +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
bc4c1787f9 show tourniquets in 3d menu 2016-10-13 19:05:29 +02:00
commy2
fe2c6e8d85 basic <-> advanced 2016-10-13 17:14:43 +02:00
commy2
68d75beae6 manual merge 2016-10-13 16:56:57 +02:00
commy2
e1cbeeea16 fix tourniquets 2016-10-13 10:12:28 +02:00
commy2
18907adcd5 increase medical item mass to at least 100 grams 2016-10-13 09:48:58 +02:00
commy2
b1f0af7e1c merge basic and adv. bandage actions 2016-10-13 09:10:08 +02:00
commy2
e38845bf45 add ace_kill event handler 2016-10-12 23:20:22 +02:00
commy2
92fc4ec14b add a setting for 'basic' blood bags 2016-10-12 22:38:58 +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
d0df141cf7 add comment explaining why 6.0 were chosen 2016-10-10 18:22:46 +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
50eeebd30d add weapon sway by pain 2016-10-07 00:09:58 +02:00
commy2
e9586ebccc use common header file for medical components 2016-10-06 22:40:36 +02:00
commy2
5613ec5d5a treatment functions and unconsciousness rework 2016-10-06 00:54:57 +02:00
commy2
56882a9bcb manual merge 2016-10-02 13:04:20 +02:00
commy2
f4d4c521d7 manual merge 2016-10-02 13:02:17 +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
PabstMirror
1bc5669c95 Merge branch 'master' into cba-log-macros 2016-09-30 11:18:58 -05: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
2c7864c02b implement custom treatment sounds 2016-09-29 18:45:18 +02:00
commy2
0decd72063 manual merge 2016-09-28 08:37:39 +02:00
commy2
20d00d7cd9 make units scream when they're hit 2016-09-27 21:21:44 +02:00
KoffeinFlummi
72899643bd Merge branch 'master' into japanesestringtables 2016-09-27 20:54:17 +02:00
commy2
a913054b57 fix error with out of bounds blood loss 2016-09-27 20:00:58 +02:00
classicarma
eaf00c8340 translate medical 2016-09-28 01:15:38 +09:00
commy2
5e35204811 woundHandler(SQF), fixes, improvements, more consistent variable naming 2016-09-27 17:29:49 +02: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
236d1f9669 Merge remote-tracking branch 'origin/medical-rewrite' into medical-rewrite 2016-09-19 18:23:37 +02:00
commy2
729ba9178b Merge remote-tracking branch 'origin/master' into medical-rewrite 2016-09-19 18:23:26 +02:00
commy2
c2f8007d36 port litter settings to treatment 2016-09-19 18:05:49 +02:00
commy2
81d962f0d5 port litter to treatment 2016-09-19 09:55:30 +02:00
Glowbal
27314c34b1 fix treatment functionality 2016-09-18 22:58:56 +02:00
Grzegorz
a63dcb49d0 PL Translation 3.7.1 (#4395) 
* translate advanced fatigue

* translate advanced throwing

* translate cargo

* translate chemlights

* translate cookoff

* translate explosives

* translate fastroping

* translate gforce

* translate googles

* translate grenades

* translate gunbag

* translate maptools

* translate medical

* translate medical_ai

* translate minedetector

* translate nametags

* translate overheating

* translate repair

* translate tagging

* translate ui

* translate zeus
 2016-09-18 22:00:13 +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
Glowbal
7691af47f3 Further clean up 2016-09-18 13:33:22 +02:00
Glowbal
811e1cd598 First set up clean up for medical rewrite 2016-09-18 12:05:36 +02:00
Glowbal
0c43c83b3d Merge branch 'master' 
Conflicts:
	addons/medical/ACE_Settings.hpp
	addons/medical/XEH_postInit.sqf
	addons/medical/XEH_preInit.sqf
	addons/medical/functions/fnc_actionDiagnose.sqf
	addons/medical/functions/fnc_actionLoadUnit.sqf
	addons/medical/functions/fnc_addDamageToUnit.sqf
	addons/medical/functions/fnc_createLitter.sqf
	addons/medical/functions/fnc_displayPatientInformation.sqf
	addons/medical/functions/fnc_handleCreateLitter.sqf
	addons/medical/functions/fnc_handleDamage.sqf
	addons/medical/functions/fnc_handleDamage_advanced.sqf
	addons/medical/functions/fnc_handleDamage_airway.sqf
	addons/medical/functions/fnc_handleDamage_caching.sqf
	addons/medical/functions/fnc_handleDamage_internalInjuries.sqf
	addons/medical/functions/fnc_handleDamage_wounds.sqf
	addons/medical/functions/fnc_isBeingCarried.sqf
	addons/medical/functions/fnc_isBeingDragged.sqf
	addons/medical/functions/fnc_litterCleanupLoop.sqf
	addons/medical/functions/fnc_moduleAssignMedicRoles.sqf
	addons/medical/functions/fnc_moduleAssignMedicalVehicle.sqf
	addons/medical/functions/fnc_setCardiacArrest.sqf
	addons/medical/functions/fnc_showBloodEffect.sqf
	addons/medical/functions/fnc_treatmentAdvanced_fullHealLocal.sqf
	addons/medical/functions/fnc_treatmentAdvanced_surgicalKit_onProgress.sqf
	addons/medical/functions/fnc_treatmentBasic_epipen.sqf
	addons/medical/functions/fnc_treatmentIV.sqf
	addons/medical/functions/fnc_treatmentIVLocal.sqf
 2016-09-18 11:51:21 +02:00
PabstMirror
1caea46d60 Medical - Fix adv wound not stacking (#4353) 2016-09-07 20:54:54 +02:00
Glowbal
89a5f28772 Merge pull request #4192 from acemod/medical-rewrite-engine-component 
merge medical engine component into medical rewrite branch
 2016-09-05 22:31:37 +02:00
PabstMirror
4fd5d6be6c Fix handleDamage params for addDamageToUnit (#4344) 2016-09-05 22:27:00 +02:00
Glowbal
b489750d5b Minor optimizations using private, params, and isEqualType (#4323) 
* Optimizations with private, params, and isEqualType

* Fixed tab being used instead of space

* Fixed tabs inserted by notepad++

* More usage of new private syntax and params

- changed a few checks for an array being empty to `_arr isEqualTo []`
rather than `count _arr == 0`
- added more uses of `private` on the same line as the variable is
declared
- added more uses of params to assign variables passed as parameters
- removed unnecessary parentheses
- removed several unnecessary variable declarations with private array
syntax

* clean up and formatting
 2016-09-04 16:44:22 +02:00
PabstMirror
1c5761f845 Bundle fire damage into larger chunks (#4223) 2016-09-03 22:00:45 +02:00
PabstMirror
c4d2383005 Increase blood bag flow rate for basic medical (#4306) 
* Change blood bags

- Increase flow rate for basic medical
- Don't queue bags

* change to ivBags, reset var on init / fullHeal
 2016-09-01 12:46:08 +02:00
commy2
2ac52fb430 remove static fix from vmedical component 2016-08-27 08:50:55 +02:00