Skip to content
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

Add ability to set aiming coefficient for mission scripting. #5828

Merged
merged 6 commits into from
May 16, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions addons/advanced_fatigue/functions/fnc_handleEffects.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@ if (_overexhausted) then {

switch (stance _unit) do {
case ("CROUCH"): {
_unit setCustomAimCoef (1.0 + _fatigue ^ 2 * 0.1);
[_unit, QUOTE(ADDON), (1.0 + _fatigue ^ 2 * 0.1) * GVAR(swayFactor)] call EFUNC(common,setAimCoef);
};
case ("PRONE"): {
_unit setCustomAimCoef (1.0 + _fatigue ^ 2 * 2.0);
[_unit, QUOTE(ADDON), (1.0 + _fatigue ^ 2 * 2.0) * GVAR(swayFactor)] call EFUNC(common,setAimCoef);
};
default {
_unit setCustomAimCoef (1.5 + _fatigue ^ 2 * 3.0);
[_unit, QUOTE(ADDON), (1.5 + _fatigue ^ 2 * 3.0) * GVAR(swayFactor)] call EFUNC(common,setAimCoef);
};
};
1 change: 1 addition & 0 deletions addons/common/XEH_PREP.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ PREP(runTests);
PREP(sanitizeString);
PREP(sendRequest);
PREP(serverLog);
PREP(setAimCoef);
PREP(setApproximateVariablePublic);
PREP(setDefinedVariable);
PREP(setDisableUserInputStatus);
Expand Down
51 changes: 51 additions & 0 deletions addons/common/functions/fnc_setAimCoef.sqf
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
/*
* Author: xrufix, Glowbal
* Handle set AimCoef calls. Will use the highest available setting.
*
* Arguments:
* 0: Unit <OBJECT>
* 1: Unique ID <STRING>
* 2: Aim coefficient (a higher value causes more shaking) <NUMBER>
* 3: Add (true) or remove (false) <BOOL> (default: true)
*
* Return Value:
* None
*
* Example:
* [player, "ace_advanced_fatigue", 1, true] call ace_common_fnc_setAimCoef
*
* Public: Yes
*/
#include "script_component.hpp"

params ["_unit", "_id", "_setting", ["_add", true]];

private _exists = false;
private _highestCoef = 1;
private _map = _unit getVariable [QGVAR(setAimCoefMap), []];

_map = _map select {
_x params ["_xID", "_xSetting"];
if (_id == _xID) then {
_exists = true;
if (_add) then {
_x set [1, _setting];
_highestCoef = _highestCoef max _setting;
true
} else {
false
};
} else {
_highestCoef = _highestCoef max _xSetting;
true
};
};

if (!_exists && _add) then {
_highestCoef = _highestCoef max _setting;
_map pushBack [_id, _setting];
};

// Update the value
_unit setVariable [QGVAR(setAimCoefMap), _map];
_unit setCustomAimCoef _highestCoef;
6 changes: 3 additions & 3 deletions addons/common/functions/fnc_setHearingCapability.sqf
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
* Handle set volume calls. Will use the lowest available volume setting.
*
* Arguments:
* 0: id <STRING>
* 1: settings <NUMBER>
* 2: add [true] OR remove [false] (default: true) <BOOL>
* 0: ID <STRING>
* 1: Settings <NUMBER>
* 2: Add (true) or remove (false) <BOOL> (default: true)
*
* Return Value:
* None
Expand Down