diff --git a/CHANGELOG.md b/CHANGELOG.md index bd29508..860cc69 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,14 @@ 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 diff --git a/defines/SupplyCrates.hpp b/defines/SupplyCrates.hpp index 9bf50cd..600e989 100644 --- a/defines/SupplyCrates.hpp +++ b/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}, diff --git a/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf b/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf index 6dc4a90..8495d3b 100644 --- a/framework/performance/functions/fn_addEmptyGroupCleanupPFH.sqf +++ b/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; - - - diff --git a/framework/script_version.hpp b/framework/script_version.hpp index 7a5fe96..098984e 100644 --- a/framework/script_version.hpp +++ b/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