Arma3_Epoch/ACE3
1
0
Fork 0
mirror of https://github.com/acemod/ACE3.git synced 2024-08-30 18:23:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix AF sway factor (#6360)

Browse Source 
* Fix sway factor, switch to CBA settings in AF

* Add movedToSQF
This commit is contained in:
BaerMitUmlaut 2018-05-31 01:05:55 +02:00 committed by PabstMirror
parent 232f986048
commit 9aba78b320
4 changed files with 27 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
addons/advanced_fatigue/ACE_Settings.hpp
View File

@ -1,49 +1,20 @@
class ACE_Settings { class ACE_Settings {
class GVAR(enabled) { class GVAR(enabled) {
category = CSTRING(DisplayName); movedToSQF = 1;
displayName = CSTRING(Enabled);
description = CSTRING(Enabled_Description);
typeName = "BOOL";
value = 1;
}; };
class GVAR(enableStaminaBar) { class GVAR(enableStaminaBar) {
category = CSTRING(DisplayName); movedToSQF = 1;
displayName = CSTRING(EnableStaminaBar);
description = CSTRING(EnableStaminaBar_Description);
typeName = "BOOL";
value = 1;
isClientSettable = 1;
}; };
class GVAR(performanceFactor) { class GVAR(performanceFactor) {
category = CSTRING(DisplayName); movedToSQF = 1;
displayName = CSTRING(PerformanceFactor);
description = CSTRING(PerformanceFactor_Description);
typeName = "SCALAR";
value = 1;
sliderSettings[] = {0, 5, 1, 1};
}; };
class GVAR(recoveryFactor) { class GVAR(recoveryFactor) {
category = CSTRING(DisplayName); movedToSQF = 1;
displayName = CSTRING(RecoveryFactor);
description = CSTRING(RecoveryFactor_Description);
typeName = "SCALAR";
value = 1;
sliderSettings[] = {0, 5, 1, 1};
}; };
class GVAR(loadFactor) { class GVAR(loadFactor) {
category = CSTRING(DisplayName); movedToSQF = 1;
displayName = CSTRING(LoadFactor);
description = CSTRING(LoadFactor_Description);
typeName = "SCALAR";
value = 1;
sliderSettings[] = {0, 5, 1, 1};
}; };
class GVAR(terrainGradientFactor) { class GVAR(terrainGradientFactor) {
category = CSTRING(DisplayName); movedToSQF = 1;
displayName = CSTRING(TerrainGradientFactor);
description = CSTRING(TerrainGradientFactor_Description);
typeName = "SCALAR";
value = 1;
sliderSettings[] = {0, 5, 1, 1};
}; };
}; };

3
addons/advanced_fatigue/XEH_preInit.sqf
View File

@ -5,7 +5,8 @@ ADDON = false;
PREP_RECOMPILE_START; PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
//#include "initSettings.sqf"
#include "initSettings.sqf"
GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40); GVAR(staminaBarWidth) = 10 * (((safezoneW / safezoneH) min 1.2) / 40);
GVAR(dutyList) = [[], []]; GVAR(dutyList) = [[], []];

24
addons/advanced_fatigue/initSettings.sqf
View File

