diff --git a/CHANGELOG.md b/CHANGELOG.md index c847eeb..0f4df23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,22 @@ 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.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 diff --git a/defines/BattalionInfo.hpp b/defines/BattalionInfo.hpp index cb5d347..ec9908c 100644 --- a/defines/BattalionInfo.hpp +++ b/defines/BattalionInfo.hpp @@ -7,7 +7,7 @@ #define COMMAND_CALLSIGN POWERLINE //#define RRC_CALLSIGN TIGER //#define MEDIC_CALLSIGN LIFELINE -#define ALPHA_CALLSIGN NOMAD +#define ALPHA_CALLSIGN KINGPIN #define ECHO_CALLSIGN WARLORD #define WPN_CALLSIGN BLACKFOOT diff --git a/defines/DisallowedEquipment.hpp b/defines/DisallowedEquipment.hpp index acaa924..1717583 100644 --- a/defines/DisallowedEquipment.hpp +++ b/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 }; }; diff --git a/defines/SupplyCrates.hpp b/defines/SupplyCrates.hpp index 26fe919..695cc7a 100644 --- a/defines/SupplyCrates.hpp +++ b/defines/SupplyCrates.hpp @@ -36,6 +36,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 +61,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[] = {}; }; diff --git a/defines/VehicleFlags.hpp b/defines/VehicleFlags.hpp index 752753a..b55e018 100644 --- a/defines/VehicleFlags.hpp +++ b/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"; diff --git a/framework/client/functions/fn_bindEventHandlers.sqf b/framework/client/functions/fn_bindEventHandlers.sqf index 4ceb134..4c7ecb5 100644 --- a/framework/client/functions/fn_bindEventHandlers.sqf +++ b/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; } ]; diff --git a/framework/script_version.hpp b/framework/script_version.hpp index f6dedbd..f0845e1 100644 --- a/framework/script_version.hpp +++ b/framework/script_version.hpp @@ -1,4 +1,4 @@ #define MAJOR 4 #define MINOR 2 -#define PATCHLVL 2 +#define PATCHLVL 3 #define BUILD 0 diff --git a/textures/flags_misc/flag_17th_warlord_co.paa b/textures/flags_misc/flag_17th_warlord_co.paa new file mode 100644 index 0000000..b8eddc9 Binary files /dev/null and b/textures/flags_misc/flag_17th_warlord_co.paa differ