Update defines/SupplyCrates.hpp

fix trailing comma on array item

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
 		};
 	};
 
@@ -148,7 +148,7 @@ class DisallowedEquipment {
 	};
 
 	class tabbedItems { // Items that are allowed for individuals with Ranger Tab
-		label = "TABBED WEAPON";
+		label = "TABBED ITEM";
 		description = "Items that are allowed for individuals with Ranger Tab.";
 		items[] = {
 			"optic_tws", // Thermal Optic
@@ -283,7 +283,22 @@ class DisallowedEquipment {
 			"rhs_weap_m16a4_grip_acog_usmc", //M16 Series
 			"rhs_weap_m16a4_grip_acog2_usmc", //M16 Series
 			"rhs_weap_m32", //M32/MGL Series
-			"rhs_weap_m32_usmc" //M32/MGL Series
+			"rhs_weap_m32_usmc", //M32/MGL Series
+			"G3_Multicam_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_M81_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_TGR_Tee_WARLORD", //Tabbed T-Shirt
+			"G3_Multicam_Tee_BLK", //Tabbed T-Shirt
+			"G3_M81_Tee_BLK", //Tabbed T-Shirt
+			"G3_TGR_Tee_BLK", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Tan", //Tabbed T-Shirt
+			"G3_M81_Tee_Tan", //Tabbed T-Shirt
+			"G3_TGR_Tee_Tan", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Gray", //Tabbed T-Shirt
+			"G3_M81_Tee_Gray", //Tabbed T-Shirt
+			"G3_TGR_Tee_Gray", //Tabbed T-Shirt
+			"G3_Multicam_Tee_Green", //Tabbed T-Shirt
+			"G3_M81_Tee_Green", //Tabbed T-Shirt
+			"G3_TGR_Tee_Green" //Tabbed T-Shirt
 		};
 	};
 

defines/SupplyCrates.hpp

@@ -7,9 +7,11 @@ class SupplyCrates {
 
 		backpacks[] = {};
 		weapons[] = {
+			{"MCC_MK18_URGI",2}, // m4a1 URGI
 			{"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},
@@ -17,6 +19,7 @@ class SupplyCrates {
 			{"1Rnd_SmokeOrange_Grenade_shell",12},
 			{"rhs_mag_M441_HE",25},
 			{"rhs_mag_M433_HEDP",15},
+			{"rhsusf_mag_6Rnd_M441_HE",10}, // M32 Ammo
 			{"ACE_40mm_Flare_ir",12},
 			{"rhsusf_200Rnd_556x45_mixed_soft_pouch_coyote",25},
 			{"rhsusf_20Rnd_762x51_m993_Mag",25},
@@ -27,15 +30,27 @@ class SupplyCrates {
 			{"1Rnd_SmokeRed_Grenade_shell",24},
 			{"1Rnd_SmokeGreen_Grenade_shell",24},
 			{"1Rnd_SmokeYellow_Grenade_shell",12},
-			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
-			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",75},
-			{"Tier1_250Rnd_762x51_Belt_M993_AP",15},
+			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",100}, // Removed M8556A1
+			{"rhsusf_100Rnd_762x51_m61_ap",40}, // Replaced from Tier 1
+			{"ranger_100rnd_762_M61",20}, // Replaced from Tier 1 
+			{"rhs_mag_20Rnd_SCAR_762x51_mk316_special",25}, // SCARH mags
+			{"MCC_PMAG_300_30_220OTMSUB",25}, // Added 300blk (Subsonic Mags)
 			{"ACE_20Rnd_762x51_Mag_Tracer",25},
 			{"ACE_20Rnd_762x51_M993_AP_Mag",25},
 			{"rhsusf_20Rnd_762x51_SR25_m993_Mag",25},
-			{"Tier1_20Rnd_762x51_M993_SR25_Mag",25},
+			{"JCA_20Rnd_762x51_SMAG",25}, // Swapped out Tier 1
 			{"KAR_20Rnd_Fury_blk",25},
+			{"MCC_PMAG_65x43_25_125PRT",25}, // Added 6.5
+			{"MCC_ICM_6ARC_20RD_ATIP",25}, // Added 6Arc
+			{"MCC_PMAG_68SPC_25_140VLD",25}, // Added 6.8SPC
+			{"rhsusf_5Rnd_Slug",25}, // Shotgun
+			{"lot_6Rnd_12Gauge_Slug",25}, // Shotgun
+			{"SMG_03C_khaki",15}, // PDW
+			{"CUP_30Rnd_9x19_MP5",15}, // PDW
+			{"JCA_30Rnd_9x21_MP5_Mag",15}, // PDW
+			{"rhsusf_mag_40Rnd_46x30_AP",15}, // PDW
 			{"rhsusf_m112_mag",25},
+			{"ranger_KAC_LAMG_150rnd_Box_Mixed",25} // Swaped out to 150
 		};
 		items[] = {};
 	};
@@ -51,14 +66,17 @@ class SupplyCrates {
 			{"launch_MRAWS_green_F",2}
 		};
 		magazines[] = {
+                        {"rhs_weap_m240B",2},
 			{"MRAWS_HEAT_F",35},
 			{"MRAWS_HE_F",15},
-			{"Tier1_250Rnd_762x51_Belt_M993_AP",50},
-			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
-			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50},
+			{"rhsusf_100Rnd_762x51_m61_ap",60}, // Replaced from Tier 1
+			{"ranger_100rnd_762_M61",40}, // Replaced from Tier 1 
 			{"Titan_AA",10},
 			{"Titan_AT",10},
-			{"200Rnd_65x39_cased_Box_Tracer_Red",50}
+			{"200Rnd_65x39_cased_Box_Tracer_Red",50},
+			{"rhsusf_mag_6Rnd_M443_HEDP",25}, // M32 Ammo
+			{"rhsusf_mag_6Rnd_M441_HE",25}, // M32 Ammo
+			{"rhsusf_mag_6Rnd_M714_white",15} // M32 Ammo
 		};
 		items[] = {};
 	};
@@ -162,7 +180,7 @@ class SupplyCrates {
 			{"tsp_stickCharge_auto_mag",10},
 			{"ACE_CableTie",25},
 			{"DemoCharge_Remote_Mag",15},
-			{"TFAR_anprc152",3},
+			{"TFAR_anprc152",3}
 		};
 	};
 

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