-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Medical - Add Unconscious Effects #716
Open
Mike-MF
wants to merge
3
commits into
master
Choose a base branch
from
unconsciousfx
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
3 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
PREP(unconsciousFX); |
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,38 @@ | ||
#include "..\script_component.hpp" | ||
/* | ||
* Author: Mike | ||
* Handles noises while unconscious | ||
* | ||
* Called locally per player via target event | ||
* | ||
* Arguments | ||
* None | ||
* | ||
* Return Value: | ||
* None | ||
* | ||
* Example: | ||
* [] call tac_medical_fnc_unconsciousFX | ||
*/ | ||
|
||
[{ | ||
params ["_args", "_handle"]; | ||
_args params [["_firstIteration", true]]; | ||
|
||
// If woken up or died end PFH. | ||
if !(ace_player getVariable ["ACE_isUnconscious", false]) exitWith { | ||
_handle call CBA_fnc_removePerFrameHandler; | ||
}; | ||
|
||
// Don't want the groaning to happen instantly. | ||
if (_firstIteration) exitWith { | ||
_args set [0, false]; | ||
}; | ||
|
||
// 50% chance of making noises, requires a heart rate above CPR/Cardiac Arrest | ||
private _heartRate = ace_player getVariable ["ace_medical_heartRate", 80]; | ||
if (random 1 > GVAR(unconsciousFXChance) && _heartRate > 40) then { | ||
private _moan = selectRandom UNCONSCIOUS_NOISES; | ||
[QEGVAR(mission,say3D), [ace_player, _moan]] call CBA_fnc_globalEvent; | ||
}; | ||
}, GVAR(unconsciousFXTimer)] call CBA_fnc_addPerFrameHandler; |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,8 +1,37 @@ | ||
private _category = format ["TAC %1", QUOTE(COMPONENT_BEAUTIFIED)]; | ||
|
||
[ | ||
QGVAR(fatalInjuriesCardiacArrestTimeCoefficient), | ||
"SLIDER", | ||
[LSTRING(FatalInjuriesCardiacArrestTimeCoefficient_DisplayName), LSTRING(FatalInjuriesCardiacArrestTimeCoefficient_Description)], | ||
format ["TAC %1", QUOTE(COMPONENT_BEAUTIFIED)], | ||
_category, | ||
[0.01, 1, 0.2, 2], | ||
true // isGlobal | ||
] call CBA_fnc_addSetting; | ||
|
||
[ | ||
QGVAR(unconsciousFXEnabled), | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This setting is unnecessary when chance can be set to 0%. |
||
"CHECKBOX", | ||
[LSTRING(UnconsciousFX_DisplayName), LSTRING(UnconsciousFX_Description)], | ||
_category, | ||
true, | ||
1 | ||
] call CBA_fnc_addSetting; | ||
|
||
[ | ||
QGVAR(unconsciousFXChance), | ||
"SLIDER", | ||
[LSTRING(UnconsciousFXChance_DisplayName), LSTRING(UnconsciousFXChance_Description)], | ||
_category, | ||
[0, 1, 0.5, 1, true], | ||
1 | ||
] call CBA_fnc_addSetting; | ||
|
||
[ | ||
QGVAR(unconsciousFXTimer), | ||
"SLIDER", | ||
[LSTRING(UnconsciousFXTimer_DisplayName), LSTRING(UnconsciousFXTimer_Description)], | ||
_category, | ||
[5, 60, 30, 1, false], | ||
1 | ||
] call CBA_fnc_addSetting; |
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,11 +1,29 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<Project name="TAC"> | ||
<Package name="Medical"> | ||
<Key ID="STR_TAC_Medical_FatalInjuriesCardiacArrestTimeCoefficient_Description"> | ||
<English>Coefficient for controlling the Cardiac Arrest Time on fatal injuries when 'Fatal Injuries' is NOT 'Always'.</English> | ||
</Key> | ||
<Key ID="STR_TAC_Medical_FatalInjuriesCardiacArrestTimeCoefficient_DisplayName"> | ||
<English>Fatal Injuries Cardiac Arrest Time Coefficient</English> | ||
</Key> | ||
<Key ID="STR_TAC_Medical_FatalInjuriesCardiacArrestTimeCoefficient_Description"> | ||
<English>Coefficient for controlling the Cardiac Arrest Time on fatal injuries when 'Fatal Injuries' is NOT 'Always'.</English> | ||
<Key ID="STR_TAC_Medical_UnconsciousFXChance_Description"> | ||
<English>The chance of unconscious sounds playing each check.</English> | ||
</Key> | ||
<Key ID="STR_TAC_Medical_UnconsciousFXChance_DisplayName"> | ||
<English>Unconscious Effect Sound Chance</English> | ||
</Key> | ||
<Key ID="STR_TAC_Medical_UnconsciousFXTimer_Description"> | ||
<English>Time interval for checking if the sound effect should play</English> | ||
</Key> | ||
<Key ID="STR_TAC_Medical_UnconsciousFXTimer_DisplayName"> | ||
<English>Unconscious Effect Timer</English> | ||
</Key> | ||
<Key ID="STR_TAC_Medical_UnconsciousFX_Description"> | ||
<English>Enabled groaning sounds for unconscious players with a heart rate.</English> | ||
</Key> | ||
<Key ID="STR_TAC_Medical_UnconsciousFX_DisplayName"> | ||
<English>Unconscious Effect Sounds</English> | ||
</Key> | ||
</Package> | ||
</Project> |
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.