Fix AF sway factor (#6360)

* Fix sway factor, switch to CBA settings in AF * Add movedToSQF
acemod · May 30, 2018 · 9aba78b · 9aba78b
1 parent 232f986
commit 9aba78b
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 55 deletions.
diff --git a/addons/advanced_fatigue/ACE_Settings.hpp b/addons/advanced_fatigue/ACE_Settings.hpp
@@ -1,49 +1,20 @@
 class ACE_Settings {
     class GVAR(enabled) {
-        category = CSTRING(DisplayName);
-        displayName = CSTRING(Enabled);
-        description = CSTRING(Enabled_Description);
-        typeName = "BOOL";
-        value = 1;
+        movedToSQF = 1;
     };
     class GVAR(enableStaminaBar) {
-        category = CSTRING(DisplayName);
-        displayName = CSTRING(EnableStaminaBar);
-        description = CSTRING(EnableStaminaBar_Description);
-        typeName = "BOOL";
-        value = 1;
-        isClientSettable = 1;
+        movedToSQF = 1;
     };
     class GVAR(performanceFactor) {
-        category = CSTRING(DisplayName);
-        displayName = CSTRING(PerformanceFactor);
-        description = CSTRING(PerformanceFactor_Description);
-        typeName = "SCALAR";
-        value = 1;
-        sliderSettings[] = {0, 5, 1, 1};
+        movedToSQF = 1;
     };
     class GVAR(recoveryFactor) {
-        category = CSTRING(DisplayName);
-        displayName = CSTRING(RecoveryFactor);
-        description = CSTRING(RecoveryFactor_Description);
-        typeName = "SCALAR";
-        value = 1;
-        sliderSettings[] = {0, 5, 1, 1};
+        movedToSQF = 1;
     };
     class GVAR(loadFactor) {
-        category = CSTRING(DisplayName);
-        displayName = CSTRING(LoadFactor);
-        description = CSTRING(LoadFactor_Description);
-        typeName = "SCALAR";
-        value = 1;
-        sliderSettings[] = {0, 5, 1, 1};
+        movedToSQF = 1;
     };
     class GVAR(terrainGradientFactor) {
-        category = CSTRING(DisplayName);
-        displayName = CSTRING(TerrainGradientFactor);
-        description = CSTRING(TerrainGradientFactor_Description);
-        typeName = "SCALAR";
-        value = 1;
-        sliderSettings[] = {0, 5, 1, 1};
+        movedToSQF = 1;
     };
 };
diff --git a/addons/advanced_fatigue/XEH_preInit.sqf b/addons/advanced_fatigue/XEH_preInit.sqf
@@ -5,7 +5,8 @@ ADDON = false;
 PREP_RECOMPILE_START;
 #include "XEH_PREP.hpp"
 PREP_RECOMPILE_END;
-//#include "initSettings.sqf"
+
+#include "initSettings.sqf"
 
 GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40);
 GVAR(dutyList) = [[], []];

diff --git a/addons/advanced_fatigue/initSettings.sqf b/addons/advanced_fatigue/initSettings.sqf
@@ -2,7 +2,7 @@
     QGVAR(enabled),
     "CHECKBOX",
     [LSTRING(Enabled), LSTRING(Enabled_Description)],
-    "ACE3 Advanced Fatigue",
+    LSTRING(DisplayName),
     true,
     true
 ] call CBA_Settings_fnc_init;
@@ -11,7 +11,7 @@
     QGVAR(enableStaminaBar),
     "CHECKBOX",
     [LSTRING(EnableStaminaBar), LSTRING(EnableStaminaBar_Description)],
-    "ACE3 Advanced Fatigue",
+    LSTRING(DisplayName),
     true,
     true, {
         if (!_this) then {
@@ -26,43 +26,43 @@
     QGVAR(performanceFactor),
     "SLIDER",
     [LSTRING(PerformanceFactor), LSTRING(PerformanceFactor_Description)],
-    "ACE3 Advanced Fatigue",
-    [0, 2, 1, 1],
+    LSTRING(DisplayName),
+    [0, 5, 1, 1],
     true
 ] call CBA_Settings_fnc_init;
 
 [
     QGVAR(recoveryFactor),
     "SLIDER",
     [LSTRING(RecoveryFactor), LSTRING(RecoveryFactor_Description)],
-    "ACE3 Advanced Fatigue",
-    [0, 2, 1, 1],
+    LSTRING(DisplayName),
+    [0, 5, 1, 1],
     true
 ] call CBA_Settings_fnc_init;
 
 [
     QGVAR(loadFactor),
     "SLIDER",
     [LSTRING(LoadFactor), LSTRING(LoadFactor_Description)],
-    "ACE3 Advanced Fatigue",
-    [0, 2, 1, 1],
+    LSTRING(DisplayName),
+    [0, 5, 1, 1],
     true
 ] call CBA_Settings_fnc_init;
 
 [
     QGVAR(terrainGradientFactor),
     "SLIDER",
     [LSTRING(TerrainGradientFactor), LSTRING(TerrainGradientFactor_Description)],
-    "ACE3 Advanced Fatigue",
-    [0, 2, 1, 1],
+    LSTRING(DisplayName),
+    [0, 5, 1, 1],
     true
 ] call CBA_Settings_fnc_init;
 
 [
     QGVAR(swayFactor),
     "SLIDER",
     [LSTRING(SwayFactor), LSTRING(SwayFactor_Description)],
-    "ACE3 Advanced Fatigue",
-    [0, 2, 1, 1],
+    LSTRING(DisplayName),
+    [0, 5, 1, 1],
     true
 ] call CBA_Settings_fnc_init;
diff --git a/addons/advanced_fatigue/stringtable.xml b/addons/advanced_fatigue/stringtable.xml
@@ -2,13 +2,13 @@
 <Project name="ACE">
     <Package name="Advanced_Fatigue">
         <Key ID="STR_ACE_Advanced_Fatigue_DisplayName">
-            <English>Advanced Fatigue</English>
-            <German>Erweiterte Ausdauer</German>
-            <Chinese>進階疲勞</Chinese>
-            <Chinesesimp>进阶疲劳</Chinesesimp>
-            <Japanese>アドバンスド疲労</Japanese>
-            <Italian>Fatica Avanzata</Italian>
-            <Korean>고급 피로도</Korean>
+            <English>ACE Advanced Fatigue</English>
+            <German>ACE Erweiterte Ausdauer</German>
+            <Chinese>ACE 進階疲勞</Chinese>
+            <Chinesesimp>ACE 进阶疲劳</Chinesesimp>
+            <Japanese>ACE アドバンスド疲労</Japanese>
+            <Italian>ACE Fatica Avanzata</Italian>
+            <Korean>ACE 고급 피로도</Korean>
         </Key>
         <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor">
             <English>Performance Factor</English>