From f0a6fc7b9d433b7b3eedd19ad866464674361034 Mon Sep 17 00:00:00 2001
From: amsteadrayle <2516219+amsteadrayle@users.noreply.github.com>
Date: Thu, 19 Oct 2023 19:25:19 -0400
Subject: [PATCH] Advanced Fatigue - Add settings to change sway factor with
weapon rested/deployed (#9536)
Add setting to change sway factor with weapon rested/deployed
---
addons/advanced_fatigue/XEH_postInit.sqf | 14 +++++++++++++-
addons/advanced_fatigue/initSettings.sqf | 18 ++++++++++++++++++
addons/advanced_fatigue/stringtable.xml | 12 ++++++++++++
3 files changed, 43 insertions(+), 1 deletion(-)
diff --git a/addons/advanced_fatigue/XEH_postInit.sqf b/addons/advanced_fatigue/XEH_postInit.sqf
index 56dcb71372..d447c3f651 100644
--- a/addons/advanced_fatigue/XEH_postInit.sqf
+++ b/addons/advanced_fatigue/XEH_postInit.sqf
@@ -17,7 +17,19 @@ if (!hasInterface) exitWith {};
};
}, QUOTE(ADDON)] call EFUNC(common,addSwayFactor);
-["multiplier", {GVAR(swayFactor)}, QUOTE(ADDON)] call EFUNC(common,addSwayFactor);
+["multiplier", {
+ switch (true) do {
+ case (isWeaponRested ACE_player): {
+ GVAR(swayFactor) * GVAR(restedSwayFactor)
+ };
+ case (isWeaponDeployed ACE_player): {
+ GVAR(swayFactor) * GVAR(deployedSwayFactor)
+ };
+ default {
+ GVAR(swayFactor)
+ };
+ };
+}, QUOTE(ADDON)] call EFUNC(common,addSwayFactor);
// recheck weapon inertia after weapon swap, change of attachments or switching unit
["weapon", {[ACE_player] call FUNC(getWeaponInertia)}, true] call CBA_fnc_addPlayerEventHandler;
diff --git a/addons/advanced_fatigue/initSettings.sqf b/addons/advanced_fatigue/initSettings.sqf
index 7787fd3f5d..e2d797bf91 100644
--- a/addons/advanced_fatigue/initSettings.sqf
+++ b/addons/advanced_fatigue/initSettings.sqf
@@ -89,3 +89,21 @@
[0, 5, 1, 1],
true
] call CBA_fnc_addSetting;
+
+[
+ QGVAR(restedSwayFactor),
+ "SLIDER",
+ [LSTRING(RestedSwayFactor), LSTRING(RestedSwayFactor_Description)],
+ LSTRING(DisplayName),
+ [0, 5, 1, 2],
+ true
+] call CBA_fnc_addSetting;
+
+[
+ QGVAR(deployedSwayFactor),
+ "SLIDER",
+ [LSTRING(DeployedSwayFactor), LSTRING(DeployedSwayFactor_Description)],
+ LSTRING(DisplayName),
+ [0, 5, 1, 2],
+ true
+] call CBA_fnc_addSetting;
diff --git a/addons/advanced_fatigue/stringtable.xml b/addons/advanced_fatigue/stringtable.xml
index 5737e1fca2..f2949cdf5a 100644
--- a/addons/advanced_fatigue/stringtable.xml
+++ b/addons/advanced_fatigue/stringtable.xml
@@ -184,6 +184,18 @@
Ovlivňuje množství kývání zbraní. Vyšší znamená více kývání.
손떨림의 정도를 정합니다. 높을 수록 많이 휘적입니다.
+
+ Rested sway factor
+
+
+ Influences the amount of weapon sway while weapon is rested.
+
+
+ Deployed sway factor
+
+
+ Influences the amount of weapon sway while weapon is deployed.
+
Enabled
Activada