Update defines/ApprovedAssets.hpp

Updated Assets provided by Fibonacci

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/ApprovedAssets.hpp

@@ -7,13 +7,13 @@ class ApprovedAssets {
 	class rhsusf_stryker_m1127_m2_wd {callsign = "Katana"; category = "APC";};
 	class rhsusf_stryker_m1132_m2_wd {callsign = "Katana"; category = "APC";};
 	class rhsusf_stryker_m1134_wd {callsign = "Katana"; category = "APC";};
+        class rhsusf_stryker_m1296_d {callsign = "Katana"; category = "APC";};
 	class B_APC_Wheeled_01_cannon_F {callsign = "Rapier"; category = "APC";};
 	class B_APC_Tracked_01_CRV_F {callsign = "DuctTape"; category = "APC";};
+        class B_AFV_Wheeled_01_cannon_F {callsign = "Gladius"; category = "Armor";};
+	class B_AFV_Wheeled_01_up_cannon_F {callsign = "Gladius"; category = "Armor";};
 	// Rotary
-	class TF373_SOAR_MH47G_No_Rear_Guns {callsign = "Achilles"; category = "Rotary";};
-	class TF373_SOAR_MH47G_No_Rear_Guns_EasyActions {callsign = "Achilles"; category = "Rotary";};
 	class TF373_SOAR_MH47G {callsign = "Achilles"; category = "Rotary";};
-	class TF373_SOAR_MH47G_EasyActions {callsign = "Achilles"; category = "Rotary";};
 	class RHS_CH_47F_10 {callsign = "Achilles"; category = "Rotary";};
 	class RHS_MELB_AH6M {callsign = "Artemis"; category = "Rotary";};
 	class RHS_MELB_MH6M {callsign = "Apollo"; category = "Rotary";};
@@ -21,11 +21,12 @@ class ApprovedAssets {
 	class RHS_UH60M {callsign = "Griffin"; category = "Rotary";};
 	class RHS_UH60M2 {callsign = "Griffin"; category = "Rotary";};
 	class RHS_UH60M_MEV {callsign = "Dustoff"; category = "Rotary";};
-	class ej_MH60MDAP {callsign = "Hades"; category = "Rotary";};
+	class ej_MH60MDAP2 {callsign = "Hades"; category = "Rotary";};
-	class ej_MH60MDAP16H {callsign = "Hades"; category = "Rotary";};
+	class ej_MH60MDAP4DP {callsign = "Hades"; category = "Rotary";};
-	class ej_MH60MDAP8H {callsign = "Hades"; category = "Rotary";};
-	class ej_MH60MDAP4 {callsign = "Hades"; category = "Rotary";};
 	class RHS_AH64DGrey {callsign = "Orion"; category = "Rotary";};
+        class cwr3_b_kiowa_dyn {callsign = "Epyon"; category = "Rotary";};
+        class RHS_UH1Y_d {callsign = "Homer"; category = "Rotary";};
+        class rhsusf_CH53E_USMC_GAU21 {callsign = "Atlas"; category = "Rotary";};
 	// Air
 	// Truck
 	class rhsusf_M1078A1R_SOV_M2_D_fmtv_socom {callsign = "DuctTape"; category = "Truck";};
@@ -34,6 +35,7 @@ class ApprovedAssets {
 	// Boats
 	class rhsusf_mkvsoc {callsign = "Poseidon"; category = "Boats";};
 	class B_Boat_Armed_01_minigun_F {callsign = "Neptune"; category = "Boats";};
+        class UK3CB_AAF_B_RHIB {callsign = "Trident"; category = "Boats";};
 	// MRAP
 	class rhsusf_M1238A1_M2_socom_d {callsign = "Tanto"; category = "MRAP";};
 	class rhsusf_M1238A1_Mk19_socom_d {callsign = "Tanto"; category = "MRAP";};
@@ -41,34 +43,42 @@ class ApprovedAssets {
 	class rhsusf_M1239_MK19_socom_d {callsign = "DuctTape"; category = "MRAP";};
 	class rhsusf_m1245_m2crows_socom_d {callsign = "Dagger"; category = "MRAP";};
 	class rhsusf_m1245_mk19crows_socom_d {callsign = "Dagger"; category = "MRAP";};
+        class ONI_LR_M2_B {callsign = "Dagger"; category = "MRAP";};
 	class rhsusf_M1239_M2_Deploy_socom_d {callsign = "DuctTape"; category = "MRAP";};
 	// TiltRotor
 	class B_T_VTOL_01_infantry_F {callsign = "Pegasus"; category = "TiltRotor";};
 	class B_T_VTOL_01_armed_F {callsign = "Chimera"; category = "TiltRotor";};
+        class UK3CB_AAF_B_Osprey_G {callsign = "Pegasus"; category = "TiltRotor";};
 	// Water
 	// Ground Vehicle
 	// Cars
-	class rhsusf_m1165a1_gmv_m134d_m240_socom_d {callsign = "Dagger"; category = "Cars";};
+	class rhsusf_m1165a1_gmv_m134d_m240_socom_d {callsign = "Marauder"; category = "Cars";};
-	class rhsusf_m1165a1_gmv_m2_m240_socom_d {callsign = "Dagger"; category = "Cars";};
+	class rhsusf_m1165a1_gmv_m2_m240_socom_d {callsign = "Marauder"; category = "Cars";};
-	class rhsusf_m1165a1_gmv_mk19_m240_socom_d {callsign = "Dagger"; category = "Cars";};
+	class rhsusf_m1165a1_gmv_mk19_m240_socom_d {callsign = "Marauder"; category = "Cars";};
 	class rhsusf_mrzr4_d {callsign = ""; category = "Cars";};
 	class UK3CB_B_M1030_NATO {callsign = ""; category = "Cars";};
 	class B_T_LSV_01_AT_F {callsign = ""; category = "Cars";};
 	class B_T_LSV_01_armed_F {callsign = ""; category = "Cars";};
 	class C_Quadbike_01_F {callsign = ""; category = "Cars";};
 	// Fixed-Wing
-	class B_Plane_CAS_01_dynamicLoadout_F {callsign = "Ares"; category = "Fixed-Wing";};
+        class JS_JC_FA18F {callsign = "Xerxes"; category = "Fixed-Wing";};
-	class RHS_A10 {callsign = "Ares"; category = "Fixed-Wing";};
+        class B_Plane_Fighter_01_F {callsign = "Xerxes"; category = "Fixed-Wing";};	
+        class B_Plane_CAS_01_dynamicLoadout_F {callsign = "Ares"; category = "Fixed-Wing";};
+	class FLAN_EA18G {callsign = "Thunder"; category = "Fixed-Wing";};
+        class FIR_F35B_Standard {callsign = "Zaku"; category = "Fixed-Wing";};
+        class RHSGREF_A29B_HIDF {callsign = "Odyssey"; category = "Fixed-Wing";};
 	class USAF_AC130U {callsign = "Odin"; category = "Fixed-Wing";};
 	class USAF_C130J {callsign = "Hercules"; category = "Fixed-Wing";};
-	class B_Plane_Fighter_01_F {callsign = "Xerxes"; category = "Fixed-Wing";};
+        class USAF_C17 {callsign = "Titan"; category = "Fixed-Wing";};
 	// Artillery
 	class rhsusf_M142_usarmy_WD {callsign = "Halberd"; category = "Artillery";};
 	class UK3CB_B_M270_MLRS_HE_DES {callsign = "Halberd"; category = "Artillery";};
 	class rhsusf_m109d_usarmy {callsign = "Glaive"; category = "Artillery";};
 	class RHS_M119_D {callsign = "Mailman"; category = "Artillery";};
-	class B_Mortar_01_F {callsign = "Hammer"; category = "Artillery";};
+        class B_Mortar_01_F {callsign = "Hammer"; category = "Artillery";};
 	// Armor
-	class B_AFV_Wheeled_01_cannon_F {callsign = "Gladius"; category = "Armor";};
+        class RHS_M2A3_BUSKIII {callsign = "Sabre"; category = "Armor";};
-	class B_AFV_Wheeled_01_up_cannon_F {callsign = "Gladius"; category = "Armor";};
+        class B_M1283_M2 {callsign = "Sabre"; category = "Armor";};
+        class rhsusf_m1a2sep2wd_usarmy {callsign = "Claymore"; category = "Armor";};
+        class usarmy_LT_M10 {callsign = "Claymore"; category = "Armor";};	
 };

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
+			//"17BN_ANPVS14", // NVG AN/PVS-14
-			"ej_PVS15D", // NVG AN/PVS-15
+			//"ej_PVS15D", // NVG AN/PVS-15
-			"ej_PVS15", // 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_14", // NVG AN/PVS-14
-			"USP_PVS_15" // NVG AN/PVS-15
+			//"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

@@ -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