Skip to content

Commit 414d46b

Browse files
authored
Merge pull request #77 from OverlordZorn/adjust-pp-minimum-values
PPE-CC: Minimum Intensity
2 parents 3e544af + 90ae1fa commit 414d46b

8 files changed

Lines changed: 20 additions & 9 deletions

File tree

addons/based/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class CfgPatches {
88
ADDON_CONFIG_HEADER; // see based/script_mod.hpp
99

1010
// Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game.
11-
requiredVersion = 2.02;
11+
requiredVersion = REQUIRED_VERSION;
1212

1313
// Required addons, used for setting load order.
1414
// When any of the addons is missing, pop-up warning will appear when launching the game.

addons/framework/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CfgPatches {
77
ADDON_CONFIG_HEADER; // see based/script_mod.hpp
88

99
// Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game.
10-
requiredVersion = 2.02;
10+
requiredVersion = REQUIRED_VERSION;
1111

1212
// Required addons, used for setting load order.
1313
// When any of the addons is missing, pop-up warning will appear when launching the game.

addons/fx_particle/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CfgPatches {
77
ADDON_CONFIG_HEADER; // see based/script_mod.hpp
88

99
// Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game.
10-
requiredVersion = 2.02;
10+
requiredVersion = REQUIRED_VERSION;
1111

1212
// Required addons, used for setting load order.
1313
// When any of the addons is missing, pop-up warning will appear when launching the game.

addons/fx_post/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CfgPatches {
77
ADDON_CONFIG_HEADER; // see based/script_mod.hpp
88

99
// Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game.
10-
requiredVersion = 2.02;
10+
requiredVersion = REQUIRED_VERSION;
1111

1212
// Required addons, used for setting load order.
1313
// When any of the addons is missing, pop-up warning will appear when launching the game.

addons/fx_post/functions/fn_request.sqf

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,19 @@ ZRN_LOG_MSG_3(INIT,_presetName,_duration,_intensity);
3636
if (_presetName isEqualTo "") exitWith { ZRN_LOG_MSG(failed: effectName not provided); false};
3737
if !(_presetName in (configProperties [configFile >> QGVAR(Presets), "true", true] apply { configName _x })) exitWith { ZRN_LOG_MSG(failed: effectName not found); false};
3838

39-
private _cfg = (configFile >> QGVAR(Presets) >> _presetName );
40-
private _jipHandle = [QADDON, getText(_cfg >> "ppEffectType"), getNumber(_cfg >> "ppEffectLayer") ] joinString "_"; // dedicated jipHandle needed due to the nature of postEffects. There can be multiple of the same type, but they have to on seperate layers. jipHandle based on effectName is not enough.
39+
private _cfg = (configFile >> QGVAR(Presets) >> _presetName );
40+
private _ppType = getText(_cfg >> "ppEffectType");
41+
private _ppEffectLayer = getNumber(_cfg >> "ppEffectLayer");
42+
private _jipHandle = [QADDON, _ppType, getNumber(_cfg >> "ppEffectLayer") ] joinString "_"; // dedicated jipHandle needed due to the nature of postEffects. There can be multiple of the same type, but they have to on seperate layers. jipHandle based on effectName is not enough.
43+
44+
45+
// Adjust Basic CC Effects for minimum Intensity
46+
if (
47+
(_ppType == "ColorCorrections") &&
48+
{_ppEffectLayer == 0}
49+
) then {
50+
_intensity = _intensity max 0.5;
51+
};
4152

4253

4354
// Check fail when _intensity == 0 while no Prev effect

addons/fx_sound/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class CfgPatches {
88
ADDON_CONFIG_HEADER; // see based/script_mod.hpp
99

1010
// Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game.
11-
requiredVersion = 2.02;
11+
requiredVersion = REQUIRED_VERSION;
1212

1313
// Required addons, used for setting load order.
1414
// When any of the addons is missing, pop-up warning will appear when launching the game.

addons/fx_weather/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CfgPatches {
77
ADDON_CONFIG_HEADER; // see based/script_mod.hpp
88

99
// Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game.
10-
requiredVersion = 2.02;
10+
requiredVersion = REQUIRED_VERSION;
1111

1212
// Required addons, used for setting load order.
1313
// When any of the addons is missing, pop-up warning will appear when launching the game.

addons/mod_skill/config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class CfgPatches {
77
ADDON_CONFIG_HEADER; // see based/script_mod.hpp
88

99
// Minimum compatible version. When the game's version is lower, pop-up warning will appear when launching the game.
10-
requiredVersion = 2.02;
10+
requiredVersion = REQUIRED_VERSION;
1111

1212
// Required addons, used for setting load order.
1313
// When any of the addons is missing, pop-up warning will appear when launching the game.

0 commit comments

Comments
 (0)