Merge pull request #186 from 501st-Aux-Mod-Team/fix-jammer-client

Fix jammer client

addons - Copy/RD501_Main/functions/jammer/fnc_jammersAddServer.sqf

@@ -13,6 +13,6 @@ if(_pfhHandle isEqualTo -1) then {
 		_this call rd501_fnc_jammersServerPFH;
 	}, 2, []] call CBA_fnc_addPerFrameHandler;
 	localNamespace getVariable ["rd501_jammers_serverPFH", _handle];
-	diag_log format["[RD501 Jammers] Started server PFH with handle '%1'", _handle];
+	diag_log format["[RD501 Jammers][Server Add] Started server PFH with handle '%1'", _handle];
 	_handle
 };

addons - Copy/RD501_Main/functions/jammer/fnc_jammersClear.sqf

@@ -1,5 +1,5 @@
 if(isServer) then {
-	diag_log "[RD501 Jammers] Clearing All Jammers";
+	diag_log "[RD501 Jammers][Server Clear] Clearing All Jammers";
 	localNamespace setVariable ["rd501_jammers_server",[]];;
 };
 

addons - Copy/RD501_Main/functions/jammer/fnc_jammersClientPFH.sqf

@@ -1,13 +1,16 @@
 params["_args", "_handle"];
 
-_jammers = [] call rd501_jammersGetLocal;
+_jammers = [] call rd501_fnc_jammersGetLocal;
 
 // Exit if jammer list is empty, remove PFH and rely on someone else calling it via jammer placement
 if(!alive player || count _jammers == 0) exitWith {
-	diag_log format["[RD501 Jammers] Exiting Client PFH with handle '%1', no jammers found", _handle];
+	diag_log format["[RD501 Jammers][Client PFH] Exiting Client PFH with handle '%1', no jammers found", _handle];
 	player setVariable ["rd501_jammers_pfh", -1];
-	player setVariable ["tf_receivingDistanceMultiplicator", 1];
-	player setVariable ["tf_sendingDistanceMultiplicator", 1];
+	player setVariable ["tf_receivingDistanceMultiplicator", nil];
+	player setVariable ["tf_sendingDistanceMultiplicator", nil];
+	private _sending = player getVariable ["tf_sendingDistanceMultiplicator", false];
+	private _receiving = player getVariable ["tf_receivingDistanceMultiplicator", false];
+	diag_log format["[RD501 Jammers][Client PFH] Sending: %1, Receiving: %2", _sending, _receiving];
 	[_handle] call CBA_fnc_removePerFrameHandler;
 };
 
@@ -18,10 +21,10 @@ private _interference = 1;
 	if(!_active || _jammer == objNull || !alive _jammer) then {
 		if(_jammer == objNull || !alive _jammer) then 
 		{
-			diag_log format["[RD501 Jammers] Pruning undefined jammer '%1'", _jammer];
+			diag_log format["[RD501 Jammers][Client PFH] Pruning undefined jammer '%1'", _jammer];
 			_jammers set [_foreachIndex, []];
 		};
-		diag_log format["[RD501 Jammers] Skipping inactive, dead or null jammer '%1'", _jammer];
+		diag_log format["[RD501 Jammers][Client PFH] Skipping inactive, dead or null jammer '%1'", _jammer];
 	}
 	else {
 		private _interferenceFactor = missionNamespace getVariable ["rd501_jammersInterferenceFactor", 0.625];
@@ -30,17 +33,19 @@ private _interference = 1;
 			private _d = _distance/_radius;
 			private _specificSignal =  1/(1 + ((_d/(1 -_d)) ^ -2.3));
 			private _specificInterference = _strength * (1 - _specificSignal) * _interferenceFactor;
-			if(_interference == 1) then {
+			if(_interference != 1) then {
+				_interference = _interference max _specificInterference;
+				if(_interference < 1) then {
+					_interference = 1; //prevent 0 from being final value
+				};
+				if(_interference > _strength) then {
+					_interference = _strength; // prevent tfar from being exposed to 1.6e^24 when distance is null
+				};
+			}
+			else
+			{
 				_interference = _specificInterference;
-				continue;
-			};
-			_interference = _interference max _specificInterference;
-			if(_interference < 1) then {
-				_interference = 1; //prevent 0 from being final value
 			};
-			if(_interference > _strength) then {
-				_interference = _strength; // prevent tfar from being exposed to 1.6e^24 when distance is null
-			}
 		};
 	};
 } forEach _jammers;
