Various fixes for the medical restructure branch #6434
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
kymckay
requested changes
Jul 15, 2018
| @@ -34,5 +34,5 @@ private _damageThreshold = if (isPlayer _unit) then { | |||
| }; | |||
|
|
|||
| if ((_headDamage > _damageThreshold / 2) || {_bodyDamage > _damageThreshold} || {(_painLevel >= PAIN_UNCONSCIOUS) && {random 1 < 0.1}}) then { | |||
| [QGVAR(CriticalInjury), _unit] call CBA_fnc_localEvent; | |||
| [QEGVAR(medical, CriticalInjury), _unit] call CBA_fnc_localEvent; | |||
| @@ -52,7 +52,7 @@ private _bloodLoss = GET_BLOOD_LOSS(_unit); | |||
| if (_bloodLoss > 0) then { | |||
| _unit setVariable [QGVAR(bloodloss), _bloodLoss, _syncValues]; | |||
|
|
|||
| [QGVAR(Injury), _unit] call CBA_fnc_localEvent; | |||
| [QEGVAR(medical, Injury), _unit] call CBA_fnc_localEvent; | |||
| @@ -87,7 +87,7 @@ _unit setVariable [VAR_BLOOD_PRESS, _bloodPressure, _syncValues]; | |||
|
|
|||
| private _cardiacOutput = [_unit] call EFUNC(medical_status,getCardiacOutput); | |||
| if (_bloodLoss > BLOOD_LOSS_KNOCK_OUT_THRESHOLD * _cardiacOutput) then { | |||
| [QGVAR(CriticalVitals), _unit] call CBA_fnc_localEvent; | |||
| [QEGVAR(medical, CriticalVitals), _unit] call CBA_fnc_localEvent; | |||
| @@ -98,10 +98,10 @@ if (!isPlayer _unit) then { | |||
|
|
|||
| _bloodPressure params ["_bloodPressureL", "_bloodPressureH"]; | |||
| if (_bloodPressureL < 40 || {_heartRate < 30}) then { | |||
| [QGVAR(CriticalVitals), _unit] call CBA_fnc_localEvent; | |||
| [QEGVAR(medical, CriticalVitals), _unit] call CBA_fnc_localEvent; | |||
| }; | ||
| if ((_heartRate < 20) || {_heartRate > 220} || {_bloodPressureH < 50}) then { | ||
| [QGVAR(FatalVitals), _unit] call CBA_fnc_localEvent; | ||
| [QEGVAR(medical, FatalVitals), _unit] call CBA_fnc_localEvent; |
kymckay
approved these changes
Jul 16, 2018
BaerMitUmlaut
pushed a commit
that referenced
this pull request
Aug 5, 2019
Various fixes for the medical restructure branch
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Some obvious yet to do things;