From 7a75952f87a2edd72ee39e91d1f86b0f84fb5085 Mon Sep 17 00:00:00 2001 From: "Ghostrider [GRG]" Date: Sat, 16 Sep 2023 04:47:24 -0400 Subject: [PATCH] Updated Killed Messaging --- GMS/Compiles/Units/fn_unitKilled.sqf | 5 ++--- GMS/Compiles/init/fn_init.sqf | 6 +++--- GMS/Configs/GMS_configs.sqf | 10 +++++++--- GMS/config.cpp | 6 +++--- 4 files changed, 15 insertions(+), 12 deletions(-) diff --git a/GMS/Compiles/Units/fn_unitKilled.sqf b/GMS/Compiles/Units/fn_unitKilled.sqf index 66166ad..fed1d8e 100644 --- a/GMS/Compiles/Units/fn_unitKilled.sqf +++ b/GMS/Compiles/Units/fn_unitKilled.sqf @@ -129,8 +129,7 @@ if (_creditKill) then _unit distance _instigator, _killstreak ]; - private _players = allPlayers deleteAt (allPlayers find _instigator); - [_instigator, _reward, _experience, name _unit, _unit distance _instigator, getText(configFile >> "CfgWeapons" >> currentWeapon _instigator >> "displayName"), _killstreak, GMS_killMessageToAllPlayers] remoteExec ["GMSCore_fnc_killedMessages",_players]; - [_instigator, _reward, _experience, name _unit, _unit distance _instigator, getText(configFile >> "CfgWeapons" >> currentWeapon _instigator >> "displayName"), _killstreak, GMS_killMessageTypesKiller] remoteExec ["GMSCore_fnc_killedMessages",[_instigator]]; + + [_instigator, _reward, _experience, name _unit, _unit distance _instigator, getText(configFile >> "CfgWeapons" >> currentWeapon _instigator >> "displayName"), _killstreak, GMS_killMessageToAllPlayers,GMS_killMessageTypesKiller,GMS_killMessagingRadius] remoteExec ["GMSCore_fnc_killedMessages",allPlayers]; }; diff --git a/GMS/Compiles/init/fn_init.sqf b/GMS/Compiles/init/fn_init.sqf index b046a5d..dad1c9a 100644 --- a/GMS/Compiles/init/fn_init.sqf +++ b/GMS/Compiles/init/fn_init.sqf @@ -28,9 +28,9 @@ diag_log format["[GMS] GMSCore_modtype = %1 | GMSCore_side %2 | GMSCore_unitType // This block waits for the mod to start but is disabled for now if ((toLowerANSI GMSCore_modtype) isEqualto "epoch") then { - //diag_log "[GMS] Waiting until EpochMod is ready..."; - //waitUntil {!isnil "EPOCH_SERVER_READY"}; - //diag_log "[GMS] EpochMod is ready...loading GMS"; + diag_log "[GMS] Waiting until EpochMod is ready..."; + waitUntil {!isnil "EPOCH_SERVER_READY"}; + diag_log "[GMS] EpochMod is ready...loading GMS"; }; if ((toLowerANSI GMSCore_modtype) isEqualTo "exile") then { diff --git a/GMS/Configs/GMS_configs.sqf b/GMS/Configs/GMS_configs.sqf index 54ab180..ba5bdcc 100644 --- a/GMS/Configs/GMS_configs.sqf +++ b/GMS/Configs/GMS_configs.sqf @@ -49,9 +49,13 @@ ***********************************************************/ - /////////////////////////////// - // Kill message configurations - // These determine whether and when messages are sent to players regarding AI Kills or illegal kills that might damage a vehicle. +/////////////////////////////// +// Kill message configurations + +// This is the radius within which nearby players will receive any messages regaring AI Kills by other players +// the location of the killer is the center of this area +GMSAI_killMessagingRadius = 3000; + GMS_killMessageToAllPlayers = [ /* These settings are used by GMSCore to determine what kinds of messages to use to notify players of a kill. diff --git a/GMS/config.cpp b/GMS/config.cpp index 53b7cec..b2916cf 100644 --- a/GMS/config.cpp +++ b/GMS/config.cpp @@ -12,9 +12,9 @@ */ class GMSBuild { - Version = "7.143"; - Build = "261"; - Date = "09-14-2023"; + Version = "7.144"; + Build = "262"; + Date = "09-16-2023"; }; class CfgPatches {