diff --git a/CHANGELOG.md b/CHANGELOG.md index 6341a9b..c847eeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,21 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project badly attempts [Semantic Versioning](https://semver.org/spec/v2.0.0.html). +## [4.2.2] - 2024-12-23 + +### Added + +- CBA settings to allow disabling of remaining text chat channels + +### Changed + +- Log triage level on player respawn +- Campaign Callsigns + +### Fixed + +- Equipment typos + ## [4.2.1] - 2024-06-23 ### Changed diff --git a/defines/BattalionInfo.hpp b/defines/BattalionInfo.hpp index 897cf85..cb5d347 100644 --- a/defines/BattalionInfo.hpp +++ b/defines/BattalionInfo.hpp @@ -4,11 +4,11 @@ // Define the callsigns for the Battalion -#define COMMAND_CALLSIGN STORMSURGE -#define RRC_CALLSIGN TIGER -#define MEDIC_CALLSIGN LIFELINE -#define ALPHA_CALLSIGN SAVAGE -#define ECHO_CALLSIGN NIGHTFALL +#define COMMAND_CALLSIGN POWERLINE +//#define RRC_CALLSIGN TIGER +//#define MEDIC_CALLSIGN LIFELINE +#define ALPHA_CALLSIGN NOMAD +#define ECHO_CALLSIGN WARLORD #define WPN_CALLSIGN BLACKFOOT // Define the frequencies for the Battalion @@ -73,26 +73,26 @@ class BattalionInfo { }; - class RRC { // WIP - callsign = RRC_CALLSIGN; - shortDescription = "RRC"; - textColor = LVL2_TEXT_COLOR; - frequencies[] = { - {"Contact", {}, {FREQ_BATTALION}}, - {"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}} - }; - }; +// class RRC { // WIP +// callsign = RRC_CALLSIGN; +// shortDescription = "RRC"; +// textColor = LVL2_TEXT_COLOR; +// frequencies[] = { +// {"Contact", {}, {FREQ_BATTALION}}, +// {"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}} +// }; +// }; - class BattalionMedical { // WIP - callsign = MEDIC_CALLSIGN; - shortDescription = "Battalion Medical"; - textColor = LVL2_TEXT_COLOR; - frequencies[] = { - {"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}}, - {"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}}, - {"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}} - }; - }; +// class BattalionMedical { // WIP +// callsign = MEDIC_CALLSIGN; +// shortDescription = "Battalion Medical"; +// textColor = LVL2_TEXT_COLOR; +// frequencies[] = { +// {"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}}, +// {"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}}, +// {"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}} +// }; +// }; class WeaponsSquad { // WIP callsign = WPN_CALLSIGN; diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index 87652c0..acaa924 100644 --- a/defines/DisallowedEquipment.hpp +++ b/defines/DisallowedEquipment.hpp @@ -141,7 +141,9 @@ class DisallowedEquipment { "Tier1_ATACR18_Geissele_Docter_Black", //Nightforce Series Optic "Tier1_ATACR18_Geissele_Docter_Desert_Vanilla", //Nightforce Series Optic "Tier1_ATACR18_Geissele_Docter_Desert", //Nightforce Series Optic - "sps_black_hornet_01_Static_F" // Black Hornet Drone Mod + "sps_black_hornet_01_Static_F", // Black Hornet Drone Mod + "MRH_TacticalDisplay", //MRH Satellite Display Tablet + "MRH_FoldedSatcomAntenna" //MRH Satellite Satcom }; }; diff --git a/framework/client/functions/fn_bindEventHandlers.sqf b/framework/client/functions/fn_bindEventHandlers.sqf index 53b2162..4ceb134 100644 --- a/framework/client/functions/fn_bindEventHandlers.sqf +++ b/framework/client/functions/fn_bindEventHandlers.sqf @@ -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 }; diff --git a/framework/client/functions/fn_logRespawnButtonUse.sqf b/framework/client/functions/fn_logRespawnButtonUse.sqf index 8d350a0..62331d7 100644 --- a/framework/client/functions/fn_logRespawnButtonUse.sqf +++ b/framework/client/functions/fn_logRespawnButtonUse.sqf @@ -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]; diff --git a/framework/common/functions/fn_addCBASettings.sqf b/framework/common/functions/fn_addCBASettings.sqf index 700f1ae..7805f92 100644 --- a/framework/common/functions/fn_addCBASettings.sqf +++ b/framework/common/functions/fn_addCBASettings.sqf @@ -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"; diff --git a/framework/script_version.hpp b/framework/script_version.hpp index 55babf9..f6dedbd 100644 --- a/framework/script_version.hpp +++ b/framework/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 4 #define MINOR 2 -#define PATCHLVL 1 +#define PATCHLVL 2 #define BUILD 0