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

Goggles - Add effects only option (#7808)

Browse Source 
* Added effects only option to goggles

* Set default back to 2
This commit is contained in:
JoramD 2020-07-22 17:24:43 +02:00 committed by GitHub
parent 4676f3e743
commit 68fe594cab
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
addons/goggles/ACE_Settings.hpp
View File

@ -6,7 +6,7 @@ class ACE_Settings {
typeName = "SCALAR";
value = 2;
isClientSettable = 1;
values[] = {ECSTRING(common,Disabled), CSTRING(effects_tintOnly), CSTRING(enabled_tintAndEffects)};
values[] = {ECSTRING(common,Disabled), CSTRING(effects_tintOnly), CSTRING(enabled_tintAndEffects), CSTRING(effects_effectsOnly)};
};
class GVAR(showInThirdPerson) {
category = CSTRING(DisplayName);

2
addons/goggles/XEH_postInit.sqf
View File

@ -85,7 +85,7 @@ if (!hasInterface) exitWith {};
// // ---Add the Dust/Dirt/Rain Effects---
if (GVAR(effects) == 2) then {
if (GVAR(effects) in [2, 3]) then {
// Register fire event handler
["ace_firedPlayer", DFUNC(handleFired)] call CBA_fnc_addEventHandler;

4
addons/goggles/functions/fnc_applyGlassesEffect.sqf
View File

@ -33,7 +33,7 @@ private _config = configFile >> "CfgGlasses" >> _glasses;
private _postProcessColour = getArray (_config >> "ACE_Color");
private _postProcessTintAmount = getNumber (_config >> "ACE_TintAmount");
if (_postProcessTintAmount != 0 && {GVAR(UsePP)}) then {
if (_postProcessTintAmount != 0 && {GVAR(UsePP)} && GVAR(effects) in [1, 2]) then {
_postProcessColour set [3, _postProcessTintAmount/100];
GVAR(PostProcess) ppEffectAdjust[0.9, 1.1, 0.004, _postProcessColour, [0,0,0,1],[0,0,0,0]];
GVAR(PostProcess) ppEffectCommit 0;
@ -50,7 +50,7 @@ if (_imagePath != "") then {
(GLASSDISPLAY displayCtrl 10650) ctrlSetText _imagePath;
};
if (GVAR(effects) == 2) then {
if (GVAR(effects) in [2, 3]) then {
if (GETDIRT) then {
call FUNC(applyDirtEffect);
};

2
addons/goggles/functions/fnc_canWipeGlasses.sqf
View File

@ -15,4 +15,4 @@
* Public: No
*/
GVAR(effects) == 2 && {!GETVAR(ACE_player,ACE_isUnconscious,false)} // return
GVAR(effects) in [2, 3] && {!GETVAR(ACE_player,ACE_isUnconscious,false)} // return

2
addons/goggles/functions/fnc_handleKilled.sqf
View File

@ -22,7 +22,7 @@ if (GVAR(effects) == 0) exitWith {true};
call FUNC(removeGlassesEffect);
if (GVAR(effects) == 2) then {
if (GVAR(effects) in [2, 3]) then {
GVAR(PostProcessEyes) ppEffectEnable false;
SETGLASSES(_unit,GLASSESDEFAULT);

2
addons/goggles/functions/fnc_removeGlassesEffect.sqf
View File

@ -22,7 +22,7 @@ if (!isNull (GLASSDISPLAY)) then {
GLASSDISPLAY closeDisplay 0;
};
if (GVAR(effects) == 2) then {
if (GVAR(effects) in [2, 3]) then {
call FUNC(removeDirtEffect);
call FUNC(removeRainEffect);
call FUNC(removeDustEffect);

16
addons/goggles/stringtable.xml
View File

@ -99,6 +99,22 @@
<Spanish>Tinte</Spanish>
<Turkish>Ton</Turkish>
</Key>
<Key ID="STR_ACE_Goggles_effects_effectsOnly">
<English>Effects</English>
<Russian>эффекты</Russian>
<Japanese>効果</Japanese>
<Polish>Efekty</Polish>
<German>Effekte</German>
<Korean>효과</Korean>
<French>Effets</French>
<Italian>Effetti</Italian>
<Chinesesimp>影响</Chinesesimp>
<Chinese>影響</Chinese>
<Portuguese>Efeitos</Portuguese>
<Czech>Efekty</Czech>
<Spanish>Efectos</Spanish>
<Turkish>Efektler</Turkish>
</Key>
<Key ID="STR_ACE_Goggles_enabled_tintAndEffects">
<English>Tint + Effects</English>
<Russian>Тонировка + эффекты</Russian>