From 02e4b822e4bd1901c7420d116a959ecbeda7d2f5 Mon Sep 17 00:00:00 2001 From: Raymix Date: Sun, 22 Oct 2017 00:10:45 +0100 Subject: [PATCH] conflicts --- Sources/epoch_code/compile/setup/masterLoop/Event2.sqf | 7 ------- Sources/epoch_code/compile/setup/masterLoop/init.sqf | 4 +++- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf b/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf index 27179454..8412b208 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/Event2.sqf @@ -47,13 +47,6 @@ _playerRadiation = missionNamespace getVariable [_playerRadiationKey, _playerRad if (_playerRadiation > 1) then { _radiationVal = linearConversion [0,100,_playerRadiation,0.1,1,true]; [_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 { [0, 2] call epoch_setRadiation; }; diff --git a/Sources/epoch_code/compile/setup/masterLoop/init.sqf b/Sources/epoch_code/compile/setup/masterLoop/init.sqf index 14f24d97..5a2fb39c 100644 --- a/Sources/epoch_code/compile/setup/masterLoop/init.sqf +++ b/Sources/epoch_code/compile/setup/masterLoop/init.sqf @@ -336,8 +336,10 @@ EPOCH_ActiveTraderMission = []; _LastMissionTrigger = 0; // setup radio active locations +//Commented out by Raymix: Does not ser variable on locations for some reason +/* { _x params ["_loc", "_rads"]; _loc setVariable ["EPOCH_Rads", _rads]; } forEach (missionNamespace getVariable ["EPOCH_radioactiveLocations", []]); -// +*/