Merge branch 'develop' into Campaign-Updates-Nov-13-2024

Reviewed-on: #59

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

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/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";