Merge pull request '4.2.2 release' (#62) from develop into main

Reviewed-on: #62

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

defines/BattalionInfo.hpp

@@ -4,11 +4,11 @@
 
 
 // Define the callsigns for the Battalion
-#define COMMAND_CALLSIGN STORMSURGE
+#define COMMAND_CALLSIGN POWERLINE
-#define RRC_CALLSIGN TIGER
+//#define RRC_CALLSIGN TIGER
-#define MEDIC_CALLSIGN LIFELINE
+//#define MEDIC_CALLSIGN LIFELINE
-#define ALPHA_CALLSIGN SAVAGE
+#define ALPHA_CALLSIGN NOMAD
-#define ECHO_CALLSIGN NIGHTFALL
+#define ECHO_CALLSIGN WARLORD
 #define WPN_CALLSIGN BLACKFOOT
 
 // Define the frequencies for the Battalion
@@ -73,26 +73,26 @@ class BattalionInfo {
 		};
 
 
-		class RRC { // WIP
+//		class RRC { // WIP
-			callsign = RRC_CALLSIGN;
+//			callsign = RRC_CALLSIGN;
-			shortDescription = "RRC";
+//			shortDescription = "RRC";
-			textColor = LVL2_TEXT_COLOR;
+//			textColor = LVL2_TEXT_COLOR;
-			frequencies[] = {
+//			frequencies[] = {
-				{"Contact", {}, {FREQ_BATTALION}},
+//				{"Contact", {}, {FREQ_BATTALION}},
-				{"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}}
+//				{"Actual", {}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_CAS}}
-			};
+//			};
-		};
+//		};
 
-		class BattalionMedical { // WIP
+//		class BattalionMedical { // WIP
-			callsign = MEDIC_CALLSIGN;
+//			callsign = MEDIC_CALLSIGN;
-			shortDescription = "Battalion Medical";
+//			shortDescription = "Battalion Medical";
-			textColor = LVL2_TEXT_COLOR;
+//			textColor = LVL2_TEXT_COLOR;
-			frequencies[] = {
+//			frequencies[] = {
-				{"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}},
+//				{"Contact", {FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION}},
-				{"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}},
+//				{"Actual", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {FREQ_BATTALION, FREQ_ECHO_FLIGHT_LOGISTICS}},
-				{"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}}
+//				{"General", {FREQ_BATTALION_MEDICAL_INTERCOM, FREQ_ALL_MEDICAL_SR}, {}}
-			};
+//			};
-		};
+//		};
 
 		class WeaponsSquad { // WIP
 			callsign = WPN_CALLSIGN;

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
 		};
 	};
 

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];

framework/script_version.hpp

@@ -1,4 +1,4 @@
 #define MAJOR 4
 #define MINOR 2
-#define PATCHLVL 1
+#define PATCHLVL 2
 #define BUILD 0