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

Reviewed-on: #46

CHANGELOG.md

@@ -4,6 +4,30 @@ 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.1.2] - 2024-04-25
+
+### Changed
+
+- Fix internal versioning
+- Swap resupply box 5.56 magazines due to mod conflict
+- Group deletion handler now properly processes empty groups and logs errors 
+
+## [4.1.1] - 2024-04-19
+
+### Added
+
+- Function to remove lightning bolt from zeus
+
+### Changed
+
+- Alpha Callsign
+- Allowed Equipment Definitions
+
+### Removed
+
+- Custom tire patch code
+- Extraneous server performance calculation broadcast to all clients
+
 ## [4.1.0] - 2024-03-01
 
 ### Added

defines/BattalionInfo.hpp

@@ -7,7 +7,7 @@
 #define COMMAND_CALLSIGN SPARTAN
 #define RRC_CALLSIGN TIGER
 #define MEDIC_CALLSIGN LIFELINE
-#define ALPHA_CALLSIGN BLACKJACK
+#define ALPHA_CALLSIGN ROGUE
 #define ECHO_CALLSIGN FIREBRAND
 #define WPN_CALLSIGN BLACKFOOT
 

defines/SupplyCrates.hpp

@@ -26,7 +26,7 @@ class SupplyCrates {
 			{"1Rnd_SmokeRed_Grenade_shell",24},
 			{"1Rnd_SmokeGreen_Grenade_shell",24},
 			{"1Rnd_SmokeYellow_Grenade_shell",12},
-			{"Tier1_30Rnd_556x45_M856A1_EMag",25},
+			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
 			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",75},
 			{"SMA_30Rnd_762x35_BLK_EPR",25},
 			{"SMA_20Rnd_762x51mm_M80A1_EPR",25},
@@ -57,7 +57,7 @@ class SupplyCrates {
 			{"MRAWS_HEAT_F",35},
 			{"MRAWS_HE_F",15},
 			{"Tier1_250Rnd_762x51_Belt_M993_AP",50},
-			{"Tier1_30Rnd_556x45_M856A1_EMag",25},
+			{"rhs_mag_30Rnd_556x45_M855A1_Stanag",25},
 			{"ACE_30Rnd_556x45_Stanag_M995_AP_mag",50},
 			{"Titan_AA",10},
 			{"Titan_AT",10},

framework/client/functions/fn_bindVehicleActions.sqf

@@ -29,39 +29,6 @@ _unflip =
 ["LandVehicle", 0, ["ACE_MainActions"], _unflip, true] call ace_interact_menu_fnc_addActionToClass;
 
 
-_patchTire = 
-[
-	"patchTire",
-	"Patch Tire",
-	"\a3\ui_f\data\IGUI\Cfg\Actions\repair_ca.paa",
-	{
-		[_player, "AinvPknlMstpSnonWnonDr_medic5", 0] call ace_common_fnc_doAnimation;
-
-		[
-			30,
-			[_player, _target],
-			{
-				params ["_args"];
-				_args params ["_player", "_target"];
-				hint "Tire Patched";
-				_target setDamage 0.2;
-				_target setVariable["milsim_ace_repair_wheel_canPatch", false];
-			},
-			{
-				params ["_args"];
-				_args params ["_player", "_target"];
-				hint "Stopped repair";
-				[_player, "", 0] call ace_common_fnc_doAnimation;
-			},
-			"Patching"
-		] call ace_common_fnc_progressBar
-	},
-	{ ( alive _target ) && ( [_player, "ToolKit"] call ace_common_fnc_hasItem ) && ( damage _target > 0.2 ) && ( _target getVariable["milsim_ace_repair_wheel_canPatch", true] ) }
-] call ace_interact_menu_fnc_createAction; 
-
-["ACE_Wheel", 0, ["ACE_MainActions"], _patchTire, true] call ace_interact_menu_fnc_addActionToClass;
-
-
 diag_log text "[MILSIM] (client) vehicle actions bound";
 
 nil;

framework/init/functions/fn_initServer.sqf

@@ -14,6 +14,13 @@ call EFUNC(common,logMissionInfo);
 call EFUNC(fbcb2_assets,initServer);
 call EFUNC(reinsert,initServer);
 
+// globally disable zeus lightning bolt functionality
+_curators = allMissionObjects "ModuleCurator_F";
+{
+	_x removeCuratorAddons ["CuratorOnly_Modules_F_Curator_Lightning"]; 
+	_x removeCuratorAddons ["A3_Modules_F_Curator_Lightning"]; 
+} foreach _curators;
+
 // declare init complete to other modules
 missionNamespace setVariable [QGVARMAIN(complete), true, true];
 

framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf

@@ -10,9 +10,39 @@
 GVAR(emptyGroupCleanupPFH) = [
 	{ 
 		{
-			if (local _x) then {
-				if ((count units _x) == 0) then {
+			if ((count units _x) == 0) then {
+				if (local _x) then {
+					[
+						LEVEL_INFO,
+						QUOTE(COMPONENT),
+						"DELETING EMPTY GROUP",
+						[
+							["groupId", groupId _x],
+							["netId", netId _x]
+						]
+					] call EFUNC(common,log);
 					deleteGroup _x;
+				} else {
+					if (isServer) then {
+						[
+							LEVEL_INFO,
+							QUOTE(COMPONENT),
+							"NON LOCAL EMPTY GROUP",
+ 							[
+								["groupId", groupId _x],
+								["groupOwner", groupOwner _x]
+							]
+						] call EFUNC(common,log);
+					} else {
+						[
+							LEVEL_INFO,
+							QUOTE(COMPONENT),
+							"EMPTY REMOTE GROUP",
+							[
+								["groupId", groupId _x]
+							]
+						] call EFUNC(common,log);
+					};
 				};
 			};
 		} forEach allGroups;
@@ -39,6 +69,3 @@ GVAR(emptyGroupCleanupPFH) = [
 	{ not (missionNamespace getVariable [QGVAR(emptyGroupCleanup_enable), false]) },
 	[]
 ] call CBA_fnc_createPerFrameHandlerObject;
-
-
-

framework/performance/functions/fn_calculateServerStats.sqf

@@ -12,7 +12,6 @@
 
 	private _rawCPS = _counter / (diag_frameNo - _frameNo);
 	missionNamespace setVariable [QGVAR(server_raw_cps), _rawCPS];
-	publicVariable QGVAR(server_raw_cps);
 
 	// with suspension
 	private _counter = 0;
@@ -26,7 +25,6 @@
 
 	private _serverCPS = _counter / (diag_frameNo - _frameNo);
 	missionNamespace setVariable [QGVAR(server_cps), _counter / (diag_frameNo - _frameNo)];
-	publicVariable QGVAR(server_cps);
 
 	// log to RPT
 	[

framework/script_version.hpp

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