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

Merge pull request #951 from morgoth0/patch-11

Browse Source 
Fix and enhancement for radiation effects post processing
This commit is contained in:
vbawol 2017-10-28 17:17:26 -05:00 committed by GitHub
commit ef5a817e7c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Sources/epoch_code/compile/setup/masterLoop/Event2.sqf
View File

@ -44,8 +44,8 @@ if (_playerAlcohol > 20) then {
// Sets visual effect // Sets visual effect
_playerRadiation = missionNamespace getVariable [_playerRadiationKey, _playerRadiationDefault]; _playerRadiation = missionNamespace getVariable [_playerRadiationKey, _playerRadiationDefault];
if (_playerRadiation > 1) then { if (_playerRadiation > _radiationEffectsThreshold) then {
_radiationVal = linearConversion [0,100,_playerRadiation,1,10,true]; _radiationVal = linearConversion [0,100,_playerRadiation,0,10,true];
[(ceil _radiationVal)/10, 2] call epoch_setRadiation; [(ceil _radiationVal)/10, 2] call epoch_setRadiation;
} else { } else {
[0, 2] call epoch_setRadiation; [0, 2] call epoch_setRadiation;

2
Sources/epoch_code/compile/setup/masterLoop/init.sqf
View File

@ -102,6 +102,8 @@ if (isNil "EPOCH_display_setup_complete") then {
// Background radiation // Background radiation
_outOfBoundsRadiation = ["CfgEpochClient", "outOfBoundsRadiation", 10] call EPOCH_fnc_returnConfigEntryV2; _outOfBoundsRadiation = ["CfgEpochClient", "outOfBoundsRadiation", 10] call EPOCH_fnc_returnConfigEntryV2;
_radsLevel = 0; _radsLevel = 0;
// Radiation screen effects threshold
_radiationEffectsThreshold = ["CfgEpochClient", "radiationEffectsThreshold", 10] call EPOCH_fnc_returnConfigEntryV2;
_prevEquippedItem = []; _prevEquippedItem = [];
_damagePlayer = damage player; _damagePlayer = damage player;

5
Sources/epoch_code/gui/scripts/post_process/Epoch_setRadiation.sqf
View File

@ -42,9 +42,8 @@ switch _level do {
}; };
case 0.1: case 0.1:
{ {
[(rmx_var_RadiationHandles select 0), _speed, [0.185533,1,1,1,0,true]] call epoch_postprocessAdjust; rmx_var_RadiationHandles call epoch_postprocessDestroy;
[(rmx_var_RadiationHandles select 1), _speed, [1,1,0,0,0,0,0,0,0,0,1,0,0,0,0]] call epoch_postprocessAdjust; rmx_var_RadiationHandles = nil;
[(rmx_var_RadiationHandles select 2), _speed, [0,0,0]] call epoch_postprocessAdjust;
}; };
case 0.2: case 0.2:
{ {

1
Sources/epoch_config/Configs/CfgEpochClient.hpp
View File

@ -23,6 +23,7 @@ class CfgEpochClient
radioactiveLocations[] = {"NameCityCapital", "NameCity", "Airport"}; // used for random radioactive locations and to suppress animal spawns within cities. radioactiveLocations[] = {"NameCityCapital", "NameCity", "Airport"}; // used for random radioactive locations and to suppress animal spawns within cities.
radiatedObjMaxFalloutDist = 125; // max distance radiated object can affect player (number in meters) radiatedObjMaxFalloutDist = 125; // max distance radiated object can affect player (number in meters)
geigerCounterEnergyUsage = 10; // default loss of 10 energy every 10sec of use geigerCounterEnergyUsage = 10; // default loss of 10 energy every 10sec of use
radiationEffectsThreshold = 10; // default level for screen effects to indicate a player's rad dosage (0-100)
baseHungerLoss = 2; // increase number to speed up rate of Hunger loss baseHungerLoss = 2; // increase number to speed up rate of Hunger loss
baseThirstLoss = 2; // increase number to speed up rate of Thirst loss baseThirstLoss = 2; // increase number to speed up rate of Thirst loss