Compare commits

...

10 Commits

Author SHA1 Message Date
eb3e08e14a Update defines/SupplyCrates.hpp
Change rhs_weap_m72a7 with JPSP_weap_m72ecmk1
2025-11-09 15:28:01 -06:00
8532ec5786 Update defines/BattalionInfo.hpp
Call Sign Updates for ACO / BCO
2025-11-09 13:28:42 -06:00
6b33680e77 Merge pull request '4.2.3 release' (#65) from develop into main
All checks were successful
Pack Release files / Dispatch MissionZGM build job (release) Successful in 1m33s
Pack Release files / Publish cleaned template (release) Successful in 1m47s
Reviewed-on: #65
2025-05-27 20:46:28 -05:00
hizumi
3db6191e0d Update script_version.hpp
All checks were successful
Generate testing snapshot / Create testing release (push) Successful in 2m17s
2025-05-27 20:33:29 -05:00
hizumi
fef05fa153 Update CHANGELOG.md 2025-05-27 20:33:23 -05:00
hizumi
2bd8a16079 Update fn_bindEventHandlers.sqf
correct logic for handling chat messages based on allowed channel cba settings
2025-05-25 22:48:53 -05:00
1fbda6ac95 Merge pull request 'aj-campaign-update-5-17-2025' (#64) from aj-campaign-update-5-17-2025 into develop
Some checks failed
Generate testing snapshot / Create testing release (push) Has been cancelled
Reviewed-on: #64
2025-05-19 16:32:08 -05:00
dbc380c6af Merge branch 'develop' into aj-campaign-update-5-17-2025 2025-05-19 16:31:58 -05:00
c9c15681ce Merge pull request 'Tabbed-Shirt-Update-3-25-2025' (#63) from Tabbed-Shirt-Update-3-25-2025 into develop
Some checks failed
Generate testing snapshot / Create testing release (push) Has been cancelled
Reviewed-on: #63
2025-05-19 16:18:17 -05:00
b60f7922f3 Update defines/DisallowedEquipment.hpp
Added T-Shirt Items
2025-03-25 20:44:01 -05:00
6 changed files with 46 additions and 17 deletions

View File

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

View File

@@ -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 KINGPIN
#define ALPHA_CALLSIGN GLACIER
#define ECHO_CALLSIGN WARLORD
#define WPN_CALLSIGN BLACKFOOT

View File

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

View File

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

View File

@@ -15,20 +15,17 @@ 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;
}
];

View File

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