diff --git a/addons/advanced_fatigue/ACE_Settings.hpp b/addons/advanced_fatigue/ACE_Settings.hpp index 2d46fd5eb3..0590e68efb 100644 --- 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 index 7d682e7db6..1cb60db917 100644 --- 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 index ea8ddb45d6..8f4e5f0c9a 100644 --- 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,8 +26,8 @@ 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; @@ -35,8 +35,8 @@ 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; @@ -44,8 +44,8 @@ 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; @@ -53,8 +53,8 @@ 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; @@ -62,7 +62,7 @@ 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 index 2dfbbac817..70fe930ad7 100644 --- a/addons/advanced_fatigue/stringtable.xml +++ b/addons/advanced_fatigue/stringtable.xml @@ -2,13 +2,13 @@ - Advanced Fatigue - Erweiterte Ausdauer - 進階疲勞 - 进阶疲劳 - アドバンスド疲労 - Fatica Avanzata - 고급 피로도 + ACE Advanced Fatigue + ACE Erweiterte Ausdauer + ACE 進階疲勞 + ACE 进阶疲劳 + ACE アドバンスド疲労 + ACE Fatica Avanzata + ACE 고급 피로도 Performance Factor