@@ -48,9 +53,7 @@ private _interference = 1;
 _jammers = _jammers - [[]]; // remove empty jammers
 
 // Set interference locally
-if(_interference != 1) then {
-	diag_log format["[RD501 Jammers] Experiencing Interference '%1'", _interference];
-};
+
 player setVariable ["tf_receivingDistanceMultiplicator", _interference];
 player setVariable ["tf_sendingDistanceMultiplicator", 1/_interference];
 
@@ -64,7 +67,9 @@ if(_name in _names) then {
 	localNamespace setVariable["rd501_jammers_rateLimit", _rateLimit];
 	if(_rateLimit % 16 == 0 || _rateLimit == 1) then
 	{
+		localNamespace setVariable ["rd501_jammers_rateLimit", _rateLimit];
 		private _message = format["Interference: %1", _interference];
+		diag_log format["[RD501 Jammers][Client PFH] Displaying '%1' to player", _message];
 		[_message, true, 4, 4] call ace_common_fnc_displayText;
 	}
 };

addons - Copy/RD501_Main/functions/jammer/fnc_jammersRemoveServer.sqf

@@ -1,13 +1,13 @@
 params["_jammerObjectToRemove"];
 
-if(!isServer) exitWith { diag_log "[RD501 Jammers] Attempted to remove jammers from a non server context"; };
+if(!isServer) exitWith { diag_log "[RD501 Jammers][Server Remove] Attempted to remove jammers from a non server context"; };
 
 private _jammers = localNamespace getVariable ["rd501_jammers_server",[]];;
 {
 	_x params["_jammer", "_radius", "_strength", "_active"];
 	if(_jammer isEqualTo _jammerObjectToRemove) exitWith
 	{
-		diag_log format["[RD501 Jammers] Removed Jammer '%1'", [_jammer, _radius, _strength, _active]];
+		diag_log format["[RD501 Jammers][Server Remove] Removed Jammer '%1'", [_jammer, _radius, _strength, _active]];
 		_jammers set [_foreachIndex, []];
 	}
 } forEach (_jammers);
@@ -16,7 +16,7 @@ _jammers = _jammers - [[]];
 private _currentLength = count _jammers;
 
 if(_previousLength == _currentLength) exitWith {
-	diag_log format["[RD501 Jammers] Specified jammer '%1' could not be found or was already removed", _jammerObjectToRemove];
+	diag_log format["[RD501 Jammers][Server Remove] Specified jammer '%1' could not be found or was already removed", _jammerObjectToRemove];
 };
 
 localNamespace setVariable ["rd501_jammers_server",_jammers];
@@ -27,6 +27,6 @@ if(_pfhHandle isEqualTo -1) then {
 		_this call rd501_fnc_jammersServerPFH;
 	}, 2, []] call CBA_fnc_addPerFrameHandler;
 	localNamespace getVariable ["rd501_jammers_serverPFH", _handle];
-	diag_log format["[RD501 Jammers] Started server PFH with handle '%1'", _handle];
+	diag_log format["[RD501 Jammers][Server Remove] Started server PFH with handle '%1'", _handle];
 	_handle
 };

addons - Copy/RD501_Main/functions/jammer/fnc_jammersServerPFH.sqf

