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

conflicts

Browse Source
This commit is contained in:
Raymix 2017-10-22 00:10:45 +01:00
parent 8b5f896424
commit 02e4b822e4
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,13 +47,6 @@ _playerRadiation = missionNamespace getVariable [_playerRadiationKey, _playerRad
if (_playerRadiation > 1) then { if (_playerRadiation > 1) then {
_radiationVal = linearConversion [0,100,_playerRadiation,0.1,1,true]; _radiationVal = linearConversion [0,100,_playerRadiation,0.1,1,true];
[_radiationVal, 2] call epoch_setRadiation; [_radiationVal, 2] call epoch_setRadiation;
// if player has geiger counter make sound based on rads level
if ('ItemGeigerCounter_EPOCH' in assignedItems player) then {
_level = round(linearConversion [0,100,_radsLevel,0,3,true]);
_sound = format ["geiger_%1",_level];
playSound _sound;
};
} else { } else {
[0, 2] call epoch_setRadiation; [0, 2] call epoch_setRadiation;
}; };

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

@ -336,8 +336,10 @@ EPOCH_ActiveTraderMission = [];
_LastMissionTrigger = 0; _LastMissionTrigger = 0;
// setup radio active locations // setup radio active locations
//Commented out by Raymix: Does not ser variable on locations for some reason
/*
{ {
_x params ["_loc", "_rads"]; _x params ["_loc", "_rads"];
_loc setVariable ["EPOCH_Rads", _rads]; _loc setVariable ["EPOCH_Rads", _rads];
} forEach (missionNamespace getVariable ["EPOCH_radioactiveLocations", []]); } forEach (missionNamespace getVariable ["EPOCH_radioactiveLocations", []]);
// */