Merge pull request 'develop' (#68) from develop into main

Reviewed-on: #68

CHANGELOG.md

@@ -4,6 +4,29 @@ 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.4] - 2025-11-09
+
+### Changed
+
+- Campaign Callsigns
+- Supply Crate contents
+
+## [4.2.3] - 2025-05-24
+
+### Added
+
+- Warlord Vehicle Flag
+
+### Changed
+
+- Campaign Callsigns
+- Equipment Changes
+- Supply Crate contents
+
+### Fixed
+
+- Update chat logic handler for new cba settings
+
 ## [4.2.2] - 2024-12-23
 
 ### Added

defines/BattalionInfo.hpp

@@ -4,10 +4,10 @@
 
 
 // Define the callsigns for the Battalion
-#define COMMAND_CALLSIGN POWERLINE
+#define COMMAND_CALLSIGN ONI
 //#define RRC_CALLSIGN TIGER
 //#define MEDIC_CALLSIGN LIFELINE
-#define ALPHA_CALLSIGN NOMAD
+#define ALPHA_CALLSIGN GLACIER
 #define ECHO_CALLSIGN WARLORD
 #define WPN_CALLSIGN BLACKFOOT
 

defines/DisallowedEquipment.hpp

@@ -11,9 +11,9 @@ class DisallowedEquipment {
 		label = "BLACKLISTED WEAPON OR ITEM";
 		description = "Items that NO member is allowed to use.";
 		items[] = {
-			"17BN_ANPVS14", // NVG AN/PVS-14
-			"ej_PVS15D", // NVG AN/PVS-15
-			"ej_PVS15", // NVG AN/PVS-15
+			//"17BN_ANPVS14", // NVG AN/PVS-14
+			//"ej_PVS15D", // NVG AN/PVS-15
+			//"ej_PVS15", // NVG AN/PVS-15
 			"LMG_Mk200_black_F", //Mk200 Series
 			"LMG_Mk200_F", //Mk200 Series
 			"rhs_weap_g36c", // G36 Series
@@ -95,8 +95,8 @@ class DisallowedEquipment {
 			"UK3CB_M14DMR_Railed_BLK", // M14 Series
 			"UK3CB_M14DMR_Railed", // M14 Series
 			"UK3CB_M14DMR", // M14 Series
-			"USP_PVS_14", // NVG AN/PVS-14
-			"USP_PVS_15" // NVG AN/PVS-15
+			//"USP_PVS_14", // NVG AN/PVS-14
+			//"USP_PVS_15" // NVG AN/PVS-15
 		};
 	};
 

defines/SupplyCrates.hpp

@@ -9,7 +9,8 @@ class SupplyCrates {
 		weapons[] = {
 			{"rhs_weap_M136",4},
 			{"rhs_weap_M136_hp",4},
-			{"rhs_weap_m72a7",2}
+			//{"rhs_weap_m72a7",2}
+			{"JPSP_weap_m72ecmk1",2}
 		};
 		magazines[] = {
 			{"1Rnd_SmokePurple_Grenade_shell",12},
@@ -36,6 +37,9 @@ class SupplyCrates {
 			{"Tier1_20Rnd_762x51_M993_SR25_Mag",25},
 			{"KAR_20Rnd_Fury_blk",25},
 			{"rhsusf_m112_mag",25},
+			{"JCA_20Rnd_762x51_PMAG",25},
+			{"JCA_20Rnd_762x51_Tracer_Red_PMAG",25},
+			{"KAR_100Rnd_Fury_blk",25},
 		};
 		items[] = {};
 	};
@@ -58,7 +62,8 @@ class SupplyCrates {
 			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50},
 			{"Titan_AA",10},
 			{"Titan_AT",10},
-			{"200Rnd_65x39_cased_Box_Tracer_Red",50}
+			{"200Rnd_65x39_cased_Box_Tracer_Red",50},
+			{"KAR_100Rnd_Fury_RT_blk",50}
 		};
 		items[] = {};
 	};

defines/VehicleFlags.hpp

@@ -248,6 +248,11 @@ class VehicleFlags {
 				actionTitle = "17th Emblem";
 				texture = "textures\flags_misc\flag_17th_emblem_co.paa";
 			};
+			class WarlordEmblem {
+				actionID = "flag_17th_warlord";
+				actionTitle = "Warlord Emblem";
+				texture = "textures\flags_misc\flag_17th_warlord_co.paa";
+			};
 			class RedCross {
 				actionID = "flag_redcross";
 				actionTitle = "Red Cross";

framework/client/functions/fn_bindEventHandlers.sqf

@@ -14,21 +14,18 @@ if ( !hasInterface ) exitWith {};
 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 };
-		
+				
 		if ( ( admin _owner ) != 0 ) exitWith { false };
 
 		if ( !isNull ( getAssignedCuratorLogic _person ) ) exitWith { false };
 		
+		if ( (missionNamespace getVariable ["milsim_globalChat", false] ) && ( _channel == 0 ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_sideChat", false] ) && ( _channel == 1 ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_commandChat", false] && ( _channel == 2 ) ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_groupChat", false] ) && ( _channel == 3 ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_vehicleChat", false] && ( _channel == 4 ) ) ) exitWith{ false };
+		if ( (missionNamespace getVariable ["milsim_directChat", false] ) && ( _channel == 5 ) ) exitWith{ false };
+
 		true;
 	}
 ];

framework/script_version.hpp

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