@ -2,7 +2,7 @@
QGVAR(enabled), QGVAR(enabled),
"CHECKBOX", "CHECKBOX",
[LSTRING(Enabled), LSTRING(Enabled_Description)], [LSTRING(Enabled), LSTRING(Enabled_Description)],
"ACE3 Advanced Fatigue", LSTRING(DisplayName),
true, true,
true true
] call CBA_Settings_fnc_init; ] call CBA_Settings_fnc_init;
@ -11,7 +11,7 @@
QGVAR(enableStaminaBar), QGVAR(enableStaminaBar),
"CHECKBOX", "CHECKBOX",
[LSTRING(EnableStaminaBar), LSTRING(EnableStaminaBar_Description)], [LSTRING(EnableStaminaBar), LSTRING(EnableStaminaBar_Description)],
"ACE3 Advanced Fatigue", LSTRING(DisplayName),
true, true,
true, { true, {
if (!_this) then { if (!_this) then {
@ -26,8 +26,8 @@
QGVAR(performanceFactor), QGVAR(performanceFactor),
"SLIDER", "SLIDER",
[LSTRING(PerformanceFactor), LSTRING(PerformanceFactor_Description)], [LSTRING(PerformanceFactor), LSTRING(PerformanceFactor_Description)],
"ACE3 Advanced Fatigue", LSTRING(DisplayName),
[0, 2, 1, 1], [0, 5, 1, 1],
true true
] call CBA_Settings_fnc_init; ] call CBA_Settings_fnc_init;
@ -35,8 +35,8 @@
QGVAR(recoveryFactor), QGVAR(recoveryFactor),
"SLIDER", "SLIDER",
[LSTRING(RecoveryFactor), LSTRING(RecoveryFactor_Description)], [LSTRING(RecoveryFactor), LSTRING(RecoveryFactor_Description)],
"ACE3 Advanced Fatigue", LSTRING(DisplayName),
[0, 2, 1, 1], [0, 5, 1, 1],
true true
] call CBA_Settings_fnc_init; ] call CBA_Settings_fnc_init;
@ -44,8 +44,8 @@
QGVAR(loadFactor), QGVAR(loadFactor),
"SLIDER", "SLIDER",
[LSTRING(LoadFactor), LSTRING(LoadFactor_Description)], [LSTRING(LoadFactor), LSTRING(LoadFactor_Description)],
"ACE3 Advanced Fatigue", LSTRING(DisplayName),
[0, 2, 1, 1], [0, 5, 1, 1],
true true
] call CBA_Settings_fnc_init; ] call CBA_Settings_fnc_init;
@ -53,8 +53,8 @@
QGVAR(terrainGradientFactor), QGVAR(terrainGradientFactor),
"SLIDER", "SLIDER",
[LSTRING(TerrainGradientFactor), LSTRING(TerrainGradientFactor_Description)], [LSTRING(TerrainGradientFactor), LSTRING(TerrainGradientFactor_Description)],
"ACE3 Advanced Fatigue", LSTRING(DisplayName),
[0, 2, 1, 1], [0, 5, 1, 1],
true true
] call CBA_Settings_fnc_init; ] call CBA_Settings_fnc_init;
@ -62,7 +62,7 @@
QGVAR(swayFactor), QGVAR(swayFactor),
"SLIDER", "SLIDER",
[LSTRING(SwayFactor), LSTRING(SwayFactor_Description)], [LSTRING(SwayFactor), LSTRING(SwayFactor_Description)],
"ACE3 Advanced Fatigue", LSTRING(DisplayName),
[0, 2, 1, 1], [0, 5, 1, 1],
true true
] call CBA_Settings_fnc_init; ] call CBA_Settings_fnc_init;

14
addons/advanced_fatigue/stringtable.xml
View File

@ -2,13 +2,13 @@
<Project name="ACE"> <Project name="ACE">
<Package name="Advanced_Fatigue"> <Package name="Advanced_Fatigue">
<Key ID="STR_ACE_Advanced_Fatigue_DisplayName"> <Key ID="STR_ACE_Advanced_Fatigue_DisplayName">
<English>Advanced Fatigue</English> <English>ACE Advanced Fatigue</English>
<German>Erweiterte Ausdauer</German> <German>ACE Erweiterte Ausdauer</German>
<Chinese>進階疲勞</Chinese> <Chinese>ACE 進階疲勞</Chinese>
<Chinesesimp>进阶疲劳</Chinesesimp> <Chinesesimp>ACE 进阶疲劳</Chinesesimp>
<Japanese>アドバンスド疲労</Japanese> <Japanese>ACE アドバンスド疲労</Japanese>
<Italian>Fatica Avanzata</Italian> <Italian>ACE Fatica Avanzata</Italian>
<Korean>고급 피로도</Korean> <Korean>ACE 고급 피로도</Korean>
</Key> </Key>
<Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor"> <Key ID="STR_ACE_Advanced_Fatigue_PerformanceFactor">
<English>Performance Factor</English> <English>Performance Factor</English>