@@ -1,20 +1,20 @@
 params["_args", "_handle"];
 
 if(!isServer) exitWith {
-	diag_log "[RD501 Jammers] Exiting Jammer Server PFH :: Not Server";
+	diag_log "[RD501 Jammers][Server PFH] Exiting :: Not Server";
 	[_handle] call CBA_fnc_removePerFrameHandler;
 };
 
 private _jammers = localNamespace getVariable ["rd501_jammers_server",[]];
 if(count _jammers == 0) exitWith {
-	diag_log "[RD501 Jammers] Exiting Jammer Server PFH :: No Jammers";
+	diag_log "[RD501 Jammers][Server PFH] Exiting :: No Jammers";
 	[_handle] call CBA_fnc_removePerFrameHandler;
 };
 
 {
 	_x params["_jammer", "_radius", "_strength", "_active"];
 	if(_jammer isEqualTo objNull || !(alive _jammer)) then {
-		diag_log format["[RD501 Jammers] Removing Jammer %1",_jammer];
+		diag_log format["[RD501 Jammers][Server PFH] Removing Jammer %1",_jammer];
 		_jammers set [_foreachIndex, []];
 	};
 } forEach _jammers;

addons - Copy/RD501_Main/functions/jammer/fnc_jammersUpdateLocal.sqf

@@ -3,17 +3,15 @@ params["_jammers"];
 // Client
 localNamespace setVariable ["rd501_jammers", _jammers];
 
-diag_log format["[RD501 Jammers] Updated jammers to '%1'", _jammers];
+diag_log format["[RD501 Jammers][Local Update] Updated jammers to '%1'", _jammers];
 
 // If we're a client with an interface, and there is no pfh running already, start it.
 if(hasInterface) then {
 	private _pfhHandle = player getVariable ["rd501_jammers_pfh", -1];
 	if(_pfhHandle isEqualTo -1) then {
-		private _handle = [{
-				_this call rd501_fnc_jammersClientPFH;
-			}, 2, [player]] call CBA_fnc_addPerFrameHandler;
+		private _handle = [rd501_fnc_jammersClientPFH, 2, []] call CBA_fnc_addPerFrameHandler;
 		player setVariable ["rd501_jammers_pfh", _handle];
-		diag_log format["[RD501 Jammers] Started client PFH with handle '%1'", _handle];
+		diag_log format["[RD501 Jammers][Local Update] Started client PFH with handle '%1'", _handle];
 		_handle
 	};
 };

addons - Copy/RD501_Main/functions/jammer/fnc_jammersUpdateServer.sqf

@@ -21,9 +21,10 @@ if(_shouldSkip) then {
 };
 if(_shouldSkip) exitWith { };
 
-diag_log "[RD501 Jammers] Broadcasting Delta";
 localNamespace setVariable["rd501_jammers_previousUpdate", _jammers];
+diag_log format["[RD501 Jammers][Server Update] Updated jammers to '%1'", _jammers];
 
+diag_log "[RD501 Jammers][Server Update] Broadcasting Delta";
 [
 	"rd501_jammersUpdateLocal",
 	[_jammers]
@@ -34,9 +35,9 @@ private _jipId = localNamespace getVariable ["rd501_jammers_jipId", -1];
 if(_jipId isEqualTo -1) exitWith {
 	_jipId = ["rd501_jammersUpdateLocal", [_jammers]] call CBA_fnc_globalEventJIP;
 	localNamespace setVariable ["rd501_jammers_jipId", _jipId];
-	diag_log format["[RD501 Jammers] Added JIP with handle '%1' and jammers '%2'", _jipId, _jammers];
+	diag_log format["[RD501 Jammers][Server Update] Added JIP with id '%1' and jammers '%2'", _jipId, _jammers];
 };
 
 // Reuse old jip var with new jammers each time updated
 ["rd501_jammersUpdateLocal", [_jammers], _jipId] call CBA_fnc_globalEventJIP;
-	diag_log format["[RD501 Jammers] Updated JIP with handle '%1' and jammers '%2'", _jipId, _jammers];
+diag_log format["[RD501 Jammers][Server Update] Updated JIP with id '%1' and jammers '%2'", _jipId, _jammers];