17th-Ranger-Battalion-ORG/MissionTemplate
6
0
Fork 0
Code Issues 1 Pull Requests Actions Projects 1 Releases 16 Wiki Activity

Campaign-Updates-Nov-13-2024 #61

Merged
hizumi merged 3 commits from Campaign-Updates-Nov-13-2024 into develop 2024-12-23 00:09:38 -06:00
Conversation 0 Commits 3 Files Changed 2 +114 -4
3 changed files with 114 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 38d03353b3 - Show all commits

6
framework/client/functions/fn_bindEventHandlers.sqf
View File

@@ -15,7 +15,13 @@ addMissionEventHandler ["HandleChatMessage",
{
params ["_channel", "_owner", "_from", "_text", "_person", "_name", "_strID", "_forcedDisplay", "_isPlayerMessage", "_sentenceType", "_chatMessageType"];
if ( missionNamespace getVariable ["milsim_globalChat", false] ) exitWith{ false };
if ( missionNamespace getVariable ["milsim_sideChat", false] ) exitWith{ false };
if ( missionNamespace getVariable ["milsim_commandChat", false] ) exitWith{ false };
if ( missionNamespace getVariable ["milsim_groupChat", false] ) exitWith{ false };
if ( missionNamespace getVariable ["milsim_vehicleChat", false] ) exitWith{ false };
if ( missionNamespace getVariable ["milsim_directChat", false] ) exitWith{ false };
if (_channel != 1) exitWith { false };

5
framework/client/functions/fn_logRespawnButtonUse.sqf
View File

@@ -8,6 +8,7 @@ if ( !hasInterface ) exitWith {};
if (not (local _unit)) exitWith {};
private _causeOfDeath = _unit getVariable ["ace_medical_causeOfDeath", "#scripted"];
private _triageLevel = _unit call ace_medical_treatment_fnc_getTriageStatus;
if (_causeOfDeath != "respawn_button") exitWith {};
private _timeWentUnconscious = _unit getVariable [QGVARMAIN(lastTimeKnockedOut), -1];
@@ -15,13 +16,13 @@ if ( !hasInterface ) exitWith {};
if (_timeWentUnconscious isEqualTo -1) exitWith {};
_durationSpentUnconscious = diag_tickTime - _timeWentUnconscious;
[
LEVEL_INFO,
QUOTE(COMPONENT),
"RESPAWNED WHILE UNCONSCIOUS",
[_unit, [
["durationSpentUnconscious", _durationSpentUnconscious]
["durationSpentUnconscious", _durationSpentUnconscious],
["triageLevel", _triageLevel#1]
]] call EFUNC(common,addPlayerInfoToArray)
] remoteExec [QEFUNC(common,log), 2];
// format["%1 was unconscious then clicked the respawn button", name _unit] remoteExec["systemChat", 0];

107
framework/common/functions/fn_addCBASettings.sqf
View File

@@ -1,15 +1,33 @@
#include "..\script_component.hpp"
//---------------------
// Global Chat
//---------------------
[
QGVARMAIN(globalChat),
"CHECKBOX",
"Global Chat Text Enabled",
[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
true, // default value
true, // requires restart
{
params ["_value"];
[
QGVARMAIN(globalChat),
_value
] call EFUNC(common,logSettingChanged);
}
] call CBA_fnc_addSetting;
//---------------------
// Side Chat
//---------------------
[
QGVARMAIN(sideChat),
"CHECKBOX",
"Side Chat Text Enabled",
[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
false, // default value
true, // default value
true, // requires restart
{
params ["_value"];
@@ -20,7 +38,92 @@
}
] call CBA_fnc_addSetting;
//---------------------
// Command Chat
//---------------------
[
QGVARMAIN(commandChat),
"CHECKBOX",
"Command Chat Text Enabled",
[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
true, // default value
true, // requires restart
{
params ["_value"];
[
QGVARMAIN(commandChat),
_value
] call EFUNC(common,logSettingChanged);
}
] call CBA_fnc_addSetting;
//---------------------
// Group Chat
//---------------------
[
QGVARMAIN(groupChat),
"CHECKBOX",
"Group Chat Text Enabled",
[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
true, // default value
true, // requires restart
{
params ["_value"];
[
QGVARMAIN(groupChat),
_value
] call EFUNC(common,logSettingChanged);
}
] call CBA_fnc_addSetting;
//---------------------
// Vehicle Chat
//---------------------
[
QGVARMAIN(vehicleChat),
"CHECKBOX",
"Vehicle Chat Text Enabled",
[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
true, // default value
true, // requires restart
{
params ["_value"];
[
QGVARMAIN(vehicleChat),
_value
] call EFUNC(common,logSettingChanged);
}
] call CBA_fnc_addSetting;
//---------------------
// Vehicle Chat
//---------------------
[
QGVARMAIN(directChat),
"CHECKBOX",
"Direct Chat Text Enabled",
[QUOTE(SETTINGS_GROUP_NAME), QUOTE(COMPONENT_BEAUTIFIED)],
true, // default value
true, // requires restart
{
params ["_value"];
[
QGVARMAIN(directChat),
_value
] call EFUNC(common,logSettingChanged);
}
] call CBA_fnc_addSetting;
[QGVARMAIN(globalChat), false] call CBA_settings_fnc_set;
[QGVARMAIN(sideChat), false] call CBA_settings_fnc_set;
[QGVARMAIN(commandChat), false] call CBA_settings_fnc_set;
[QGVARMAIN(groupChat), false] call CBA_settings_fnc_set;
[QGVARMAIN(vehicleChat), false] call CBA_settings_fnc_set;
[QGVARMAIN(directChat), false] call CBA_settings_fnc_set;
diag_log text "[MILSIM] (settings) Custom CBA settings initialized";