From 4b8641b99cddf7427df971116fcc7b3b2aa159ab Mon Sep 17 00:00:00 2001 From: Teh Dango Date: Wed, 25 Oct 2017 21:51:06 -0400 Subject: [PATCH] Cleanup Code cleanup, minor fixes... --- sarge/code/functions/fn_AI_despawn.sqf | 2 +- sarge/code/functions/fn_AI_heli.sqf | 2 +- sarge/code/functions/fn_AI_hit.sqf | 2 +- sarge/code/functions/fn_AI_hit_vehicle.sqf | 2 +- sarge/code/functions/fn_AI_infantry.sqf | 2 +- sarge/code/functions/fn_AI_interact.sqf | 2 +- sarge/code/functions/fn_AI_killed.sqf | 2 +- sarge/code/functions/fn_AI_refresh.sqf | 2 +- sarge/code/functions/fn_AI_spawn.sqf | 2 +- sarge/code/functions/fn_AI_trace.sqf | 27 ++++++++++---------- sarge/code/functions/fn_AI_trace_base.sqf | 2 +- sarge/code/functions/fn_AI_trace_vehicle.sqf | 20 ++++++--------- sarge/code/functions/fn_AI_traders.sqf | 2 +- sarge/code/functions/fn_AI_vehicle.sqf | 2 +- sarge/code/functions/fn_functions.sqf | 2 +- 15 files changed, 34 insertions(+), 39 deletions(-) diff --git a/sarge/code/functions/fn_AI_despawn.sqf b/sarge/code/functions/fn_AI_despawn.sqf index 261cd87..150937e 100644 --- a/sarge/code/functions/fn_AI_despawn.sqf +++ b/sarge/code/functions/fn_AI_despawn.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_heli.sqf b/sarge/code/functions/fn_AI_heli.sqf index db5079a..63b4b6f 100644 --- a/sarge/code/functions/fn_AI_heli.sqf +++ b/sarge/code/functions/fn_AI_heli.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_hit.sqf b/sarge/code/functions/fn_AI_hit.sqf index c99fd54..4ec9f7e 100644 --- a/sarge/code/functions/fn_AI_hit.sqf +++ b/sarge/code/functions/fn_AI_hit.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_hit_vehicle.sqf b/sarge/code/functions/fn_AI_hit_vehicle.sqf index 4a10397..3349cad 100644 --- a/sarge/code/functions/fn_AI_hit_vehicle.sqf +++ b/sarge/code/functions/fn_AI_hit_vehicle.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_infantry.sqf b/sarge/code/functions/fn_AI_infantry.sqf index 9667b07..c71b5c3 100644 --- a/sarge/code/functions/fn_AI_infantry.sqf +++ b/sarge/code/functions/fn_AI_infantry.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_interact.sqf b/sarge/code/functions/fn_AI_interact.sqf index a1066a3..bd26490 100644 --- a/sarge/code/functions/fn_AI_interact.sqf +++ b/sarge/code/functions/fn_AI_interact.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_killed.sqf b/sarge/code/functions/fn_AI_killed.sqf index 23e8300..14ed4fa 100644 --- a/sarge/code/functions/fn_AI_killed.sqf +++ b/sarge/code/functions/fn_AI_killed.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_refresh.sqf b/sarge/code/functions/fn_AI_refresh.sqf index 4e5b70d..1e0dbc6 100644 --- a/sarge/code/functions/fn_AI_refresh.sqf +++ b/sarge/code/functions/fn_AI_refresh.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_spawn.sqf b/sarge/code/functions/fn_AI_spawn.sqf index f696a60..0ab424d 100644 --- a/sarge/code/functions/fn_AI_spawn.sqf +++ b/sarge/code/functions/fn_AI_spawn.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango http://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_trace.sqf b/sarge/code/functions/fn_AI_trace.sqf index 99d3c24..60dd0ae 100644 --- a/sarge/code/functions/fn_AI_trace.sqf +++ b/sarge/code/functions/fn_AI_trace.sqf @@ -7,25 +7,23 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango http://www.hod-servers.com */ private ["_ai","_entity_array","_sleeptime","_detectrange"]; -if (isServer || !hasInterface) exitWith {}; // Do not execute on server or any headless client(s) +// Prevent execution on server or dedicated clients +if (isServer || !hasInterface) exitWith {}; _ai = _this select 0; -_detectrange = SAR_DETECT_HOSTILE; -_respectlimit = SAR_RESPECT_HOSTILE_LIMIT; -_sleeptime = SAR_DETECT_INTERVAL; - while {alive _ai} do { - _entity_array = (position _ai) nearEntities ["CAManBase",_detectrange]; + _entity_array = (position _ai) nearEntities ["CAManBase",SAR_DETECT_HOSTILE]; { - if(vehicle _ai == _ai) then { // AI is not in a vehicle, so we trace Zeds + // Only do this for zombies (WIP) + /* if (vehicle _ai == _ai) then { if (_x isKindof "civilclass") then { if(rating _x > -10000) then { _x addrating -10000; @@ -34,16 +32,17 @@ while {alive _ai} do { }; }; }; - }; - if(isPlayer _x && {vehicle _x == _x}) then { // only do this for players not in vehicles - _respect = _x getVariable ["ExileScore",0]; - If (_respect < _respectlimit && {rating _x > -10000}) then { - if(SAR_EXTREME_DEBUG) then { + }; */ + // Only do this for players not in vehicles + if (isPlayer _x && (vehicle _x == _x)) then { + //_respect = _x getVariable ["ExileScore",0]; + if (rating player < SAR_RESPECT_HOSTILE_LIMIT && (rating _x > -10000)) then { + if (SAR_EXTREME_DEBUG) then { diag_log format["SAR EXTREME DEBUG: reducing rating (trace_entities) for player: %1", _x]; }; _x addrating -10000; }; }; } forEach _entity_array; - sleep _sleeptime; + sleep SAR_DETECT_INTERVAL; }; diff --git a/sarge/code/functions/fn_AI_trace_base.sqf b/sarge/code/functions/fn_AI_trace_base.sqf index 9b8c2ad..95c91de 100644 --- a/sarge/code/functions/fn_AI_trace_base.sqf +++ b/sarge/code/functions/fn_AI_trace_base.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_trace_vehicle.sqf b/sarge/code/functions/fn_AI_trace_vehicle.sqf index 6a0b409..a8d8112 100644 --- a/sarge/code/functions/fn_AI_trace_vehicle.sqf +++ b/sarge/code/functions/fn_AI_trace_vehicle.sqf @@ -7,32 +7,28 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com */ -private ["_ai","_entity_array","_humanity","_humanitylimit","_sleeptime","_detectrange","_tracewhat","_player_rating","_clientmachine"]; +private ["_ai","_entity_array","_tracewhat","_player_rating","_clientmachine"]; if (!isServer) exitWith {}; _ai = _this select 0; _tracewhat = "CAManBase"; -_detectrange = SAR_DETECT_HOSTILE_FROM_VEHICLE; -_respectlimit = SAR_RESPECT_HOSTILE_LIMIT; -_sleeptime = SAR_DETECT_FROM_VEHICLE_INTERVAL; - while {alive _ai} do { - _entity_array = (position _ai) nearEntities [_tracewhat, _detectrange]; + _entity_array = (position _ai) nearEntities [_tracewhat, SAR_DETECT_HOSTILE_FROM_VEHICLE]; { - if(isPlayer _x && {vehicle _x == _x}) then { // only do that for players that are not in a vehicle + if (isPlayer _x && {vehicle _x == _x}) then { // only do that for players that are not in a vehicle _player_rating = rating _x; - _respect = _x getVariable ["ExileScore",0]; - If (_respect < _respectlimit && {_player_rating > -10000}) then { + //_respect = _x getVariable ["ExileScore",0]; + if (rating player < SAR_RESPECT_HOSTILE_LIMIT && (_player_rating > -10000)) then { - if(SAR_EXTREME_DEBUG) then { + if (SAR_EXTREME_DEBUG) then { diag_log format["SAR EXTREME DEBUG: reducing rating (trace_from_vehicle) for player: %1", _x]; }; @@ -50,5 +46,5 @@ while {alive _ai} do { }; }; } forEach _entity_array; - sleep _sleeptime; + sleep SAR_DETECT_FROM_VEHICLE_INTERVAL; }; diff --git a/sarge/code/functions/fn_AI_traders.sqf b/sarge/code/functions/fn_AI_traders.sqf index 3538855..b2f8562 100644 --- a/sarge/code/functions/fn_AI_traders.sqf +++ b/sarge/code/functions/fn_AI_traders.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango http://www.hod-servers.com diff --git a/sarge/code/functions/fn_AI_vehicle.sqf b/sarge/code/functions/fn_AI_vehicle.sqf index e1e50c0..db87640 100644 --- a/sarge/code/functions/fn_AI_vehicle.sqf +++ b/sarge/code/functions/fn_AI_vehicle.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0+ - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com diff --git a/sarge/code/functions/fn_functions.sqf b/sarge/code/functions/fn_functions.sqf index a3d913e..5401826 100644 --- a/sarge/code/functions/fn_functions.sqf +++ b/sarge/code/functions/fn_functions.sqf @@ -7,7 +7,7 @@ # Fork # Sarge AI System 2.0pushBack - Modded for Arma 3: Exile Mod + Modded for Arma 3: Epoch Mod Changes: Dango https://www.hod-servers.com