NightVision - Add setting for shutter effects (#6134)

Also convert to cba settings
Close #6119
This commit is contained in:
PabstMirror 2018-02-09 20:31:22 -06:00 committed by jonpas
parent 4cabaa48b7
commit e73a2ddec0
5 changed files with 68 additions and 29 deletions

View File

@ -1,40 +1,17 @@
class ACE_Settings { class ACE_Settings {
class GVAR(disableNVGsWithSights) { class GVAR(disableNVGsWithSights) {
category = CSTRING(Category); movedToSQF = 1;
displayName = CSTRING(DisableNVGsWithSights_DisplayName);
description = CSTRING(DisableNVGsWithSights_description);
typeName = "BOOL";
value = 0;
}; };
class GVAR(fogScaling) { class GVAR(fogScaling) {
category = CSTRING(Category); movedToSQF = 1;
displayName = CSTRING(fogScaling_DisplayName);
description = CSTRING(fogScaling_Description);
typeName = "SCALAR";
value = 1;
sliderSettings[] = {0, 2, 1, 1};
}; };
class GVAR(noiseScaling) { class GVAR(noiseScaling) {
category = CSTRING(Category); movedToSQF = 1;
displayName = CSTRING(noiseScaling_DisplayName);
description = CSTRING(noiseScaling_Description);
typeName = "SCALAR";
value = 1;
sliderSettings[] = {0, 2, 1, 1};
}; };
class GVAR(effectScaling) { class GVAR(effectScaling) {
category = CSTRING(Category); movedToSQF = 1;
displayName = CSTRING(effectScaling_DisplayName);
description = CSTRING(effectScaling_Description);
typeName = "SCALAR";
value = 1;
sliderSettings[] = {0, 2, 1, 1};
}; };
class GVAR(aimDownSightsBlur) { class GVAR(aimDownSightsBlur) {
category = CSTRING(Category); movedToSQF = 1;
displayName = CSTRING(aimDownSightsBlur_DisplayName);
typeName = "SCALAR";
value = 1;
sliderSettings[] = {0, 2, 1, 1};
}; };
}; };

View File

@ -6,4 +6,6 @@ PREP_RECOMPILE_START;
#include "XEH_PREP.hpp" #include "XEH_PREP.hpp"
PREP_RECOMPILE_END; PREP_RECOMPILE_END;
#include "initSettings.sqf";
ADDON = true; ADDON = true;

View File

@ -18,7 +18,7 @@
//IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile"]; //IGNORE_PRIVATE_WARNING ["_unit", "_weapon", "_muzzle", "_mode", "_ammo", "_magazine", "_projectile"];
TRACE_7("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile); TRACE_7("firedEH:",_unit, _weapon, _muzzle, _mode, _ammo, _magazine, _projectile);
if ((!GVAR(running)) || {_weapon == "throw"} || {_weapon == "put"}) exitWith {}; if ((!GVAR(running)) || {!GVAR(shutterEffects)} || {_weapon == "throw"} || {_weapon == "put"}) exitWith {};
private _visibleFireCoef = 1; private _visibleFireCoef = 1;
if (_unit == ace_player) then { if (_unit == ace_player) then {

View File

@ -0,0 +1,54 @@
// CBA Settings [ADDON: ace_nightVision]:
[
QGVAR(effectScaling), "SLIDER",
[LSTRING(effectScaling_DisplayName), LSTRING(effectScaling_Description)],
localize LSTRING(Category),
[0,2,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
true, // isGlobal
{[QGVAR(effectScaling), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_settings_fnc_init;
[
QGVAR(fogScaling), "SLIDER",
[LSTRING(fogScaling_DisplayName), LSTRING(fogScaling_Description)],
localize LSTRING(Category),
[0,2,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
true, // isGlobal
{[QGVAR(fogScaling), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_settings_fnc_init;
[
QGVAR(noiseScaling), "SLIDER",
[LSTRING(noiseScaling_DisplayName), LSTRING(noiseScaling_Description)],
localize LSTRING(Category),
[0,2,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
true, // isGlobal
{[QGVAR(noiseScaling), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_settings_fnc_init;
[
QGVAR(aimDownSightsBlur), "SLIDER",
[LSTRING(aimDownSightsBlur_DisplayName)],
localize LSTRING(Category),
[0,2,1,1], // [min, max, default value, trailing decimals (-1 for whole numbers only)]
true, // isGlobal
{[QGVAR(aimDownSightsBlur), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_settings_fnc_init;
[
QGVAR(disableNVGsWithSights), "CHECKBOX",
[LSTRING(DisableNVGsWithSights_DisplayName), LSTRING(DisableNVGsWithSights_description)],
localize LSTRING(Category),
false, // default value
true, // isGlobal
{[QGVAR(disableNVGsWithSights), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_settings_fnc_init;
[
QGVAR(shutterEffects), "CHECKBOX",
[LSTRING(shutterEffects_DisplayName), LSTRING(shutterEffects_description)],
localize LSTRING(Category),
true, // default value
false, // isGlobal
{[QGVAR(shutterEffects), _this] call EFUNC(common,cbaSettings_settingChanged)}
] call CBA_settings_fnc_init;

View File

@ -296,5 +296,11 @@
<Chinese>調整配戴夜視鏡時畫面雜訊的多寡。</Chinese> <Chinese>調整配戴夜視鏡時畫面雜訊的多寡。</Chinese>
<Chinesesimp>调整配戴夜视镜时画面杂讯的多寡。</Chinesesimp> <Chinesesimp>调整配戴夜视镜时画面杂讯的多寡。</Chinesesimp>
</Key> </Key>
<Key ID="STR_ACE_NightVision_shutterEffects_DisplayName">
<English>Shutter Effects</English>
</Key>
<Key ID="STR_ACE_NightVision_shutterEffects_description">
<English>Rolling shutter effect from muzzle flashes</English>
</Key>
</Package> </Package>
</Project> </Project>